validate - fix datetime- add error wrapper

Author: dshabin

src/superannotate/lib/app/interface/sdk_interface.py

@@ -3657,7 +3657,9 @@ def validate_annotations(
         """
     with open(annotations_json) as file:
         annotation_data = json.loads(file.read())
-        response = controller.validate_annotations(project_type, annotation_data, allow_extra=False)
+        response = controller.validate_annotations(
+            project_type, annotation_data, allow_extra=False
+        )
         if response.errors:
             raise AppException(response.errors)
         is_valid, _ = response.data

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

@@ -7,8 +7,8 @@
 from pydantic import conlist
 from pydantic import constr
 from pydantic import EmailStr
-from pydantic import Field
 from pydantic import Extra
+from pydantic import Field
 from pydantic import validator
 from pydantic.errors import EnumMemberError
 
@@ -26,9 +26,10 @@ def enum_error_handling(self) -> str:
 
 DATE_REGEX = r"\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d{3})Z"
 
+DATE_TIME_FORMAT_ERROR_MESSAGE = "Expected format: YYYY-mm-ddTHH:MM:SS.055Z"
 
-class BaseModel(PyDanticBaseModel):
 
+class BaseModel(PyDanticBaseModel):
     class Config:
         extra = Extra.allow
         use_enum_values = True
@@ -106,6 +107,26 @@ class TimedBaseModel(BaseModel):
     created_at: constr(regex=DATE_REGEX) = Field(None, alias="createdAt")
     updated_at: constr(regex=DATE_REGEX) = Field(None, alias="updatedAt")
 
+    @validator("created_at", pre=True)
+    def validate_created_at(cls, value):
+        from pydantic import StrRegexError
+
+        try:
+            constr(regex=DATE_REGEX).validate(value)
+        except StrRegexError:
+            raise TypeError(DATE_TIME_FORMAT_ERROR_MESSAGE)
+        return value
+
+    @validator("updated_at", pre=True)
+    def validate_updated_at(cls, value):
+        from pydantic import StrRegexError
+
+        try:
+            constr(regex=DATE_REGEX).validate(value)
+        except StrRegexError:
+            raise TypeError(DATE_TIME_FORMAT_ERROR_MESSAGE)
+        return value
+
 
 class UserAction(BaseModel):
     email: EmailStr

src/superannotate/lib/core/usecases/images.py

@@ -3154,11 +3154,11 @@ def execute(self):
 
 class ValidateAnnotationUseCase(BaseUseCase):
     def __init__(
-            self,
-            project_type: str,
-            annotation: dict,
-            validators: BaseAnnotationValidator,
-            allow_extra: bool = True
+        self,
+        project_type: str,
+        annotation: dict,
+        validators: BaseAnnotationValidator,
+        allow_extra: bool = True,
     ):
         super().__init__()
         self._project_type = project_type

src/superannotate/lib/infrastructure/controller.py

@@ -1642,10 +1642,13 @@ def delete_annotations(
         )
         return use_case.execute()
 
-    def validate_annotations(self, project_type: str, annotation: dict, allow_extra: bool = False):
+    def validate_annotations(
+        self, project_type: str, annotation: dict, allow_extra: bool = False
+    ):
         use_case = usecases.ValidateAnnotationUseCase(
-            project_type, annotation,
+            project_type,
+            annotation,
             validators=self.annotation_validators,
-            allow_extra=allow_extra
+            allow_extra=allow_extra,
         )
         return use_case.execute()

src/superannotate/lib/infrastructure/validators.py

@@ -22,8 +22,9 @@ def wrap_error(e: ValidationError) -> str:
     error_messages = defaultdict(list)
     for error in e.errors():
         errors_list = list(error["loc"])
-        errors_list[1::2] = [f"[{i}]" for i in errors_list[1::2]]
-        errors_list[2::2] = [f".{i}" for i in errors_list[2::2]]
+        errors_list[1::] = [
+            f"[{i}]" if isinstance(i, int) else f".{i}" for i in errors_list[1::]
+        ]
         error_messages["".join(errors_list)].append(error["msg"])
     texts = ["\n"]
     for field, text in error_messages.items():

tests/unit/test_validators.py

@@ -89,7 +89,7 @@ def test_validate_annotation_without_metadata(self):
                 self.assertIn("metadatafieldrequired", out.getvalue().strip().replace(" ", ""))
 
     def test_validate_annotation_invalid_date_time_format(self):
-        with self.assertRaises(ValidationError):
+        with self.assertRaisesRegexp(ValidationError,"Expected format: YYYY-mm-ddTHH:MM:SS.055Z"):
             TimedBaseModel(createdAt="2021-11-02T15:11:50.065000Z")
 
     def test_validate_annotation_valid_date_time_format(self):