fix: add chat_id parameter to MCP request handling functions

Author: liuruibin

apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py

@@ -228,7 +228,8 @@ def reset_message_list(message_list: List[BaseMessage], answer_text):
         return result
 
     def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
-                            application_ids, skill_tool_ids, mcp_output_enable, chat_model, message_list, agent_id):
+                            application_ids, skill_tool_ids, mcp_output_enable, chat_model, message_list, agent_id,
+                            chat_id):
 
         mcp_servers_config = {}
 
@@ -314,8 +315,10 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
         if len(mcp_servers_config) > 0:
             source_id = agent_id
             source_type = 'APPLICATION'
-            return mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
-                                          tool_init_params, source_id, source_type)
+            return mcp_response_generator(
+                chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
+                tool_init_params, source_id, source_type, chat_id
+            )
 
         return None
 
@@ -331,7 +334,8 @@ def get_stream_result(self, message_list: List[BaseMessage],
                           application_ids=None,
                           skill_tool_ids=None,
                           mcp_output_enable=True,
-                          agent_id=None
+                          agent_id=None,
+                          chat_id=None
                           ):
         if paragraph_list is None:
             paragraph_list = []
@@ -352,7 +356,7 @@ def get_stream_result(self, message_list: List[BaseMessage],
             mcp_result = self._handle_mcp_request(
                 mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
                 application_ids, skill_tool_ids, mcp_output_enable, chat_model,
-                message_list, agent_id
+                message_list, agent_id, chat_id
             )
             if mcp_result:
                 return mcp_result, True
@@ -380,7 +384,8 @@ def execute_stream(self, message_list: List[BaseMessage],
                                                          no_references_setting, problem_text, mcp_tool_ids,
                                                          mcp_servers, mcp_source, tool_ids,
                                                          application_ids, skill_tool_ids,
-                                                         mcp_output_enable, manage.context.get('application_id'))
+                                                         mcp_output_enable, manage.context.get('application_id'),
+                                                         chat_id)
         chat_record_id = self.context.get('step_args', {}).get('chat_record_id') if self.context.get('step_args',
                                                                                                      {}).get(
             'chat_record_id') else uuid.uuid7()
@@ -406,7 +411,8 @@ def get_block_result(self, message_list: List[BaseMessage],
                          application_ids=None,
                          skill_tool_ids=None,
                          mcp_output_enable=True,
-                         application_id=None
+                         application_id=None,
+                         chat_id=None
                          ):
         if paragraph_list is None:
             paragraph_list = []
@@ -426,7 +432,7 @@ def get_block_result(self, message_list: List[BaseMessage],
             mcp_result = self._handle_mcp_request(
                 mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
                 application_ids, skill_tool_ids, mcp_output_enable,
-                chat_model, message_list, application_id
+                chat_model, message_list, application_id, chat_id
             )
             if mcp_result:
                 return mcp_result, True
@@ -461,7 +467,8 @@ def execute_block(self, message_list: List[BaseMessage],
                                                             no_references_setting, problem_text,
                                                             mcp_tool_ids, mcp_servers, mcp_source,
                                                             tool_ids, application_ids, skill_tool_ids,
-                                                            mcp_output_enable, manage.context.get('application_id'))
+                                                            mcp_output_enable, manage.context.get('application_id'),
+                                                            chat_id)
             if is_ai_chat:
                 request_token = chat_model.get_num_tokens_from_messages(message_list)
                 response_token = chat_model.get_num_tokens(chat_result.content)

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

@@ -12,17 +12,16 @@
 from functools import reduce
 from typing import List, Dict
 
-from django.db.models import QuerySet
-from django.utils.translation import gettext as _
-from langchain_core.messages import BaseMessage, AIMessage, HumanMessage, SystemMessage
-
 from application.flow.i_step_node import NodeResult, INode
 from application.flow.step_node.ai_chat_step_node.i_chat_node import IChatNode
 from application.flow.tools import Reasoning, mcp_response_generator
 from application.models import Application, ApplicationApiKey, ApplicationAccessToken
 from common.exception.app_exception import AppApiException
 from common.utils.rsa_util import rsa_long_decrypt
 from common.utils.tool_code import ToolExecutor
+from django.db.models import QuerySet
+from django.utils.translation import gettext as _
+from langchain_core.messages import BaseMessage, AIMessage, HumanMessage, SystemMessage
 from models_provider.models import Model
 from models_provider.tools import get_model_credential, get_model_instance_by_model_workspace_id
 from tools.models import Tool
@@ -189,7 +188,7 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
         mcp_result = self._handle_mcp_request(
             mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids,
             application_ids, skill_tool_ids, mcp_output_enable,
-            chat_model, message_list, history_message, question
+            chat_model, message_list, history_message, question, chat_id
         )
         if mcp_result:
             return mcp_result
@@ -209,7 +208,7 @@ def execute(self, model_id, system, prompt, dialogue_number, history_chat_record
 
     def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids, tool_ids,
                             application_ids, skill_tool_ids,
-                            mcp_output_enable, chat_model, message_list, history_message, question):
+                            mcp_output_enable, chat_model, message_list, history_message, question, chat_id):
 
         mcp_servers_config = {}
 
@@ -306,7 +305,7 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
             source_id = application_id or knowledge_id
             source_type = 'APPLICATION' if application_id else 'KNOWLEDGE'
             r = mcp_response_generator(chat_model, message_list, json.dumps(mcp_servers_config), mcp_output_enable,
-                                       tool_init_params, source_id, source_type)
+                                       tool_init_params, source_id, source_type, chat_id)
             return NodeResult(
                 {'result': r, 'chat_model': chat_model, 'message_list': message_list,
                  'history_message': [{'content': message.content, 'role': message.type} for message in

apps/application/flow/tools.py

@@ -525,12 +525,12 @@ async def save_tool_record(tool_id, tool_info, tool_result, source_id, source_ty
 
 
 def mcp_response_generator(chat_model, message_list, mcp_servers, mcp_output_enable=True, tool_init_params={},
-                           source_id=None, source_type=None):
+                           source_id=None, source_type=None, chat_id=None):
     """使用全局事件循环，不创建新实例"""
     result_queue = queue.Queue()
     loop = get_global_loop()  # 使用共享循环
     # 创建临时文件夹
-    temp_dir = tempfile.mkdtemp(dir='/tmp')
+    temp_dir = os.path.join('/tmp', chat_id[:8])
     skills_dir = os.path.join(temp_dir, 'skills')
     os.makedirs(skills_dir, exist_ok=True)