From 5b4335c4b52a7416259241f0c4ee60920bb53a6f Mon Sep 17 00:00:00 2001 From: jyong <718720800@qq.com> Date: Thu, 28 Aug 2025 22:02:22 +0800 Subject: [PATCH] fix preview run --- api/core/app/apps/common/workflow_response_converter.py | 3 +-- api/core/app/entities/app_invoke_entities.py | 2 +- api/core/workflow/nodes/base/node.py | 2 +- api/core/workflow/nodes/datasource/datasource_node.py | 2 +- api/services/rag_pipeline/rag_pipeline.py | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/api/core/app/apps/common/workflow_response_converter.py b/api/core/app/apps/common/workflow_response_converter.py index 16944d8670..969fb87852 100644 --- a/api/core/app/apps/common/workflow_response_converter.py +++ b/api/core/app/apps/common/workflow_response_converter.py @@ -1,7 +1,7 @@ import time from collections.abc import Mapping, Sequence from datetime import UTC, datetime -from typing import Any, Optional, Union, cast +from typing import Any, Optional, Union from sqlalchemy import select from sqlalchemy.orm import Session @@ -43,7 +43,6 @@ from core.variables.segments import ArrayFileSegment, FileSegment, Segment from core.workflow.entities import WorkflowExecution, WorkflowNodeExecution from core.workflow.enums import WorkflowNodeExecutionStatus from core.workflow.nodes import NodeType -from core.workflow.nodes.datasource.entities import DatasourceNodeData from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter from libs.datetime_utils import naive_utc_now from models import ( diff --git a/api/core/app/entities/app_invoke_entities.py b/api/core/app/entities/app_invoke_entities.py index bf800e30a2..9745a6f4d1 100644 --- a/api/core/app/entities/app_invoke_entities.py +++ b/api/core/app/entities/app_invoke_entities.py @@ -256,6 +256,7 @@ class RagPipelineGenerateEntity(WorkflowAppGenerateEntity): batch: str document_id: Optional[str] = None start_node_id: Optional[str] = None + class SingleIterationRunEntity(BaseModel): """ Single Iteration Run Entity. @@ -275,4 +276,3 @@ class RagPipelineGenerateEntity(WorkflowAppGenerateEntity): inputs: dict single_loop_run: Optional[SingleLoopRunEntity] = None - diff --git a/api/core/workflow/nodes/base/node.py b/api/core/workflow/nodes/base/node.py index c888884b21..24a1bcaecd 100644 --- a/api/core/workflow/nodes/base/node.py +++ b/api/core/workflow/nodes/base/node.py @@ -117,7 +117,7 @@ class Node: if isinstance(self, ToolNode): start_event.provider_id = getattr(self.get_base_node_data(), "provider_id", "") start_event.provider_type = getattr(self.get_base_node_data(), "provider_type", "") - + from core.workflow.nodes.datasource.datasource_node import DatasourceNode if isinstance(self, DatasourceNode): diff --git a/api/core/workflow/nodes/datasource/datasource_node.py b/api/core/workflow/nodes/datasource/datasource_node.py index 7f603dbff8..37b4974ee3 100644 --- a/api/core/workflow/nodes/datasource/datasource_node.py +++ b/api/core/workflow/nodes/datasource/datasource_node.py @@ -21,7 +21,7 @@ from core.variables.segments import ArrayAnySegment from core.variables.variables import ArrayAnyVariable from core.workflow.entities.variable_pool import VariablePool, VariableValue from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus -from core.workflow.enums import ErrorStrategy, NodeType, SystemVariableKey, NodeExecutionType +from core.workflow.enums import ErrorStrategy, NodeExecutionType, NodeType, SystemVariableKey from core.workflow.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig from core.workflow.nodes.base.node import Node diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py index ce3954b315..550253429f 100644 --- a/api/services/rag_pipeline/rag_pipeline.py +++ b/api/services/rag_pipeline/rag_pipeline.py @@ -41,10 +41,9 @@ from core.workflow.entities.workflow_node_execution import ( ) from core.workflow.enums import ErrorStrategy, NodeType, SystemVariableKey from core.workflow.errors import WorkflowNodeRunFailedError -from core.workflow.graph_events import NodeRunSucceededEvent, NodeRunFailedEvent +from core.workflow.graph_events import NodeRunFailedEvent, NodeRunSucceededEvent from core.workflow.graph_events.base import GraphNodeEventBase from core.workflow.node_events.base import NodeRunResult -from core.workflow.node_events.node import StreamCompletedEvent from core.workflow.nodes.base.node import Node from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING from core.workflow.repositories.workflow_node_execution_repository import OrderConfig