Merge branch 're-design-sdk' of https://github.com/superannotateai/superannotate-python-sdk into 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,4 +1,3 @@
-import logging
 import logging.config
 
 from superannotate.lib.app.analytics.class_analytics import attribute_distribution
@@ -289,6 +288,7 @@
 
 __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

@@ -2697,11 +2697,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.")
 
@@ -3533,4 +3533,4 @@ def aggregate_annotations_as_df(
         include_tags,
         verbose,
         folder_names,
-    )
+    )

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

@@ -4159,7 +4159,7 @@ 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)
@@ -4180,9 +4180,9 @@ 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):
@@ -4280,7 +4280,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 = []
@@ -4296,6 +4296,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/services.py

@@ -6,12 +6,12 @@
 from typing import Tuple
 from urllib.parse import urljoin
 
-import requests
-from requests.packages.urllib3.exceptions import InsecureRequestWarning
 import lib.core as constance
+import requests
 from lib.core.exceptions import AppException
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from requests.exceptions import HTTPError
+import requests.packages.urllib3
 
 requests.packages.urllib3.disable_warnings()
 
@@ -74,7 +74,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(

tests/integration/test_interface.py

@@ -1,3 +1,5 @@
+import os
+from os.path import dirname
 import src.superannotate as sa
 from tests.integration.base import BaseTestCase
 
@@ -7,11 +9,14 @@ class TestInterface(BaseTestCase):
     TEST_FOLDER_PATH = "data_set/sample_project_vector"
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
+    @property
+    def folder_path(self):
+        return os.path.join(dirname(dirname(__file__)), self.TEST_FOLDER_PATH)
 
     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_get_project_metadata(self):
-        metadata = sa.get_project_metadata(include_complete_image_count=True)
+        metadata = sa.upload_images_from_folder_to_project(self.PROJECT_NAME, self.folder_path)
         pass