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

♻️ fix lint problems

Browse source
This commit is contained in:
FuQuan233 2026-06-29 13:45:23 +08:00
parent 7d0ad43c7c
commit a061aa0a32
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nonebot_plugin_llmchat/mcpclient.py
View file

@ -6,8 +6,8 @@ from typing import Any, cast
import httpx import httpx
from mcp import ClientSession, StdioServerParameters from mcp import ClientSession, StdioServerParameters
from mcp.client.sse import sse_client from mcp.client.sse import sse_client
from mcp.client.streamable_http import streamable_http_client
from mcp.client.stdio import stdio_client from mcp.client.stdio import stdio_client
from mcp.client.streamable_http import streamable_http_client
from nonebot import logger from nonebot import logger
from .config import MCPServerConfig from .config import MCPServerConfig
@ -93,36 +93,28 @@ class MCPClient:
transport_type = config.transport transport_type = config.transport
if transport_type == "streamable_http": if transport_type == "streamable_http":
logger.debug(f"服务器[{server_name}]使用 streamable_http 传输协议") logger.debug(f"服务器[{server_name}]使用 streamable_http 传输协议")
http_client = await session_stack.enter_async_context( http_client = await session_stack.enter_async_context(httpx.AsyncClient(headers=config.headers or {}))
httpx.AsyncClient(headers=config.headers or {})
)
read, write, _ = await session_stack.enter_async_context( read, write, _ = await session_stack.enter_async_context(
streamable_http_client(url=config.url, http_client=http_client) streamable_http_client(url=config.url, http_client=http_client)
) )
transport = (read, write) transport = (read, write)
elif transport_type == "sse": elif transport_type == "sse":
logger.debug(f"服务器[{server_name}]使用 sse 传输协议") logger.debug(f"服务器[{server_name}]使用 sse 传输协议")
transport = await session_stack.enter_async_context( transport = await session_stack.enter_async_context(sse_client(url=config.url, headers=config.headers))
sse_client(url=config.url, headers=config.headers)
)
else: else:
# 未指定协议，自动探测：先尝试 sse，失败则回退到 streamable_http # 未指定协议，自动探测：先尝试 sse，失败则回退到 streamable_http
# （sse 服务器对 streamable_http 的 POST 请求会卡住，反之 sse 连 streamable_http 服务器会快速返回 405） # （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:
read, write = await probe_stack.enter_async_context( read, write = await probe_stack.enter_async_context(sse_client(url=config.url, headers=config.headers))
sse_client(url=config.url, headers=config.headers)
)
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}]自动探测成功: 使用 sse 传输协议") 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}]sse 探测失败({e})，回退到 streamable_http") logger.debug(f"服务器[{server_name}]sse 探测失败({e})，回退到 streamable_http")
http_client = await session_stack.enter_async_context( http_client = await session_stack.enter_async_context(httpx.AsyncClient(headers=config.headers or {}))
httpx.AsyncClient(headers=config.headers or {})
)
read, write, _ = await session_stack.enter_async_context( read, write, _ = await session_stack.enter_async_context(
streamable_http_client(url=config.url, http_client=http_client) streamable_http_client(url=config.url, http_client=http_client)
) )
@ -136,9 +128,7 @@ class MCPClient:
} }
if self.default_command_cwd: if self.default_command_cwd:
stdio_params["cwd"] = self.default_command_cwd stdio_params["cwd"] = self.default_command_cwd
transport = await session_stack.enter_async_context( transport = await session_stack.enter_async_context(cast(Any, stdio_client(StdioServerParameters(**stdio_params))))
cast(Any, stdio_client(StdioServerParameters(**stdio_params)))
)
else: else:
raise ValueError("Server config must have either url or command") raise ValueError("Server config must have either url or command")
@ -236,8 +226,6 @@ class MCPClient:
logger.info(f"工具列表缓存完成，共缓存{len(available_tools)}个工具") logger.info(f"工具列表缓存完成，共缓存{len(available_tools)}个工具")
async def get_available_tools(self, is_group: bool): async def get_available_tools(self, is_group: bool):
"""获取可用工具列表，使用缓存机制""" """获取可用工具列表，使用缓存机制"""
await self.init_tools_cache() await self.init_tools_cache()

2
pyproject.toml
View file

@ -18,7 +18,7 @@ aiofiles = ">=24.0.0"
nonebot-plugin-apscheduler = "^0.5.0" nonebot-plugin-apscheduler = "^0.5.0"
nonebot-adapter-onebot = "^2.0.0" nonebot-adapter-onebot = "^2.0.0"
nonebot-plugin-localstore = "^0.7.3" nonebot-plugin-localstore = "^0.7.3"
mcp = "^1.6.0" mcp = ">=1.9.0"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
ruff = "^0.8.0" ruff = "^0.8.0"