diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py index a1b6f69289..605b6eaf6d 100644 --- a/api/core/workflow/workflow_entry.py +++ b/api/core/workflow/workflow_entry.py @@ -4,7 +4,7 @@ from collections.abc import Generator, Mapping, Sequence from typing import Any, Optional, cast from configs import dify_config -from core.app.apps.base_app_queue_manager import GenerateTaskStoppedError +from core.app.apps.exc import GenerateTaskStoppedError from core.app.entities.app_invoke_entities import InvokeFrom from core.file.models import File from core.workflow.callbacks import WorkflowCallback @@ -199,10 +199,10 @@ class WorkflowEntry: "error while running node_instance, workflow_id=%s, node_id=%s, type=%s, version=%s", workflow.id, node_instance.id, - node_instance.node_type, + node_instance.type_, node_instance.version(), ) - raise WorkflowNodeRunFailedError(node_instance=node_instance, error=str(e)) + raise WorkflowNodeRunFailedError(node=node_instance, err_msg=str(e)) return node_instance, generator @classmethod @@ -307,10 +307,10 @@ class WorkflowEntry: logger.exception( "error while running node_instance, node_id=%s, type=%s, version=%s", node_instance.id, - node_instance.node_type, + node_instance.type_, node_instance.version(), ) - raise WorkflowNodeRunFailedError(node_instance=node_instance, error=str(e)) + raise WorkflowNodeRunFailedError(node=node_instance, err_msg=str(e)) @staticmethod def handle_special_values(value: Optional[Mapping[str, Any]]) -> Mapping[str, Any] | None: diff --git a/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py b/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py index 499457f9cc..367c2c6596 100644 --- a/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py +++ b/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py @@ -11,6 +11,7 @@ from core.workflow.graph_engine.entities.event import ( NodeRunStreamChunkEvent, ) from core.workflow.graph_engine.entities.graph import Graph +from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState from core.workflow.graph_engine.graph_engine import GraphEngine from core.workflow.nodes.event.event import RunCompletedEvent, RunStreamChunkEvent @@ -178,7 +179,7 @@ class ContinueOnErrorTestHelper: variable_pool=variable_pool, ) - return GraphEngine( + graph_init_params = GraphInitParams( tenant_id="111", app_id="222", workflow_type=WorkflowType.CHAT, @@ -188,11 +189,14 @@ class ContinueOnErrorTestHelper: user_from=UserFrom.ACCOUNT, invoke_from=InvokeFrom.WEB_APP, call_depth=0, - graph=graph, - graph_runtime_state=graph_runtime_state, max_execution_steps=500, max_execution_time=1200, ) + return GraphEngine( + graph=graph, + graph_runtime_state=graph_runtime_state, + graph_init_params=graph_init_params, + ) DEFAULT_VALUE_EDGE = [