Merge pull request #317 from superannotateai/friday

Fix stricts

Author: dshabin

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

@@ -10,6 +10,8 @@
 from pydantic import Extra
 from pydantic import Field
 from pydantic import StrictStr
+from pydantic import StrictInt
+from pydantic import StrictBool
 from pydantic import StrRegexError
 from pydantic import ValidationError
 from pydantic import validator
@@ -90,8 +92,8 @@ class BaseImageRoleEnum(str, Enum):
 
 
 class Attribute(BaseModel):
-    id: Optional[int]
-    group_id: Optional[int] = Field(None, alias="groupId")
+    id: Optional[StrictInt]
+    group_id: Optional[StrictInt] = Field(None, alias="groupId")
     name: NotEmptyStr
     group_name: NotEmptyStr = Field(alias="groupName")
 
@@ -102,6 +104,7 @@ class Tag(BaseModel):
 
 class AttributeGroup(BaseModel):
     name: NotEmptyStr
+    # TODO :
     is_multiselect: Optional[int] = False
     attributes: List[Attribute]
 
@@ -146,21 +149,21 @@ def clean_creation_type(cls, _):
 
 class LastUserAction(BaseModel):
     email: EmailStr
-    timestamp: int
+    timestamp: StrictInt
 
 
 class BaseInstance(TrackableModel, TimedBaseModel):
-    class_id: Optional[int] = Field(None, alias="classId")
+    class_id: Optional[StrictInt] = Field(None, alias="classId")
     class_name: Optional[NotEmptyStr] = Field(None, alias="className")
 
 
 class MetadataBase(BaseModel):
-    url: Optional[str]
+    url: Optional[StrictStr]
     name: NotEmptyStr
     last_action: Optional[LastUserAction] = Field(None, alias="lastAction")
-    width: Optional[int]
-    height: Optional[int]
-    project_id: Optional[int] = Field(None, alias="projectId")
+    width: Optional[StrictInt]
+    height: Optional[StrictInt]
+    project_id: Optional[StrictInt] = Field(None, alias="projectId")
     annotator_email: Optional[EmailStr] = Field(None, alias="annotatorEmail")
     qa_email: Optional[EmailStr] = Field(None, alias="qaEmail")
     status: Optional[AnnotationStatusEnum]
@@ -174,16 +177,16 @@ class Correspondence(BaseModel):
 class Comment(TimedBaseModel, TrackableModel):
     x: float
     y: float
-    resolved: Optional[bool] = Field(False)
+    resolved: Optional[StrictBool] = Field(False)
     correspondence: conlist(Correspondence, min_items=1)
 
 
 class BaseImageInstance(BaseInstance):
-    visible: Optional[bool]
-    locked: Optional[bool]
-    probability: Optional[int] = Field(100)
+    visible: Optional[StrictBool]
+    locked: Optional[StrictBool]
+    probability: Optional[StrictInt] = Field(100)
     attributes: Optional[List[Attribute]] = Field(list())
-    error: Optional[bool]
+    error: Optional[StrictBool]
 
     class Config:
         error_msg_templates = {
@@ -196,7 +199,7 @@ class StringA(BaseModel):
 
 
 class PointLabels(BaseModel):
-    __root__: Dict[constr(regex=r"^[0-9]*$"), str]
+    __root__: Dict[constr(regex=r"^[0-9]*$"), StrictStr]
 
     @classmethod
     def __get_validators__(cls):
@@ -244,10 +247,10 @@ def validate_type(cls, values):
 class BaseVectorInstance(BaseImageInstance):
     type: VectorAnnotationTypeEnum
     point_labels: Optional[PointLabels] = Field(None, alias="pointLabels")
-    tracking_id: Optional[str] = Field(None, alias="trackingId")
-    group_id: Optional[int] = Field(None, alias="groupId")
+    tracking_id: Optional[StrictStr] = Field(None, alias="trackingId")
+    group_id: Optional[StrictInt] = Field(None, alias="groupId")
 
 
 class Metadata(MetadataBase):
-    pinned: Optional[bool]
-    is_predicted: Optional[bool] = Field(None, alias="isPredicted")
+    pinned: Optional[StrictBool]
+    is_predicted: Optional[StrictBool] = Field(None, alias="isPredicted")

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

@@ -14,6 +14,8 @@
 from pydantic import constr
 from pydantic import Field
 from pydantic import StrictStr
+from pydantic import StrictInt
+from pydantic import StrictBool
 
 
 class VideoType(str, Enum):
@@ -23,13 +25,13 @@ class VideoType(str, Enum):
 
 class MetaData(MetadataBase):
     name: Optional[StrictStr]
-    width: Optional[int]
-    height: Optional[int]
-    duration: Optional[int]
+    width: Optional[StrictInt]
+    height: Optional[StrictInt]
+    duration: Optional[StrictInt]
 
 
 class BaseTimeStamp(BaseModel):
-    active: Optional[bool]
+    active: Optional[StrictBool]
     attributes: Optional[Dict[constr(regex=r"^[-|+]$"), List[Attribute]]]  # noqa: F722
 
 
@@ -40,7 +42,7 @@ class BboxTimeStamp(BaseTimeStamp):
 class BaseVideoInstance(BaseInstance):
     id: Optional[str]
     type: VideoType
-    locked: Optional[bool]
+    locked: Optional[StrictBool]
     timeline: Dict[float, BaseTimeStamp]
 
 

tests/unit/test_validators.py

@@ -1211,7 +1211,7 @@ def test_validate_vector_temlpate_polygon_polyline_min_annotation(self):
                                     "email": "some@some.com",
                                     "timestamp": 1636964198056
                                 },
-                                "width": 1234,
+                                "width": "1234",
                                 "height": 1540,
                                 "name": "t.png",
                                 "projectId": 164988,
@@ -1348,11 +1348,12 @@ def test_validate_vector_temlpate_polygon_polyline_min_annotation(self):
                 '''
                 )
 
+
             with catch_prints() as out:
                 sa.validate_annotations("Vector", os.path.join(self.vector_folder_path,
                                                                f"{tmpdir_name}/test_validate_vector_temlpate_polygon_polyline_min_annotation.json"))
                 self.assertEqual(
-                    "instances[0].pointsensurethisvaluehasatleast1items\ninstances[1].pointsensurethisvaluehasatleast3items\ninstances[2].pointsensurethisvaluehasatleast2items",
+                    "metadata.widthintegertypeexpected\ninstances[0].pointsensurethisvaluehasatleast1items\ninstances[1].pointsensurethisvaluehasatleast3items\ninstances[2].pointsensurethisvaluehasatleast2items",
                     out.getvalue().strip().replace(" ", ""))
 
     def test_validate_video_point_labels(self):