Merge pull request #180 from superannotateai/re-design-sdk

Re design sdk

Author: dshabin

pytest.ini

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

src/superannotate/__init__.py

@@ -60,6 +60,7 @@
 from superannotate.lib.app.interface.sdk_interface import create_project
 from superannotate.lib.app.interface.sdk_interface import create_project_from_metadata
 from superannotate.lib.app.interface.sdk_interface import delete_annotation_class
+from superannotate.lib.app.interface.sdk_interface import delete_annotations
 from superannotate.lib.app.interface.sdk_interface import (
     delete_contributor_to_team_invitation,
 )
@@ -235,6 +236,7 @@
     "assign_images",
     "unassign_images",
     "download_image_annotations",
+    "delete_annotations",
     "upload_image_to_project",
     "upload_image_annotations",
     "upload_images_from_public_urls_to_project",

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

@@ -608,9 +608,11 @@ def upload_images_from_public_urls_to_project(
         raise AppException("Not all image URLs have corresponding names.")
 
     project_name, folder_name = extract_project_folder(project)
-    existing_images = controller.search_images(
-        project_name=project_name, folder_path=folder_name
-    ).data
+    existing_images = controller.get_duplicated_images(
+        project_name=project_name,
+        folder_name=folder_name,
+        images=img_names,
+    )
 
     image_name_url_map = {}
     duplicate_images = []
@@ -1221,6 +1223,9 @@ def assign_folder(project_name: str, folder_name: str, users: List[str]):
             f"Skipping {user} from assignees. {user} is not a verified contributor for the {project_name}"
         )
 
+    if not verified_users:
+        return
+
     response = controller.assign_folder(
         project_name=project_name, folder_name=folder_name, users=list(verified_users)
     )
@@ -1498,7 +1503,7 @@ def get_image_annotations(project: Union[str, dict], image_name: str):
         project_name=project_name, folder_name=folder_name, image_name=image_name
     )
     if res.errors:
-        raise AppValidationException(res)
+        raise AppException(res)
     return res.data
 
 
@@ -1556,7 +1561,7 @@ def upload_images_from_folder_to_project(
     )
     images_to_upload, _ = use_case.images_to_upload
     if use_case.is_valid():
-        with tqdm(total=len(images_to_upload)) as progress_bar:
+        with tqdm(total=len(images_to_upload), desc="Uploading images") as progress_bar:
             for _ in use_case.execute():
                 progress_bar.update(1)
         return use_case.data
@@ -1721,7 +1726,7 @@ def upload_images_from_s3_bucket_to_project(
     :type image_quality_in_editor: str
     """
     project_name, folder_name = extract_project_folder(project)
-    controller.backend_upload_from_s3(
+    response = controller.backend_upload_from_s3(
         project_name=project_name,
         folder_name=folder_name,
         folder_path=folder_path,
@@ -1730,6 +1735,8 @@ def upload_images_from_s3_bucket_to_project(
         bucket_name=bucket_name,
         image_quality=image_quality_in_editor,
     )
+    if response.errors:
+        raise AppException(response.errors)
 
 
 @Trackable
@@ -1859,7 +1866,7 @@ def upload_videos_from_folder_to_project(
     )
 
     uploaded_images, failed_images = [], []
-    for path in tqdm(video_paths):
+    for path in tqdm(video_paths, desc="Uploading videos"):
         with tempfile.TemporaryDirectory() as temp_path:
             res = controller.extract_video_frames(
                 project_name=project_name,
@@ -1953,7 +1960,9 @@ def upload_video_to_project(
         )
         images_to_upload, _ = use_case.images_to_upload
         if use_case.is_valid():
-            with tqdm(total=len(images_to_upload)) as progress_bar:
+            with tqdm(
+                total=len(images_to_upload), desc="Uploading frames."
+            ) as progress_bar:
                 for _ in use_case.execute():
                     progress_bar.update(1)
             return use_case.data[0]
@@ -2488,8 +2497,10 @@ def upload_annotations_from_folder_to_project(
     uploaded_annotations = []
     failed_annotations = []
     missing_annotations = []
-    chunk_size = 10
-    with tqdm(total=len(annotation_paths)) as progress_bar:
+    chunk_size = 50
+    with tqdm(
+        total=len(annotation_paths), desc="Uploading annotations"
+    ) as progress_bar:
         for i in range(0, len(annotation_paths), chunk_size):
             response = controller.upload_annotations_from_folder(
                 project_name=project_name,
@@ -2549,7 +2560,9 @@ def upload_preannotations_from_folder_to_project(
     failed_annotations = []
     missing_annotations = []
     chunk_size = 10
-    with tqdm(total=len(annotation_paths)) as progress_bar:
+    with tqdm(
+        total=len(annotation_paths), desc="Uploading pre annotations"
+    ) as progress_bar:
         for i in range(0, len(annotation_paths), chunk_size):
             response = controller.upload_annotations_from_folder(
                 project_name=project_name,
@@ -3511,7 +3524,7 @@ def _upload_s3_image(image_path: str):
             executor.submit(upload_method, image_path)
             for image_path in images_to_upload
         ]
-        with tqdm(total=len(images_to_upload)) as progress_bar:
+        with tqdm(total=len(images_to_upload), desc="Uploading images") as progress_bar:
             for future in concurrent.futures.as_completed(results):
                 processed_image = future.result()
                 if processed_image.uploaded and processed_image.entity:
@@ -3587,3 +3600,24 @@ def aggregate_annotations_as_df(
         verbose,
         folder_names,
     )
+
+
+@Trackable
+@validate_input
+def delete_annotations(project: str, image_names: List[str] = None):
+    """
+    Delete image annotations from a given list of images.
+
+    :param project: project name or folder path (e.g., "project1/folder1")
+    :type project: str
+    :param image_names:  image names. If None, all image annotations from a given project/folder will be deleted.
+    :type image_names: list of strs
+    """
+
+    project_name, folder_name = extract_project_folder(project)
+
+    response = controller.delete_annotations(
+        project_name=project, folder_name=folder_name, image_names=image_names
+    )
+    if response.errors:
+        raise AppException(response.errors)

src/superannotate/lib/core/serviceproviders.py

@@ -296,3 +296,17 @@ def run_prediction(
         self, team_id: int, project_id: int, ml_model_id: int, image_ids: list
     ):
         raise NotImplementedError
+
+    def delete_image_annotations(
+        self,
+        team_id: int,
+        project_id: int,
+        folder_id: int = None,
+        image_names: List[str] = None,
+    ) -> int:
+        raise NotImplementedError
+
+    def get_annotations_delete_progress(
+        self, team_id: int, project_id: int, poll_id: int
+    ):
+        raise NotImplementedError