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

Interface fix

Author: VaghinakDev

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

@@ -2,6 +2,7 @@
 import json
 import logging
 import os
+import sys
 import tempfile
 import uuid
 from collections import Counter
@@ -42,6 +43,7 @@ def version():
         ) as f:
             version = f.read().rstrip()[15:-1]
             print(version)
+        sys.exit(0)
 
     @staticmethod
     def init():
@@ -64,8 +66,9 @@ def init():
             print("Configuration file successfully updated.")
         else:
             print("Configuration file successfully created.")
+        sys.exit(0)
 
-    def create_project(self, name: str, description: str, type: str) -> dict:
+    def create_project(self, name: str, description: str, type: str):
         """
         To create a new project
         """
@@ -74,14 +77,14 @@ def create_project(self, name: str, description: str, type: str) -> dict:
             return response.errors
         return response.data
 
-    def create_folder(self, project: str, name: str) -> dict:
+    def create_folder(self, project: str, name: str):
         """
         To create a new folder
         """
         response = self.controller.create_folder(project=project, folder_name=name)
         if response.errors:
-            return response.errors
-        return response.data
+            logger.critical(response.errors)
+        sys.exit(0)
 
     def upload_images(
         self,
@@ -168,6 +171,7 @@ def upload_image(image_path: str):
                 images=uploaded_image_entities[i : i + 500],  # noqa: E203
                 annotation_status=set_annotation_status,
             )
+        sys.exit(0)
 
     def export_project(
         self,
@@ -192,6 +196,7 @@ def export_project(
             extract_zip_contents=not disable_extract_zip_contents,
             to_s3_bucket=False,
         )
+        sys.exit(0)
 
     def upload_preannotations(
         self, project, folder, data_set_name=None, task=None, format=None
@@ -213,6 +218,7 @@ def upload_preannotations(
             task=task,
             pre=True,
         )
+        sys.exit(0)
 
     def upload_annotations(
         self, project, folder, data_set_name=None, task=None, format=None
@@ -234,6 +240,7 @@ def upload_annotations(
             task=task,
             pre=False,
         )
+        sys.exit(0)
 
     def _upload_annotations(
         self, project, folder, format, data_set_name, task, pre=True
@@ -281,6 +288,7 @@ def _upload_annotations(
                     if response.errors:
                         logger.warning(response.errors)
                     progress_bar.update()
+        sys.exit(0)
 
     def attach_image_urls(
         self, project: str, attachments: str, annotation_status: Optional[Any] = None
@@ -289,11 +297,13 @@ def attach_image_urls(
         To attach image URLs to project use:
         """
         self._attach_urls(project, attachments, annotation_status)
+        sys.exit(0)
 
     def attach_video_urls(
         self, project: str, attachments: str, annotation_status: Optional[Any] = None
     ):
         self._attach_urls(project, attachments, annotation_status)
+        sys.exit(0)
 
     def _attach_urls(
         self, project: str, attachments: str, annotation_status: Optional[Any] = None
@@ -407,3 +417,4 @@ def _upload_image(image_path: str) -> str:
                 images=uploaded_image_entities[i : i + 500],  # noqa: E203
                 annotation_status=set_annotation_status,
             )
+        sys.exit(0)

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

@@ -187,9 +187,9 @@ def create_project_from_metadata(project_metadata):
     :rtype: dict
     """
     response = controller.create_project(
-        name=project_metadata["project"]["name"],
-        description=project_metadata["project"]["description"],
-        project_type=project_metadata["project"]["type"],
+        name=project_metadata["name"],
+        description=project_metadata["description"],
+        project_type=project_metadata["type"],
         contributors=project_metadata.get("contributors", []),
         settings=project_metadata.get("settings", []),
         annotation_classes=project_metadata.get("classes", []),
@@ -305,7 +305,7 @@ def create_folder(project, folder_name):
         logger.info(f"Folder {folder_name} created in project {project}")
         return folder.to_dict()
     if res.errors:
-        logger.warning(res.errors)
+        raise AppException(res.errors)
 
 
 @Trackable
@@ -361,7 +361,9 @@ def delete_folders(project, folder_names):
     :type folder_names: list of strs
     """
 
-    controller.delete_folders(project_name=project, folder_names=folder_names)
+    res = controller.delete_folders(project_name=project, folder_names=folder_names)
+    if res.errors:
+        raise AppException(res.errors)
     logger.info(f"Folders {folder_names} deleted in project {project}")
 
 
@@ -396,7 +398,9 @@ def rename_folder(project, new_folder_name):
     :type new_folder_name: str
     """
     project_name, folder_name = extract_project_folder(project)
-    controller.update_folder(project_name, folder_name, {"name": new_folder_name})
+    res = controller.update_folder(project_name, folder_name, {"name": new_folder_name})
+    if res.errors:
+        raise AppException(res.errors)
     logger.info(
         f"Folder {folder_name} renamed to {new_folder_name} in project {project_name}"
     )
@@ -793,23 +797,24 @@ def get_project_metadata(
     :rtype: dict
     """
     project_name, folder_name = extract_project_folder(project)
-    metadata = controller.get_project_metadata(
+    response = controller.get_project_metadata(
         project_name,
         include_annotation_classes,
         include_settings,
         include_workflow,
         include_contributors,
         include_complete_image_count,
-    )
-    metadata = metadata.data
-    for elem in "settings", "classes", "workflow":
-        if metadata.get(elem):
+    ).data
+
+    metadata = ProjectSerializer(response["project"]).serialize()
+
+    for elem in "settings", "classes", "workflows", "contributors":
+        if response.get(elem):
             metadata[elem] = [
-                BaseSerializers(attribute).serialize() for attribute in metadata[elem]
+                BaseSerializers(attribute).serialize() for attribute in response[elem]
             ]
-
-    if metadata.get("project"):
-        metadata["project"] = ProjectSerializer(metadata["project"]).serialize()
+        else:
+            metadata[elem] = []
     return metadata
 
 
@@ -899,7 +904,7 @@ def get_project_default_image_quality_in_editor(project):
     :rtype: str
     """
     project_name, folder_name = extract_project_folder(project)
-    settings = controller.get_project_settings(project_name)
+    settings = controller.get_project_settings(project_name).data
     for setting in settings:
         if setting.attribute == "ImageQuality":
             return setting.value
@@ -2343,22 +2348,20 @@ def upload_annotations_from_folder_to_project(
     failed_annotations = []
     missing_annotations = []
     chunk_size = 10
-    with tqdm(total=len(annotation_paths)) as progress_bar:
-        for i in range(0, len(annotation_paths), chunk_size):
-            response = controller.upload_annotations_from_folder(
-                project_name=project_name,
-                folder_name=folder_name,
-                folder_path=folder_path,
-                annotation_paths=annotation_paths[i : i + chunk_size],  # noqa: E203
-                client_s3_bucket=from_s3_bucket,
-            )
-            if response.errors:
-                logger.warning(response.errors)
-            if response.data:
-                uploaded_annotations.extend(response.data[0])
-                missing_annotations.extend(response.data[1])
-                failed_annotations.extend(response.data[2])
-            progress_bar.update(chunk_size)
+    for i in tqdm(range(0, len(annotation_paths), chunk_size)):
+        response = controller.upload_annotations_from_folder(
+            project_name=project_name,
+            folder_name=folder_name,
+            folder_path=folder_path,
+            annotation_paths=annotation_paths[i : i + chunk_size],  # noqa: E203
+            client_s3_bucket=from_s3_bucket,
+        )
+        if response.errors:
+            logger.warning(response.errors)
+        if response.data:
+            uploaded_annotations.extend(response.data[0])
+            missing_annotations.extend(response.data[1])
+            failed_annotations.extend(response.data[2])
     return uploaded_annotations, failed_annotations, missing_annotations
 
 

src/superannotate/lib/app/serializers.py

@@ -10,6 +10,8 @@ def __init__(self, entity: BaseEntity):
         self._entity = entity
 
     def serialize(self):
+        if isinstance(self._entity, dict):
+            return self._entity
         return self._entity.to_dict()
 
 

src/superannotate/lib/core/enums.py

@@ -59,9 +59,9 @@ class ExportStatus(BaseTitledEnum):
 class AnnotationStatus(BaseTitledEnum):
     NOT_STARTED = "NotStarted", 1
     IN_PROGRESS = "InProgress", 2
-    COMPLETED = "Completed", 3
-    QUALITY_CHECK = "QualityCheck", 4
-    RETURNED = "Returned", 5
+    QUALITY_CHECK = "QualityCheck", 3
+    RETURNED = "Returned", 4
+    COMPLETED = "Completed", 5
     SKIPPED = "Skipped", 6
 
 

src/superannotate/lib/core/repositories.py

@@ -38,6 +38,9 @@ def update(self, entity: BaseEntity) -> BaseEntity:
     def delete(self, uuid: Any):
         raise NotImplementedError
 
+    def bulk_delete(self, entities: List[BaseEntity]) -> bool:
+        raise NotImplementedError
+
     @staticmethod
     def _drop_nones(data: dict):
         for k, v in list(data.items()):

src/superannotate/lib/core/response.py

@@ -25,7 +25,7 @@ def status(self, value):
 
     @property
     def errors(self):
-        return self._errors
+        return "\n".join([error.message for error in self._errors])
 
     @errors.setter
     def errors(self, error: list):