Schema fixes

Author: Vaghinak Basentsyan

src/superannotate/lib/core/entities/pixel.py

@@ -3,15 +3,15 @@
 
 from lib.core.entities.utils import BaseImageInstance
 from lib.core.entities.utils import BaseModel
-from lib.core.entities.utils import MetadataBase
+from lib.core.entities.utils import Metadata
 from lib.core.entities.utils import Tag
 from pydantic import Field
 from pydantic import validator
 from pydantic.color import Color
 from pydantic.color import ColorType
 
 
-class PixelMetaData(MetadataBase):
+class PixelMetaData(Metadata):
     is_segmented: Optional[bool] = Field(None, alias="isSegmented")
 
 

src/superannotate/lib/core/entities/utils.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from enum import Enum
 from typing import Dict
 from typing import List
@@ -24,6 +23,9 @@ def enum_error_handling(self) -> str:
 NotEmptyStr = constr(strict=True, min_length=1)
 
 
+DATE_REGEX = r'\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d{3})Z'
+
+
 class BaseModel(PyDanticBaseModel):
     class Config:
         use_enum_values = True
@@ -98,8 +100,8 @@ class BboxPoints(BaseModel):
 
 
 class TimedBaseModel(BaseModel):
-    created_at: constr(regex=r'\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d{3})Z') = Field(None, alias="createdAt")
-    updated_at: constr(regex=r'\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d{3})Z') = Field(None, alias="updatedAt")
+    created_at: constr(regex=DATE_REGEX) = Field(None, alias="createdAt")
+    updated_at: constr(regex=DATE_REGEX) = Field(None, alias="updatedAt")
 
 
 class UserAction(BaseModel):
@@ -128,12 +130,14 @@ class BaseInstance(TrackableModel, TimedBaseModel):
 
 
 class MetadataBase(BaseModel):
+    name: NotEmptyStr
     last_action: Optional[LastUserAction] = Field(None, alias="lastAction")
     width: Optional[int]
     height: Optional[int]
     project_id: Optional[int] = Field(None, alias="projectId")
     annotator_email: Optional[EmailStr] = Field(None, alias="annotatorEmail")
     qa_email: Optional[EmailStr] = Field(None, alias="qaEmail")
+    status: Optional[AnnotationStatusEnum]
 
 
 class PointLabels(BaseModel):
@@ -154,7 +158,7 @@ class Comment(TimedBaseModel, TrackableModel):
 
 class BaseImageInstance(BaseInstance):
     class_id: Optional[int] = Field(None, alias="classId")
-    class_name: Optional[str] = Field(None, alias="className")
+    class_name: str = Field(alias="className")
     visible: Optional[bool]
     locked: Optional[bool]
     probability: Optional[int] = Field(100)
@@ -175,7 +179,5 @@ class BaseVectorInstance(BaseImageInstance):
 
 
 class Metadata(MetadataBase):
-    name: NotEmptyStr
-    status: Optional[AnnotationStatusEnum]
     pinned: Optional[bool]
     is_predicted: Optional[bool] = Field(None, alias="isPredicted")

src/superannotate/lib/core/entities/vector.py

@@ -2,7 +2,6 @@
 from typing import Optional
 from typing import Union
 
-from lib.core.entities.utils import AttributeGroup
 from lib.core.entities.utils import BaseModel
 from lib.core.entities.utils import BaseVectorInstance
 from lib.core.entities.utils import BboxPoints
@@ -12,20 +11,6 @@
 from lib.core.entities.utils import VectorAnnotationTypeEnum
 from pydantic import conlist
 from pydantic import Field
-from pydantic import StrictStr
-from pydantic import validate_model
-from pydantic import ValidationError
-from pydantic import validator
-
-
-class ClassesJson(BaseModel):
-    name: StrictStr
-    color: StrictStr
-    attribute_groups: List[AttributeGroup]
-
-
-class Tags(BaseModel):
-    items: Optional[List[str]]
 
 
 class AxisPoint(BaseModel):
@@ -126,9 +111,7 @@ def return_action(cls, values):
         try:
             instance_type = values["type"]
         except KeyError:
-            raise ValueError(
-                f"meta.type required"
-            )
+            raise ValueError("meta.type required")
         try:
             return ANNOTATION_TYPES[instance_type](**values)
         except KeyError:

src/superannotate/lib/core/entities/video_export.py

@@ -4,18 +4,15 @@
 from typing import Optional
 from typing import Union
 
-from lib.core.entities.utils import AnnotationStatusEnum
 from lib.core.entities.utils import Attribute
 from lib.core.entities.utils import BaseInstance
 from lib.core.entities.utils import BaseModel
 from lib.core.entities.utils import BboxPoints
 from lib.core.entities.utils import MetadataBase
-from lib.core.entities.utils import NotEmptyStr
 from lib.core.entities.utils import PointLabels
 from lib.core.entities.utils import Tag
 from pydantic import conlist
 from pydantic import Field
-from pydantic import validator
 
 
 class VideoType(str, Enum):
@@ -24,9 +21,7 @@ class VideoType(str, Enum):
 
 
 class MetaData(MetadataBase):
-    name: NotEmptyStr
     url: Optional[str]
-    status: Optional[AnnotationStatusEnum]
     duration: Optional[int]
     error: Optional[bool]
 
@@ -113,7 +108,7 @@ def return_action(cls, values):
             instance_type = values["meta"]["type"]
         except KeyError:
             raise ValueError(
-                f"meta.type required"
+                "meta.type required"
             )
         try:
             return INSTANCES[instance_type](**values)

tests/integration/annotations/test_annotation_upload_pixel.py

@@ -31,7 +31,7 @@ def folder_path(self):
     @pytest.mark.flaky(reruns=2)
     @patch("lib.core.usecases.annotations.UploadAnnotationUseCase.s3_bucket")
     def test_recursive_annotation_upload_pixel(self, s3_bucket):
-        sa.create_folder(self.PROJECT_NAME,self.FOLDER)
+        sa.create_folder(self.PROJECT_NAME, self.FOLDER)
         destination = f"{self.PROJECT_NAME}/{self.FOLDER}"
         sa.upload_images_from_folder_to_project(
             destination, self.folder_path, recursive_subfolders=False
@@ -42,17 +42,17 @@ def test_recursive_annotation_upload_pixel(self, s3_bucket):
                                                                                   recursive_subfolders=False)
         self.assertEqual(len(uploaded_annotations), 3)
         self.assertEqual(len(s3_bucket.method_calls), 6)
-        self.assertIn(f"Uploading 3 annotations from {self.S3_FOLDER_PATH} to the project {destination}.", self._caplog.text)
+        self.assertIn(f"Uploading 3 annotations from {self.S3_FOLDER_PATH} to the project {destination}.",
+                      self._caplog.text)
 
         uploaded_annotations, _, _ = sa.upload_preannotations_from_folder_to_project(destination,
-                                                                                  self.S3_FOLDER_PATH,
-                                                                                  from_s3_bucket="superannotate-python-sdk-test",
-                                                                                  recursive_subfolders=False)
+                                                                                     self.S3_FOLDER_PATH,
+                                                                                     from_s3_bucket="superannotate-python-sdk-test",
+                                                                                     recursive_subfolders=False)
         self.assertEqual(len(s3_bucket.method_calls), 12)
         self.assertIn(f"Uploading 3 annotations from {self.S3_FOLDER_PATH} to the project {destination}.",
                       self._caplog.text)
 
-
     @pytest.mark.flaky(reruns=2)
     def test_annotation_upload_pixel(self):
         sa.upload_images_from_folder_to_project(self.PROJECT_NAME, self.folder_path)
@@ -67,7 +67,6 @@ def test_annotation_upload_pixel(self):
             )
 
 
-
 class TestAnnotationUploadPixelSingle(BaseTestCase):
     PROJECT_NAME = "TestAnnotationUploadPixelSingle"
     PROJECT_DESCRIPTION = "Desc"
@@ -83,7 +82,7 @@ def folder_path_pixel(self):
 
     @pytest.mark.flaky(reruns=2)
     @patch("lib.core.usecases.annotations.UploadAnnotationUseCase.s3_bucket")
-    def test_annotation_upload_pixel(self,s3_bucket):
+    def test_annotation_upload_pixel(self, s3_bucket):
         annotation_path = join(self.folder_path_pixel, f"{self.IMAGE_NAME}___pixel.json")
         sa.upload_image_to_project(self.PROJECT_NAME, join(self.folder_path_pixel, self.IMAGE_NAME))
         sa.upload_image_annotations(self.PROJECT_NAME, self.IMAGE_NAME, annotation_path)