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

Re design sdk

Author: VaghinakDev

src/superannotate.egg-info/SOURCES.txt

@@ -131,6 +131,11 @@ src/superannotate/lib/app/interface/sdk_interface.py
 src/superannotate/lib/app/interface/sdk/__init__.py
 src/superannotate/lib/app/interface/sdk/folders.py
 src/superannotate/lib/app/interface/sdk/project.py
+src/superannotate/lib/app/mixp/__init__.py
+src/superannotate/lib/app/mixp/config.py
+src/superannotate/lib/app/mixp/decorators.py
+src/superannotate/lib/app/mixp/utils/__init__.py
+src/superannotate/lib/app/mixp/utils/parsers.py
 src/superannotate/lib/app/superannotate/__init__.py
 src/superannotate/lib/core/__init__.py
 src/superannotate/lib/core/conditions.py

src/superannotate.egg-info/requires.txt

@@ -18,3 +18,4 @@ google-cloud-storage>=1.33.0
 azure-storage-blob>=12.6.0
 fire==0.4.0
 Shapely>=1.7.1
+mixpanel>=4.8.3

src/superannotate/lib/app/helpers.py

@@ -76,7 +76,7 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
                 "Key"
             ].endswith(PIXEL_ANNOTATION_POSTFIX):
                 annotation_paths.append(annotation["Key"])
-    return annotation_paths
+    return list(set(annotation_paths))
 
 
 def reformat_metrics_json(data, name):

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

@@ -41,6 +41,7 @@
 from tqdm import tqdm
 
 logger = logging.getLogger()
+logger.setLevel(logging.INFO)
 
 
 controller = Controller(logger)
@@ -196,7 +197,7 @@ def create_project_from_metadata(project_metadata):
     )
     if response.errors:
         raise Exception(response.errors)
-    return response.data
+    return ProjectSerializer(response.data).serialize()
 
 
 @Trackable
@@ -530,8 +531,7 @@ def copy_image(
             is_pinned=1,
         )
     logger.info(
-        f"Copied image {source_project_name}/{source_folder_name}"
-        f" to {destination_project}/{destination_folder}/{image_name}."
+        f"Copied image {source_project}" f" to {destination_project}/{image_name}."
     )
 
 
@@ -760,7 +760,7 @@ def move_images(source_project, image_names, destination_project, *_, **__):
         + message_postfix.format(from_path=source_project, to_path=destination_project)
     )
 
-    return len(image_names) - moved_count
+    return list(set(image_names) - set(moved_images))
 
 
 @Trackable
@@ -956,7 +956,10 @@ def delete_image(project, image_name):
     :type image_name: str
     """
     project_name, _ = extract_project_folder(project)
-    controller.delete_image(image_name=image_name, project_name=project_name)
+    response = controller.delete_image(image_name=image_name, project_name=project_name)
+    if response.errors:
+        raise AppException("Couldn't delete image ")
+    logger.info(f"Successfully deleted image {image_name}.")
 
 
 @Trackable
@@ -1106,9 +1109,11 @@ def assign_folder(project_name, folder_name, users):
     :param users: list of user emails
     :type users: list of str
     """
-    controller.assign_folder(
+    response = controller.assign_folder(
         project_name=project_name, folder_name=folder_name, users=users
     )
+    if response.errors:
+        raise AppException(response.errors)
 
 
 @Trackable
@@ -2138,7 +2143,7 @@ def create_fuse_image(
 def download_image(
     project,
     image_name,
-    local_dir_path=".",
+    local_dir_path="./",
     include_annotations=False,
     include_fuse=False,
     include_overlay=False,
@@ -2739,8 +2744,8 @@ def run_segmentation(project, images_list, model):
 
     :param project: project name of metadata of the project
     :type  project: str or dict
-    :param model  : The model name or metadata of the model
-    :type  model  : str or dict
+    :param model: The model name or metadata of the model
+    :type  model: str or dict
     :return: tupe of two lists, list of images on which the segmentation has succeeded and failed respectively
     :rtype res: tuple
     """

src/superannotate/lib/core/usecases.py

@@ -1370,6 +1370,7 @@ def __init__(
 
     def execute(self):
         self._images.delete(self._image.uuid, self._team_id, self._project_id)
+        return self._response
 
 
 class GetImageMetadataUseCase(BaseUseCase):
@@ -1433,7 +1434,7 @@ def __init__(
     def execute(self):
         moved_images = []
         for i in range(0, len(self._image_names), self.CHUNK_SIZE):
-            moved_images.append(
+            moved_images.extend(
                 self._backend_service.move_images_between_folders(
                     team_id=self._project.team_id,
                     project_id=self._project.uuid,
@@ -1580,15 +1581,17 @@ def validate_project_type(self):
     def execute(self):
         if self.is_valid():
             for i in range(0, len(self._image_names), self.CHUNK_SIZE):
-                self._response.data = self._service.assign_images(
+                is_assigned = self._service.assign_images(
                     team_id=self._project.team_id,
                     project_id=self._project.uuid,
                     folder_name=self._folder_name,
                     user=self._user,
                     image_names=self._image_names[
-                        i : i + self.CHUNK_SIZE
-                    ],  # noqa: E203
+                        i : i + self.CHUNK_SIZE  # noqa: E203
+                    ],
                 )
+                self._response.data = is_assigned
+            logger.info(f"Assign images to user {self._user}")
 
         return self._response
 
@@ -1657,12 +1660,20 @@ def __init__(
         self._users = users
 
     def execute(self):
-        self._response.data = self._service.assign_folder(
+        is_assigned = self._service.assign_folder(
             team_id=self._project_entity.team_id,
             project_id=self._project_entity.uuid,
             folder_name=self._folder_name,
             users=self._users,
         )
+        if is_assigned:
+            logger.info(
+                f'Assigned {self._folder_name} to users: {", ".join(self._users)}'
+            )
+        else:
+            self._response.errors = AppException(
+                "Couldn't assign folder to users: {', '.join(self._users)"
+            )
         return self._response
 
 
@@ -1962,7 +1973,7 @@ def execute(self):
                 self._response.data = data
                 return self._response
             data["annotation_json"] = response.json()
-            data["annotation_json_filename"] = f"{self._image_name}{file_postfix}.json"
+            data["annotation_json_filename"] = f"{self._image_name}{file_postfix}"
             if self._project.project_type == constances.ProjectType.PIXEL.value:
                 annotation_blue_map_creds = credentials["annotation_bluemap_path"]
                 response = requests.get(
@@ -2055,7 +2066,7 @@ def execute(self):
         if not response.ok:
             raise AppException(f"Couldn't load annotations {response.text}")
         data["preannotation_json"] = response.json()
-        data["preannotation_json_filename"] = f"{self._image_name}{file_postfix}.json"
+        data["preannotation_json_filename"] = f"{self._image_name}{file_postfix}"
         if self._project.project_type == constances.ProjectType.PIXEL.value:
             annotation_blue_map_creds = credentials["annotation_bluemap_path"]
             response = requests.get(
@@ -4200,13 +4211,13 @@ def execute(self):
                 yield
 
         uploaded = []
-        for i in range(0, len(uploaded_images), 500):
+        for i in range(0, len(uploaded_images), 100):
             response = AttachFileUrlsUseCase(
                 project=self._project,
                 folder=self._folder,
                 limit=self.auth_data["availableImageCount"],
                 backend_service_provider=self._backend_client,
-                attachments=[image.entity for image in uploaded_images],
+                attachments=[image.entity for image in uploaded_images[i : i + 100]],
                 annotation_status=self._annotation_status,
             ).execute()
 

src/superannotate/lib/infrastructure/services.py

@@ -1,4 +1,3 @@
-import time
 from contextlib import contextmanager
 from datetime import datetime
 from typing import Dict
@@ -74,7 +73,6 @@ def _request(
                 url, **kwargs, headers=headers_dict, params=params, timeout=60
             )
         if response.status_code == 404 and retried < 3:
-            time.sleep(1)
             return self._request(
                 url,
                 method="get",

tests/convertors/test_conversion.py

@@ -258,4 +258,4 @@ def test_upload_annotations_with_template_id(self):
             )
             sa.upload_annotations_from_folder_to_project(project, out_path)
             image_metadata = sa.get_image_annotations(project_name, "t.png")
-            assert image_metadata["annotation_json"]["instances"][0]["templateId"] == -1
+            self.assertEqual(image_metadata["annotation_json"]["instances"][0]["templateId"], -1)

tests/data_set/consensus_benchmark/consensus_test_data/classes/classes.json

@@ -1 +1 @@
-[{"id":776015,"project_id":108158,"name":"person","color":"#96963a","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z","attribute_groups":[]},{"id":776016,"project_id":108158,"name":"car","color":"#b01cb4","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z","attribute_groups":[{"id":297464,"class_id":776016,"name":"color","is_multiselect":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z","attributes":[{"id":1077532,"group_id":297464,"project_id":108158,"name":"red","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z"},{"id":1077533,"group_id":297464,"project_id":108158,"name":"blue","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z"},{"id":1077534,"group_id":297464,"project_id":108158,"name":"green","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z"},{"id":1077535,"group_id":297464,"project_id":108158,"name":"yellow","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z"}]}]},{"id":776017,"project_id":108158,"name":"tree","color":"#249e9e","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z","attribute_groups":[]},{"id":776018,"project_id":108158,"name":"sign","color":"#fed339","count":0,"createdAt":"2021-08-27T05:39:25.000Z","updatedAt":"2021-08-27T05:39:25.000Z","attribute_groups":[]}]
+[{"id":776731,"project_id":108441,"name":"person","color":"#96963a","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z","attribute_groups":[]},{"id":776732,"project_id":108441,"name":"car","color":"#b01cb4","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z","attribute_groups":[{"id":297688,"class_id":776732,"name":"color","is_multiselect":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z","attributes":[{"id":1077990,"group_id":297688,"project_id":108441,"name":"red","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z"},{"id":1077991,"group_id":297688,"project_id":108441,"name":"blue","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z"},{"id":1077992,"group_id":297688,"project_id":108441,"name":"green","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z"},{"id":1077993,"group_id":297688,"project_id":108441,"name":"yellow","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z"}]}]},{"id":776733,"project_id":108441,"name":"tree","color":"#249e9e","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z","attribute_groups":[]},{"id":776734,"project_id":108441,"name":"sign","color":"#fed339","count":0,"createdAt":"2021-08-27T08:58:44.000Z","updatedAt":"2021-08-27T08:58:44.000Z","attribute_groups":[]}]