Merge pull request #319 from superannotateai/friday

Friday

Author: VaghinakDev

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

@@ -34,7 +34,7 @@ def enum_error_handling(self) -> str:
     "does not match expected format YYYY-MM-DDTHH:MM:SS.fffZ"
 )
 
-POINT_LABEL_KEY_FORMAT_ERROR_MESSAGE = "does not match expected format ^[0-9]*$"
+POINT_LABEL_KEY_FORMAT_ERROR_MESSAGE = "does not match expected format ^[0-9]+$"
 
 POINT_LABEL_VALUE_FORMAT_ERROR_MESSAGE = "str type expected"
 
@@ -199,7 +199,7 @@ class StringA(BaseModel):
 
 
 class PointLabels(BaseModel):
-    __root__: Dict[constr(regex=r"^[0-9]*$"), StrictStr]
+    __root__: Dict[constr(regex=r"^[0-9]+$"), StrictStr]
 
     @classmethod
     def __get_validators__(cls):
@@ -214,7 +214,7 @@ def validate_value(cls, values):
         validate_value = None
         for key, value in values.items():
             try:
-                validate_key = constr(regex=r"^[0-9]*$", min_length=1).validate(key)
+                validate_key = constr(regex=r"^[0-9]+$", min_length=1).validate(key)
             except ValueError:
                 errors.append(
                     ErrorWrapper(

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

@@ -47,7 +47,7 @@ class BaseVideoInstance(BaseInstance):
 
 
 class BboxInstance(BaseVideoInstance):
-    point_labels: Optional[Dict[constr(regex=r"^[0-9]*$"), NotEmptyStr]] = Field(
+    point_labels: Optional[Dict[constr(regex=r"^[0-9]+$"), NotEmptyStr]] = Field(
         None, alias="pointLabels"
     )
     timeline: Dict[float, BboxTimeStamp]

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

@@ -33,7 +33,7 @@ class MetaData(MetadataBase):
 
 class BaseTimeStamp(BaseModel):
     timestamp: StrictInt
-    attributes: List[Attribute]
+    attributes: Optional[List[Attribute]] = Field(list())
 
 
 class BboxTimeStamp(BaseTimeStamp):

src/superannotate/lib/core/types.py

@@ -48,7 +48,7 @@ class Metadata(BaseModel):
 
 
 class PointLabels(BaseModel):
-    __root__: Dict[constr(regex=r"^[0-9]*$"), str]  # noqa: F722
+    __root__: Dict[constr(regex=r"^[0-9]+$"), str]  # noqa: F722
 
 
 class BaseInstance(BaseModel):

tests/unit/test_validators.py

@@ -2027,5 +2027,5 @@ def test_validate_video_point_labels_bad_keys(self):
                 sa.validate_annotations("Video", os.path.join(self.vector_folder_path,
                                                               f"{tmpdir_name}/test_validate_video_point_labels_bad_keys.json"))
                 self.assertEqual(
-                    "instances[0].meta.pointLabels.bad_key_1doesnotmatchexpectedformat^[0-9]*$\ninstances[0].meta.pointLabels.bad_key_2doesnotmatchexpectedformat^[0-9]*$\ninstances[0].meta.pointLabels.doesnotmatchexpectedformat^[0-9]*$\ninstances[0].meta.pointLabels.1strtypeexpected\ninstances[2].meta.pointLabelsextrafieldsnotpermitted\ninstances[2].parameters[0].timestamps[2].timestampintegertypeexpected\ninstances[3].metafieldrequired\ninstances[4].metavalueisnotavaliddict\ninstances[5].metavalueisnotavaliddict\ntags[0]strtypeexpected",
+                    "instances[0].meta.pointLabels.bad_key_1doesnotmatchexpectedformat^[0-9]+$\ninstances[0].meta.pointLabels.bad_key_2doesnotmatchexpectedformat^[0-9]+$\ninstances[0].meta.pointLabels.doesnotmatchexpectedformat^[0-9]+$\ninstances[0].meta.pointLabels.1strtypeexpected\ninstances[2].meta.pointLabelsextrafieldsnotpermitted\ninstances[2].parameters[0].timestamps[2].timestampintegertypeexpected\ninstances[3].metafieldrequired\ninstances[4].metavalueisnotavaliddict\ninstances[5].metavalueisnotavaliddict\ntags[0]strtypeexpected",
                     out.getvalue().strip().replace(" ", ""))