Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 150a741e92 | |||
| 88c1d77f0b |
@@ -345,9 +345,6 @@ class MCPClient:
|
|||||||
|
|
||||||
async def cleanup(self):
|
async def cleanup(self):
|
||||||
"""Clean up resources including old exit stacks from reconnections"""
|
"""Clean up resources including old exit stacks from reconnections"""
|
||||||
# Set running_event first to unblock any waiting tasks
|
|
||||||
self.running_event.set()
|
|
||||||
|
|
||||||
# Close current exit stack
|
# Close current exit stack
|
||||||
try:
|
try:
|
||||||
await self.exit_stack.aclose()
|
await self.exit_stack.aclose()
|
||||||
@@ -359,6 +356,9 @@ class MCPClient:
|
|||||||
# Just clear the list to release references
|
# Just clear the list to release references
|
||||||
self._old_exit_stacks.clear()
|
self._old_exit_stacks.clear()
|
||||||
|
|
||||||
|
# Set running_event first to unblock any waiting tasks
|
||||||
|
self.running_event.set()
|
||||||
|
|
||||||
|
|
||||||
class MCPTool(FunctionTool, Generic[TContext]):
|
class MCPTool(FunctionTool, Generic[TContext]):
|
||||||
"""A function tool that calls an MCP service."""
|
"""A function tool that calls an MCP service."""
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from collections import defaultdict
|
|||||||
from astrbot import logger
|
from astrbot import logger
|
||||||
from astrbot.api import star
|
from astrbot.api import star
|
||||||
from astrbot.api.event import AstrMessageEvent
|
from astrbot.api.event import AstrMessageEvent
|
||||||
from astrbot.api.message_components import Image, Plain
|
from astrbot.api.message_components import At, Image, Plain
|
||||||
from astrbot.api.platform import MessageType
|
from astrbot.api.platform import MessageType
|
||||||
from astrbot.api.provider import Provider, ProviderRequest
|
from astrbot.api.provider import Provider, ProviderRequest
|
||||||
from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
|
from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
|
||||||
@@ -142,6 +142,8 @@ class LongTermMemory:
|
|||||||
logger.error(f"获取图片描述失败: {e}")
|
logger.error(f"获取图片描述失败: {e}")
|
||||||
else:
|
else:
|
||||||
parts.append(" [Image]")
|
parts.append(" [Image]")
|
||||||
|
elif isinstance(comp, At):
|
||||||
|
parts.append(f" [At: {comp.name}]")
|
||||||
|
|
||||||
final_message = "".join(parts)
|
final_message = "".join(parts)
|
||||||
logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")
|
logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")
|
||||||
|
|||||||
Reference in New Issue
Block a user