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

api/services/workflow_service.py

@@ -6,19 +6,20 @@ from typing import Optional
 
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
-from core.app.segments import Variable
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.workflow.entities.node_entities import NodeRunResult, NodeType
+from core.variables import Variable
+from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.errors import WorkflowNodeRunFailedError
+from core.workflow.nodes import NodeType
 from core.workflow.nodes.event import RunCompletedEvent
-from core.workflow.nodes.node_mapping import node_classes
+from core.workflow.nodes.node_mapping import node_type_classes_mapping
 from core.workflow.workflow_entry import WorkflowEntry
 from events.app_event import app_draft_workflow_was_synced, app_published_workflow_was_updated
 from extensions.ext_database import db
 from models.account import Account
+from models.enums import CreatedByRole
 from models.model import App, AppMode
 from models.workflow import (
-    CreatedByRole,
     Workflow,
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
@@ -175,7 +176,7 @@ class WorkflowService:
         """
         # return default block config
         default_block_configs = []
-        for node_type, node_class in node_classes.items():
+        for node_type, node_class in node_type_classes_mapping.items():
             default_config = node_class.get_default_config()
             if default_config:
                 default_block_configs.append(default_config)
@@ -189,10 +190,10 @@ class WorkflowService:
         :param filters: filter by node config parameters.
         :return:
         """
-        node_type_enum: NodeType = NodeType.value_of(node_type)
+        node_type_enum: NodeType = NodeType(node_type)
 
         # return default block config
-        node_class = node_classes.get(node_type_enum)
+        node_class = node_type_classes_mapping.get(node_type_enum)
         if not node_class:
             return None
 
@@ -251,7 +252,7 @@ class WorkflowService:
         workflow_node_execution.triggered_from = WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP.value
         workflow_node_execution.index = 1
         workflow_node_execution.node_id = node_id
-        workflow_node_execution.node_type = node_instance.node_type.value
+        workflow_node_execution.node_type = node_instance.node_type
         workflow_node_execution.title = node_instance.node_data.title
         workflow_node_execution.elapsed_time = time.perf_counter() - start_at
         workflow_node_execution.created_by_role = CreatedByRole.ACCOUNT.value