Skip to content

feat: tool workflow node cancel #7335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hexiaonan-800 merged 1 commit into from
Oct 14, 2026
Merged

feat: tool workflow node cancel #7335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions apps/application/workflow/nodes/tool_workflow_lib_node/tool_workflow_lib_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@ class ToolWorkflowLibNode(INode):
supported_workflow_type_list = [WorkflowType.APPLICATION, WorkflowType.KNOWLEDGE, WorkflowType.TOOL]
type = "tool-workflow-lib-node"

def __init__(self, node, workflow_manage, get_node_parameters):
super().__init__(node, workflow_manage, get_node_parameters)
self._current_sub_manage = None

def cancel(self):
super().cancel()
if self._current_sub_manage:
self._current_sub_manage.cancel()

def _run(self):
# 完成时机由子工作流的 on_complete 回调驱动，这里不自动 complete
self.execute()
Expand Down Expand Up @@ -120,6 +129,7 @@ def on_next(wf_manage, content):
self.write(content)

def on_complete(wf_manage, error):
self._current_sub_manage = None
# 收集工具工作流输出（tool-start-node 初始化、变量赋值节点覆写）
output = dict(wf_manage.context.get("output", {}) or {})
# 只有需要给下游引用的数据才写 context：各输出字段
Expand All @@ -131,6 +141,10 @@ def on_complete(wf_manage, error):
self.data["message_tokens"] = _sum_tokens(wf_manage.context, "message_tokens")
self.data["answer_tokens"] = _sum_tokens(wf_manage.context, "answer_tokens")

# 子工作流被取消：如实以 CANCELLED 结束本节点
if wf_manage.signal == Signal.CANCELLED or self.workflow_manage.signal == Signal.CANCELLED:
self.complete(Status.CANCELLED)
return
if error:
self.complete(Status.FAIL, error=error)
return
Expand Down Expand Up @@ -167,6 +181,11 @@ def get_start_node_fn(wf, wm):
get_start_node=get_start_node_fn,
)
sub_manage.start_node.workflow_manage = sub_manage
self._current_sub_manage = sub_manage
# 取消发生在构造之后、启动之前：不再启动子工作流
if self.status == Status.CANCELLED or self.workflow_manage.signal == Signal.CANCELLED:
self.complete(Status.CANCELLED)
return
# 子工作流的输出已在 on_next 中逐块转发给父工作流，无需按 is_result 重复输出
sub_manage.run()

Expand Down
Loading