scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-10-10 03:27:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2026-10-08 23:59:35 +04:00
parent fc87f97255
commit 22102e4a24
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
backend/open_webui/utils/mcp/client.py
View file

@ -17,6 +17,7 @@ from open_webui.env import (
AIOHTTP_CLIENT_TIMEOUT_TOOL_SERVER,
MCP_INITIALIZE_TIMEOUT,
)
from open_webui.utils.json_codec import JSONCodec
def _build_httpx_client(headers=None, timeout=None, auth=None, verify=True):
@ -137,7 +138,7 @@ class MCPClient:
return tool_specs
async def call_tool(self, function_name: str, function_args: dict) -> Optional[dict]:
async def call_tool(self, function_name: str, function_args: dict) -> list[dict]:
if not self.session:
raise RuntimeError('MCP client is not connected.')
@ -150,13 +151,30 @@ class MCPClient:
raise Exception('No result returned from MCP tool call.')
result_dict = result.model_dump(mode='json')
result_content = result_dict.get('content', {})
result_content = result_dict['content']
if result.isError:
raise Exception(result_content)
else:
structured_content = result_dict.get('structuredContent')
if structured_content is None:
return result_content
# Compare serialized JSON: Python equality treats True and 1 as the same value.
structured_json = JSONCodec.dumps(structured_content, sort_keys=True)
for item in result_content:
if item['type'] != 'text':
continue
try:
text_content = JSONCodec.loads(item['text'])
except JSONCodec.JSONDecodeError:
continue
if JSONCodec.dumps(text_content, sort_keys=True) == structured_json:
return result_content
result_content.append({'type': 'text', 'text': structured_json})
return result_content
async def list_resources(self, cursor: Optional[str] = None) -> Optional[dict]:
if not self.session:
raise RuntimeError('MCP client is not connected.')