Merge branch 're-design-sdk' of https://github.com/superannotateai/superannotate-python-sdk into re-design-sdk

Author: dshabin

src/superannotate/lib/core/usecases.py

@@ -348,7 +348,6 @@ def validate_project_type(self):
 
     def execute(self):
         if self.is_valid():
-            self._project_to_create.description = self._project.description
             project = self._projects.insert(self._project_to_create)
 
             annotation_classes_mapping = {}
@@ -677,17 +676,13 @@ def upload_state_code(self) -> int:
         return constances.UploadState.BASIC.value
 
     def execute(self):
-        duplications = self._backend_service.get_bulk_images(
+        response = self._backend_service.get_bulk_images(
             project_id=self._project.uuid,
             team_id=self._project.team_id,
             folder_id=self._folder.uuid,
             images=[image.name for image in self._attachments],
         )
-        try:
-            duplications = [image["name"] for image in duplications]
-        except Exception:
-            print(duplications)
-            raise
+        duplications = [image["name"] for image in response]
         meta = {}
         to_upload = []
         for image in self._attachments:
@@ -4511,25 +4506,25 @@ def __init__(
     def execute(self) -> Response:
 
         if self._folder.name == "root" and not self._image_names:
-            poll_id = self._backend_service.delete_image_annotations(
+            response = self._backend_service.delete_image_annotations(
                 project_id=self._project.uuid, team_id=self._project.team_id,
             )
         else:
-            poll_id = self._backend_service.delete_image_annotations(
+            response = self._backend_service.delete_image_annotations(
                 project_id=self._project.uuid,
                 team_id=self._project.team_id,
                 folder_id=self._folder.uuid,
                 image_names=self._image_names,
             )
 
-        if poll_id:
+        if response:
             timeout_start = time.time()
             while time.time() < timeout_start + self.POLL_AWAIT_TIME:
                 progress = int(
                     self._backend_service.get_annotations_delete_progress(
                         project_id=self._project.uuid,
                         team_id=self._project.team_id,
-                        poll_id=poll_id,
+                        poll_id=response.get("poll_id"),
                     ).get("process", -1)
                 )
                 if 0 < progress < 100:

src/superannotate/lib/infrastructure/controller.py

@@ -53,10 +53,16 @@ def __init__(self, logger, config_path=constances.CONFIG_FILE_LOCATION):
             self.configs.insert(ConfigEntity("token", ""))
             logger.warning("Fill config.json")
             return
+        verify_ssl_entity = self.configs.get_one("ssl_verify")
+        if not verify_ssl_entity:
+            verify_ssl = True
+        else:
+            verify_ssl = verify_ssl_entity.value
         self._backend_client = SuperannotateBackendService(
             api_url=self.configs.get_one("main_endpoint").value,
             auth_token=ConfigRepository().get_one("token").value,
             logger=logger,
+            verify_ssl=verify_ssl
         )
         self._s3_upload_auth_data = None
         self._projects = None
@@ -337,7 +343,9 @@ def clone_project(
         project = self._get_project(from_name)
         project_to_create = copy.copy(project)
         project_to_create.name = name
-        project_to_create.description = project_description
+        if project_description:
+            project_to_create.description = project_description
+
         use_case = usecases.CloneProjectUseCase(
             project=project,
             project_to_create=project_to_create,

src/superannotate/lib/infrastructure/services.py

@@ -1,3 +1,4 @@
+import os
 from contextlib import contextmanager
 from datetime import datetime
 from typing import Dict
@@ -26,11 +27,12 @@ class BaseBackendService(SuerannotateServiceProvider):
     Base service class
     """
 
-    def __init__(self, api_url: str, auth_token: str, logger, paginate_by=None):
+    def __init__(self, api_url: str, auth_token: str, logger, paginate_by=None, verify_ssl=True):
         self.api_url = api_url
         self._auth_token = auth_token
         self.logger = logger
         self._paginate_by = paginate_by
+        self._verify_ssl = verify_ssl
         self.team_id = auth_token.split("=")[-1]
 
     @timed_lru_cache(seconds=360)
@@ -82,7 +84,7 @@ def _request(
         with self.safe_api():
             req = requests.Request(method=method, url=url, **kwargs, params=params)
             prepared = session.prepare_request(req)
-            response = session.send(request=prepared)
+            response = session.send(request=prepared, verify=self._verify_ssl)
         if response.status_code == 404 and retried < 3:
             return self._request(
                 url,
@@ -966,7 +968,7 @@ def delete_image_annotations(
             delete_annotations_url, "post", params=params, data=data
         )
         if response.ok:
-            return response.json()["poll_id"]
+            return response.json()
 
     def get_annotations_delete_progress(
         self, team_id: int, project_id: int, poll_id: int

tests/integration/test_annotation_delete.py

@@ -7,7 +7,7 @@
 
 
 class TestAnnotationDelete(BaseTestCase):
-    PROJECT_NAME_ = "TestAnnotationDelete"
+    PROJECT_NAME = "TestAnnotationDelete"
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
     TEST_FOLDER_PATH = "data_set/sample_project_vector_single_image"

tests/integration/test_create_from_full_info.py

@@ -90,14 +90,18 @@ def test_create_from_full_info(self):
             len(new_project_metadata["workflows"]), len(project_metadata["workflows"])
         )
 
-    def test_clone_contributors(self):
+    def test_clone_contributors_and_description(self):
         team_users = sa.search_team_contributors()
         sa.share_project(self.PROJECT_NAME_1, team_users[0], "QA")
-        first_project_contributors = sa.get_project_metadata(
+        first_project_metadata = sa.get_project_metadata(
             self.PROJECT_NAME_1, include_contributors=True
-        )["contributors"]
-        sa.clone_project(self.PROJECT_NAME_2, self.PROJECT_NAME_1, copy_contributors=True)
-        second_project_contributors = sa.get_project_metadata(
+        )
+        first_project_contributors = first_project_metadata["contributors"]
+        sa.clone_project(self.PROJECT_NAME_2, self.PROJECT_NAME_1, "DESCRIPTION", copy_contributors=True)
+        second_project_metadata = sa.get_project_metadata(
             self.PROJECT_NAME_2, include_contributors=True
-        )["contributors"]
-        self.assertEqual(first_project_contributors[0]["user_id"], second_project_contributors[0]["user_id"])
+        )
+        second_project_contributors = second_project_metadata["contributors"]
+
+        self.assertEqual(first_project_contributors[0]["user_id"], second_project_contributors[0]["user_id"])
+        self.assertEqual("DESCRIPTION", second_project_metadata["description"])