GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 07:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge agent and tool execution messages into a single message

Browse Source 
Co-authored-by: jxxghp <51039935+jxxghp@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-19 15:59:21 +00:00
co-authored by jxxghp
parent 605aba1a3c
commit 271d1d23d5
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/agent/tools/base.py
+16 -7
View File
@@ -39,11 +39,8 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta):
""" """
异步运行工具 异步运行工具
""" """
# 发送和记忆工具调用前的信息 # 获取工具调用前的agent消息
agent_message = await self._callback_handler.get_message() agent_message = await self._callback_handler.get_message()
if agent_message:
# 发送消息
await self.send_tool_message(agent_message, title="MoviePilot助手")
# 记忆工具调用 # 记忆工具调用
await conversation_manager.add_conversation( await conversation_manager.add_conversation(
@@ -58,15 +55,27 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta):
} }
) )
# 发送执行工具说明,优先使用工具自定义的提示消息，如果没有则使用 explanation # 获取执行工具说明,优先使用工具自定义的提示消息，如果没有则使用 explanation
tool_message = self.get_tool_message(**kwargs) tool_message = self.get_tool_message(**kwargs)
if not tool_message: if not tool_message:
explanation = kwargs.get("explanation") explanation = kwargs.get("explanation")
if explanation: if explanation:
tool_message = explanation tool_message = explanation
# 合并agent消息和工具执行消息，一起发送
merged_message = ""
if agent_message:
merged_message = agent_message
if tool_message: if tool_message:
formatted_message = f"⚙️ => {tool_message}" formatted_tool_message = f"⚙️ => {tool_message}"
await self.send_tool_message(formatted_message) if merged_message:
merged_message = f"{merged_message}\n\n{formatted_tool_message}"
else:
merged_message = formatted_tool_message
# 发送合并后的消息
if merged_message:
await self.send_tool_message(merged_message, title="MoviePilot助手")
logger.debug(f'Executing tool {self.name} with args: {kwargs}') logger.debug(f'Executing tool {self.name} with args: {kwargs}')
result = await self.run(**kwargs) result = await self.run(**kwargs)