Merge pull request #247 from superannotateai/folder_fix

284 Fixed create_folder

Author: VaghinakDev

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

@@ -332,10 +332,6 @@ def create_folder(project: NotEmptyStr, folder_name: NotEmptyStr):
     res = controller.create_folder(project=project, folder_name=folder_name)
     if res.data:
         folder = res.data
-        if folder and folder.name != folder_name:
-            logger.warning(
-                f"Created folder has name {folder.name}, since folder with name {folder_name} already existed.",
-            )
         logger.info(f"Folder {folder.name} created in project {project}")
         return folder.to_dict()
     if res.errors:

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

@@ -27,6 +27,7 @@ def __init__(
         self._project = project
         self._folder = folder
         self._folders = folders
+        self._origin_name = folder.name
 
     def validate_folder(self):
         if not self._folder.name:
@@ -53,6 +54,11 @@ def execute(self):
         if self.is_valid():
             self._folder.project_id = self._project.uuid
             self._response.data = self._folders.insert(self._folder)
+            if self._response.data.name not in (self._origin_name, self._folder.name):
+                logger.warning(
+                    f"Created folder has name {self._response.data.name},"
+                    f" since folder with name {self._folder.name} already existed."
+                )
         return self._response
 
 

tests/integration/test_interface.py

@@ -3,6 +3,7 @@
 import tempfile
 import pytest
 
+
 import src.superannotate as sa
 from src.superannotate.lib.app.exceptions import AppException
 from tests.integration.base import BaseTestCase
@@ -224,3 +225,29 @@ def test_export_annotation(self):
                 )
                 pass
 
+    def test_create_folder_with_special_character(self):
+        with self.assertLogs() as logs:
+            folder_1 = sa.create_folder(self.PROJECT_NAME, "**abc")
+            folder_2 = sa.create_folder(self.PROJECT_NAME, "**abc")
+            self.assertEqual(folder_1["name"], "__abc")
+            self.assertEqual(folder_2["name"], "__abc (1)")
+            self.assertIn(
+                'New folder name has special characters. Special characters will be replaced by underscores.',
+                logs.output[0]
+            )
+            self.assertIn(
+                'Folder __abc created in project Interface Pixel test',
+                logs.output[1]
+            )
+            self.assertIn(
+                'New folder name has special characters. Special characters will be replaced by underscores.',
+                logs.output[2]
+            )
+            self.assertIn(
+                'Created folder has name __abc (1), since folder with name __abc already existed.',
+                logs.output[3]
+            )
+            self.assertIn(
+                'Folder __abc (1) created in project Interface Pixel test',
+                logs.output[4]
+            )