Merge pull request #14 from superannotateai/develop

Develop

Author: VaghinakDev

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

src/superannotate_schemas/schemas/base.py

@@ -26,6 +26,7 @@
 from superannotate_schemas.schemas.enums import BaseImageRoleEnum
 from superannotate_schemas.schemas.enums import VectorAnnotationTypeEnum
 from superannotate_schemas.schemas.enums import AnnotationStatusEnum
+from superannotate_schemas.schemas.enums import ClassTypeEnum
 from superannotate_schemas.schemas.constances import DATE_REGEX
 from superannotate_schemas.schemas.constances import DATE_TIME_FORMAT_ERROR_MESSAGE
 from superannotate_schemas.schemas.constances import POINT_LABEL_VALUE_FORMAT_ERROR_MESSAGE
@@ -64,20 +65,14 @@ class AxisPoint(BaseModel):
 class BaseAttribute(BaseModel):
     id: Optional[StrictInt]
     group_id: Optional[StrictInt] = Field(alias="groupId")
-    name: NotEmptyStr
-    group_name: NotEmptyStr = Field(alias="groupName")
+    name: Optional[NotEmptyStr]
+    group_name: Optional[NotEmptyStr] = Field(alias="groupName")
 
 
 class Tag(BaseModel):
     __root__: NotEmptyStr
 
 
-class AttributeGroup(BaseModel):
-    name: NotEmptyStr
-    is_multiselect: Optional[bool] = Field(False)
-    attributes: List[BaseAttribute]
-
-
 class BboxPoints(BaseModel):
     x1: StrictNumber
     x2: StrictNumber
@@ -126,6 +121,12 @@ class BaseInstance(TrackableModel, TimedBaseModel):
     class_name: Optional[NotEmptyStr] = Field(None, alias="className")
 
 
+class BaseInstanceTag(BaseInstance):
+    type: ClassTypeEnum
+    probability: Optional[StrictInt] = Field(100)
+    attributes: Optional[List[BaseAttribute]] = Field(list())
+
+
 class BaseMetadata(BaseModel):
     name: NotEmptyStr
     url: Optional[StrictStr]
@@ -220,15 +221,8 @@ class BaseVectorInstance(BaseImageAnnotationInstance):
     tracking_id: Optional[str] = Field(alias="trackingId")
     group_id: Optional[int] = Field(alias="groupId")
 
-#
-# class Metadata(BaseMetadata):
-#     name: NotEmptyStr
-#     status: Optional[AnnotationStatusEnum]
-#     pinned: Optional[StrictBool]
-#     is_predicted: Optional[StrictBool] = Field(None, alias="isPredicted")
-
 
-class PixelColor(BaseModel):
+class HexColor(BaseModel):
     __root__: ColorType
 
     @validator("__root__")

src/superannotate_schemas/schemas/classes.py

@@ -0,0 +1,48 @@
+from typing import Optional
+from typing import List
+
+from superannotate_schemas.schemas.base import BaseModel
+from superannotate_schemas.schemas.base import TimedBaseModel
+from superannotate_schemas.schemas.base import StrictInt
+from superannotate_schemas.schemas.base import StrictStr
+from superannotate_schemas.schemas.base import HexColor
+from superannotate_schemas.schemas.enums import ClassTypeEnum
+
+
+class Attribute(TimedBaseModel):
+    id: Optional[StrictInt]
+    group_id: Optional[StrictInt]
+    project_id: Optional[StrictInt]
+    name: StrictStr
+    count: Optional[StrictInt]
+
+    def __hash__(self):
+        return hash(f"{self.id}{self.group_id}{self.name}")
+
+
+class AttributeGroup(TimedBaseModel):
+    id: Optional[StrictInt]
+    class_id: Optional[StrictInt]
+    name: StrictStr
+    is_multiselect: Optional[bool]
+    attributes: List[Attribute]
+
+    def __hash__(self):
+        return hash(f"{self.id}{self.class_id}{self.name}")
+
+
+class AnnotationClass(TimedBaseModel):
+    id: Optional[StrictInt]
+    project_id: Optional[StrictInt]
+    type: ClassTypeEnum = ClassTypeEnum.OBJECT
+    name: StrictStr
+    color: HexColor
+    count: Optional[StrictInt]
+    attribute_groups: List[AttributeGroup]
+
+    def __hash__(self):
+        return hash(f"{self.id}{self.type}{self.name}")
+
+
+class AnnotationClasses(BaseModel):
+    __root__: List[AnnotationClass]

src/superannotate_schemas/schemas/enums.py

@@ -10,6 +10,7 @@ class VectorAnnotationTypeEnum(str, Enum):
     POLYGON = "polygon"
     POINT = "point"
     RBBOX = "rbbox"
+    TAG = "tag"
 
 
 class CreationTypeEnum(str, Enum):
@@ -38,3 +39,8 @@ class BaseImageRoleEnum(str, Enum):
     ADMIN = "Admin"
     ANNOTATOR = "Annotator"
     QA = "QA"
+
+
+class ClassTypeEnum(str, Enum):
+    OBJECT = "object"
+    TAG = "tag"

src/superannotate_schemas/schemas/external/pixel.py

@@ -6,7 +6,7 @@
 from superannotate_schemas.schemas.base import BaseImageMetadata
 from superannotate_schemas.schemas.base import NotEmptyStr
 from superannotate_schemas.schemas.base import StrictStr
-from superannotate_schemas.schemas.base import PixelColor
+from superannotate_schemas.schemas.base import HexColor
 from superannotate_schemas.schemas.base import Tag
 from superannotate_schemas.schemas.base import Comment
 
@@ -25,7 +25,7 @@ class MetaData(BaseImageMetadata):
 
 
 class AnnotationPart(BaseModel):
-    color: PixelColor
+    color: HexColor
 
 
 class AnnotationInstance(BaseImageAnnotationInstance):

src/superannotate_schemas/schemas/external/vector.py

@@ -21,9 +21,14 @@
 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
+
+
 class Attribute(BaseAttribute):
     name: NotEmptyStr
     group_name: NotEmptyStr = Field(alias="groupName")
@@ -115,12 +120,13 @@ class Cuboid(VectorInstance):
     VectorAnnotationTypeEnum.POLYLINE: PolyLine,
     VectorAnnotationTypeEnum.ELLIPSE: Ellipse,
     VectorAnnotationTypeEnum.RBBOX: RotatedBox,
+    VectorAnnotationTypeEnum.TAG: InstanceTag,
 }
 
 
 class AnnotationInstance(BaseModel):
     __root__: Union[
-        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox
+        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox, InstanceTag
     ]
 
     @classmethod

src/superannotate_schemas/schemas/internal/pixel.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 from superannotate_schemas.schemas.base import BaseImageMetadata as Metadata
-from superannotate_schemas.schemas.base import PixelColor
+from superannotate_schemas.schemas.base import HexColor
 from superannotate_schemas.schemas.base import BaseAttribute
 from superannotate_schemas.schemas.base import BaseImageAnnotationInstance
 from superannotate_schemas.schemas.base import Tag
@@ -19,7 +19,7 @@ class Attribute(BaseAttribute):
 
 
 class AnnotationPart(BaseModel):
-    color: PixelColor
+    color: HexColor
 
 
 class AnnotationInstance(BaseImageAnnotationInstance):

src/superannotate_schemas/schemas/internal/vector.py

@@ -10,6 +10,7 @@
 from superannotate_schemas.schemas.base import Tag
 from superannotate_schemas.schemas.base import AxisPoint
 from superannotate_schemas.schemas.base import VectorAnnotationTypeEnum
+from superannotate_schemas.schemas.base import BaseInstanceTag
 from superannotate_schemas.schemas.base import StrictNumber
 from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE
 from superannotate_schemas.schemas.base import BaseModel
@@ -24,6 +25,11 @@
 from pydantic.error_wrappers import ErrorWrapper
 
 
+
+class InstanceTag(BaseInstanceTag):
+    class_id: StrictInt
+
+
 class Attribute(BaseAttribute):
     id: StrictInt
     group_id: StrictInt = Field(alias="groupId")
@@ -110,11 +116,13 @@ class Cuboid(VectorInstance):
     VectorAnnotationTypeEnum.POLYLINE: PolyLine,
     VectorAnnotationTypeEnum.ELLIPSE: Ellipse,
     VectorAnnotationTypeEnum.RBBOX: RotatedBox,
+    VectorAnnotationTypeEnum.TAG: InstanceTag,
 }
 
+
 class AnnotationInstance(BaseModel):
     __root__: Union[
-        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox
+        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox, InstanceTag
     ]
 
     @classmethod

src/superannotate_schemas/validators.py

@@ -15,6 +15,7 @@
 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

@@ -82,4 +82,5 @@ def test_(self):
         #         pass
         # print(time.time() - s)
         import datetime
-        print((datetime.datetime.now(datetime.timezone.utc)).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + 'Z')
+        print((datetime.datetime.now(datetime.timezone.utc)).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + 'Z')
+