Merge remote-tracking branch 'upstream/v2' into feat/support-regular-expression-comparison

Author: wangliang181230

apps/application/flow/common.py

@@ -249,6 +249,8 @@ def is_valid_model_params(self):
         node_list = [node for node in self.nodes if (
                 node.type == 'ai-chat-node' or node.type == 'question-node' or node.type == 'parameter-extraction-node')]
         for node in node_list:
+            if (node.properties.get('node_data', {}).get('model_id_type') or 'custom') == 'reference':
+                continue
             model = QuerySet(Model).filter(id=node.properties.get('node_data', {}).get('model_id')).first()
             if model is None:
                 raise ValidationError(ErrorDetail(

apps/application/flow/i_step_node.py

@@ -298,6 +298,7 @@ def __init__(self, node, workflow_params, workflow_manage, up_node_id_list=None,
                                                                                              node.id]))),
                                                                      "utf-8")).hexdigest() + (
                                    "__" + str(salt) if salt is not None else '')
+        self.extra = {}
 
     def valid_args(self, node_params, flow_params):
         flow_params_serializer_class = self.get_flow_params_serializer_class()

apps/application/flow/step_node/ai_chat_step_node/impl/base_chat_node.py

@@ -277,6 +277,8 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
             if reference_data and isinstance(reference_data, dict):
                 model_id = reference_data.get('model_id', model_id)
                 model_params_setting = reference_data.get('model_params_setting')
+        if model_id is None or model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
 
         if model_params_setting is None and model_id:
             model_params_setting = get_default_model_params_setting(model_id)
@@ -428,13 +430,19 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
         if len(mcp_servers_config) > 0 or len(tools) > 0:
             # 安全获取 application
             application_id = None
-            if (self.workflow_manage and
-                    self.workflow_manage.work_flow_post_handler and
-                    self.workflow_manage.work_flow_post_handler.chat_info):
+            tool_id = None
+            knowledge_id = None
+            if [WorkflowMode.KNOWLEDGE, WorkflowMode.KNOWLEDGE_LOOP].__contains__(
+                    self.workflow_manage.flow.workflow_mode):
+                knowledge_id = self.workflow_params.get('knowledge_id')
+            elif [WorkflowMode.APPLICATION, WorkflowMode.APPLICATION_LOOP].__contains__(
+                    self.workflow_manage.flow.workflow_mode):
                 application_id = self.workflow_manage.work_flow_post_handler.chat_info.application.id
-            knowledge_id = self.workflow_params.get('knowledge_id')
-            source_id = application_id or knowledge_id
-            source_type = 'APPLICATION' if application_id else 'KNOWLEDGE'
+            elif [WorkflowMode.TOOL, WorkflowMode.TOOL_LOOP].__contains__(self.workflow_manage.flow.workflow_mode):
+                tool_id = self.workflow_params.get('tool_id')
+
+            source_id = application_id or knowledge_id or tool_id
+            source_type = 'APPLICATION' if application_id else 'KNOWLEDGE' if knowledge_id else 'TOOL'
             r = mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
                                        tool_init_params, source_id, source_type, chat_id, tools)
             return NodeResult(

apps/application/flow/step_node/document_split_node/i_document_split_node.py

@@ -80,7 +80,7 @@ def get_node_params_serializer_class(self) -> Type[serializers.Serializer]:
         return DocumentSplitNodeSerializer
 
     def _run(self):
-        if [WorkflowMode.KNOWLEDGE, WorkflowMode.KNOWLEDGE_LOOP, WorkflowMode.TOOL,
+        if [WorkflowMode.APPLICATION, WorkflowMode.APPLICATION_LOOP, WorkflowMode.TOOL,
             WorkflowMode.TOOL_LOOP].__contains__(
             self.workflow_manage.flow.workflow_mode):
             return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data,

apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py

@@ -4,7 +4,7 @@
 
 import requests
 from langchain_core.messages import BaseMessage, HumanMessage, AIMessage
-
+from django.utils.translation import gettext_lazy as _
 from application.flow.common import WorkflowMode
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.image_generate_step_node.i_image_generate_node import IImageGenerateNode
@@ -37,6 +37,9 @@ def execute(self, model_id, prompt, negative_prompt, dialogue_number, dialogue_t
                 model_id = reference_data.get('model_id', model_id)
                 model_params_setting = reference_data.get('model_params_setting')
 
+        if model_id is None or model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
+
         workspace_id = self.workflow_manage.get_body().get('workspace_id')
         tti_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
                                                              **(model_params_setting or {}))

apps/application/flow/step_node/image_to_video_step_node/impl/base_image_to_video_node.py

@@ -6,7 +6,7 @@
 import requests
 from django.db.models import QuerySet
 from langchain_core.messages import BaseMessage, HumanMessage, AIMessage
-
+from django.utils.translation import gettext_lazy as _
 from application.flow.common import WorkflowMode
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.image_to_video_step_node.i_image_to_video_node import IImageToVideoNode
@@ -40,7 +40,8 @@ def execute(self, model_id, prompt, negative_prompt, dialogue_number, dialogue_t
             if reference_data and isinstance(reference_data, dict):
                 model_id = reference_data.get('model_id', model_id)
                 model_params_setting = reference_data.get('model_params_setting')
-
+        if model_id is None or model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
         workspace_id = self.workflow_manage.get_body().get('workspace_id')
         ttv_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
                                                              **(model_params_setting or {}))

apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py

@@ -7,7 +7,7 @@
 
 from django.db.models import QuerySet
 from langchain_core.messages import BaseMessage, HumanMessage, SystemMessage, AIMessage
-
+from django.utils.translation import gettext_lazy as _
 from application.flow.i_step_node import NodeResult, INode
 from application.flow.step_node.image_understand_step_node.i_image_understand_node import IImageUnderstandNode
 from application.flow.tools import Reasoning
@@ -153,6 +153,8 @@ def execute(self, model_id, system, prompt, dialogue_number, dialogue_type, hist
                 model_id = reference_data.get('model_id', model_id)
                 model_params_setting = reference_data.get('model_params_setting')
 
+        if model_id is None or model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
         # 处理不正确的参数
         workspace_id = self.workflow_manage.get_body().get('workspace_id')
         image_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
@@ -205,7 +207,7 @@ def generate_history_ai_message(self, chat_record):
     def generate_history_human_message_for_details(self, chat_record):
         for data in chat_record.details.values():
             if self.node.id == data['node_id'] and 'image_list' in data:
-                image_list = data['image_list']
+                image_list = data['image_list'] or []
                 if len(image_list) == 0 or data['dialogue_type'] == 'WORKFLOW':
                     return HumanMessage(content=chat_record.problem_text)
 
@@ -236,7 +238,7 @@ def generate_history_human_message(self, chat_record):
 
         for data in chat_record.details.values():
             if self.node.id == data['node_id'] and 'image_list' in data:
-                image_list = data['image_list']
+                image_list = data['image_list'] or []
                 if len(image_list) == 0 or data['dialogue_type'] == 'WORKFLOW':
                     return HumanMessage(content=chat_record.problem_text)
                 file_id_list = []

apps/application/flow/step_node/speech_to_text_step_node/impl/base_speech_to_text_node.py

@@ -33,6 +33,10 @@ def execute(self, stt_model_id, audio, model_params_setting=None, stt_model_id_t
                 stt_model_id = reference_data.get('stt_model_id', reference_data.get('model_id', stt_model_id))
                 model_params_setting = reference_data.get('model_params_setting')
 
+        from django.utils.translation import gettext_lazy as _
+
+        if stt_model_id is None or stt_model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
         workspace_id = self.workflow_manage.get_body().get('workspace_id')
         stt_model = get_model_instance_by_model_workspace_id(stt_model_id, workspace_id, **(model_params_setting or {}))
         audio_list = audio

apps/application/flow/step_node/text_to_speech_step_node/impl/base_text_to_speech_node.py

@@ -56,6 +56,11 @@ def execute(self, tts_model_id,
             if reference_data and isinstance(reference_data, dict):
                 tts_model_id = reference_data.get('tts_model_id', reference_data.get('model_id', tts_model_id))
                 model_params_setting = reference_data.get('model_params_setting')
+
+        from django.utils.translation import gettext_lazy as _
+
+        if tts_model_id is None or tts_model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
         # 分割文本为合理片段
         content = _remove_empty_lines(content)
         content_chunks = [content[i:i + max_length]

apps/application/flow/step_node/text_to_video_step_node/impl/base_text_to_video_node.py

@@ -38,6 +38,10 @@ def execute(self, model_id, prompt, negative_prompt, dialogue_number, dialogue_t
                 model_id = reference_data.get('model_id', model_id)
                 model_params_setting = reference_data.get('model_params_setting')
 
+        from django.utils.translation import gettext_lazy as _
+
+        if model_id is None or model_id == '':
+            raise Exception(_('Model is not allowed to be empty'))
         workspace_id = self.workflow_manage.get_body().get('workspace_id')
         ttv_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
                                                              **(model_params_setting or {}))