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

Re design sdk

Author: dshabin

setup.py

@@ -27,7 +27,7 @@
     name='superannotate',
     version=version,
     package_dir={"": "src"},
-
+    package_data={"superannotate": ["logging.conf"]},
     packages=find_packages(where="src"),
     description='Python SDK to SuperAnnotate platform',
     license='MIT',

src/superannotate/__init__.py

@@ -1,3 +1,5 @@
+import logging.config
+
 from superannotate.lib.app.analytics.class_analytics import attribute_distribution
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.annotation_helpers import add_annotation_bbox_to_json
@@ -243,6 +245,7 @@
     "upload_videos_from_folder_to_project",
     # Annotation Section
     "create_annotation_class",
+    "delete_annotation_class",
     "prepare_export",
     "download_export",
     "set_images_annotation_statuses",
@@ -284,3 +287,8 @@
 ]
 
 __author__ = "Superannotate"
+import os
+
+file_dir = os.path.split(os.path.realpath(__file__))[0]
+
+logging.config.fileConfig(os.path.join(file_dir, "logging.conf"))

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

@@ -36,6 +36,7 @@
 from lib.app.serializers import BaseSerializers
 from lib.app.serializers import ImageSerializer
 from lib.app.serializers import ProjectSerializer
+from lib.app.serializers import SettingsSerializer
 from lib.app.serializers import TeamSerializer
 from lib.core.enums import ImageQuality
 from lib.core.exceptions import AppException
@@ -45,15 +46,7 @@
 from tqdm import tqdm
 
 
-logging.basicConfig(level=logging.INFO)
-formatter = logging.Formatter(fmt="SA-PYTHON-SDK - %(levelname)s - %(message)s")
-
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-
 logger = logging.getLogger("superannotate-python-sdk")
-logger.setLevel(logging.INFO)
-logger.addHandler(handler)
 
 controller = Controller(logger)
 
@@ -864,8 +857,12 @@ def get_project_metadata(
     ).data
 
     metadata = ProjectSerializer(response["project"]).serialize()
+    if response.get("settings"):
+        metadata["settings"] = [
+            SettingsSerializer(setting).serialize() for setting in response["settings"]
+        ]
 
-    for elem in "settings", "classes", "workflows", "contributors":
+    for elem in "classes", "workflows", "contributors":
         if response.get(elem):
             metadata[elem] = [
                 BaseSerializers(attribute).serialize() for attribute in response[elem]
@@ -2690,7 +2687,6 @@ def delete_model(model):
         logger.info("Failed to delete model, please try again")
     else:
         logger.info("Model successfully deleted")
-        raise AppException("Failed to delete model")
     return model
 
 
@@ -2706,11 +2702,11 @@ def stop_model_training(model):
 
     model_id = None
     if isinstance(model, dict):
-        model_id = model['id']
+        model_id = model["id"]
     else:
         res = controller.search_models(name=model).data
         if len(res):
-            model_id = res[0]['id']
+            model_id = res[0]["id"]
         else:
             raise AppException("Model not found.")
 
@@ -3542,4 +3538,4 @@ def aggregate_annotations_as_df(
         include_tags,
         verbose,
         folder_names,
-    )
+    )

src/superannotate/lib/app/serializers.py

@@ -62,3 +62,11 @@ def deserialize(data):
         if isinstance(data, list):
             return [ImageEntity(**image) for image in data]
         return ImageEntity(**data)
+
+
+class SettingsSerializer(BaseSerializers):
+    def serialize(self):
+        data = super().serialize()
+        if data["attribute"] == "ImageQuality":
+            data["value"] = constance.ImageQuality.get_name(data["value"])
+        return data

src/superannotate/lib/core/__init__.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from superannotate.lib.core.enums import AnnotationStatus
+from superannotate.lib.core.enums import ImageQuality
 from superannotate.lib.core.enums import ProjectType
 from superannotate.lib.core.enums import SegmentationStatus
 from superannotate.lib.core.enums import TrainingStatus
@@ -63,6 +64,7 @@
     TrainingStatus,
     SegmentationStatus,
     TrainingTask,
+    ImageQuality,
     AnnotationStatus,
     CONFIG_FILE_LOCATION,
     BACKEND_URL,

src/superannotate/lib/core/serviceproviders.py

@@ -287,4 +287,4 @@ def run_segmentation(
     def run_prediction(
         self, team_id: int, project_id: int, ml_model_id: int, image_ids: list
     ):
-        raise NotImplementedError
+        raise NotImplementedError

src/superannotate/lib/core/usecases.py

@@ -1938,6 +1938,7 @@ def execute(self):
         project = self._projects.get_one(
             uuid=self._project.uuid, team_id=self._project.team_id
         )
+        data["project"] = project
         if self._include_complete_image_count:
             projects = self._projects.get_all(
                 condition=(
@@ -1948,8 +1949,6 @@ def execute(self):
             )
             if projects:
                 data["project"] = projects[0]
-        else:
-            data["project"] = project
 
         if self._include_annotation_classes:
             self.annotation_classes_use_case.execute()
@@ -3537,7 +3536,8 @@ def __init__(self, model_id: int, models: BaseManageableRepository):
         self._models = models
 
     def execute(self):
-        self._models.delete(self._model_id)
+        self._response.data = self._models.delete(self._model_id)
+        return self._response
 
 
 class StopModelTraining(BaseUseCase):
@@ -4157,7 +4157,9 @@ def s3_repository(self):
         return self._s3_repo_instance
 
     def _upload_image(self, image_path: str):
-        ProcessedImage = namedtuple("ProcessedImage", ["uploaded", "path", "entity"])
+        ProcessedImage = namedtuple(
+            "ProcessedImage", ["uploaded", "path", "entity", "name"]
+        )
         if self._from_s3_bucket:
             image_bytes = (
                 GetS3ImageUseCase(s3_bucket=self._from_s3_bucket, image_path=image_path)
@@ -4178,9 +4180,16 @@ def _upload_image(self, image_path: str):
 
         if not upload_response.errors and upload_response.data:
             entity = upload_response.data
-            return ProcessedImage(uploaded=True, path=entity.path, entity=entity)
+            return ProcessedImage(
+                uploaded=True,
+                path=entity.path,
+                entity=entity,
+                name=Path(image_path).name,
+            )
         else:
-            return ProcessedImage(uploaded=False, path=image_path, entity=None)
+            return ProcessedImage(
+                uploaded=False, path=image_path, entity=None, name=Path(image_path).name
+            )
 
     @property
     def paths(self):
@@ -4278,7 +4287,7 @@ def execute(self):
                 if processed_image.uploaded and processed_image.entity:
                     uploaded_images.append(processed_image)
                 else:
-                    failed_images.append(processed_image)
+                    failed_images.append(processed_image.path)
                 yield
 
         uploaded = []
@@ -4294,6 +4303,7 @@ def execute(self):
 
             attachments, duplications = response.data
             uploaded.extend(attachments)
-            # duplicates.extend(duplications)
+        uploaded = [image["name"] for image in uploaded]
+        failed_images = [image.name for image in failed_images]
 
-        self.response.data = uploaded, failed_images, duplications
+        self._response.data = uploaded, failed_images, duplications

src/superannotate/lib/infrastructure/controller.py

@@ -777,7 +777,7 @@ def assign_images(
 
     def un_assign_images(self, project_name, folder_name, image_names):
         project = self._get_project(project_name)
-        folder = self._get_folder(folder_name)
+        folder = self._get_folder(project, folder_name)
         use_case = usecases.UnAssignImagesUseCase(
             project_entity=project,
             service=self._backend_client,

src/superannotate/lib/infrastructure/services.py

@@ -7,11 +7,13 @@
 from urllib.parse import urljoin
 
 import lib.core as constance
-import requests
+import requests.packages.urllib3
 from lib.core.exceptions import AppException
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from requests.exceptions import HTTPError
 
+requests.packages.urllib3.disable_warnings()
+
 
 class BaseBackendService(SuerannotateServiceProvider):
     AUTH_TYPE = "sdk"
@@ -71,7 +73,12 @@ def _request(
         method = getattr(requests, method)
         with self.safe_api():
             response = method(
-                url, **kwargs, headers=headers_dict, params=params, timeout=60, verify=False
+                url,
+                **kwargs,
+                headers=headers_dict,
+                params=params,
+                timeout=60,
+                verify=False,
             )
         if response.status_code == 404 and retried < 3:
             return self._request(
@@ -159,6 +166,7 @@ class SuperannotateBackendService(BaseBackendService):
     URL_GET_TEMPLATES = "templates"
     URL_PROJECT_WORKFLOW_ATTRIBUTE = "project/{}/workflow_attribute"
     URL_MODELS = "ml_models"
+    URL_MODEL = "ml_model"
     URL_STOP_MODEL_TRAINING = "ml_model/{}/stopTrainingJob"
     URL_GET_MODEL_METRICS = "ml_models/{}/getCurrentMetrics"
     URL_BULK_GET_FOLDERS = "foldersByTeam"
@@ -885,7 +893,7 @@ def update_model(self, team_id: int, model_id: int, data: dict):
         return res.json()
 
     def delete_model(self, team_id: int, model_id: int):
-        delete_model_url = urljoin(self.api_url, f"{self.URL_MODELS}/{model_id}")
+        delete_model_url = urljoin(self.api_url, f"{self.URL_MODEL}/{model_id}")
         res = self._request(delete_model_url, "delete", params={"team_id": team_id})
         return res.ok
 

src/superannotate/logging.conf

@@ -0,0 +1,28 @@
+[loggers]
+keys=root,superannotate-python-sdk
+
+[handlers]
+keys=consoleHandler
+
+[formatters]
+keys=consoleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[logger_superannotate-python-sdk]
+level=DEBUG
+handlers=consoleHandler
+qualname=consoleFormatter
+propagate=0
+
+[handler_consoleHandler]
+class=StreamHandler
+level=INFO
+formatter=consoleFormatter
+args=(sys.stdout,)
+
+[formatter_consoleFormatter]
+format=SA-PYTHON-SDK - %(levelname)s - %(message)s
+datefmt=