Merge pull request #16 from superannotateai/develop

Develop

Author: VaghinakDev

requirements.txt

@@ -1,9 +1,10 @@
 dnspython==2.1.0
-email-validator==1.1.3
 fire==0.4.0
 idna==3.3
 pydantic==1.8.2
 six==1.16.0
 termcolor==1.1.0
 typing-extensions==3.10.0.2
-?typingx==0.5.3
+typingx==0.5.3
+pydantic[email]
+email-validator>=1.0.3

src/superannotate_schemas/schemas/base.py

@@ -6,7 +6,6 @@
 from pydantic import BaseModel as PyDanticBaseModel
 from pydantic import conlist
 from pydantic import constr
-from pydantic import EmailStr
 from pydantic import Extra
 from pydantic import StrictInt
 from pydantic import StrictFloat
@@ -46,6 +45,18 @@ def enum_error_handling(self) -> str:
 StrictNumber = Union[StrictInt, StrictFloat]
 
 
+class EmailStr(StrictStr):
+    @classmethod
+    def validate(cls, value: Union[str]) -> Union[str]:
+        try:
+            constr(
+                regex=r"^(?=.{1,254}$)(?=.{1,64}@)[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
+            ).validate(value)
+        except StrRegexError:
+            raise ValueError("Invalid email")
+        return value
+
+
 class BaseModel(PyDanticBaseModel):
     class Config:
         extra = Extra.allow
@@ -121,10 +132,16 @@ class BaseInstance(TrackableModel, TimedBaseModel):
     class_name: Optional[NotEmptyStr] = Field(None, alias="className")
 
 
+class BaseInstanceTagAttribute(BaseAttribute):
+    name: NotEmptyStr
+    group_name: NotEmptyStr = Field(alias="groupName")
+
+
 class BaseInstanceTag(BaseInstance):
     type: ClassTypeEnum
     probability: Optional[StrictInt] = Field(100)
-    attributes: Optional[List[BaseAttribute]] = Field(list())
+    attributes: Optional[List[BaseInstanceTagAttribute]] = Field(list())
+    class_name: NotEmptyStr = Field(alias="className")
 
 
 class BaseMetadata(BaseModel):

src/superannotate_schemas/schemas/classes.py

@@ -24,7 +24,7 @@ class AttributeGroup(TimedBaseModel):
     id: Optional[StrictInt]
     class_id: Optional[StrictInt]
     name: StrictStr
-    is_multiselect: Optional[bool]
+    is_multiselect: Optional[bool] = False
     attributes: List[Attribute]
 
     def __hash__(self):
@@ -43,6 +43,10 @@ class AnnotationClass(TimedBaseModel):
     def __hash__(self):
         return hash(f"{self.id}{self.type}{self.name}")
 
+    class Config:
+        validate_assignment = True
+        use_enum_values = True
+
 
 class AnnotationClasses(BaseModel):
     __root__: List[AnnotationClass]

src/superannotate_schemas/schemas/external/document.py

@@ -5,16 +5,16 @@
 from superannotate_schemas.schemas.base import BaseInstance
 from superannotate_schemas.schemas.base import BaseMetadata as Metadata
 from superannotate_schemas.schemas.base import Tag
+from superannotate_schemas.schemas.base import NotEmptyStr
 
 from superannotate_schemas.schemas.base import BaseModel
 from pydantic import Field
 from pydantic import StrictStr
-from pydantic import StrictInt
 
 
 class Attribute(BaseAttribute):
-    id: StrictInt
-    group_id: StrictInt = Field(None, alias="groupId")
+    name: NotEmptyStr
+    group_name: NotEmptyStr = Field(alias="groupName")
 
 
 class DocumentInstance(BaseInstance):

src/superannotate_schemas/schemas/external/vector.py

@@ -2,7 +2,6 @@
 from typing import Optional
 from typing import Union
 
-from superannotate_schemas.schemas.base import BaseModel
 from pydantic import Field
 from pydantic import StrictFloat
 from pydantic import StrictInt
@@ -14,19 +13,20 @@
 from superannotate_schemas.schemas.base import AxisPoint
 from superannotate_schemas.schemas.base import BaseAttribute
 from superannotate_schemas.schemas.base import BaseImageMetadata
+from superannotate_schemas.schemas.base import BaseInstanceTag
+from superannotate_schemas.schemas.base import BaseModel
 from superannotate_schemas.schemas.base import BaseVectorInstance
 from superannotate_schemas.schemas.base import BboxPoints
 from superannotate_schemas.schemas.base import Comment
 from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE
 from superannotate_schemas.schemas.base import NotEmptyStr
 from superannotate_schemas.schemas.base import StrictNumber
 from superannotate_schemas.schemas.base import Tag
-from superannotate_schemas.schemas.base import BaseInstanceTag
 from superannotate_schemas.schemas.enums import VectorAnnotationTypeEnum
 
 
 class InstanceTag(BaseInstanceTag):
-    class_name: NotEmptyStr
+    pass
 
 
 class Attribute(BaseAttribute):
@@ -164,3 +164,4 @@ class VectorAnnotation(BaseModel):
     comments: Optional[List[Comment]] = Field(list())
     tags: Optional[List[Tag]] = Field(list())
     instances: Optional[List[AnnotationInstance]] = Field(list())
+

src/superannotate_schemas/schemas/internal/document.py

@@ -5,7 +5,7 @@
 from superannotate_schemas.schemas.base import BaseInstance
 from superannotate_schemas.schemas.base import BaseMetadata as Metadata
 from superannotate_schemas.schemas.base import Tag
-from superannotate_schemas.schemas.base import NotEmptyStr
+from superannotate_schemas.schemas.base import StrictInt
 
 from superannotate_schemas.schemas.base import BaseModel
 
@@ -14,8 +14,8 @@
 
 
 class Attribute(BaseAttribute):
-    name: NotEmptyStr
-    group_name: NotEmptyStr = Field(alias="groupName")
+    id: StrictInt
+    group_id: StrictInt = Field(None, alias="groupId")
 
 
 class DocumentInstance(BaseInstance):

src/superannotate_schemas/schemas/internal/vector.py

@@ -14,6 +14,7 @@
 from superannotate_schemas.schemas.base import StrictNumber
 from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE
 from superannotate_schemas.schemas.base import BaseModel
+from superannotate_schemas.schemas.base import NotEmptyStr
 
 from pydantic import StrictInt
 from pydantic import StrictFloat
@@ -25,9 +26,9 @@
 from pydantic.error_wrappers import ErrorWrapper
 
 
-
 class InstanceTag(BaseInstanceTag):
     class_id: StrictInt
+    class_name: NotEmptyStr = Field(None, alias="className")
 
 
 class Attribute(BaseAttribute):

src/superannotate_schemas/validators.py

@@ -15,7 +15,6 @@
 from superannotate_schemas.schemas.internal import VectorAnnotation as InternalVectorAnnotation
 from superannotate_schemas.schemas.internal import VideoAnnotation as InternalVideoAnnotation
 from superannotate_schemas.schemas.internal import DocumentAnnotation as InternalDocumentAnnotation
-from superannotate_schemas.schemas.classes import AnnotationClass
 
 
 from superannotate_schemas.schemas.base import BaseModel

tests/test_cli.py

@@ -2,7 +2,6 @@
 import os
 from os.path import dirname
 from tests import LIB_PATH
-from pydantic import EmailStr
 
 from unittest import TestCase