Merge pull request #346 from superannotateai/friday

Friday

Author: dshabin

src/superannotate/lib/app/analytics/aggregators.py

@@ -1,14 +1,14 @@
 import copy
 import json
 import logging
-from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
+from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX

src/superannotate/lib/app/annotation_helpers.py

@@ -1,4 +1,5 @@
 """SuperAnnotate format annotation JSON helpers"""
+import datetime
 import json
 
 from superannotate.lib.app.exceptions import AppException
@@ -33,6 +34,18 @@ def _postprocess_annotation_json(annotation_json, path):
         return annotation_json
 
 
+def _add_created_updated(annotation):
+    created_at = (
+        datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[
+            :-3
+        ]
+        + "Z"
+    )
+    annotation["createdAt"] = created_at
+    annotation["updatedAt"] = created_at
+    return annotation
+
+
 def add_annotation_comment_to_json(
     annotation_json,
     comment_text,
@@ -63,13 +76,17 @@ def add_annotation_comment_to_json(
         annotation_json, image_name=image_name
     )
 
+    user_action = {"email": comment_author, "role": "Admin"}
+
     annotation = {
-        "type": "comment",
         "x": comment_coords[0],
         "y": comment_coords[1],
         "correspondence": [{"text": comment_text, "email": comment_author}],
         "resolved": resolved,
+        "createdBy": user_action,
+        "updatedBy": user_action,
     }
+    annotation = _add_created_updated(annotation)
     annotation_json["comments"].append(annotation)
 
     return _postprocess_annotation_json(annotation_json, path)
@@ -118,6 +135,7 @@ def add_annotation_bbox_to_json(
         else annotation_class_attributes,
     }
 
+    annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)
 
     return _postprocess_annotation_json(annotation_json, path)
@@ -127,6 +145,7 @@ def add_annotation_point_to_json(
     annotation_json,
     point,
     annotation_class_name,
+    image_name,
     annotation_class_attributes=None,
     error=None,
 ):
@@ -148,7 +167,7 @@ def add_annotation_point_to_json(
     if len(point) != 2:
         raise AppException("Point should be 2 element float list.")
 
-    annotation_json, path = _preprocess_annotation_json(annotation_json)
+    annotation_json, path = _preprocess_annotation_json(annotation_json, image_name)
 
     annotation = {
         "type": "point",
@@ -165,6 +184,7 @@ def add_annotation_point_to_json(
         else annotation_class_attributes,
     }
 
+    annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)
 
     return _postprocess_annotation_json(annotation_json, path)

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

@@ -2461,7 +2461,11 @@ def add_annotation_bbox_to_image(
     :param error: if not None, marks annotation as error (True) or no-error (False)
     :type error: bool
     """
-    annotations = get_image_annotations(project, image_name)["annotation_json"]
+    project_name, folder_name = extract_project_folder(project)
+    response = controller.get_image_annotations(
+        project_name=project_name, folder_name=folder_name, image_name=image_name
+    )
+    annotations = response.data["annotation_json"]
     annotations = add_annotation_bbox_to_json(
         annotations,
         bbox,
@@ -2503,9 +2507,18 @@ def add_annotation_point_to_image(
     :param error: if not None, marks annotation as error (True) or no-error (False)
     :type error: bool
     """
-    annotations = get_image_annotations(project, image_name)["annotation_json"]
+    project_name, folder_name = extract_project_folder(project)
+    response = controller.get_image_annotations(
+        project_name=project_name, folder_name=folder_name, image_name=image_name
+    )
+    annotations = response.data["annotation_json"]
     annotations = add_annotation_point_to_json(
-        annotations, point, annotation_class_name, annotation_class_attributes, error
+        annotations,
+        point,
+        annotation_class_name,
+        image_name,
+        annotation_class_attributes,
+        error,
     )
     controller.upload_image_annotations(
         *extract_project_folder(project), image_name, annotations
@@ -2537,7 +2550,11 @@ def add_annotation_comment_to_image(
     :param resolved: comment resolve status
     :type resolved: bool
     """
-    annotations = get_image_annotations(project, image_name)["annotation_json"]
+    project_name, folder_name = extract_project_folder(project)
+    response = controller.get_image_annotations(
+        project_name=project_name, folder_name=folder_name, image_name=image_name
+    )
+    annotations = response.data["annotation_json"]
     annotations = add_annotation_comment_to_json(
         annotations,
         comment_text,

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

@@ -4,7 +4,6 @@
 from typing import Iterable
 from typing import List
 
-import lib.core as constances
 from lib.core.enums import SegmentationStatus
 
 

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

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

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

@@ -35,11 +35,13 @@
 from lib.core.exceptions import ImageProcessingException
 from lib.core.plugin import ImagePlugin
 from lib.core.plugin import VideoPlugin
+from lib.core.reporter import Reporter
 from lib.core.repositories import BaseManageableRepository
 from lib.core.repositories import BaseReadOnlyRepository
 from lib.core.response import Response
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from lib.core.usecases.base import BaseInteractiveUseCase
+from lib.core.usecases.base import BaseReportableUseCae
 from lib.core.usecases.base import BaseUseCase
 from lib.core.usecases.projects import GetAnnotationClassesUseCase
 from lib.core.validators import BaseAnnotationValidator
@@ -2463,16 +2465,17 @@ def execute(self):
         return self._response
 
 
-class GetImageAnnotationsUseCase(BaseUseCase):
+class GetImageAnnotationsUseCase(BaseReportableUseCae):
     def __init__(
         self,
+        reporter: Reporter,
         service: SuerannotateServiceProvider,
         project: ProjectEntity,
         folder: FolderEntity,
         image_name: str,
         images: BaseManageableRepository,
     ):
-        super().__init__()
+        super().__init__(reporter)
         self._service = service
         self._project = project
         self._folder = folder
@@ -2524,7 +2527,7 @@ def execute(self):
                 headers=credentials["annotation_json_path"]["headers"],
             )
             if not response.ok:
-                logger.warning("Couldn't load annotations.")
+                self.reporter.log_warning("Couldn't load annotations.")
                 self._response.data = data
                 return self._response
             data["annotation_json"] = response.json()