Merge remote-tracking branch 'origin/validations' into createion_type

# Conflicts:
#	src/superannotate/lib/core/entities/utils.py

Author: Vaghinak Basentsyan

src/superannotate/lib/app/annotation_helpers.py

@@ -74,7 +74,7 @@ def add_annotation_bbox_to_json(
     annotation_class_name,
     annotation_class_attributes=None,
     error=None,
-    image_name: str = ""
+    image_name: str = "",
 ):
     """Add a bounding box annotation to SuperAnnotate format annotation JSON
 

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

@@ -2476,6 +2476,7 @@ def upload_annotations_from_folder_to_project(
         folder_name=folder_name,
         annotation_paths=annotation_paths,  # noqa: E203
         client_s3_bucket=from_s3_bucket,
+        folder_path=folder_path,
     )
     if response.errors:
         raise AppException(response.errors)
@@ -3069,7 +3070,12 @@ def add_annotation_bbox_to_image(
     """
     annotations = get_image_annotations(project, image_name)["annotation_json"]
     annotations = add_annotation_bbox_to_json(
-        annotations, bbox, annotation_class_name, annotation_class_attributes, error, image_name
+        annotations,
+        bbox,
+        annotation_class_name,
+        annotation_class_attributes,
+        error,
+        image_name,
     )
     upload_image_annotations(project, image_name, annotations, verbose=False)
 

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

@@ -4,17 +4,24 @@
 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 PixelColor
 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):
     is_segmented: Optional[bool] = Field(None, alias="isSegmented")
 
 
 class PixelAnnotationPart(BaseModel):
-    color: PixelColor
+    color: ColorType
+
+    @validator("color")
+    def validate_color(cls, v):
+        color = Color(v)
+        return color.as_hex()
 
 
 class PixelAnnotationInstance(BaseImageInstance):

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

@@ -10,9 +10,6 @@
 from pydantic import EmailStr
 from pydantic import Field
 from pydantic import validator
-from pydantic.color import Color
-from pydantic.color import ColorType
-from pydantic.datetime_parse import parse_datetime
 from pydantic.errors import EnumMemberError
 
 
@@ -37,17 +34,6 @@ class Config:
         }
 
 
-class StringDate(datetime):
-    @classmethod
-    def __get_validators__(cls):
-        yield parse_datetime
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, v: datetime):
-        return f'{v.replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]}Z'
-
-
 class VectorAnnotationTypeEnum(str, Enum):
     BBOX = "bbox"
     ELLIPSE = "ellipse"
@@ -112,8 +98,8 @@ class BboxPoints(BaseModel):
 
 
 class TimedBaseModel(BaseModel):
-    created_at: StringDate = Field(None, alias="createdAt")
-    updated_at: StringDate = Field(None, alias="updatedAt")
+    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")
 
 
 class UserAction(BaseModel):
@@ -193,12 +179,3 @@ class Metadata(MetadataBase):
     status: Optional[AnnotationStatusEnum]
     pinned: Optional[bool]
     is_predicted: Optional[bool] = Field(None, alias="isPredicted")
-
-
-class PixelColor(BaseModel):
-    __root__: ColorType
-
-    @validator("__root__")
-    def validate_color(cls, v):
-        color = Color(v)
-        return color.as_hex()

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

@@ -49,6 +49,7 @@ def __init__(
         validators: BaseAnnotationValidator,
         pre_annotation: bool = False,
         client_s3_bucket=None,
+        folder_path: str = None,
     ):
         super().__init__(reporter)
         self._project = project
@@ -66,6 +67,7 @@ def __init__(
         self.missing_attribute_groups = set()
         self.missing_classes = set()
         self.missing_attributes = set()
+        self._folder_path = folder_path
 
     @property
     def annotation_postfix(self):
@@ -173,7 +175,6 @@ def _upload_annotation(
                 validators=self._validators,
             ).execute()
             if response.errors:
-                self.reporter.store_message("Invalid jsons", path)
                 return path, False
             return path, True
         except Exception as _:
@@ -193,14 +194,23 @@ def get_bucket_to_upload(self, ids: List[int]):
 
     def _log_report(self):
         for key, values in self.reporter.custom_messages.items():
-            template = key + ": {}"
-            if key == "missing_classes":
-                template = "Could not find annotation classes matching existing classes on the platform: [{}]"
-            elif key == "missing_attribute_groups":
-                template = "Could not find attribute groups matching existing attribute groups on the platform: [{}]"
-            elif key == "missing_attributes":
-                template = "Could not find attributes matching existing attributes on the platform: [{}]"
-            logger.warning(template.format("', '".join(values)))
+            if key in [
+                "missing_classes",
+                "missing_attribute_groups",
+                "missing_attributes",
+            ]:
+                template = key + ": {}"
+                if key == "missing_classes":
+                    template = "Could not find annotation classes matching existing classes on the platform: [{}]"
+                elif key == "missing_attribute_groups":
+                    template = "Could not find attribute groups matching existing attribute groups on the platform: [{}]"
+                elif key == "missing_attributes":
+                    template = "Could not find attributes matching existing attributes on the platform: [{}]"
+                logger.warning(template.format("', '".join(values)))
+        if self.reporter.custom_messages.get("invalid_jsons"):
+            logger.warning(
+                f"Couldn't validate {len(self.reporter.custom_messages['invalid_jsons'])}/{len(self._annotations_to_upload + self._missing_annotations)} annotations from {self._folder_path}."
+            )
 
     def execute(self):
         uploaded_annotations = []
@@ -457,4 +467,5 @@ def execute(self):
                     )
             else:
                 self._response.errors = "Invalid json"
+                self.reporter.store_message("invalid_jsons", self._annotation_path)
         return self._response

src/superannotate/lib/infrastructure/controller.py

@@ -1323,6 +1323,7 @@ def upload_annotations_from_folder(
         annotation_paths: List[str],
         client_s3_bucket=None,
         is_pre_annotations: bool = False,
+        folder_path: str = None,
     ):
         project = self._get_project(project_name)
         folder = self._get_folder(project, folder_name)
@@ -1342,6 +1343,7 @@ def upload_annotations_from_folder(
             ),
             validators=self.annotation_validators,
             reporter=Reporter(log_info=False, log_warning=False),
+            folder_path=folder_path,
         )
         return use_case.execute()
 

tests/integration/annotations/test_text_annotation_upload.py

@@ -52,7 +52,7 @@ def test_document_annotation_upload_invalid_json(self):
         self.assertEqual(len(uploaded_annotations), 0)
         self.assertEqual(len(failed_annotations), 1)
         self.assertEqual(len(missing_annotations), 0)
-        self.assertIn("Invalid json", self._caplog.text)
+        self.assertIn("Couldn't validate 1/1 annotations", self._caplog.text)
 
     def test_text_annotation_upload(self):
         sa.create_annotation_classes_from_classes_json(self.PROJECT_NAME, self.classes_path)

tests/integration/annotations/test_video_annotation_upload.py

@@ -59,7 +59,7 @@ def test_video_annotation_upload_invalid_json(self):
         self.assertEqual(len(uploaded_annotations), 0)
         self.assertEqual(len(failed_annotations), 1)
         self.assertEqual(len(missing_annotations), 0)
-        self.assertIn("Invalid json", self._caplog.text)
+        self.assertIn("Couldn't validate ", self._caplog.text)
 
     def test_video_annotation_upload(self):
         sa.create_annotation_classes_from_classes_json(self.PROJECT_NAME, self.classes_path)

tests/unit/test_validators.py

@@ -2,10 +2,11 @@
 import os
 from os.path import dirname
 import tempfile
-
 import src.superannotate as sa
 from tests.utils.helpers import catch_prints
-
+from src.superannotate.lib.core.entities.utils import TimedBaseModel
+from src.superannotate.lib.core.entities.pixel import PixelAnnotationPart
+from pydantic import ValidationError
 from unittest import TestCase
 
 VECTOR_ANNOTATION_JSON_WITH_BBOX = """
@@ -87,6 +88,21 @@ def test_validate_annotation_without_metadata(self):
                 sa.validate_annotations("Vector", os.path.join(self.vector_folder_path, f"{tmpdir_name}/vector.json"))
                 self.assertIn("metadatafieldrequired", out.getvalue().strip().replace(" ", ""))
 
+    def test_validate_annotation_invalid_date_time_format(self):
+        with self.assertRaises(ValidationError):
+            TimedBaseModel(createdAt="2021-11-02T15:11:50.065000Z")
+
+    def test_validate_annotation_valid_date_time_format(self):
+        self.assertEqual(TimedBaseModel(createdAt="2021-11-02T15:11:50.065Z").created_at, "2021-11-02T15:11:50.065Z")
+
+    def test_validate_annotation_invalid_color_format(self):
+        with self.assertRaisesRegexp(ValidationError, "1 validation error for PixelAnnotationPart"):
+            PixelAnnotationPart(color="fd435eraewf4rewf")
+
+
+    def test_validate_annotation_valid_color_format(self):
+        self.assertEqual(PixelAnnotationPart(color="#f1f2f3").color, "#f1f2f3")
+
 
 class TestTypeHandling(TestCase):
     ANNOTATION = """