Merge pull request #172 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

@@ -1,5 +1,7 @@
+import os
 import logging.config
 
+from version import __version__
 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
@@ -156,6 +158,7 @@
 
 
 __all__ = [
+    "__version__",
     # Utils
     "AppException",
     #
@@ -287,7 +290,7 @@
 ]
 
 __author__ = "Superannotate"
-import os
+
 
 file_dir = os.path.split(os.path.realpath(__file__))[0]
 

src/superannotate/lib/core/response.py

@@ -1,7 +1,5 @@
 from typing import Union
 
-from lib.core.exceptions import AppException
-
 
 class Response:
     def __init__(self, status: str = None, data: Union[dict, list] = None):
@@ -27,13 +25,7 @@ def status(self, value):
 
     @property
     def errors(self):
-        message = ""
-        for error in self._errors:
-            if isinstance(error, AppException):
-                message += error.message + "\n"
-            else:
-                message += str(error)
-        return message
+        return "\n".join([str(error) for error in self._errors])
 
     @errors.setter
     def errors(self, error: list):

src/superannotate/lib/core/serviceproviders.py

@@ -1,4 +1,3 @@
-from abc import ABC
 from abc import abstractmethod
 from typing import Any
 from typing import Dict
@@ -7,7 +6,16 @@
 from typing import Tuple
 
 
-class SuerannotateServiceProvider(ABC):
+class SingleInstanceMetaClass(type):
+    _instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in SingleInstanceMetaClass._instances:
+            SingleInstanceMetaClass._instances[cls] = super().__call__(*args, **kwargs)
+        return SingleInstanceMetaClass._instances[cls]
+
+
+class SuerannotateServiceProvider(metaclass=SingleInstanceMetaClass):
     @abstractmethod
     def attach_files(
         self,

src/superannotate/lib/core/usecases.py

@@ -129,10 +129,7 @@ def execute(self):
             if not projects:
                 self._response.errors = AppException("Project not found.")
             else:
-                for project in projects:
-                    if project.name == self._name:
-                        self._response.data = project
-                    break
+                self._response.data = next(project for project in projects if project.name == self._name)
         return self._response
 
 
@@ -1359,7 +1356,9 @@ def __init__(
 
     def validate_image_quality(self):
         for setting in self._to_update:
-            if setting["attribute"].lower() == "imagequality" and isinstance(setting["value"], str):
+            if setting["attribute"].lower() == "imagequality" and isinstance(
+                setting["value"], str
+            ):
                 setting["value"] = constances.ImageQuality.get_value(setting["value"])
                 return
 
@@ -1593,7 +1592,7 @@ def execute(self):
                 self._backend_service.delete_images(
                     project_id=self._project.uuid,
                     team_id=self._project.team_id,
-                    image_ids=image_ids[i : i + self.CHUNK_SIZE],
+                    image_ids=image_ids[i : i + self.CHUNK_SIZE],  # noqa: E203
                 )
         return self._response
 
@@ -1970,6 +1969,8 @@ def execute(self):
 
         if self._include_contributors:
             data["contributors"] = project.users
+        else:
+            project.users = []
 
         self._response.data = data
         return self._response
@@ -2678,7 +2679,11 @@ def execute(self):
             for step in [step for step in self._steps if "className" in step]:
                 if step.get("id"):
                     del step["id"]
-                step["class_id"] = annotation_classes_map[step["className"]]
+                step["class_id"] = annotation_classes_map.get(step["className"], None)
+                if not step["class_id"]:
+                    raise AppException(
+                        "Annotation class not found in set_project_workflow."
+                    )
 
             self._service.set_project_workflow_bulk(
                 team_id=self._project.team_id,
@@ -2698,6 +2703,17 @@ def execute(self):
                     attribute_group_name = attribute["attribute"]["attribute_group"][
                         "name"
                     ]
+                    if not annotations_classes_attributes_map.get(
+                        f"{annotation_class_name}__{attribute_group_name}__{attribute_name}",
+                        None,
+                    ):
+                        raise AppException(
+                            "Attribute group name or attribute name not found in set_project_workflow."
+                        )
+
+                    if not existing_workflows_map.get(step["step"], None):
+                        raise AppException("Couldn't find step in workflow")
+
                     req_data.append(
                         {
                             "workflow_id": existing_workflows_map[step["step"]],

src/superannotate/lib/infrastructure/repositories.py

@@ -190,7 +190,7 @@ def update(self, entity: ProjectSettingEntity):
         res = self._service.set_project_settings(
             self._project.uuid, self._project.team_id, [entity.to_dict()]
         )
-        return self.dict2entity(res[0])
+        return entity
 
     @staticmethod
     def dict2entity(data: dict):

src/superannotate/lib/infrastructure/services.py

@@ -8,16 +8,19 @@
 
 import lib.core as constance
 import requests.packages.urllib3
+import requests.adapters
 from lib.core.exceptions import AppException
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from requests.exceptions import HTTPError
+from lib.infrastructure.helpers import timed_lru_cache
 
 requests.packages.urllib3.disable_warnings()
 
 
 class BaseBackendService(SuerannotateServiceProvider):
     AUTH_TYPE = "sdk"
     PAGINATE_BY = 100
+    MAX_RETRY = 3
 
     """
     Base service class
@@ -29,6 +32,14 @@ def __init__(self, api_url: str, auth_token: str, logger, paginate_by=None):
         self.logger = logger
         self._paginate_by = paginate_by
         self.team_id = auth_token.split("=")[-1]
+        self._session = None
+
+    @timed_lru_cache(seconds=360)
+    def get_session(self):
+        if not self._session:
+            self._session = requests.Session()
+            self._session.headers.update(self.default_headers)
+        return self._session
 
     @property
     def default_headers(self):
@@ -69,16 +80,12 @@ def _request(
     ) -> requests.Response:
         kwargs = {"json": data} if data else {}
         headers_dict = self.default_headers.copy()
-        headers_dict.update(headers if headers else {})
-        method = getattr(requests, method)
+        session = self.get_session()
+        session.headers.update(headers if headers else {})
+        method = getattr(session, 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,
             )
         if response.status_code == 404 and retried < 3:
             return self._request(
@@ -239,7 +246,8 @@ def get_projects(self, query_string: str = None) -> list:
         url = urljoin(self.api_url, self.URL_LIST_PROJECTS)
         if query_string:
             url = f"{url}?{query_string}"
-        return self._get_all_pages(url)
+        data = self._get_all_pages(url)
+        return data
 
     def create_project(self, project_data: dict) -> dict:
         create_project_url = urljoin(self.api_url, self.URL_CREATE_PROJECT)

tests/integration/test_folders.py

@@ -182,7 +182,7 @@ def test_project_folder_image_count(self):
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
         )
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 0)
+        self.assertEqual(num_images, 4)
 
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
         sa.upload_images_from_folder_to_project(
@@ -191,7 +191,7 @@ def test_project_folder_image_count(self):
             annotation_status="InProgress",
         )
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 0)
+        self.assertEqual(num_images, 4)
 
         num_images = sa.get_project_image_count(
             self.PROJECT_NAME + f"/{self.TEST_FOLDER_NAME_1}"
@@ -201,7 +201,7 @@ def test_project_folder_image_count(self):
         num_images = sa.get_project_image_count(
             self.PROJECT_NAME, with_all_subfolders=True
         )
-        self.assertEqual(num_images, 4)
+        self.assertEqual(num_images, 8)
 
     def test_delete_images(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
@@ -252,7 +252,7 @@ def test_copy_images3(self):
         )
 
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        assert num_images == 0
+        assert num_images == 4
 
     def test_copy_images4(self):
         sa.upload_images_from_folder_to_project(
@@ -269,7 +269,7 @@ def test_copy_images4(self):
         self.assertEqual(num_images, 2)
 
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 0)
+        self.assertEqual(num_images, 4)
 
     def test_copy_images(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)

tests/integration/test_interface.py

@@ -1,6 +1,7 @@
 import os
 from os.path import dirname
 import src.superannotate as sa
+from src.superannotate.lib.app.exceptions import AppException
 from tests.integration.base import BaseTestCase
 
 
@@ -9,6 +10,10 @@ class TestInterface(BaseTestCase):
     TEST_FOLDER_PATH = "data_set/sample_project_vector"
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
+    TEST_FOLDER_NAME = "folder"
+    EXAMPLE_IMAGE_1 = "example_image_1.jpg"
+    EXAMPLE_IMAGE_2 = "example_image_2.jpg"
+
     @property
     def folder_path(self):
         return os.path.join(dirname(dirname(__file__)), self.TEST_FOLDER_PATH)
@@ -17,5 +22,33 @@ def test_get_project_default_image_quality_in_editor(self):
         sa.invite_contributor_to_team(2, 2)
         self.assertIsNotNone(sa.get_project_default_image_quality_in_editor(self.PROJECT_NAME))
 
+    def test_delete_images(self):
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME)
+
+        sa.upload_images_from_folder_to_project(
+            f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME}",
+            self.folder_path,
+            annotation_status="InProgress",
+        )
+        num_images = sa.get_project_image_count(
+            self.PROJECT_NAME, with_all_subfolders=True
+        )
+        self.assertEqual(num_images, 4)
+        sa.delete_images(f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME}")
+
+        num_images = sa.get_project_image_count(
+            self.PROJECT_NAME, with_all_subfolders=True
+        )
+        self.assertEqual(num_images, 0)
+
+    def test_delete_folder(self):
+        print(sa.search_folders(self.PROJECT_NAME))
+        with self.assertRaises(AppException):
+            sa.delete_folders(self.PROJECT_NAME, ["non-existing folder"])
+
     def test_get_project_metadata(self):
-        pass
+        metadata = sa.get_project_metadata(self.PROJECT_NAME)
+        self.assertIsNotNone(metadata["id"])
+        self.assertListEqual(metadata.get("contributors", []), [])
+        metadata_with_users = sa.get_project_metadata(self.PROJECT_NAME, include_contributors=True)
+        self.assertIsNotNone(metadata_with_users.get("contributors"))

tests/profiling/profiling.py

@@ -0,0 +1,9 @@
+import src.superannotate as sa
+
+import time
+
+
+stat = time.time()
+sa.search_annotation_classes("Vector Project")
+end = time.time()
+print(11, end-stat)