Merge pull request #362 from superannotateai/develop

Develop

Author: davitavagyan

docs/source/cli.rst

@@ -148,7 +148,6 @@ Only when COCO format is specified *dataset-name* and *task* arguments are requi
 *task* specifies the COCO task for conversion. Please see 
 :ref:`import_annotation_format <ref_import_annotation_format>` for more details.
 
-The annotation classes will be created during the execution of this command.
 
 ----------
 
@@ -176,8 +175,6 @@ Only when COCO format is specified *dataset-name* and *task* arguments are requi
 *task* specifies the COCO task for conversion. Please see 
 :ref:`import_annotation_format <ref_import_annotation_format>` for more details.
 
-The annotation classes will be created during the execution of this command.
-
 ----------
 
 .. _ref_export_project:

docs/source/superannotate.sdk.rst

@@ -49,6 +49,7 @@ ________
 .. autofunction:: superannotate.upload_annotations_from_folder_to_project
 .. autofunction:: superannotate.upload_preannotations_from_folder_to_project
 .. autofunction:: superannotate.share_project
+.. autofunction:: superannotate.add_contributors_to_project
 .. autofunction:: superannotate.get_project_settings
 .. autofunction:: superannotate.set_project_default_image_quality_in_editor
 .. autofunction:: superannotate.get_project_workflow
@@ -108,7 +109,7 @@ Team contributors
 _________________
 
 .. autofunction:: superannotate.get_team_metadata
-.. autofunction:: superannotate.invite_contributor_to_team
+.. autofunction:: superannotate.invite_contributors_to_team
 .. autofunction:: superannotate.search_team_contributors
 
 ----------

docs/source/tutorial.sdk.rst

@@ -388,7 +388,7 @@ A team contributor can be invited to the team with:
 
 .. code-block:: python
 
-   sa.invite_contributor_to_team(email="hovnatan@superannotate.com", admin=False)
+   sa.invite_contributors_to_team(emails=["hovnatan@superannotate.com"], admin=False)
 
 
 This invitation should be accepted by the contributor. After which, to share the 

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=lo adscope

src/superannotate/__init__.py

@@ -17,6 +17,7 @@
     add_annotation_comment_to_image,
 )
 from superannotate.lib.app.interface.sdk_interface import add_annotation_point_to_image
+from superannotate.lib.app.interface.sdk_interface import add_contributors_to_project
 from superannotate.lib.app.interface.sdk_interface import aggregate_annotations_as_df
 from superannotate.lib.app.interface.sdk_interface import assign_folder
 from superannotate.lib.app.interface.sdk_interface import assign_images
@@ -63,7 +64,7 @@
 from superannotate.lib.app.interface.sdk_interface import get_project_workflow
 from superannotate.lib.app.interface.sdk_interface import get_team_metadata
 from superannotate.lib.app.interface.sdk_interface import init
-from superannotate.lib.app.interface.sdk_interface import invite_contributor_to_team
+from superannotate.lib.app.interface.sdk_interface import invite_contributors_to_team
 from superannotate.lib.app.interface.sdk_interface import move_images
 from superannotate.lib.app.interface.sdk_interface import pin_image
 from superannotate.lib.app.interface.sdk_interface import prepare_export
@@ -128,7 +129,6 @@
     "convert_project_type",
     # Teams Section
     "get_team_metadata",
-    "invite_contributor_to_team",
     "search_team_contributors",
     # Projects Section
     "create_project_from_metadata",
@@ -199,6 +199,8 @@
     "consensus",
     "upload_video_to_project",
     "upload_images_to_project",
+    "add_contributors_to_project",
+    "invite_contributors_to_team",
 ]
 
 __author__ = "Superannotate"

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/helpers.py

@@ -87,7 +87,7 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
 
     paginator = s3_client.get_paginator("list_objects_v2")
     for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
-        for annotation in data["Contents"]:
+        for annotation in data.get("Contents", []):
             key = annotation["Key"]
             if (
                 key.endswith(VECTOR_ANNOTATION_POSTFIX)

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

@@ -144,7 +144,7 @@ def export_project(
         sys.exit(0)
 
     def upload_preannotations(
-        self, project, folder, data_set_name=None, task=None, format=None
+        self, project, folder, dataset_name=None, task=None, format=None
     ):
         """
         To upload preannotations from folder to project use
@@ -153,20 +153,19 @@ def upload_preannotations(
         Only when COCO format is specified dataset-name and task arguments are required.
         dataset-name specifies JSON filename (without extension) in <folder_path>.
         task specifies the COCO task for conversion. Please see import_annotation_format for more details.
-        The annotation classes will be created during the execution of this command.
         """
         self._upload_annotations(
             project=project,
             folder=folder,
             format=format,
-            data_set_name=data_set_name,
+            dataset_name=dataset_name,
             task=task,
             pre=True,
         )
         sys.exit(0)
 
     def upload_annotations(
-        self, project, folder, data_set_name=None, task=None, format=None
+        self, project, folder, dataset_name=None, task=None, format=None
     ):
         """
         To upload annotations from folder to project use
@@ -175,29 +174,28 @@ def upload_annotations(
         Only when COCO format is specified dataset-name and task arguments are required.
         dataset-name specifies JSON filename (without extension) in <folder_path>.
         task specifies the COCO task for conversion. Please see import_annotation_format for more details.
-        The annotation classes will be created during the execution of this command.
         """
         self._upload_annotations(
             project=project,
             folder=folder,
             format=format,
-            data_set_name=data_set_name,
+            dataset_name=dataset_name,
             task=task,
             pre=False,
         )
         sys.exit(0)
 
     def _upload_annotations(
-        self, project, folder, format, data_set_name, task, pre=True
+        self, project, folder, format, dataset_name, task, pre=True
     ):
         project_name, folder_name = split_project_path(project)
         project = self.controller.get_project_metadata(project_name=project_name).data
         if not format:
             format = "SuperAnnotate"
-        if not data_set_name and format == "COCO":
+        if not dataset_name and format == "COCO":
             raise Exception("Data-set name is required")
-        elif not data_set_name:
-            data_set_name = ""
+        elif not dataset_name:
+            dataset_name = ""
         if not task:
             task = "object_detection"
         annotations_path = folder
@@ -207,18 +205,13 @@ def _upload_annotations(
                     input_dir=folder,
                     output_dir=temp_dir,
                     dataset_format=format,
-                    dataset_name=data_set_name,
+                    dataset_name=dataset_name,
                     project_type=constances.ProjectType.get_name(
                         project["project"].project_type
                     ),
                     task=task,
                 )
                 annotations_path = temp_dir
-            classes_path = f"{annotations_path}/classes/classes.json"
-            self.controller.create_annotation_classes(
-                project_name=project_name,
-                annotation_classes=json.load(open(classes_path)),
-            )
             if pre:
                 upload_preannotations_from_folder_to_project(
                     project_name, annotations_path