feat/enhance the multi-modal support (#8818)

api/core/workflow/graph_engine/__init__.py

@@ -0,0 +1,3 @@
+from .entities import Graph, GraphInitParams, GraphRuntimeState, RuntimeRouteState
+
+__all__ = ["Graph", "GraphInitParams", "GraphRuntimeState", "RuntimeRouteState"]

api/core/workflow/graph_engine/condition_handlers/condition_handler.py

@@ -18,11 +18,10 @@ class ConditionRunConditionHandlerHandler(RunConditionHandler):
 
         # process condition
         condition_processor = ConditionProcessor()
-        input_conditions, group_result = condition_processor.process_conditions(
-            variable_pool=graph_runtime_state.variable_pool, conditions=self.condition.conditions
+        _, _, final_result = condition_processor.process_conditions(
+            variable_pool=graph_runtime_state.variable_pool,
+            conditions=self.condition.conditions,
+            operator="and",
         )
 
-        # Apply the logical operator for the current case
-        compare_result = all(group_result)
-
-        return compare_result
+        return final_result

api/core/workflow/graph_engine/entities/__init__.py

@@ -0,0 +1,6 @@
+from .graph import Graph
+from .graph_init_params import GraphInitParams
+from .graph_runtime_state import GraphRuntimeState
+from .runtime_route_state import RuntimeRouteState
+
+__all__ = ["Graph", "GraphInitParams", "GraphRuntimeState", "RuntimeRouteState"]

api/core/workflow/graph_engine/entities/event.py

@@ -3,9 +3,9 @@ from typing import Any, Optional
 
 from pydantic import BaseModel, Field
 
-from core.workflow.entities.base_node_data_entities import BaseNodeData
-from core.workflow.entities.node_entities import NodeType
 from core.workflow.graph_engine.entities.runtime_route_state import RouteNodeState
+from core.workflow.nodes import NodeType
+from core.workflow.nodes.base import BaseNodeData
 
 
 class GraphEngineEvent(BaseModel):

api/core/workflow/graph_engine/entities/graph.py

@@ -4,8 +4,8 @@ from typing import Any, Optional, cast
 
 from pydantic import BaseModel, Field
 
-from core.workflow.entities.node_entities import NodeType
 from core.workflow.graph_engine.entities.run_condition import RunCondition
+from core.workflow.nodes import NodeType
 from core.workflow.nodes.answer.answer_stream_generate_router import AnswerStreamGeneratorRouter
 from core.workflow.nodes.answer.entities import AnswerStreamGenerateRoute
 from core.workflow.nodes.end.end_stream_generate_router import EndStreamGeneratorRouter

api/core/workflow/graph_engine/entities/graph_init_params.py

@@ -4,7 +4,7 @@ from typing import Any
 from pydantic import BaseModel, Field
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.node_entities import UserFrom
+from models.enums import UserFrom
 from models.workflow import WorkflowType
 
 

api/core/workflow/graph_engine/graph_engine.py

@@ -10,11 +10,7 @@ from flask import Flask, current_app
 
 from core.app.apps.base_app_queue_manager import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.node_entities import (
-    NodeRunMetadataKey,
-    NodeType,
-    UserFrom,
-)
+from core.workflow.entities.node_entities import NodeRunMetadataKey
 from core.workflow.entities.variable_pool import VariablePool, VariableValue
 from core.workflow.graph_engine.condition_handlers.condition_manager import ConditionManager
 from core.workflow.graph_engine.entities.event import (
@@ -36,12 +32,14 @@ from core.workflow.graph_engine.entities.graph import Graph, GraphEdge
 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.entities.runtime_route_state import RouteNodeState
+from core.workflow.nodes import NodeType
 from core.workflow.nodes.answer.answer_stream_processor import AnswerStreamProcessor
-from core.workflow.nodes.base_node import BaseNode
+from core.workflow.nodes.base import BaseNode
 from core.workflow.nodes.end.end_stream_processor import EndStreamProcessor
 from core.workflow.nodes.event import RunCompletedEvent, RunRetrieverResourceEvent, RunStreamChunkEvent
-from core.workflow.nodes.node_mapping import node_classes
+from core.workflow.nodes.node_mapping import node_type_classes_mapping
 from extensions.ext_database import db
+from models.enums import UserFrom
 from models.workflow import WorkflowNodeExecutionStatus, WorkflowType
 
 logger = logging.getLogger(__name__)
@@ -229,10 +227,8 @@ class GraphEngine:
                 raise GraphRunFailedError(f"Node {node_id} config not found.")
 
             # convert to specific node
-            node_type = NodeType.value_of(node_config.get("data", {}).get("type"))
-            node_cls = node_classes.get(node_type)
-            if not node_cls:
-                raise GraphRunFailedError(f"Node {node_id} type {node_type} not found.")
+            node_type = NodeType(node_config.get("data", {}).get("type"))
+            node_cls = node_type_classes_mapping[node_type]
 
             previous_node_id = previous_route_node_state.node_id if previous_route_node_state else None