From 362d364a8bc931c10f3fe9b00c750853f6b04bd8 Mon Sep 17 00:00:00 2001
From: Vaghinak Basentsyan <vaghinak@superannotate.com>
Date: Tue, 9 Apr 2024 18:37:56 +0400
Subject: [PATCH] Fixed ids issue

---
 src/superannotate/lib/app/interface/sdk_interface.py |  8 ++++----
 src/superannotate/lib/core/usecases/annotations.py   | 11 +++++------
 tests/integration/test_image_upload.py               |  2 +-
 tests/integration/test_recursive_folder.py           |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/superannotate/lib/app/interface/sdk_interface.py b/src/superannotate/lib/app/interface/sdk_interface.py
index 08afaba21..c62233f0c 100644
--- a/src/superannotate/lib/app/interface/sdk_interface.py
+++ b/src/superannotate/lib/app/interface/sdk_interface.py
@@ -2321,10 +2321,10 @@ def get_annotations(
         if isinstance(project, str):
             project, folder = self.controller.get_project_folder_by_path(project)
         else:
-            project, folder = (
-                self.controller.get_project_by_id(project_id=project).data,
-                None,
-            )
+            project = self.controller.get_project_by_id(project_id=project).data
+            folder = self.controller.get_folder_by_id(
+                project_id=project.id, folder_id=project.folder_id
+            ).data
         response = self.controller.annotations.list(project, folder, items)
         if response.errors:
             raise AppException(response.errors)
diff --git a/src/superannotate/lib/core/usecases/annotations.py b/src/superannotate/lib/core/usecases/annotations.py
index faae56927..acfa651f2 100644
--- a/src/superannotate/lib/core/usecases/annotations.py
+++ b/src/superannotate/lib/core/usecases/annotations.py
@@ -1114,7 +1114,7 @@ def execute(self):
                 reporter=Reporter(log_info=False),
                 project=self._project,
                 folder=self._folder,
-                item_names=[self._video_name],
+                items=[self._video_name],
                 service_provider=self._service_provider,
             ).execute()
             if response.data:
@@ -1628,8 +1628,6 @@ def execute(self):
             try:
                 annotations = run_async(self.run_workers(large_items, small_items))
             except Exception as e:
-                # todo remove
-                raise e
                 logger.error(e)
                 self._response.errors = AppException("Can't get annotations.")
                 return self._response
@@ -1663,9 +1661,10 @@ def __init__(
         self._big_file_queue = None
 
     def validate_items(self):
-        self._item_names = GetAnnotations.items_duplication_validation(
-            self.reporter, self._item_names
-        )
+        if self._item_names:
+            self._item_names = GetAnnotations.items_duplication_validation(
+                self.reporter, self._item_names
+            )
 
     @property
     def destination(self) -> str:
diff --git a/tests/integration/test_image_upload.py b/tests/integration/test_image_upload.py
index e9b60e1e0..3ac0c5066 100644
--- a/tests/integration/test_image_upload.py
+++ b/tests/integration/test_image_upload.py
@@ -123,4 +123,4 @@ def test_multiple_image_upload_with_duplicates(self):
             )
             self.assertEqual(len(uploaded), 3)
             self.assertEqual(len(could_not_upload), 0)
-            self.assertEqual(len(existing_images), 2)
+            self.assertEqual(len(existing_images), 0)
diff --git a/tests/integration/test_recursive_folder.py b/tests/integration/test_recursive_folder.py
index fda537992..657e278de 100644
--- a/tests/integration/test_recursive_folder.py
+++ b/tests/integration/test_recursive_folder.py
@@ -35,7 +35,7 @@ def test_recursive_upload(self):
             self.PROJECT_NAME, self.second_folder_path, recursive_subfolders=True
         )
         self.assertEqual(2, len(uploaded))
-        self.assertEqual(2, len(duplicated))
+        self.assertEqual(0, len(duplicated))
 
     def test_non_recursive_annotations_folder(self):
         sa.upload_images_from_folder_to_project(