opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-01 06:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/chore-fix' into dev/plugin-deploy

Browse Source
This commit is contained in:
Yeuoly 2024-12-27 17:55:57 +08:00
commit b1522e860a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/core/workflow/nodes/tool/tool_node.py
View File

@ -193,7 +193,7 @@ class ToolNode(BaseNode[ToolNodeData]):
files: list[File] = [] files: list[File] = []
json: list[dict] = [] json: list[dict] = []
agent_logs: list[AgentLog] = [] agent_logs: list[AgentLogEvent] = []
variables: dict[str, Any] = {} variables: dict[str, Any] = {}
@ -288,7 +288,7 @@ class ToolNode(BaseNode[ToolNodeData]):
files.append(message.meta["file"]) files.append(message.meta["file"])
elif message.type == ToolInvokeMessage.MessageType.LOG: elif message.type == ToolInvokeMessage.MessageType.LOG:
assert isinstance(message.message, ToolInvokeMessage.LogMessage) assert isinstance(message.message, ToolInvokeMessage.LogMessage)
yield AgentLogEvent( agent_log = AgentLogEvent(
id=message.message.id, id=message.message.id,
node_execution_id=self.id, node_execution_id=self.id,
parent_id=message.message.parent_id, parent_id=message.message.parent_id,
@ -298,11 +298,25 @@ class ToolNode(BaseNode[ToolNodeData]):
label=message.message.label, label=message.message.label,
) )
# check if the agent log is already in the list
for log in agent_logs:
if log.id == agent_log.id:
# update the log
log.data = agent_log.data
log.status = agent_log.status
log.error = agent_log.error
log.label = agent_log.label
break
else:
agent_logs.append(agent_log)
yield agent_log
yield RunCompletedEvent( yield RunCompletedEvent(
run_result=NodeRunResult( run_result=NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED, status=WorkflowNodeExecutionStatus.SUCCEEDED,
outputs={"text": text, "files": files, "json": json, **variables}, outputs={"text": text, "files": files, "json": json, **variables},
metadata={NodeRunMetadataKey.TOOL_INFO: tool_info}, metadata={NodeRunMetadataKey.TOOL_INFO: tool_info, NodeRunMetadataKey.AGENT_LOG: agent_logs},
inputs=parameters_for_log, inputs=parameters_for_log,
) )
) )