Merge pull request #717 from superannotateai/FRIDAY_3118

Fix system status check

Author: VaghinakDev

pytest.ini

@@ -3,4 +3,4 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope

src/superannotate/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 
-__version__ = "4.4.25b2"
+__version__ = "4.4.25b3"
 
 os.environ.update({"sa_version": __version__})
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])

src/superannotate/lib/core/service_types.py

@@ -222,6 +222,10 @@ class ProjectResponse(ServiceResponse):
     res_data: entities.ProjectEntity = None
 
 
+class WorkflowResponse(ServiceResponse):
+    res_data: entities.WorkflowEntity = None
+
+
 class WorkflowListResponse(ServiceResponse):
     res_data: List[entities.WorkflowEntity] = None
 

src/superannotate/lib/core/serviceproviders.py

@@ -70,6 +70,10 @@ def __init__(self, client: BaseClient):
 
 
 class BaseWorkManagementService(SuperannotateServiceProvider):
+    @abstractmethod
+    def get_workflow(self, pk: int) -> entities.WorkflowEntity:
+        raise NotImplementedError
+
     @abstractmethod
     def list_workflows(self, query: Query) -> WorkflowListResponse:
         raise NotImplementedError

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

@@ -36,7 +36,6 @@
 from lib.core.entities import ImageEntity
 from lib.core.entities import ProjectEntity
 from lib.core.entities import UserEntity
-from lib.core.entities import WorkflowEntity
 from lib.core.exceptions import AppException
 from lib.core.jsx_conditions import EmptyQuery
 from lib.core.jsx_conditions import Filter
@@ -477,13 +476,8 @@ def execute(self):
                 {i.item.name for i in items_to_upload}
                 - set(self._report.failed_annotations).union(set(skipped))
             )
-            response = self._service_provider.work_management.list_workflows(
-                Filter("id", self._project.workflow_id, OperatorEnum.EQ)
-            )
-            if not response.ok:
-                raise AppException(response.error)
-            workflow: WorkflowEntity = next(
-                (i for i in response.data if i.id == self._project.workflow_id), None
+            workflow = self._service_provider.work_management.get_workflow(
+                self._project.workflow_id
             )
             if workflow.is_system():
                 if uploaded_annotations and not self._keep_status:
@@ -842,12 +836,9 @@ def execute(self):
             name_path_mappings.keys()
             - set(self._report.failed_annotations).union(set(missing_annotations))
         )
-        response = self._service_provider.work_management.list_workflows(
-            Filter("id", self._project.id, OperatorEnum.EQ)
+        workflow = self._service_provider.work_management.get_workflow(
+            self._project.workflow_id
         )
-        if response.error:
-            raise response.error
-        workflow = response.data[0]
         if workflow.is_system() and uploaded_annotations and not self._keep_status:
             statuses_changed = set_annotation_statuses_in_progress(
                 service_provider=self._service_provider,
@@ -1084,12 +1075,9 @@ def execute(self):
                                 ],
                                 Body=mask,
                             )
-                    response = self._service_provider.work_management.list_workflows(
-                        Filter("id", self._project.workflow_id, OperatorEnum.EQ)
+                    workflow = self._service_provider.work_management.get_workflow(
+                        self._project.workflow_id
                     )
-                    if not response.ok:
-                        raise AppException(response.error)
-                    workflow = response.data[0]
                     if workflow.is_system() and not self._keep_status:
                         statuses_changed = set_annotation_statuses_in_progress(
                             service_provider=self._service_provider,

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

@@ -743,19 +743,15 @@ def __init__(
         self._s3_repo = s3_repo
         self._service_provider = service_provider
         if annotation_status_value is None:
-            response = self._service_provider.work_management.list_workflows(
-                Filter("id", self._project.workflow_id, OperatorEnum.EQ)
+            workflow = self._service_provider.work_management.get_workflow(
+                self._project.workflow_id
             )
-            if response.error:
-                raise AppException(response.error)
-            workflow = response.data[0]
             if workflow.is_system():
                 annotation_status_value = (
                     self._service_provider.get_annotation_status_value(
                         self._project, "NotStarted"
                     )
                 )
-
         self._annotation_status_value = annotation_status_value
         self._auth_data = None
 
@@ -1106,12 +1102,9 @@ def execute(self):
             attach_duplications_list = []
 
             if not self._annotation_status_value:
-                response = self._service_provider.work_management.list_workflows(
-                    Filter("id", self._project.workflow_id, OperatorEnum.EQ)
+                workflow = self._service_provider.work_management.get_workflow(
+                    self._project.workflow_id
                 )
-                if response.error:
-                    raise AppException(response.error)
-                workflow = response.data[0]
                 if workflow.is_system():
                     self._annotation_status_value = (
                         self._service_provider.get_annotation_status_value(

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

@@ -926,7 +926,6 @@ def execute(
         self,
     ):
         if self.is_valid():
-
             futures = []
             with ThreadPoolExecutor(max_workers=4) as executor:
                 for path, items in self.path_separated.items():

src/superannotate/lib/infrastructure/services/work_management.py

@@ -1,6 +1,8 @@
 import base64
 
 from lib.core.entities import WorkflowEntity
+from lib.core.jsx_conditions import Filter
+from lib.core.jsx_conditions import OperatorEnum
 from lib.core.jsx_conditions import Query
 from lib.core.serviceproviders import BaseWorkManagementService
 
@@ -11,6 +13,14 @@ class WorkManagementService(BaseWorkManagementService):
     URL_LIST_STATUSES = "workflows/{workflow_id}/workflowstatuses"
     URL_LIST_ROLES = "workflows/{workflow_id}/workflowroles"
 
+    def get_workflow(self, pk: int) -> WorkflowEntity:
+        response = self.list_workflows(Filter("id", pk, OperatorEnum.EQ))
+        if response.error:
+            raise response.error
+        for w in response.data:
+            if w.id == pk:
+                return w
+
     def list_workflows(self, query: Query):
         result = self.client.paginate(
             f"{self.URL_LIST}?{query.build_query()}",

tests/applicatoin/custom_workflow.py

@@ -23,13 +23,13 @@ class TestWorkflow(TestCase):
     PROJECT_DESCRIPTION = PROJECT_NAME
     CLASSES_PATH = "sample_project_vector/classes/classes.json"
     ANNOTATIONS_PATH = "sample_project_vector"
-    PROJECT_TYPE = "GenAi"
+    PROJECT_TYPE = "Vector"
 
     @classmethod
     def setUpClass(cls, *args, **kwargs):
         cls.tearDownClass()
         cls._project = sa.create_project(
-            cls.PROJECT_NAME, cls.PROJECT_DESCRIPTION, cls.PROJECT_TYPE, workflow="ttt"
+            cls.PROJECT_NAME, cls.PROJECT_DESCRIPTION, cls.PROJECT_TYPE, workflow="ttp"
         )
 
     @classmethod
@@ -190,7 +190,9 @@ def alphanumeric_key(s):
 
     def test_steps(self):
         for name, step in self._steps():
-            try:
-                step()
-            except Exception as e:
-                self.fail("{} failed ({}: {})".format(step, type(e), e))
+            step()
+            # try:
+            #     step()
+            # except Exception as e:
+            #     raise e
+            #     self.fail("{} failed ({}: {})".format(step, type(e), e))