Merge pull request #735 from superannotateai/FRIDAY_2985

Fixed folders duplication

Author: nareksa

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

@@ -1937,22 +1937,39 @@ async def run_workers(
         )
 
     def get_or_create_folder(self, folder_name: str) -> FolderEntity:
-        if folder_name is None:
+        """
+        Retrieve an existing folder by name or create it if it doesn't exist.
+
+        Args:
+            folder_name (str): The name of the folder to retrieve or create.
+
+        Returns:
+            FolderEntity: The retrieved or newly created folder entity.
+        """
+        if not folder_name:
             return self._root_folder
+
         response = self._service_provider.folders.get_by_name(
             self._project, folder_name
         )
+        if response.ok:
+            return response.data
+
+        # Handle non-404 errors
         if response.status != 404:
             response.raise_for_status()
+
+        # Create the folder if it doesn't exist
         response = CreateFolderUseCase(
             project=self._project,
             folder=FolderEntity(name=folder_name),
             service_provider=self._service_provider,
         ).execute()
+
         if response.errors:
             raise AppException(response.errors)
-        else:
-            return response.data
+
+        return response.data
 
     def attach_items(
         self, folder: FolderEntity, item_names: List[str]
@@ -1994,10 +2011,18 @@ def serialize_folder_name(val):
             val = val.strip().translate(translation_table)
         return val.lower()
 
+    @property
+    def categorization_enabled(self):
+        settings = self._service_provider.projects.list_settings(self._project).data
+        for setting in settings:
+            if setting.attribute == "CategorizeItems":
+                return bool(setting.value)
+        return False
+
     def execute(self):
         if self.is_valid():
             # TODO check categories status in the project
-            skip_categorization = False
+            categorization_enabled = self.categorization_enabled
             serialized_original_folder_map = {}
             failed, skipped, uploaded = [], [], []
             # folder_id -> item_name -> annotation
@@ -2071,7 +2096,7 @@ def execute(self):
                     {i.item.name for i in items_to_upload}
                     - set(failed_annotations).union(skipped)
                 )
-                if not skip_categorization:
+                if categorization_enabled:
                     item_id_category_map = {}
                     for item_name in uploaded_annotations:
                         category = name_annotation_map[item_name]["metadata"].get(

tests/integration/annotations/test_upload_annotations.py

@@ -163,7 +163,7 @@ def setUp(self, *args, **kwargs):
             ],
         )
         project = sa.controller.get_project(self.PROJECT_NAME)
-        time.sleep(2)
+        time.sleep(4)
         with open(self.EDITOR_TEMPLATE_PATH) as f:
             res = sa.controller.service_provider.projects.attach_editor_template(
                 sa.controller.team, project, template=json.load(f)
@@ -191,6 +191,10 @@ def test_upload_from_root_to_folder(self):
             assert len(response["succeeded"]) == 3
             annotations = sa.get_annotations(f"{self.PROJECT_NAME}/test_folder")
             assert all([len(i["instances"]) == 3 for i in annotations]) is True
+            folders = sa.search_folders(self.PROJECT_NAME)
+            assert len(folders) == 1
+            sa.upload_annotations(self.PROJECT_NAME, annotations=data)
+            assert len(folders) == 1
 
     def test_error_upload_from_folder_to_folder_(self):
         with open(self.JSONL_ANNOTATIONS_PATH) as f: