Merge pull request #691 from superannotateai/develop

Develop

Author: VaghinakDev

CHANGELOG.rst

@@ -6,6 +6,16 @@ History
 
 All release highlights of this project will be documented in this file.
 
+4.4.22 - Jun 13, 2024
+_______________________
+
+
+**Updated**
+
+    - Dependencies, updated ``packaging``, ``superannotate-schemas``.
+    - ``search_folders`` by multiple statuses.
+
+
 4.4.21 - May 23, 2024
 _______________________
 

requirements.txt

@@ -2,7 +2,7 @@ pydantic>=1.10,!=2.0.*
 aiohttp~=3.8
 boto3~=1.26
 opencv-python-headless~=4.7
-packaging~=23.1
+packaging~=24.0
 plotly~=5.14
 pandas~=2.0
 ffmpeg-python~=0.2
@@ -12,4 +12,4 @@ requests==2.*
 aiofiles==23.*
 fire==0.4.0
 mixpanel==4.8.3
-superannotate-schemas==1.0.47b5
+superannotate-schemas==1.0.49

src/superannotate/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 
-__version__ = "4.4.21"
+__version__ = "4.4.22"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -627,9 +627,11 @@ def search_folders(
         if return_metadata:
             condition &= Condition("includeUsers", return_metadata, EQ)
         if status:
-            condition &= Condition(
-                "status", constants.FolderStatus.get_value(status), EQ
-            )
+            if isinstance(status, list):
+                status_condition = [constants.FolderStatus.get_value(i) for i in status]
+            else:
+                status_condition = constants.FolderStatus.get_value(status)
+            condition &= Condition("status", status_condition, EQ)
         response = self.controller.folders.list(project, condition)
         if response.errors:
             raise AppException(response.errors)

tests/integration/folders/test_search_folders.py

@@ -13,6 +13,7 @@ class TestSearchFolders(BaseTestCase):
     SPECIAL_CHARS = r"/\:*?“<>|"
     TEST_FOLDER_NAME_1 = "folder_1"
     TEST_FOLDER_NAME_2 = "folder_2"
+    TEST_FOLDER_NAME_3 = "folder_3"
 
     def test_search_folders(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
@@ -29,6 +30,26 @@ def test_search_folders(self):
         folders = sa.search_folders(self.PROJECT_NAME, status="NotStarted")
         assert len(folders) == 2
 
+        # with status list
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_3)
+        sa.set_folder_status(
+            self.PROJECT_NAME, self.TEST_FOLDER_NAME_3, status="InProgress"
+        )
+        folders_2 = sa.search_folders(
+            self.PROJECT_NAME, status=["NotStarted", "InProgress", "Completed"]
+        )
+        assert len(folders_2) == 3
+
+        folders_3 = sa.search_folders(
+            self.PROJECT_NAME, status=["InProgress", "Completed"]
+        )
+        assert len(folders_3) == 1
+
+        folders_4 = sa.search_folders(
+            self.PROJECT_NAME, status=["NotStarted", "Completed"]
+        )
+        assert len(folders_4) == 2
+
         # with invalid status
         pattern = (
             r"(\s+)status(\s+)Available values are 'NotStarted', "