Add created_at updated_at

Author: dshabin

src/superannotate/lib/app/annotation_helpers.py

@@ -34,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,
@@ -64,24 +76,17 @@ def add_annotation_comment_to_json(
         annotation_json, image_name=image_name
     )
 
-    created_at = (
-        datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[
-            :-3
-        ]
-        + "Z"
-    )
     user_action = {"email": comment_author, "role": "Admin"}
 
     annotation = {
         "x": comment_coords[0],
         "y": comment_coords[1],
         "correspondence": [{"text": comment_text, "email": comment_author}],
         "resolved": resolved,
-        "createdAt": created_at,
-        "updatedAt": created_at,
         "createdBy": user_action,
         "updatedBy": user_action,
     }
+    annotation = _add_created_updated(annotation)
     annotation_json["comments"].append(annotation)
 
     return _postprocess_annotation_json(annotation_json, path)
@@ -130,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)
@@ -178,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,7 +2507,11 @@ 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,
@@ -2542,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,10 +48,8 @@ class BaseVideoInstance(BaseInstance):
 
 class BboxInstance(BaseVideoInstance):
     point_labels: Optional[
-        Dict[constr(regex=r"^[0-9]+$"), NotEmptyStr]
-    ] = Field(  # noqa F722
-        None, alias="pointLabels"
-    )
+        Dict[constr(regex=r"^[0-9]+$"), NotEmptyStr]  # noqa F722
+    ] = Field(None, alias="pointLabels")
     timeline: Dict[float, BboxTimeStamp]
 
 

tests/integration/annotations/test_annotation_adding.py

@@ -60,6 +60,9 @@ def test_add_point_to_empty_image(self):
             self.PROJECT_NAME, self.EXAMPLE_IMAGE_1
         )["annotation_json"]
 
+        annotations_new["instances"][0]['createdAt'] = ''
+        annotations_new["instances"][0]['updatedAt'] = ''
+
         self.assertEqual(
             annotations_new["instances"][0], {
                 'x': 250.0,
@@ -73,7 +76,9 @@ def test_add_point_to_empty_image(self):
                 'type': 'point',
                 'pointLabels': {},
                 'groupId': 0,
-                'classId': -1
+                'classId': -1,
+                'createdAt': '',
+                'updatedAt': ''
             })
 
     def test_add_bbox_to_empty_annotation(self):
@@ -89,6 +94,9 @@ def test_add_bbox_to_empty_annotation(self):
             self.PROJECT_NAME, self.EXAMPLE_IMAGE_1
         )["annotation_json"]
 
+        annotations_new["instances"][0]['createdAt'] = ''
+        annotations_new["instances"][0]['updatedAt'] = ''
+
         self.assertEqual(annotations_new['instances'][0], {
             'creationType': 'Preannotation',
             'className': 'test_add', 'visible': True,
@@ -98,7 +106,9 @@ def test_add_bbox_to_empty_annotation(self):
             'pointLabels': {},
             'groupId': 0,
             'points': {'x1': 10.0, 'x2': 500.0, 'y1': 10.0, 'y2': 100.0},
-            'classId': -1
+            'classId': -1,
+            'createdAt': '',
+            'updatedAt': ''
         })