Merge branch 'friday' into big_file_upload

Author: VaghinakDev

.github/workflows/release.yml

@@ -14,6 +14,12 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: "3.7"
+    - name: Upgrade pip 
+      run: >-
+        python -m
+        pip install
+        pip --upgrade
+        --user
     - name: Install pypi/build
       run: >-
         python -m

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope

src/superannotate/__init__.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-__version__ = "4.4.1"
+__version__ = "4.4.2dev1"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -1347,7 +1347,6 @@ def download_export(
         )
         if response.errors:
             raise AppException(response.errors)
-        logger.info(response.data)
 
     def set_project_workflow(
         self, project: Union[NotEmptyStr, dict], new_workflow: List[dict]

src/superannotate/lib/core/usecases/images.py

@@ -738,14 +738,14 @@ def execute(self):
         return self._response
 
 
-class DownloadImageUseCase(BaseUseCase):
+class DownloadImageUseCase(BaseReportableUseCase):
     def __init__(
         self,
+        reporter: Reporter,
         project: ProjectEntity,
         folder: FolderEntity,
         image: ImageEntity,
         images: BaseManageableRepository,
-        classes: BaseManageableRepository,
         backend_service_provider: SuperannotateServiceProvider,
         annotation_classes: BaseReadOnlyRepository,
         download_path: str,
@@ -754,7 +754,7 @@ def __init__(
         include_fuse: bool = False,
         include_overlay: bool = False,
     ):
-        super().__init__()
+        super().__init__(reporter)
         self._project = project
         self._image = image
         self._download_path = download_path
@@ -777,7 +777,9 @@ def __init__(
             annotation_classes=annotation_classes,
         )
         self.get_annotation_classes_ues_case = GetAnnotationClassesUseCase(
-            classes=classes,
+            reporter=self.reporter,
+            project=self._project,
+            backend_client=backend_service_provider
         )
 
     def validate_project_type(self):

src/superannotate/lib/core/usecases/projects.py

@@ -495,6 +495,8 @@ def _copy_include_contributors(self, to_project: ProjectEntity):
     def _copy_settings(self, to_project: ProjectEntity):
         new_settings = self._settings_repo(self._backend_service, to_project)
         for setting in self.settings.get_all():
+            if setting.attribute == "WorkflowType" and not self._include_workflow:
+                continue
             for new_setting in new_settings.get_all():
                 if new_setting.attribute == setting.attribute:
                     setting_copy = copy.copy(setting)
@@ -562,7 +564,9 @@ def execute(self):
                 self._project_to_create.upload_state = (
                     constances.UploadState.INITIAL.value
                 )
+
             self._project_to_create.status = constances.ProjectStatus.NotStarted.value
+
             project = self._projects.insert(self._project_to_create)
             self.reporter.log_info(
                 f"Created project {self._project_to_create.name} with type"
@@ -585,6 +589,7 @@ def execute(self):
                     )
                     self.reporter.log_debug(str(e), exc_info=True)
 
+
             if self._include_settings:
                 self.reporter.log_info(
                     f"Cloning settings from {self._project.name} to {self._project_to_create.name}."
@@ -632,6 +637,7 @@ def execute(self):
                         f"Failed to clone contributors from {self._project.name} to {self._project_to_create.name}."
                     )
                     self.reporter.log_debug(str(e), exc_info=True)
+
             self._response.data = self._projects.get_one(
                 uuid=project.id, team_id=project.team_id
             )

src/superannotate/lib/infrastructure/controller.py

@@ -994,11 +994,11 @@ def download_image(
         image = self._get_image(project, image_name, folder)
 
         use_case = usecases.DownloadImageUseCase(
+            reporter=self.get_default_reporter(),
             project=project,
             folder=folder,
             image=image,
             images=self.images,
-            classes=AnnotationClassRepository(self._backend_client, project),
             backend_service_provider=self._backend_client,
             download_path=download_path,
             image_variant=image_variant,

tests/integration/aggregations/test_df_processing.py

@@ -1,13 +1,13 @@
 import os
-from os.path import dirname
 from pathlib import Path
 
 import pytest
 
 from src.superannotate import SAClient
-sa = SAClient()
 from tests.integration.base import BaseTestCase
 
+sa = SAClient()
+
 
 class TestDF(BaseTestCase):
     PROJECT_NAME = "test df processing"

tests/integration/annotations/test_upload_annotations_from_folder_to_project.py

@@ -22,7 +22,7 @@ def folder_path(self):
     @property
     def big_annotations_folder_path(self):
         return os.path.join(Path(__file__).parent.parent.parent, self.TEST_BIG_FOLDER_PATH)
-
+    
     def test_annotation_folder_upload_download(self):
         self._attach_items()
         sa.create_annotation_classes_from_classes_json(