merge

Author: dshabin

superannotate/consensus_benchmark/benchmark.py

@@ -10,6 +10,7 @@
 from ..db.exports import prepare_export, download_export
 from ..analytics.common import aggregate_annotations_as_df
 from ..mixp.decorators import Trackable
+from ..db.project_api import get_project_and_folder_metadata
 
 logger = logging.getLogger("superannotate-python-sdk")
 
@@ -44,6 +45,12 @@ def benchmark(
     :return: Pandas DateFrame with columns (creatorEmail, QA, imageName, instanceId, className, area, attribute, folderName, score)
     :rtype: pandas DataFrame
     """
+
+    if isinstance(project, dict):
+        get_project_and_folder_metadata(project['name'])
+    else:
+        get_project_and_folder_metadata(project)
+
     def aggregate_attributes(instance_df):
         def attribute_to_list(attribute_df):
             attribute_names = list(attribute_df["attributeName"])

superannotate/consensus_benchmark/consensus.py

@@ -2,6 +2,7 @@
 Main module for consensus computation
 """
 import logging
+from ..db.project_api import get_project_and_folder_metadata
 import tempfile
 import pandas as pd
 from pathlib import Path
@@ -45,6 +46,8 @@ def consensus(
     if annot_type not in supported_types:
         raise NotImplementedError
 
+    get_project_and_folder_metadata(project)
+
     if export_root is None:
         with tempfile.TemporaryDirectory() as export_dir:
             proj_export_meta = prepare_export(project)

superannotate/db/exports.py

@@ -131,11 +131,15 @@ def prepare_export(
     upload_state = upload_state_int_to_str(project.get("upload_state"))
 
     if upload_state == "External" and include_fuse:
-        logger.warning("Include fuse functionality is not supported for projects containing  items attached with URLs")
+        logger.warning(
+            "Include fuse functionality is not supported for projects containing  items attached with URLs"
+        )
         include_fuse = False
     if project["type"] == "Video":
         if only_pinned:
-            logger.warning("Pin functionality is not supported for projects containing videos attached with URLs")
+            logger.warning(
+                "Pin functionality is not supported for projects containing videos attached with URLs"
+            )
         only_pinned, include_fuse = False, False
 
     team_id, project_id = project["team_id"], project["id"]
@@ -150,8 +154,8 @@ def prepare_export(
     json_req = {
         "include": annotation_statuses,
         "coco": 0,
-        "is_pinned": only_pinned,
-        "fuse": include_fuse,
+        "is_pinned": int(only_pinned),
+        "fuse": int(include_fuse),
         "time": current_time
     }
     if folder_names is not None:

superannotate/db/project_api.py

@@ -36,12 +36,25 @@ def get_project_metadata_bare(project_name, include_complete_image_count=False):
     if len(results) > 1:
         raise SAExistingProjectNameException(
             0, "Project name " + project_name +
-               " is not unique. To use SDK please make project names unique."
+            " is not unique. To use SDK please make project names unique."
         )
     elif len(results) == 1:
         res = results[0]
         res["type"] = common.project_type_int_to_str(res["type"])
         res["user_role"] = common.user_role_int_to_str(res["user_role"])
+        current_frame = inspect.currentframe()
+        outer_function = inspect.getframeinfo(current_frame.f_back).function
+        outer_outer_function = inspect.getframeinfo(
+            current_frame.f_back.f_back
+        ).function
+        if res.get("type") and res["type"] == "Video" and (
+            outer_function in common.VIDEO_DEPRICATED_FUNCTIONS or
+            outer_outer_function in common.VIDEO_DEPRICATED_FUNCTIONS
+        ):
+            raise SABaseException(
+                0,
+                "The function does not support projects containing videos attached with URLs"
+            )
         return res
     else:
         raise SANonExistingProjectNameException(
@@ -134,11 +147,16 @@ def get_project_and_folder_metadata(project):
         raise SAIncorrectProjectArgument(project)
     current_frame = inspect.currentframe()
     outer_function = inspect.getframeinfo(current_frame.f_back).function
-    outer_outer_function = inspect.getframeinfo(current_frame.f_back.f_back).function
-    if project["type"] == "Video" \
+    outer_outer_function = inspect.getframeinfo(
+        current_frame.f_back.f_back
+    ).function
+    if project.get("type") and project["type"] == "Video" \
             and (outer_function in common.VIDEO_DEPRICATED_FUNCTIONS
                  or outer_outer_function in common.VIDEO_DEPRICATED_FUNCTIONS):
-        raise SABaseException(0, "The function does not support projects containing videos attached with URLs")
+        raise SABaseException(
+            0,
+            "The function does not support projects containing videos attached with URLs"
+        )
     return project, folder
 
 
@@ -210,9 +228,9 @@ def create_folder(project, folder_name):
     params = {"team_id": project["team_id"], "project_id": project["id"]}
     name_changed = False
     if len(
-            set(folder_name).intersection(
-                common.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
-            )
+        set(folder_name).intersection(
+            common.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
+        )
     ) > 0:
         logger.warning(
             "New folder name has special characters. Special characters will be replaced by underscores."