Add depricated functions per project type

dshabin · dshabin · commit 105800c54083 · 2021-09-14T14:51:04.000+04:00
diff --git a/superannotate/.DS_Store b/superannotate/.DS_Store
diff --git a/superannotate/common.py b/superannotate/common.py
@@ -59,45 +59,96 @@
     "Semantic Segmentation for Pixel Projects": "semantic_segmentation_pixel"
 }
 
-VIDEO_DEPRICATED_FUNCTIONS = [
-    "upload_images_from_folder_to_project",
-    "get_image_metadata",
-    "search_images",
-    "upload_images_to_project",
-    "upload_annotations_from_folder_to_project",
-    "upload_image_annotations",
-    "download_image",
-    "download_image_annotations",
-    "get_image_annotations",
-    "set_image_annotation_status",
-    "aggregate_annotations_as_df",
-    "attach_image_urls_to_project",
-    "clone_project",
-    "copy_image",
-    "export_annotation",
-    "upload_image_to_project",
-    "upload_video_to_project",
-    "add_annotation_bbox_to_image",
-    "assign_images",
-    "delete_images",
-    "get_project_image_count",
-    "set_project_workflow",
-    "upload_preannotations_from_folder_to_project",
-    "upload_videos_from_folder_to_project",
-    "add_annotation_comment_to_image",
-    "add_annotation_point_to_image",
-    "benchmark",
-    "class_distribution",
-    "consensus",
-    "convert_project_type",
-    "copy_images",
-    "get_project_workflow",
-    "move_image",
-    "move_images",
-    "set_images_annotation_statuses",
-    "set_project_default_image_quality_in_editor",
-    "upload_images_from_google_cloud_to_project",
-]
+DEPRICATED_FUNCTIONS_PER_PROJECT_TYPE = {
+    "Vector": [],
+    "Pixel": [],
+    "Video": [
+        "attach_document_urls_to_project",
+        "upload_images_from_folder_to_project",
+        "get_image_metadata",
+        "search_images",
+        "upload_images_to_project",
+        "upload_annotations_from_folder_to_project",
+        "upload_image_annotations",
+        "download_image",
+        "download_image_annotations",
+        "get_image_annotations",
+        "set_image_annotation_status",
+        "aggregate_annotations_as_df",
+        "attach_image_urls_to_project",
+        "clone_project",
+        "copy_image",
+        "export_annotation",
+        "upload_image_to_project",
+        "upload_video_to_project",
+        "add_annotation_bbox_to_image",
+        "assign_images",
+        "delete_images",
+        "get_project_image_count",
+        "set_project_workflow",
+        "upload_preannotations_from_folder_to_project",
+        "upload_videos_from_folder_to_project",
+        "add_annotation_comment_to_image",
+        "add_annotation_point_to_image",
+        "benchmark",
+        "class_distribution",
+        "consensus",
+        "convert_project_type",
+        "copy_images",
+        "get_project_workflow",
+        "move_image",
+        "move_images",
+        "set_images_annotation_statuses",
+        "set_project_default_image_quality_in_editor",
+        "upload_images_from_google_cloud_to_project",
+        "get_image_bytes",
+        "upload_images_from_azure_blob_to_project",
+        "upload_images_from_public_urls_to_project"
+    ],
+    "Document": [
+        "attach_video_urls_to_project",
+        "upload_images_from_folder_to_project",
+        "get_image_metadata",
+        "search_images",
+        "upload_images_to_project",
+        "upload_annotations_from_folder_to_project",
+        "upload_image_annotations",
+        "download_image",
+        "download_image_annotations",
+        "get_image_annotations",
+        "set_image_annotation_status",
+        "aggregate_annotations_as_df",
+        "attach_image_urls_to_project",
+        "clone_project",
+        "copy_image",
+        "export_annotation",
+        "upload_image_to_project",
+        "upload_video_to_project",
+        "add_annotation_bbox_to_image",
+        "assign_images",
+        "delete_images",
+        "get_project_image_count",
+        "set_project_workflow",
+        "upload_preannotations_from_folder_to_project",
+        "upload_videos_from_folder_to_project",
+        "add_annotation_comment_to_image",
+        "add_annotation_point_to_image",
+        "benchmark",
+        "class_distribution",
+        "consensus",
+        "convert_project_type",
+        "copy_images",
+        "get_project_workflow",
+        "move_image",
+        "move_images",
+        "set_images_annotation_statuses",
+        "set_project_default_image_quality_in_editor",
+        "upload_images_from_google_cloud_to_project",
+        "get_image_bytes",
+        "upload_images_from_azure_blob_to_project",
+        "upload_images_from_public_urls_to_project"
+    ],
+}
 
 
 def prediction_segmentation_status_from_str_to_int(status):
@@ -364,7 +415,7 @@ def write_to_json(output_path, json_data):
 
 
 def tqdm_converter(
-        total_num, images_converted, images_not_converted, finish_event
+    total_num, images_converted, images_not_converted, finish_event
 ):
     with tqdm(total=total_num) as pbar:
         while True:
diff --git a/superannotate/db/images.py b/superannotate/db/images.py
@@ -659,13 +659,6 @@ def download_image(
         )
 
     project, project_folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project['type']
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type}   attached with URLs"
-        )
     img = get_image_bytes(
         (project, project_folder), image_name, variant=variant
     )
@@ -736,14 +729,7 @@ def get_image_bytes(project, image_name, variant='original'):
     :rtype: io.BytesIO()
     """
     project, project_folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project['type']
 
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     if variant not in ["original", "lores"]:
         raise SABaseException(
             0, "Image download variant should be either original or lores"
diff --git a/superannotate/db/project_api.py b/superannotate/db/project_api.py
@@ -49,8 +49,8 @@ def get_project_metadata_bare(project_name, include_complete_image_count=False):
             current_frame.f_back.f_back
         ).function
         if res.get("type") and res["type"] in ["Video","Document"] and (
-            outer_function in common.VIDEO_DEPRICATED_FUNCTIONS or
-            outer_outer_function in common.VIDEO_DEPRICATED_FUNCTIONS
+            outer_function in common.DEPRICATED_FUNCTIONS_PER_PROJECT_TYPE[res["type"]] or
+            outer_outer_function in common.DEPRICATED_FUNCTIONS_PER_PROJECT_TYPE[res["type"]]
         ):
             raise SABaseException(
                 0,
@@ -152,8 +152,8 @@ def get_project_and_folder_metadata(project):
         current_frame.f_back.f_back
     ).function
     if project.get("type") and project["type"] in ["Video","Document"] \
-            and (outer_function in common.VIDEO_DEPRICATED_FUNCTIONS
-                 or outer_outer_function in common.VIDEO_DEPRICATED_FUNCTIONS):
+            and (outer_function in common.DEPRICATED_FUNCTIONS_PER_PROJECT_TYPE[project["type"]]
+                 or outer_outer_function in common.DEPRICATED_FUNCTIONS_PER_PROJECT_TYPE[project["type"]]):
         project_type = project['type']
         raise SABaseException(
             0,
diff --git a/superannotate/db/project_images.py b/superannotate/db/project_images.py
@@ -57,13 +57,6 @@ def upload_image_to_project(
     """
     initial_project_inp = project
     project, folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project["type"]
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     annotation_status = common.annotation_status_str_to_int(annotation_status)
     if image_quality_in_editor is None:
         image_quality_in_editor = get_project_default_image_quality_in_editor(
diff --git a/superannotate/db/projects.py b/superannotate/db/projects.py
@@ -417,14 +417,6 @@ def upload_video_to_project(
 
     limit = _get_available_image_counts(project, folder)
 
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get("type")
-
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     logger.info("Uploading from video %s.", str(video_path))
     tempdir = tempfile.TemporaryDirectory()
     upload_file_names = []
@@ -519,14 +511,7 @@ def upload_videos_from_folder_to_project(
     :rtype: tuple of list of strs
     """
     project, folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get("type")
 
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type}attached with URLs"
-        )
     if recursive_subfolders:
         logger.warning(
             "When using recursive subfolder parsing same name videos in different subfolders will overwrite each other."
@@ -618,14 +603,7 @@ def upload_images_from_folder_to_project(
     project_folder_name = project["name"] + (
         f'/{project_folder["name"]}' if project_folder else ""
     )
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get("type")
 
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     if recursive_subfolders:
         logger.info(
             "When using recursive subfolder parsing same name images in different subfolders will overwrite each other."
@@ -720,14 +698,7 @@ def upload_images_to_project(
     """
     project, folder = get_project_and_folder_metadata(project)
     folder_name = project["name"] + (f'/{folder["name"]}' if folder else "")
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get("type")
 
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     if not isinstance(img_paths, list):
         raise SABaseException(
             0, "img_paths argument to upload_images_to_project should be a list"
@@ -793,8 +764,8 @@ def attach_image_urls_to_project(
     :return: attached images, failed images, skipped images
     :rtype: (list, list, list)
     """
-    get_project_and_folder_metadata(project)
-    return attach_file_urls_to_project(project, attachments, annotation_status)
+    project, folder = get_project_and_folder_metadata(project)
+    return attach_file_urls_to_project(project, folder, attachments, annotation_status)
 
 
 @Trackable
@@ -832,13 +803,7 @@ def upload_images_from_public_urls_to_project(
     duplicate_images_filenames = []
     path_to_url = {}
     project, project_folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get('type')
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
+
     finish_event = threading.Event()
     tqdm_thread = threading.Thread(
         target=_tqdm_download,
@@ -942,14 +907,7 @@ def upload_images_from_google_cloud_to_project(
     duplicate_images_filenames = []
     path_to_url = {}
     project, project_folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get("type")
 
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     cloud_client = storage.Client(project=google_project)
     bucket = cloud_client.get_bucket(bucket_name)
     image_blobs = bucket.list_blobs(prefix=folder_path)
@@ -1028,13 +986,6 @@ def upload_images_from_azure_blob_to_project(
     duplicate_images_filenames = []
     path_to_url = {}
     project, project_folder = get_project_and_folder_metadata(project)
-    upload_state = common.upload_state_int_to_str(project.get("upload_state"))
-    project_type = project.get('type')
-    if upload_state == "External":
-        raise SABaseException(
-            0,
-            f"The function does not support projects containing {project_type} attached with URLs"
-        )
     connect_key = os.getenv('AZURE_STORAGE_CONNECTION_STRING')
     blob_service_client = BlobServiceClient.from_connection_string(connect_key)
     container_client = blob_service_client.get_container_client(container_name)
@@ -2013,10 +1964,11 @@ def attach_video_urls_to_project(
     :return: attached videos, failed videos, skipped videos
     :rtype: (list, list, list)
     """
-    return attach_file_urls_to_project(project, attachments, annotation_status)
+    project, folder = get_project_and_folder_metadata(project)
+    return attach_file_urls_to_project(project,folder, attachments, annotation_status)
 
 
-def attach_file_urls_to_project(project, attachments, annotation_status):
+def attach_file_urls_to_project(project,folder,attachments, annotation_status):
     """Link files on external storage to SuperAnnotate.
 
     :param project: project name or project folder path
@@ -2031,7 +1983,6 @@ def attach_file_urls_to_project(project, attachments, annotation_status):
     :return: attached files, failed files, skipped files
     :rtype: (list, list, list)
     """
-    project, folder = get_project_and_folder_metadata(project)
     folder_name = project["name"] + (f'/{folder["name"]}' if folder else "")
     upload_state = common.upload_state_int_to_str(project.get("upload_state"))
     if upload_state == "Basic":
@@ -2104,5 +2055,6 @@ def attach_document_urls_to_project(
     :return: attached videos, failed videos, skipped videos
     :rtype: (list, list, list)
     """
-    return attach_file_urls_to_project(project, attachments, annotation_status)
+    project, folder = get_project_and_folder_metadata(project)
+    return attach_file_urls_to_project(project,folder, attachments, annotation_status)
 
diff --git a/tests/test_attach_text.py b/tests/test_attach_text.py
@@ -74,3 +74,33 @@ def test_attach_text_urls():
         assert str(
             e
         ) == f"The function does not support projects containing {PROJECT_TYPE} attached with URLs"
+
+
+    with pytest.raises(SABaseException) as e:
+        sa.attach_video_urls_to_project(
+            PROJECT_NAME_TEXT, PATH_TO_URLS
+        )
+        assert str(
+            e
+        ) == f"The function does not support projects containing {PROJECT_TYPE} attached with URLs"
+
+
+def test_attach_text_to_video():
+    project_name_video = "video t"
+    project_type_video = "Video"
+    projects = sa.search_projects(project_name_video, return_metadata=True)
+    for project in projects:
+        sa.delete_project(project)
+
+    time.sleep(1)
+    sa.create_project(project_name_video, "test", project_type_video)
+    time.sleep(1)
+
+    with pytest.raises(SABaseException) as e:
+        sa.attach_document_urls_to_project(
+            project_name_video, PATH_TO_URLS
+        )
+        assert str(
+            e
+        ) == f"The function does not support projects containing {project_type_video} attached with URLs"
+
