fuquan/nonebot-plugin-llmchat
1
0
Fork 0
mirror of https://github.com/FuQuan233/nonebot-plugin-llmchat.git synced 2026-06-29 16:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

🐛 调整 MCP HTTP 自动检测顺序，防止意外卡住 #28

Browse source
This commit is contained in:
FuQuan233 2026-06-29 11:39:55 +08:00
parent bec3fda293
commit 97e82e0c0e
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nonebot_plugin_llmchat/mcpclient.py
View file

@ -106,26 +106,28 @@ class MCPClient:
sse_client(url=config.url, headers=config.headers) sse_client(url=config.url, headers=config.headers)
) )
else: else:
# 未指定协议，自动探测：先尝试 streamable_http，失败则回退到 sse # 未指定协议，自动探测：先尝试 sse，失败则回退到 streamable_http
# （sse 服务器对 streamable_http 的 POST 请求会卡住，反之 sse 连 streamable_http 服务器会快速返回 405）
logger.debug(f"服务器[{server_name}]未指定传输协议，开始自动探测") logger.debug(f"服务器[{server_name}]未指定传输协议，开始自动探测")
probe_stack = AsyncExitStack() probe_stack = AsyncExitStack()
try: try:
http_client = await probe_stack.enter_async_context( read, write = await probe_stack.enter_async_context(
httpx.AsyncClient(headers=config.headers or {}) sse_client(url=config.url, headers=config.headers)
)
read, write, _ = await probe_stack.enter_async_context(
streamable_http_client(url=config.url, http_client=http_client)
) )
await session_stack.enter_async_context(probe_stack) await session_stack.enter_async_context(probe_stack)
transport = (read, write) transport = (read, write)
logger.debug(f"服务器[{server_name}]自动探测成功: 使用 streamable_http 传输协议") logger.debug(f"服务器[{server_name}]自动探测成功: 使用 sse 传输协议")
except Exception as e: except Exception as e:
await probe_stack.aclose() await probe_stack.aclose()
logger.debug(f"服务器[{server_name}]streamable_http 探测失败({e})，回退到 sse") logger.debug(f"服务器[{server_name}]sse 探测失败({e})，回退到 streamable_http")
transport = await session_stack.enter_async_context( http_client = await session_stack.enter_async_context(
sse_client(url=config.url, headers=config.headers) httpx.AsyncClient(headers=config.headers or {})
) )
logger.debug(f"服务器[{server_name}]自动探测成功: 使用 sse 传输协议") read, write, _ = await session_stack.enter_async_context(
streamable_http_client(url=config.url, http_client=http_client)
)
transport = (read, write)
logger.debug(f"服务器[{server_name}]自动探测成功: 使用 streamable_http 传输协议")
elif config.command: elif config.command:
stdio_params: dict[str, Any] = { stdio_params: dict[str, Any] = {
"command": config.command, "command": config.command,