merge

Author: dshabin

src/superannotate/lib/core/reporter.py

@@ -44,16 +44,17 @@ def start_progress(
     ):
         self.progress_bar = self.get_progress_bar(iterations, description)
 
+    @staticmethod
     def get_progress_bar(
-        self, iterations: Union[int, range], description: str = "Processing"
+            iterations: Union[int, range], description: str = "Processing", disable=False
     ):
         if isinstance(iterations, range):
             return tqdm.tqdm(
-                iterations, desc=description, disable=self._disable_progress_bar
+                iterations, desc=description, disable=disable
             )
         else:
             return tqdm.tqdm(
-                total=iterations, desc=description, disable=self._disable_progress_bar
+                total=iterations, desc=description, disable=disable
             )
 
     def finish_progress(self):
@@ -77,3 +78,21 @@ def store_message(self, key: str, value: str):
     def messages(self):
         for key, values in self.custom_messages.items():
             yield f"{key} [{', '.join(values)}]"
+
+
+class Progress(object):
+    def __init__(self, iterations: Union[int, range], description: str = "Processing"):
+        self._iterations = iterations
+        self._description = description
+        self._progress_bar = None
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self._progress_bar.clos()
+
+    def update(self, value=1):
+        if not self._progress_bar:
+            self._progress_bar = Reporter.get_progress_bar(self._iterations, self._description)
+        self._progress_bar.update(value)

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

@@ -40,6 +40,7 @@
 from lib.core.repositories import BaseManageableRepository
 from lib.core.repositories import BaseReadOnlyRepository
 from lib.core.response import Response
+from lib.core.reporter import Progress
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from lib.core.usecases.base import BaseInteractiveUseCase
 from lib.core.usecases.base import BaseReportableUseCae
@@ -3237,40 +3238,37 @@ def execute(self) -> Response:
                         continue
                     uploaded_paths = []
                     for _ in frames_generator:
-                        use_case = UploadImagesFromFolderToProject(
-                            project=self._project,
-                            folder=self._folder,
-                            backend_client=self._service,
-                            folder_path=temp_path,
-                            settings=self._settings,
-                            s3_repo=self._s3_repo,
-                            annotation_status=self.annotation_status,
-                            image_quality_in_editor=self._image_quality_in_editor,
-                        )
+                        with Progress(total_frames_count, f"Uploading {Path(path).name}") as progress:
+                            use_case = UploadImagesFromFolderToProject(
+                                project=self._project,
+                                folder=self._folder,
+                                backend_client=self._service,
+                                folder_path=temp_path,
+                                settings=self._settings,
+                                s3_repo=self._s3_repo,
+                                annotation_status=self.annotation_status,
+                                image_quality_in_editor=self._image_quality_in_editor,
+                            )
 
-                        images_to_upload, duplicates = use_case.images_to_upload
-                        if not len(images_to_upload):
-                            continue
-                        progress = self.reporter.get_progress_bar(
-                            total_frames_count, f"Uploading {Path(path).name}"
-                        )
-                        if use_case.is_valid():
-                            for _ in use_case.execute():
-                                progress.update()
-
-                            uploaded, failed_images, _ = use_case.response.data
-                            uploaded_paths.extend(uploaded)
-                            if failed_images:
-                                self.reporter.log_warning(
-                                    f"Failed {len(failed_images)}."
-                                )
-                            files = os.listdir(temp_path)
-                            image_paths = [f"{temp_path}/{f}" for f in files]
-                            for image_path in image_paths:
-                                os.remove(image_path)
-                        else:
-                            raise AppException(use_case.response.errors)
-                    progress.close()
+                            images_to_upload, duplicates = use_case.images_to_upload
+                            if not len(images_to_upload):
+                                continue
+                            if use_case.is_valid():
+                                for _ in use_case.execute():
+                                    progress.update()
+
+                                uploaded, failed_images, _ = use_case.response.data
+                                uploaded_paths.extend(uploaded)
+                                if failed_images:
+                                    self.reporter.log_warning(
+                                        f"Failed {len(failed_images)}."
+                                    )
+                                files = os.listdir(temp_path)
+                                image_paths = [f"{temp_path}/{f}" for f in files]
+                                for image_path in image_paths:
+                                    os.remove(image_path)
+                            else:
+                                raise AppException(use_case.response.errors)
                 data[str(path)] = uploaded_paths
             self._response.data = data
         return self._response