Update __init__.py

Author: VaghinakDev

src/superannotate/__init__.py

@@ -1,5 +1,6 @@
 import logging.config
 import os
+import sys
 
 from superannotate.lib.app.analytics.class_analytics import attribute_distribution
 from superannotate.lib.app.analytics.class_analytics import class_distribution
@@ -295,6 +296,6 @@
 
 
 file_dir = os.path.split(os.path.realpath(__file__))[0]
-
+sys.path.append(file_dir)
 logging.config.fileConfig(os.path.join(file_dir, "logging.conf"))
 logger = logging.getLogger()

src/superannotate/lib/core/entities.py

@@ -60,6 +60,7 @@ def __init__(
         settings: List = None,
         annotation_classes: List = None,
         workflow: List = None,
+        completed_images_count: int = None,
         root_folder_completed_images_count: int = None,
     ):
         super().__init__(uuid)
@@ -80,6 +81,7 @@ def __init__(
         self.settings = settings
         self.annotation_classes = annotation_classes
         self.workflow = workflow
+        self.completed_images_count = completed_images_count
         self.root_folder_completed_images_count = root_folder_completed_images_count
 
     def __copy__(self):
@@ -110,6 +112,7 @@ def to_dict(self):
             "folder_id": self.folder_id,
             "upload_state": self.upload_state,
             "users": self.users,
+            "completed_images_count": self.completed_images_count,
             "rootFolderCompletedImagesCount": self.root_folder_completed_images_count,
         }
 

src/superannotate/lib/infrastructure/controller.py

@@ -212,21 +212,16 @@ def get_folder_name(name: str = None):
             return name
         return "root"
 
-    def search_project(self, name: str, **kwargs) -> Response:
-        conditions = []
+    def search_project(
+        self, name: str = None, include_complete_image_count=False
+    ) -> Response:
+        condition = Condition.get_empty_condition()
         if name:
-            conditions.append(Condition("name", name, EQ))
-        for key, val in kwargs.items():
-            conditions.append(Condition(key, val, EQ))
-        condition_set = None
-        if conditions:
-            for condition in conditions:
-                if condition_set:
-                    condition_set &= condition
-                else:
-                    condition_set = condition
+            condition = condition & (Condition("name", name, EQ))
+        if include_complete_image_count:
+            condition = condition & Condition("completeImagesCount", "true", EQ)
         use_case = usecases.GetProjectsUseCase(
-            condition=condition_set, projects=self.projects, team_id=self.team_id,
+            condition=condition, projects=self.projects, team_id=self.team_id,
         )
         return use_case.execute()
 

src/superannotate/lib/infrastructure/repositories.py

@@ -127,6 +127,7 @@ def dict2entity(data: dict):
                 description=data["description"],
                 folder_id=data.get("folder_id"),
                 users=data.get("users", ()),
+                completed_images_count=data.get("completedImagesCount"),
                 root_folder_completed_images_count=data.get(
                     "rootFolderCompletedImagesCount"
                 ),

tests/integration/__init__.py

@@ -1,4 +1,4 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.join(sys.path[0], "src/superannotate"))
+sys.path.insert(0, os.path.join(sys.path[0], "src/superannotate"))

tests/integration/test_interface.py

@@ -85,4 +85,10 @@ def test_get_project_settings(self):
         for elem in data:
             if elem["attribute"] == "ImageQuality":
                 self.assertEqual(elem["value"], "original")
-                break
+                break
+
+    def test_search_project(self):
+        sa.upload_images_from_folder_to_project(self.PROJECT_NAME, self.folder_path)
+        sa.set_image_annotation_status(self.PROJECT_NAME, self.EXAMPLE_IMAGE_1, "Completed")
+        data = sa.search_projects(self.PROJECT_NAME, return_metadata=True, include_complete_image_count=True)
+        self.assertIsNotNone(data[0]['completed_images_count'])

tox.ini

@@ -2,7 +2,7 @@
 isolated_build = True
 
 envlist =
-    py{38}
+    py{36}
 
 [testenv]
 usedevelop = true
@@ -48,7 +48,7 @@ deps =
 basepython =
     python3
 commands =
-    pytest -q --cov-report term --cov='src/superannotate' --cov-fail-under=80 {posargs}
+    pytest -q --cov-report term --cov='src/' --cov-fail-under=80 {posargs}
 
 [testenv:pre-commit]
 deps =