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

@@ -147,7 +147,7 @@ def check_types(obj, **kwargs):
                     errors.append(f"Argument {attr_name} is not of type {attr_type}")
             elif kwargs.get(attr_name) and not isinstance(kwargs[attr_name], attr_type):
                 errors.append(f"Argument {attr_name} is not of type {attr_type}")
-        except:
+        except Exception as _:
             pass
     return errors
 

src/superannotate/lib/app/input_converters/conversion.py

@@ -224,7 +224,7 @@ def export_annotation(
 def import_annotation(
     input_dir,
     output_dir,
-    dataset_format = "superannotate",
+    dataset_format="superannotate",
     dataset_name="",
     project_type="Vector",
     task="object_detection",

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

@@ -276,7 +276,7 @@ def _upload_annotations(
                     task=task,
                 )
                 annotations_path = temp_dir
-            classes_path = f"{folder}/classes/classes.json"
+            classes_path = f"{annotations_path}/classes/classes.json"
             self.controller.create_annotation_classes(
                 project_name=project_name,
                 annotation_classes=json.load(open(classes_path)),
@@ -296,7 +296,7 @@ def _upload_annotations(
                     )
                     if response.errors:
                         logger.warning(response.errors)
-                    progress_bar.update()
+                    progress_bar.update(chunk_size)
         sys.exit(0)
 
     def attach_image_urls(

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

@@ -46,7 +46,7 @@
 
 
 logging.basicConfig(level=logging.INFO)
-formatter = logging.Formatter(fmt='SA-PYTHON-SDK - %(levelname)s - %(message)s')
+formatter = logging.Formatter(fmt="SA-PYTHON-SDK - %(levelname)s - %(message)s")
 
 handler = logging.StreamHandler()
 handler.setFormatter(formatter)
@@ -58,8 +58,6 @@
 controller = Controller(logger)
 
 
-
-
 @validate_input
 def init(path_to_config_json: str):
     """
@@ -478,9 +476,7 @@ def search_folders(
 @Trackable
 @validate_input
 def get_image_bytes(
-    project: Union[str, dict],
-    image_name: str,
-    variant: str = "original",
+    project: Union[str, dict], image_name: str, variant: str = "original",
 ):
     """Returns an io.BytesIO() object of the image. Suitable for creating
     PIL.Image out of it.
@@ -981,8 +977,7 @@ def get_project_default_image_quality_in_editor(project: Union[str, dict]):
 @Trackable
 @validate_input
 def set_project_default_image_quality_in_editor(
-    project: Union[str, dict],
-    image_quality_in_editor: Optional[str],
+    project: Union[str, dict], image_quality_in_editor: Optional[str],
 ):
     """Sets project's default image quality in editor setting.
 
@@ -1075,9 +1070,7 @@ def get_image_metadata(project: Union[str, dict], image_name: str, *_, **__):
 @Trackable
 @validate_input
 def set_images_annotation_statuses(
-    project: Union[str, dict],
-    image_names: List[str],
-    annotation_status: str,
+    project: Union[str, dict], image_names: List[str], annotation_status: str,
 ):
     """Sets annotation statuses of images
 
@@ -1138,9 +1131,13 @@ def assign_images(project: Union[str, dict], image_names: List[str], user: str):
     project_name, folder_name = extract_project_folder(project)
     if not folder_name:
         folder_name = "root"
-    contributors = controller.get_project_metadata(
-        project_name=project_name, include_contributors=True
-    ).data["project"].users
+    contributors = (
+        controller.get_project_metadata(
+            project_name=project_name, include_contributors=True
+        )
+        .data["project"]
+        .users
+    )
     contributor = None
     for c in contributors:
         if c["user_id"] == user:

src/superannotate/lib/core/usecases.py

@@ -1938,7 +1938,22 @@ def work_flow_use_case(self):
         )
 
     def execute(self):
-        data = {"project": self._projects.get_one(uuid=self._project.uuid,team_id=self._project.team_id) }
+        data = {}
+        project = self._projects.get_one(
+            uuid=self._project.uuid, team_id=self._project.team_id
+        )
+        if self._include_complete_image_count:
+            projects = self._projects.get_all(
+                condition=(
+                    Condition("completeImagesCount", "true", EQ)
+                    & Condition("name", self._project.name, EQ)
+                    & Condition("team_id", self._project.team_id, EQ)
+                )
+            )
+            if projects:
+                data["project"] = projects[0]
+        else:
+            data["project"] = project
 
         if self._include_annotation_classes:
             self.annotation_classes_use_case.execute()
@@ -1953,18 +1968,7 @@ def execute(self):
             data["workflows"] = self.work_flow_use_case.execute().data
 
         if self._include_contributors:
-            data["contributors"] = self._project.users
-
-        if self._include_complete_image_count:
-            projects = self._projects.get_all(
-                condition=(
-                    Condition("completeImagesCount", "true", EQ)
-                    & Condition("name", self._project.name, EQ)
-                    & Condition("team_id", self._project.team_id, EQ)
-                )
-            )
-            if projects:
-                data["project"] = projects[0]
+            data["contributors"] = project.users
 
         self._response.data = data
         return self._response
@@ -4135,20 +4139,21 @@ def validate_project_type(self):
     def auth_data(self):
         if not self._auth_data:
             self._auth_data = self._backend_client.get_s3_upload_auth_token(
-            team_id=self._project.team_id,
-            folder_id=self._folder.uuid,
-            project_id=self._project.uuid, )
+                team_id=self._project.team_id,
+                folder_id=self._folder.uuid,
+                project_id=self._project.uuid,
+            )
         return self._auth_data
 
     @property
     def s3_repository(self):
         if not self._s3_repo_instance:
-            self._s3_repo_instance =  self._s3_repo(
-            self.auth_data["accessKeyId"],
-            self.auth_data["secretAccessKey"],
-            self.auth_data["sessionToken"],
-            self.auth_data["bucket"],
-        )
+            self._s3_repo_instance = self._s3_repo(
+                self.auth_data["accessKeyId"],
+                self.auth_data["secretAccessKey"],
+                self.auth_data["sessionToken"],
+                self.auth_data["bucket"],
+            )
         return self._s3_repo_instance
 
     def _upload_image(self, image_path: str):

tests/data_set/consensus_benchmark/consensus_test_data/classes/classes.json

@@ -1 +1 @@
-[{"id":779699,"project_id":109861,"name":"car","color":"#b01cb4","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z","attribute_groups":[{"id":298784,"class_id":779699,"name":"color","is_multiselect":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z","attributes":[{"id":1080243,"group_id":298784,"project_id":109861,"name":"red","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z"},{"id":1080244,"group_id":298784,"project_id":109861,"name":"blue","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z"},{"id":1080245,"group_id":298784,"project_id":109861,"name":"green","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z"},{"id":1080246,"group_id":298784,"project_id":109861,"name":"yellow","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z"}]}]},{"id":779700,"project_id":109861,"name":"person","color":"#96963a","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z","attribute_groups":[]},{"id":779701,"project_id":109861,"name":"sign","color":"#fed339","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z","attribute_groups":[]},{"id":779702,"project_id":109861,"name":"tree","color":"#249e9e","count":0,"createdAt":"2021-08-28T09:15:09.000Z","updatedAt":"2021-08-28T09:15:09.000Z","attribute_groups":[]}]
+[{"id":781236,"project_id":110511,"name":"person","color":"#96963a","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z","attribute_groups":[]},{"id":781237,"project_id":110511,"name":"car","color":"#b01cb4","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z","attribute_groups":[{"id":299348,"class_id":781237,"name":"color","is_multiselect":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z","attributes":[{"id":1081393,"group_id":299348,"project_id":110511,"name":"red","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z"},{"id":1081394,"group_id":299348,"project_id":110511,"name":"blue","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z"},{"id":1081395,"group_id":299348,"project_id":110511,"name":"green","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z"},{"id":1081396,"group_id":299348,"project_id":110511,"name":"yellow","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z"}]}]},{"id":781238,"project_id":110511,"name":"sign","color":"#fed339","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z","attribute_groups":[]},{"id":781239,"project_id":110511,"name":"tree","color":"#249e9e","count":0,"createdAt":"2021-08-30T05:57:44.000Z","updatedAt":"2021-08-30T05:57:44.000Z","attribute_groups":[]}]