Merge pull request #194 from superannotateai/sdk_fix_logs

Fix logs, annotations upload

Author: VaghinakDev

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/core/usecases.py

@@ -2240,7 +2240,7 @@ def execute(self):
                     with open(mask_path, "wb") as f:
                         f.write(data["annotation_mask"].getbuffer())
                 else:
-                    logger.info(f"There is no blue-map for the image.")
+                    logger.info("There is no blue-map for the image.")
 
             json_path = Path(self._destination) / data["annotation_json_filename"]
             with open(json_path, "w") as f:

src/superannotate/lib/infrastructure/repositories.py

@@ -432,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

@@ -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,