merge with develop

Author: dshabin

docs/source/superannotate.sdk.rst

@@ -126,6 +126,7 @@ _________________
 .. autofunction:: superannotate.get_team_metadata
 .. autofunction:: superannotate.invite_contributor_to_team
 .. autofunction:: superannotate.delete_contributor_to_team_invitation
+.. autofunction:: superannotate.search_team_contributors
 
 ----------
 

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/lib/app/interface/sdk_interface.py

@@ -352,7 +352,14 @@ def rename_project(project: str, new_name: str):
     :param new_name: project's new name
     :type new_name: str
     """
-    controller.update_project(name=project, project_data={"name": new_name})
+
+    response = controller.update_project(name=project, project_data={"name": new_name})
+    if response.errors:
+        raise AppException(response.errors)
+
+    logger.info(
+        "Successfully renamed project %s to %s.", project, response.data["name"]
+    )
 
 
 @Trackable

src/superannotate/lib/core/usecases.py

@@ -320,7 +320,8 @@ def execute(self):
         if self.is_valid():
             for field, value in self._project_data.items():
                 setattr(self._project, field, value)
-            self._response.data = self._projects.update(self._project)
+            new_project = self._projects.update(self._project)
+            self._response.data = new_project.to_dict()
         return self._response
 
 

src/superannotate/lib/infrastructure/repositories.py

@@ -97,9 +97,10 @@ def insert(self, entity: ProjectEntity) -> ProjectEntity:
 
     def update(self, entity: ProjectEntity):
         condition = Condition("team_id", entity.team_id, EQ)
-        self._service.update_project(
+        result = self._service.update_project(
             entity.to_dict(), query_string=condition.build_query()
         )
+        return self.dict2entity(result)
 
     def delete(self, entity: ProjectEntity):
         team_id = entity.team_id
@@ -431,7 +432,7 @@ def get_one(self, uuid: int) -> MLModelEntity:
         raise NotImplementedError
 
     def get_all(self, condition: Optional[Condition] = None) -> List[MLModelEntity]:
-        models = self._service.search_models(condition.build_query())["data"]
+        models = self._service.search_models(condition.build_query())
         return [self.dict2entity(model) for model in models]
 
     def insert(self, entity: MLModelEntity) -> MLModelEntity:

src/superannotate/lib/infrastructure/services.py

@@ -270,7 +270,7 @@ def update_project(self, data: dict, query_string: str = None) -> bool:
         if query_string:
             url = f"{url}?{query_string}"
         res = self._request(url, "put", data)
-        return res.ok
+        return res.json()
 
     def attach_files(
         self,
@@ -307,10 +307,7 @@ def get_folders(self, query_string: str = None, params: dict = None):
         get_folder_url = urljoin(self.api_url, self.URL_FOLDERS_IMAGES)
         if query_string:
             get_folder_url = f"{get_folder_url}?{query_string}"
-        response = self._get_all_pages(
-            get_folder_url, params=params, key_field="folders"
-        )
-        return response
+        return self._get_all_pages(get_folder_url, params=params, key_field="folders")
 
     def delete_folders(self, project_id: int, team_id: int, folder_ids: List[int]):
         delete_folders_url = urljoin(self.api_url, self.URL_DELETE_FOLDERS)
@@ -884,8 +881,8 @@ def search_models(self, query_string: str):
         search_model_url = urljoin(self.api_url, self.URL_MODELS)
         if query_string:
             search_model_url = f"{search_model_url}?{query_string}"
-        response = self._request(search_model_url, "get",)
-        return response.json()
+        # response = self._request(search_model_url, "get",)
+        return self._get_all_pages(search_model_url)
 
     def bulk_get_folders(self, team_id: int, project_ids: List[int]):
         get_folders_url = urljoin(self.api_url, self.URL_BULK_GET_FOLDERS)

tests/data_set/sample_project_vector/example_image_1.jpg___fuse.png

@@ -28,15 +28,15 @@ def test_basic_images(self):
             sa.upload_images_from_folder_to_project(
                 self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
             )
+            sa.create_annotation_classes_from_classes_json(
+                self.PROJECT_NAME, self.classes_json_path
+            )
+
             sa.upload_image_annotations(
                 project=self.PROJECT_NAME,
                 image_name=self.EXAMPLE_IMAGE_1,
                 annotation_json=f"{self.folder_path}/{self.EXAMPLE_IMAGE_1}___pixel.json",
             )
-            sa.create_annotation_classes_from_classes_json(
-                self.PROJECT_NAME, self.classes_json_path
-            )
-
             downloaded = sa.download_image(
                 project=self.PROJECT_NAME,
                 image_name=self.EXAMPLE_IMAGE_1,

tests/integration/test_basic_images.py

@@ -7,13 +7,17 @@ class TestProjectRename(BaseTestCase):
     PROJECT_DESCRIPTION = "Desc"
     PROJECT_TYPE = "Vector"
     NEW_PROJECT_NAME = "new"
+    REPLACED_PROJECT_NAME = "_ _ _ _ _ _ _ _ _"
+    BAD_PROJECT_NAME = '/ \ : * ? " < > |'
 
     def test_project_rename(self):
         sa.rename_project(self.PROJECT_NAME, self.NEW_PROJECT_NAME)
         meta = sa.get_project_metadata(self.NEW_PROJECT_NAME)
         assert meta["name"] == self.NEW_PROJECT_NAME
+        sa.delete_project(self.NEW_PROJECT_NAME)
 
     def test_rename_with_special_characters(self):
-        sa.rename_project(self.PROJECT_NAME, '/ \ : * ? " < > |')
-        sa.get_project_metadata("_ _ _ _ _ _ _ _ _")
+        sa.rename_project(self.PROJECT_NAME, self.BAD_PROJECT_NAME)
+        sa.get_project_metadata(self.REPLACED_PROJECT_NAME)
+        sa.delete_project(self.REPLACED_PROJECT_NAME)