Fixed query builder

Author: VaghinakDev

src/superannotate/lib/core/conditions.py

@@ -34,7 +34,9 @@ def __or__(self, other):
 
         self._condition_set.append(
             QueryCondition(
-                CONDITION_OR, other.build_query(), {other._key: other._value}
+                CONDITION_OR,
+                other.build_query(),
+                {other._key: other._value} if isinstance(other, Condition) else {},
             )
         )
         return self
@@ -52,7 +54,9 @@ def __and__(self, other):
 
         self._condition_set.append(
             QueryCondition(
-                CONDITION_AND, other.build_query(), {} if isinstance(other, Condition) else {other._key: other._value}
+                CONDITION_AND,
+                other.build_query(),
+                {other._key: other._value} if isinstance(other, Condition) else {},
             )
         )
         return self

tests/integration/folders/test_folders.py

@@ -46,7 +46,6 @@ def test_search_folders(self):
         folders = sa.search_folders(self.PROJECT_NAME)
         assert all(["is_root" not in folder for folder in folders])
 
-
     def test_basic_folders(self):
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
@@ -265,3 +264,10 @@ def test_create_long_name(self):
                 'A while back I needed to count the amount of letters that '
                 'a piece of text in an email template had (to avoid passing any)'
             )
+
+    def test_search_folder(self):
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_2)
+        folders = sa.search_folders(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
+        assert len(folders) == 1
+        assert folders[0] == self.TEST_FOLDER_NAME_1

tests/integration/projects/test_basic_project.py

@@ -6,12 +6,13 @@
 import pytest
 
 from src.superannotate import SAClient
-sa = SAClient()
 from tests import DATA_SET_PATH
 from tests.integration.base import BaseTestCase
 
+sa = SAClient()
+
 
-class TestWorkflowGet(BaseTestCase):
+class TestProjectBasic(BaseTestCase):
     PROJECT_NAME = "TestWorkflowGet"
     PROJECT_TYPE = "Vector"
     PROJECT_DESCRIPTION = "DESCRIPTION"
@@ -101,6 +102,12 @@ def test_workflow_get(self):
         self.assertEqual(workflows[0]['className'], "class1")
         self.assertEqual(workflows[1]['className'], "class2")
 
+    def test_include_complete_image_count(self):
+        self._attach_items()  # will attach 4 items
+        sa.set_annotation_statuses(self.PROJECT_NAME, annotation_status="Completed")
+        metadata = sa.get_project_metadata(self.PROJECT_NAME, include_complete_image_count=True)
+        assert metadata["completed_images_count"] == 4
+
 
 class TestProject(BaseTestCase):
     PROJECT_NAME = "sample_basic_project"