Merge pull request #308 from superannotateai/friday

Friday

Author: dshabin

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

@@ -110,18 +110,11 @@ 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)
+    @validator("created_at", "updated_at" , pre=True)
     def validate_created_at(cls, value):
         try:
-            constr(regex=DATE_REGEX).validate(value)
-        except (TypeError, StrRegexError):
-            raise TypeError(DATE_TIME_FORMAT_ERROR_MESSAGE)
-        return value
-
-    @validator("updated_at", pre=True)
-    def validate_updated_at(cls, value):
-        try:
-            constr(regex=DATE_REGEX).validate(value)
+            if value is not None:
+                constr(regex=DATE_REGEX).validate(value)
         except (TypeError, StrRegexError):
             raise TypeError(DATE_TIME_FORMAT_ERROR_MESSAGE)
         return value

tests/unit/test_validators.py

@@ -352,3 +352,48 @@ def test_validate_document_annotation_wrong_class_id(self):
                 sa.validate_annotations("Document", os.path.join(self.vector_folder_path, f"{tmpdir_name}/test_validate_document_annotation_wrong_class_id.json"))
                 self.assertIn("instances[0].classIdintegertypeexpected", out.getvalue().strip().replace(" ", ""))
 
+
+    def test_validate_document_annotation_with_null_created_at(self):
+        with tempfile.TemporaryDirectory() as tmpdir_name:
+            with open(f"{tmpdir_name}/test_validate_document_annotation_with_null_created_at.json", "w") as test_validate_document_annotation_with_null_created_at:
+                test_validate_document_annotation_with_null_created_at.write(
+                    '''
+                    {
+                        "metadata": {
+                            "name": "text_file_example_1",
+                            "status": "NotStarted",
+                            "url": "https://sa-public-files.s3.us-west-2.amazonaws.com/Text+project/text_file_example_1.txt",
+                            "projectId": 167826,
+                            "annotatorEmail": null,
+                            "qaEmail": null,
+                            "lastAction": {
+                                "email": "some.email@gmail.com",
+                                "timestamp": 1636620976450
+                            }
+                        },
+                        "instances": [{
+                                      "start": 253,
+                                      "end": 593,
+                                      "classId": 1,
+                                      "createdAt": null,
+                                      "createdBy": {
+                                        "email": "some.email@gmail.com",
+                                        "role": "Admin"
+                                      },
+                                      "updatedAt": null,
+                                      "updatedBy": {
+                                        "email": "some.email@gmail.com",
+                                        "role": "Admin"
+                                      },
+                                      "attributes": [],
+                                      "creationType": "Manual",
+                                      "className": "vid"
+                                    }],
+                        "tags": [],
+                        "freeText": ""
+                    }
+                    '''
+                )
+            self.assertTrue(sa.validate_annotations("Document", os.path.join(self.vector_folder_path,
+                                                                             f"{tmpdir_name}/test_validate_document_annotation_with_null_created_at.json")))
+