From cb12cbdd3dc2518b4687cdd82557702b54f74410 Mon Sep 17 00:00:00 2001 From: Raven95676 Date: Wed, 16 Jul 2025 23:44:51 +0800 Subject: [PATCH] fix: managing MCP connections with AsyncExitStack --- astrbot/core/provider/func_tool_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/astrbot/core/provider/func_tool_manager.py b/astrbot/core/provider/func_tool_manager.py index 8d79b1de8..f8cacff75 100644 --- a/astrbot/core/provider/func_tool_manager.py +++ b/astrbot/core/provider/func_tool_manager.py @@ -130,7 +130,7 @@ class MCPClient: timeout=cfg.get("timeout", 5), sse_read_timeout=cfg.get("sse_read_timeout", 60 * 5), ) - streams = await self._streams_context.__aenter__() + streams = await self.exit_stack.enter_async_context(self._streams_context) # Create a new client session self.session = await self.exit_stack.enter_async_context( @@ -148,7 +148,7 @@ class MCPClient: sse_read_timeout=sse_read_timeout, terminate_on_close=cfg.get("terminate_on_close", True), ) - read_s, write_s, _ = await self._streams_context.__aenter__() + read_s, write_s, _ = await self.exit_stack.enter_async_context(self._streams_context) # Create a new client session self.session = await self.exit_stack.enter_async_context( @@ -414,7 +414,7 @@ class FuncCall: try: # 关闭MCP连接 await self.mcp_client_dict[name].cleanup() - del self.mcp_client_dict[name] + self.mcp_client_dict.pop(name) except Exception as e: logger.info(f"清空 MCP 客户端资源 {name}: {e}。") # 移除关联的FuncTool