codemie-test-harness 0.1.213__tar.gz → 0.1.214__tar.gz

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: codemie-test-harness
-Version: 0.1.213
+Version: 0.1.214
 Summary: Autotest for CodeMie backend and UI
 Author: Anton Yeromin
 Author-email: anton_yeromin@epam.com
@@ -13,7 +13,7 @@ Requires-Dist: aws-assume-role-lib (>=2.10.0,<3.0.0)
 Requires-Dist: boto3 (>=1.39.8,<2.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: codemie-plugins (>=0.1.123,<0.2.0)
-Requires-Dist: codemie-sdk-python (==0.1.213)
+Requires-Dist: codemie-sdk-python (==0.1.214)
 Requires-Dist: pytest (>=8.4.1,<9.0.0)
 Requires-Dist: pytest-playwright (>=0.7.0,<0.8.0)
 Requires-Dist: pytest-repeat (>=0.9.3,<0.10.0)

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/codemie_test_harness/tests/utils/base_utils.py

@@ -4,21 +4,11 @@ import re
 import string
 import time
 import unicodedata
-from time import sleep
 
 from hamcrest import assert_that, equal_to, contains_string
 
 from codemie_sdk import CodeMieClient
-from codemie_sdk.exceptions import ApiError
-from codemie_sdk.models.workflow_state import (
-    WorkflowExecutionState,
-    WorkflowExecutionStatusEnum,
-)
-from codemie_sdk.services.workflow_execution_state import (
-    WorkflowExecutionStateService,
-)
 from codemie_test_harness.tests import autotest_entity_prefix
-from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 
 
 class BaseUtils:
@@ -47,29 +37,6 @@ def to_camel_case(input_string):
     return camel_case
 
 
-def wait_for_completion(
-    execution_state_service: WorkflowExecutionStateService,
-    state_id: str,
-    timeout: int = int(CredentialsManager.get_parameter("DEFAULT_TIMEOUT", "120")),
-    pool_interval: int = 3,
-) -> WorkflowExecutionState:
-    start_time = time.time()
-    while time.time() - start_time < timeout:
-        states = [row for row in execution_state_service.list() if row.id == state_id]
-        if len(states) == 0:
-            sleep(pool_interval)
-            continue
-        state = states[0]
-        if state.status == WorkflowExecutionStatusEnum.SUCCEEDED:
-            return state
-        elif state.status == WorkflowExecutionStatusEnum.FAILED:
-            raise ApiError(
-                f"State execution failed: {execution_state_service.get_output(state_id)}"
-            )
-        sleep(pool_interval)
-    raise TimeoutError("State was not executed within the timeout period.")
-
-
 def clean_json(json_str):
     try:
         # Attempt to parse the JSON string directly

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/codemie_test_harness/tests/utils/similarity_check.py

@@ -3,9 +3,9 @@ from hamcrest import assert_that, greater_than_or_equal_to
 
 from codemie_test_harness.tests.utils.base_utils import (
     wait_for_entity,
-    wait_for_completion,
     clean_json,
 )
+from codemie_test_harness.tests.utils.workflow_utils import WorkflowUtils
 
 
 class SimilarityCheck:
@@ -27,7 +27,7 @@ class SimilarityCheck:
             lambda: states_service.list(),
             entity_name="similarity_analysis",
         )
-        wait_for_completion(execution_state_service=states_service, state_id=state.id)
+        WorkflowUtils.wait_for_completion(service=states_service, _id=state.id)
         output = states_service.get_output(state_id=state.id).output
         output = int(clean_json(output).get("similarity_rank"))
         assert_that(

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/codemie_test_harness/tests/utils/workflow_utils.py

@@ -1,21 +1,37 @@
 import os
 from pathlib import Path
 from typing import Optional
+import time
 
+
+from codemie_sdk.exceptions import ApiError
 from codemie_sdk.models.workflow import (
     WorkflowCreateRequest,
     WorkflowUpdateRequest,
     WorkflowMode,
+    WorkflowExecution,
+)
+from codemie_sdk.models.workflow_state import (
+    WorkflowExecutionState,
+    WorkflowExecutionStatusEnum,
+)
+from codemie_sdk.services.workflow_execution import WorkflowExecutionService
+from codemie_sdk.services.workflow_execution_state import WorkflowExecutionStateService
+
+from codemie_test_harness.tests import (
+    PROJECT,
+    VERIFY_SSL,
+    API_DOMEN,
+    CredentialsManager,
 )
-
-from codemie_test_harness.tests import PROJECT, VERIFY_SSL, API_DOMEN
 from codemie_test_harness.tests.utils.base_utils import (
     BaseUtils,
     get_random_name,
     wait_for_entity,
-    wait_for_completion,
 )
 from codemie_test_harness.tests.utils.http_utils import RequestHandler
+from time import sleep
+
 
 workflow_endpoint = "/v1/workflows"
 
@@ -106,17 +122,21 @@ class WorkflowUtils(BaseUtils):
         file_name: Optional[str] = None,
     ):
         self.client.workflows.run(workflow, user_input=user_input, file_name=file_name)
-        executions = self.client.workflows.executions(workflow)
+        executions_service = self.client.workflows.executions(workflow)
         execution_id = next(
-            row.execution_id for row in executions.list() if row.prompt == user_input
+            row.execution_id
+            for row in executions_service.list()
+            if row.prompt == user_input
         )
-        states_service = executions.states(execution_id)
+        states_service = executions_service.states(execution_id)
         state = wait_for_entity(
             lambda: states_service.list(),
             entity_name=execution_name,
         )
 
-        wait_for_completion(execution_state_service=states_service, state_id=state.id)
+        self.wait_for_completion(service=states_service, _id=state.id)
+        self.wait_for_completion(service=executions_service, _id=execution_id)
+
         return states_service.get_output(state_id=state.id).output
 
     def run_workflow(self, workflow_id, user_input=""):
@@ -279,3 +299,39 @@ class WorkflowUtils(BaseUtils):
                 process_thought(thought)
 
         return triggered_tools
+
+    @staticmethod
+    def wait_for_completion(
+        service: WorkflowExecutionStateService | WorkflowExecutionService,
+        _id: str,
+        timeout: int = int(CredentialsManager.get_parameter("DEFAULT_TIMEOUT", "120")),
+        pool_interval: int = 3,
+    ) -> WorkflowExecutionState | WorkflowExecution:
+        is_workflow_execution_state_state = isinstance(
+            service, WorkflowExecutionStateService
+        )
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            executions_or_states = [
+                row
+                for row in service.list()
+                if row.id == _id or row.execution_id == _id
+            ]
+            if len(executions_or_states) == 0:
+                sleep(pool_interval)
+                continue
+            execution_or_state = executions_or_states[0]
+            if execution_or_state.status == WorkflowExecutionStatusEnum.SUCCEEDED:
+                return execution_or_state
+            elif execution_or_state.status == WorkflowExecutionStatusEnum.FAILED:
+                if is_workflow_execution_state_state:
+                    raise ApiError(f"State execution failed: {service.get_output(_id)}")
+                else:
+                    raise ApiError(
+                        f"Execution failed. Execution id: {execution_or_state.execution_id}"
+                    )
+            sleep(pool_interval)
+        if is_workflow_execution_state_state:
+            raise TimeoutError("State was not executed within the timeout period.")
+        else:
+            raise TimeoutError("Workflow was not executed within the timeout period.")

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/codemie_test_harness/tests/utils/yaml_utils.py

@@ -54,7 +54,6 @@ class StateModel(BaseModel):
 
 
 class WorkflowYamlModel(BaseModel):
-    enable_summarization_node: bool = False
     tools: List[ToolModel] = Field(default_factory=list)
     assistants: List[AssistantModel] = Field(default_factory=list)
     states: List[StateModel] = Field(default_factory=list)

{codemie_test_harness-0.1.213 → codemie_test_harness-0.1.214}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemie-test-harness"
-version = "0.1.213"
+version = "0.1.214"
 description = "Autotest for CodeMie backend and UI"
 authors = [
     "Anton Yeromin <anton_yeromin@epam.com>",
@@ -12,7 +12,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.12"
-codemie-sdk-python = "0.1.213"
+codemie-sdk-python = "0.1.214"
 pytest = "^8.4.1"
 python-dotenv = "^1.1.0"
 PyHamcrest = "^2.1.0"