FRIDAY 8 fix

Author: Vaghinak Basentsyan

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,7 +1,6 @@
-import os
 import logging.config
+import os
 
-from superannotate.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
@@ -155,6 +154,7 @@
 from superannotate.lib.app.interface.sdk_interface import (
     upload_videos_from_folder_to_project,
 )
+from superannotate.version import __version__
 
 
 __all__ = [

src/superannotate/lib/app/interface/sdk_interface.py

@@ -886,7 +886,9 @@ def get_project_settings(project: Union[str, dict]):
     """
     project_name, folder_name = extract_project_folder(project)
     settings = controller.get_project_settings(project_name=project_name)
-    settings = [BaseSerializers(attribute).serialize() for attribute in settings.data]
+    settings = [
+        SettingsSerializer(attribute).serialize() for attribute in settings.data
+    ]
     return settings
 
 
@@ -1143,9 +1145,6 @@ def assign_images(project: Union[str, dict], image_names: List[str], user: str):
         logger.warning(
             f"Skipping {user}. {user} is not a verified contributor for the {project_name}"
         )
-
-
-
         return
 
     controller.assign_images(project_name, folder_name, image_names, user)

src/superannotate/lib/core/usecases.py

@@ -129,7 +129,10 @@ def execute(self):
             if not projects:
                 self._response.errors = AppException("Project not found.")
             else:
-                project = next((project for project in projects if project.name == self._name), None)
+                project = next(
+                    (project for project in projects if project.name == self._name),
+                    None,
+                )
                 if not project:
                     self._response.errors = AppException("Project not found")
                 self._response.data = project
@@ -3156,6 +3159,7 @@ def execute(self):
 
 class UploadAnnotationsUseCase(BaseUseCase):
     MAX_WORKERS = 10
+
     def __init__(
         self,
         project: ProjectEntity,
@@ -3335,9 +3339,18 @@ def execute(self):
         else:
             from_s3 = None
 
-        with concurrent.futures.ThreadPoolExecutor(max_workers=self.MAX_WORKERS) as executor:
+        with concurrent.futures.ThreadPoolExecutor(
+            max_workers=self.MAX_WORKERS
+        ) as executor:
             for image_id, image_info in auth_data["images"].items():
-                executor.submit(self.upload_to_s3, image_id, image_info, bucket, from_s3, image_id_name_map)
+                executor.submit(
+                    self.upload_to_s3,
+                    image_id,
+                    image_info,
+                    bucket,
+                    from_s3,
+                    image_id_name_map,
+                )
 
         uploaded_annotations = [annotation.path for annotation in annotations_to_upload]
         missing_annotations = [annotation.path for annotation in missing_annotations]
@@ -3353,7 +3366,9 @@ def execute(self):
         )
         return self._response
 
-    def upload_to_s3(self, image_id: int, image_info, bucket, from_s3, image_id_name_map):
+    def upload_to_s3(
+        self, image_id: int, image_info, bucket, from_s3, image_id_name_map
+    ):
         if from_s3:
             file = io.BytesIO()
             s3_object = from_s3.Object(
@@ -3367,13 +3382,11 @@ def upload_to_s3(self, image_id: int, image_info, bucket, from_s3, image_id_name
 
         self.fill_classes_data(annotation_json)
         bucket.put_object(
-            Key=image_info["annotation_json_path"],
-            Body=json.dumps(annotation_json),
+            Key=image_info["annotation_json_path"], Body=json.dumps(annotation_json),
         )
         if self._project.project_type == constances.ProjectType.PIXEL.value:
             mask_filename = (
-                    image_id_name_map[image_id].name
-                    + constances.ANNOTATION_MASK_POSTFIX
+                image_id_name_map[image_id].name + constances.ANNOTATION_MASK_POSTFIX
             )
             if from_s3:
                 file = io.BytesIO()
@@ -3383,9 +3396,7 @@ def upload_to_s3(self, image_id: int, image_info, bucket, from_s3, image_id_name
                 s3_object.download_file(file)
                 file.seek(0)
             else:
-                with open(
-                        f"{self._folder_path}/{mask_filename}", "rb"
-                ) as mask_file:
+                with open(f"{self._folder_path}/{mask_filename}", "rb") as mask_file:
                     file = io.BytesIO(mask_file.read())
 
             bucket.put_object(Key=image_info["annotation_bluemap_path"], Body=file)
@@ -4347,7 +4358,9 @@ def execute(self):
                     folder=self._folder,
                     limit=self.auth_data["availableImageCount"],
                     backend_service_provider=self._backend_client,
-                    attachments=[image.entity for image in uploaded_images[i : i + 100]],
+                    attachments=[
+                        image.entity for image in uploaded_images[i : i + 100]
+                    ],
                     annotation_status=self._annotation_status,
                 ).execute()
 

src/superannotate/lib/infrastructure/services.py

@@ -10,8 +10,8 @@
 import requests.packages.urllib3
 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
+from requests.exceptions import HTTPError
 
 requests.packages.urllib3.disable_warnings()
 

tests/integration/test_interface.py

@@ -44,7 +44,6 @@ def test_delete_images(self):
         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"])
 
@@ -75,3 +74,19 @@ def test_download_image_annotations(self):
         sa.upload_images_from_folder_to_project(self.PROJECT_NAME, self.folder_path)
         with tempfile.TemporaryDirectory() as temp_dir:
             sa.download_image_annotations(self.PROJECT_NAME, self.EXAMPLE_IMAGE_1, temp_dir)
+
+    def test_search_folder(self):
+        team_users = sa.search_team_contributors()
+        sa.share_project(self.PROJECT_NAME, team_users[0], "QA")
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME)
+        data = sa.search_folders(self.PROJECT_NAME, return_metadata=True)
+        folder_data = sa.search_folders(self.PROJECT_NAME, self.TEST_FOLDER_NAME, return_metadata=True)
+        self.assertEqual(data, folder_data)
+
+    def test_get_project_settings(self):
+        sa.set_project_settings(self.PROJECT_NAME, [{'attribute': 'ImageQuality', 'value': 'original'}])
+        data = sa.get_project_settings(self.PROJECT_NAME)
+        for elem in data:
+            if elem["attribute"] == "ImageQuality":
+                self.assertEqual(elem["value"], "original")
+                break