panyy
/
UnisKB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: enhance execute method to support mcp_tool_id and mcp_source parameters 

--bug=1060726 --user=刘瑞斌 【工具】应用中引用的MCP没删除后，在应用对话界面依然可以调用MCP的工具 https://www.tapd.cn/62980211/s/1759963
v3.2
CaptainB 2025-08-22 14:32:59 +08:00
parent c3001ffd2d
commit c8e8afa8b9
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/application/flow/step_node/mcp_node/i_mcp_node.py
View File

@ -9,16 +9,12 @@ from application.flow.i_step_node import INode, NodeResult
class McpNodeSerializer(serializers.Serializer): class McpNodeSerializer(serializers.Serializer):
mcp_servers = serializers.JSONField(required=True, mcp_servers = serializers.JSONField(required=True, label=_("Mcp servers"))
label=_("Mcp servers")) mcp_server = serializers.CharField(required=True, label=_("Mcp server"))
mcp_server = serializers.CharField(required=True,
label=_("Mcp server"))
mcp_tool = serializers.CharField(required=True, label=_("Mcp tool")) mcp_tool = serializers.CharField(required=True, label=_("Mcp tool"))
mcp_tool_id = serializers.UUIDField(required=False, label=_("Mcp tool"), allow_null=True)
tool_params = serializers.DictField(required=True, mcp_source = serializers.CharField(required=False, label=_("Mcp source"), allow_blank=True, allow_null=True)
label=_("Tool parameters")) tool_params = serializers.DictField(required=True, label=_("Tool parameters"))
class IMcpNode(INode): class IMcpNode(INode):
@ -30,5 +26,5 @@ class IMcpNode(INode):
def _run(self): def _run(self):
return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data) return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data)
def execute(self, mcp_servers, mcp_server, mcp_tool, tool_params, **kwargs) -> NodeResult: def execute(self, mcp_servers, mcp_server, mcp_tool, mcp_tool_id, mcp_source, tool_params, **kwargs) -> NodeResult:
pass pass

20
apps/application/flow/step_node/mcp_node/impl/base_mcp_node.py
View File

@ -3,10 +3,12 @@ import asyncio
import json import json
from typing import List from typing import List
from django.db.models import QuerySet
from langchain_mcp_adapters.client import MultiServerMCPClient from langchain_mcp_adapters.client import MultiServerMCPClient
from application.flow.i_step_node import NodeResult from application.flow.i_step_node import NodeResult
from application.flow.step_node.mcp_node.i_mcp_node import IMcpNode from application.flow.step_node.mcp_node.i_mcp_node import IMcpNode
from tools.models import Tool
class BaseMcpNode(IMcpNode): class BaseMcpNode(IMcpNode):
@ -15,10 +17,20 @@ class BaseMcpNode(IMcpNode):
self.context['tool_params'] = details.get('tool_params') self.context['tool_params'] = details.get('tool_params')
self.context['mcp_tool'] = details.get('mcp_tool') self.context['mcp_tool'] = details.get('mcp_tool')
def execute(self, mcp_servers, mcp_server, mcp_tool, tool_params, **kwargs) -> NodeResult: def execute(self, mcp_servers, mcp_server, mcp_tool, mcp_tool_id, mcp_source, tool_params,**kwargs) -> NodeResult:
servers = json.loads(mcp_servers) if mcp_source == 'referencing':
params = json.loads(json.dumps(tool_params)) if not mcp_tool_id:
params = self.handle_variables(params) raise ValueError("MCP tool ID is required when mcp_source is 'referencing'.")
tool = QuerySet(Tool).filter(id=mcp_tool_id).first()
if not tool:
raise ValueError(f"Tool with ID {mcp_tool_id} not found.")
servers = json.loads(tool.code)
params = json.loads(json.dumps(tool_params))
params = self.handle_variables(params)
else:
servers = json.loads(mcp_servers)
params = json.loads(json.dumps(tool_params))
params = self.handle_variables(params)
async def call_tool(t, a): async def call_tool(t, a):
client = MultiServerMCPClient(servers) client = MultiServerMCPClient(servers)