Fixed serach_folder function

Author: Vaghinak Basentsyan

.gitignore

@@ -1,5 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
+*.pyc
 *.py[cod]
 *$py.class
 *mypy*

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

@@ -130,7 +130,7 @@ def upload_image(image_path: str):
 
         paths = []
 
-        if isinstance(extensions,str):
+        if isinstance(extensions, str):
             extensions = extensions.strip().split(",")
 
         for extension in extensions:
@@ -264,7 +264,7 @@ def _upload_annotations(
 
         annotations_path = folder
         with tempfile.TemporaryDirectory() as temp_dir:
-            if format != 'SuperAnnotate':
+            if format != "SuperAnnotate":
                 import_annotation(
                     input_dir=folder,
                     output_dir=temp_dir,

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

@@ -462,12 +462,12 @@ def search_folders(
     :rtype: list of strs or dicts
     """
 
-    if not folder_name:
-        data = controller.get_project_folders(project).data
-    else:
-        data = controller.search_folder(
-            project_name=project, name=folder_name, include_users=return_metadata
-        ).data
+    response = controller.search_folders(
+        project_name=project, folder_name=folder_name, include_users=return_metadata
+    )
+    if response.errors:
+        raise AppException(response.errors)
+    data = response.data
     if return_metadata:
         return [BaseSerializers(folder).serialize() for folder in data]
     return [folder.name for folder in data]

src/superannotate/lib/core/conditions.py

@@ -20,6 +20,20 @@ def __init__(self, key: str, value: Any, condition_type: str):
         self._type = condition_type
         self._condition_set = []  # type: List[NamedTuple]
 
+    @staticmethod
+    def get_empty_condition():
+        class EmptyCondition:
+            def __or__(self, other):
+                return other
+
+            def __and__(self, other):
+                return other
+
+            def build_query(self):
+                return ""
+
+        return EmptyCondition()
+
     def __str__(self):
         return f"{self._key}{self._type}{self._value}"
 

src/superannotate/lib/core/usecases.py

@@ -847,17 +847,19 @@ def execute(self):
         return self._response
 
 
-class SearchFolderUseCase(BaseUseCase):
+class SearchFoldersUseCase(BaseUseCase):
     def __init__(
         self,
         project: ProjectEntity,
         folders: BaseReadOnlyRepository,
         condition: Condition,
+        folder_name: str = None,
         include_users=False,
     ):
         super().__init__()
         self._project = project
         self._folders = folders
+        self._folder_name = folder_name
         self._condition = condition
         self._include_users = include_users
 
@@ -868,22 +870,8 @@ def execute(self):
             & Condition("team_id", self._project.team_id, EQ)
             & Condition("includeUsers", self._include_users, EQ)
         )
-        self._response.data = self._folders.get_all(condition)
-        return self._response
-
-
-class GetProjectFoldersUseCase(BaseUseCase):
-    def __init__(
-        self, project: ProjectEntity, folders: BaseReadOnlyRepository,
-    ):
-        super().__init__()
-        self._project = project
-        self._folders = folders
-
-    def execute(self):
-        condition = Condition("team_id", self._project.team_id, EQ) & Condition(
-            "project_id", self._project.uuid, EQ
-        )
+        if self._folder_name:
+            condition &= Condition("name", self._folder_name, EQ)
         self._response.data = self._folders.get_all(condition)
         return self._response
 

src/superannotate/lib/infrastructure/controller.py

@@ -379,36 +379,26 @@ def get_folder(self, project_name: str, folder_name: str):
         )
         return use_case.execute()
 
-    def search_folder(self, project_name: str, include_users=False, **kwargs):
-        condition = None
+    def search_folders(
+        self, project_name: str, folder_name: str = None, include_users=False, **kwargs
+    ):
+        condition = Condition.get_empty_condition()
         if kwargs:
-            conditions_iter = iter(kwargs)
-            key = next(conditions_iter)
-            condition = Condition(key, kwargs[key], EQ)
-            for key, val in conditions_iter:
+            for key, val in kwargs:
                 condition = condition & Condition(key, val, EQ)
-
         project = self._get_project(project_name)
-        use_case = usecases.SearchFolderUseCase(
+        use_case = usecases.SearchFoldersUseCase(
             project=project,
             folders=self.folders,
             condition=condition,
+            folder_name=folder_name,
             include_users=include_users,
         )
         return use_case.execute()
 
-    def get_project_folders(
-        self, project_name: str,
-    ):
-        project = self._get_project(project_name)
-        use_case = usecases.GetProjectFoldersUseCase(
-            project=project, folders=self.folders,
-        )
-        return use_case.execute()
-
     def delete_folders(self, project_name: str, folder_names: List[str]):
         project = self._get_project(project_name)
-        folders = self.get_project_folders(project_name).data
+        folders = self.search_folders(project_name=project_name).data
 
         use_case = usecases.DeleteFolderUseCase(
             project=project,