Fixed upload_videos

Author: VaghinakDev

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

@@ -1774,12 +1774,12 @@ def execute(self) -> Response:
                     )
                     duplicate_images = []
                     for names in divide_to_chunks(frame_names, 500):
-                        data = self._service_provider.item_service.list(
+                        _items = self._service_provider.item_service.list(
                             self._project.id,
                             self._folder.id,
                             Filter("name", names, OperatorEnum.IN),
                         )
-                        duplicate_images.extend(data)
+                        duplicate_images.extend(_items)
                     duplicate_images = [image.name for image in duplicate_images]
                     frames_generator_use_case = ExtractFramesUseCase(
                         service_provider=self._service_provider,
@@ -1816,7 +1816,6 @@ def execute(self) -> Response:
                         )
                     if set(duplicate_images) == set(frame_names):
                         continue
-                    uploaded_paths = []
                     with Progress(
                         total_frames_count, f"Uploading {Path(path).name}"
                     ) as progress:
@@ -1839,7 +1838,7 @@ def execute(self) -> Response:
                                     progress.update()
 
                                 uploaded, failed_images, _ = use_case.response.data
-                                uploaded_paths.extend(uploaded)
+                                data.extend(uploaded)
                                 if failed_images:
                                     self.reporter.log_warning(
                                         f"Failed {len(failed_images)}."
@@ -1850,6 +1849,5 @@ def execute(self) -> Response:
                                     os.remove(image_path)
                             else:
                                 raise AppException(use_case.response.errors)
-                data.extend(uploaded_paths)
             self._response.data = data
         return self._response

tests/integration/test_video.py

@@ -16,6 +16,7 @@ class TestVideo(BaseTestCase):
     PROJECT_TYPE = "Vector"
     TEST_FOLDER_NAME = "new_folder"
     TEST_VIDEO_FOLDER_PATH = "data_set/sample_videos/single"
+    TEST_MULTIPLE_VIDEO_FOLDER_PATH = "data_set/sample_videos"
     TEST_VIDEO_FOLDER_PATH_BIG = "data_set/sample_videos/earth_video"
     TEST_VIDEO_NAME = "video.mp4"
     TEST_FOLDER_NAME_BIG_VIDEO = "big"
@@ -24,6 +25,12 @@ class TestVideo(BaseTestCase):
     def folder_path(self):
         return os.path.join(dirname(dirname(__file__)), self.TEST_VIDEO_FOLDER_PATH)
 
+    @property
+    def folder_multiple_path(self):
+        return os.path.join(
+            dirname(dirname(__file__)), self.TEST_MULTIPLE_VIDEO_FOLDER_PATH
+        )
+
     @property
     def folder_path_big(self):
         return os.path.join(dirname(dirname(__file__)), self.TEST_VIDEO_FOLDER_PATH_BIG)
@@ -43,11 +50,23 @@ def tearDown(self) -> None:
             for project in projects:
                 sa.delete_project(project)
 
+    def test_videos_upload_from_folder(self):
+        res = sa.upload_videos_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_multiple_path, target_fps=1
+        )
+        assert len(res) == 16
+
     def test_video_upload_from_folder(self):
-        sa.upload_videos_from_folder_to_project(
+        res = sa.upload_videos_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, target_fps=1
         )
-
+        assert res == [
+            "video_001.jpg",
+            "video_002.jpg",
+            "video_004.jpg",
+            "video_005.jpg",
+            "video_003.jpg",
+        ]
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME)
         sa.upload_videos_from_folder_to_project(
             f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME}",