Udpated tests, fixed issues

Author: VaghinakDev

docs/source/superannotate.sdk.rst

@@ -89,7 +89,6 @@ ______
 .. autofunction:: superannotate.download_image
 .. autofunction:: superannotate.set_image_annotation_status
 .. autofunction:: superannotate.set_images_annotation_statuses
-.. autofunction:: superannotate.get_image_annotations
 .. autofunction:: superannotate.download_image_annotations
 .. autofunction:: superannotate.upload_image_annotations
 .. autofunction:: superannotate.copy_image

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=loadscope

src/superannotate/__init__.py

@@ -57,7 +57,6 @@
 from superannotate.lib.app.interface.sdk_interface import get_annotations_per_frame
 from superannotate.lib.app.interface.sdk_interface import get_exports
 from superannotate.lib.app.interface.sdk_interface import get_folder_metadata
-from superannotate.lib.app.interface.sdk_interface import get_image_annotations
 from superannotate.lib.app.interface.sdk_interface import get_image_metadata
 from superannotate.lib.app.interface.sdk_interface import get_integrations
 from superannotate.lib.app.interface.sdk_interface import get_item_metadata
@@ -206,7 +205,6 @@
     "add_annotation_bbox_to_image",
     "add_annotation_point_to_image",
     "add_annotation_comment_to_image",
-    "get_image_annotations",
     "search_annotation_classes",
     "create_annotation_classes_from_classes_json",
     "upload_annotations_from_folder_to_project",

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

@@ -215,6 +215,8 @@ def create_project_from_metadata(project_metadata: Project):
         settings=project_metadata.get("settings", []),
         annotation_classes=project_metadata.get("classes", []),
         workflows=project_metadata.get("workflows", []),
+        attachment_path=project_metadata.get("attachment_path"),
+        attachment_name=project_metadata.get("attachment_name"),
     )
     if response.errors:
         raise AppException(response.errors)
@@ -973,8 +975,6 @@ def assign_images(project: Union[NotEmptyStr, dict], image_names: List[str], use
     ]:
         raise AppException(LIMITED_FUNCTIONS[project["project"].project_type])
 
-    if not folder_name:
-        folder_name = "root"
     contributors = (
         Controller.get_default()
         .get_project_metadata(project_name=project_name, include_contributors=True)
@@ -1117,38 +1117,6 @@ def share_project(
         raise AppException(response.errors)
 
 
-@Trackable
-@validate_arguments
-def get_image_annotations(project: Union[NotEmptyStr, dict], image_name: NotEmptyStr):
-    """Get annotations of the image.
-
-    :param project: project name or folder path (e.g., "project1/folder1")
-    :type project: str
-    :param image_name: image name
-    :type image_name: str
-
-    :return: dict object with following keys:
-        "annotation_json": dict object of the annotation,
-        "annotation_json_filename": filename on server,
-        "annotation_mask": mask (for pixel),
-        "annotation_mask_filename": mask filename on server
-    :rtype: dict
-    """
-    warning_msg = (
-        "The get_image_annotations function is deprecated and will be removed with the coming releases, "
-        "please use get_annotations instead."
-    )
-    logger.warning(warning_msg)
-    warnings.warn(warning_msg, DeprecationWarning)
-    project_name, folder_name = extract_project_folder(project)
-    res = Controller.get_default().get_image_annotations(
-        project_name=project_name, folder_name=folder_name, image_name=image_name
-    )
-    if res.errors:
-        raise AppException(res.errors)
-    return res.data
-
-
 @validate_arguments
 def upload_images_from_folder_to_project(
     project: Union[NotEmptyStr, dict],
@@ -2349,8 +2317,14 @@ def add_annotation_bbox_to_image(
     :type error: bool
     """
     project_name, folder_name = extract_project_folder(project)
+    project = Controller.get_default().get_project_metadata(project_name).data
+    if project["project"].project_type in [
+        constances.ProjectType.VIDEO.value,
+        constances.ProjectType.DOCUMENT.value,
+    ]:
+        raise AppException(LIMITED_FUNCTIONS[project["project"].project_type])
     response = Controller.get_default().get_annotations(
-        project_name=project_name, folder_name=folder_name, item_names=[image_name]
+        project_name=project_name, folder_name=folder_name, item_names=[image_name], logging=False
     )
     if response.errors:
         raise AppException(response.errors)
@@ -2368,7 +2342,7 @@ def add_annotation_bbox_to_image(
     )
 
     Controller.get_default().upload_image_annotations(
-        *extract_project_folder(project), image_name, annotations
+        project_name, folder_name, image_name, annotations
     )
 
 
@@ -2400,8 +2374,14 @@ def add_annotation_point_to_image(
     :type error: bool
     """
     project_name, folder_name = extract_project_folder(project)
+    project = Controller.get_default().get_project_metadata(project_name).data
+    if project["project"].project_type in [
+        constances.ProjectType.VIDEO.value,
+        constances.ProjectType.DOCUMENT.value,
+    ]:
+        raise AppException(LIMITED_FUNCTIONS[project["project"].project_type])
     response = Controller.get_default().get_annotations(
-        project_name=project_name, folder_name=folder_name, item_names=[image_name]
+        project_name=project_name, folder_name=folder_name, item_names=[image_name], logging=False
     )
     if response.errors:
         raise AppException(response.errors)
@@ -2418,7 +2398,7 @@ def add_annotation_point_to_image(
         error,
     )
     Controller.get_default().upload_image_annotations(
-        *extract_project_folder(project), image_name, annotations
+        project_name, folder_name, image_name, annotations
     )
 
 
@@ -2448,8 +2428,14 @@ def add_annotation_comment_to_image(
     :type resolved: bool
     """
     project_name, folder_name = extract_project_folder(project)
+    project = Controller.get_default().get_project_metadata(project_name).data
+    if project["project"].project_type in [
+        constances.ProjectType.VIDEO.value,
+        constances.ProjectType.DOCUMENT.value,
+    ]:
+        raise AppException(LIMITED_FUNCTIONS[project["project"].project_type])
     response = Controller.get_default().get_annotations(
-        project_name=project_name, folder_name=folder_name, item_names=[image_name]
+        project_name=project_name, folder_name=folder_name, item_names=[image_name], logging=False
     )
     if response.errors:
         raise AppException(response.errors)
@@ -2466,7 +2452,7 @@ def add_annotation_comment_to_image(
         image_name=image_name,
     )
     Controller.get_default().upload_image_annotations(
-        *extract_project_folder(project), image_name, annotations
+        project_name, folder_name, image_name, annotations
     )
 
 

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

@@ -97,7 +97,7 @@ class ProjectTypes(StrictStr):
     def validate(cls, value: Union[str]) -> Union[str]:
         if value.lower() not in ProjectType.values():
             raise TypeError(
-                f"Available annotation_statuses are {', '.join(ProjectType.titles())}. "
+                f" Available project types are {', '.join(ProjectType.titles())}. "
             )
         return value
 

src/superannotate/lib/app/mixp/decorators.py

@@ -53,17 +53,44 @@ def extract_arguments(function, *args, **kwargs) -> dict:
     def team(self):
         return get_default_controller().get_team()
 
+    @staticmethod
+    def default_parser(function_name: str, kwargs: dict):
+        properties = {}
+        for key, value in kwargs:
+            if isinstance(value, (str, int, float, bool, str)):
+                properties[key] = value
+            elif isinstance(value, (list, set, tuple)):
+                properties[key] = len(value)
+            elif isinstance(value, dict):
+                properties[key] = value.keys()
+            elif hasattr(value, "__len__"):
+                properties[key] = len(value)
+            else:
+                properties[key] = str(value)
+        return {
+            "event_name": function_name,
+            "properties": properties
+        }
+
     def track(self, *args, **kwargs):
         try:
+            function_name = self.function.__name__ if self.function else ""
             if self._initial:
                 data = self.INITIAL_EVENT
                 Trackable.INITIAL_LOGGED = True
                 self._success = True
             else:
+                data = {}
                 arguments = self.extract_arguments(self.function, *args, **kwargs)
-                data = getattr(parsers, self.function.__name__)(**arguments)
-            event_name = data["event_name"]
-            properties = data["properties"]
+                if hasattr(parsers, function_name):
+                    try:
+                        data = getattr(parsers, function_name)(**arguments)
+                    except Exception:
+                        pass
+                else:
+                    data = self.default_parser(function_name, arguments)
+            event_name = data.get("event_name", )
+            properties = data.get("properties", {})
             team_data = self.team.data
             user_id = team_data.creator_id
             team_name = team_data.name
@@ -78,7 +105,7 @@ def track(self, *args, **kwargs):
 
             if "pytest" not in sys.modules:
                 get_mp_instance().track(user_id, event_name, properties)
-        except Exception as _:
+        except Exception:
             pass
 
     def __call__(self, *args, **kwargs):