youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-04 01:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(workflow): missing parallel event in workflow app

Browse Source
This commit is contained in:
takatost
2024-08-30 20:04:17 +08:00
parent 77e62f7fee
commit 162e9677c7
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/core/workflow/graph_engine/entities/graph.py
View File

@ -516,22 +516,21 @@ class Graph(BaseModel):
duplicate_end_node_ids[(node_id, node_id2)] = branch_node_ids
for (node_id, node_id2), branch_node_ids in duplicate_end_node_ids.items():
if node_id not in merge_branch_node_ids or node_id2 not in branch_node_ids:
continue
# check which node is after
if cls._is_node2_after_node1(
node1_id=node_id,
node2_id=node_id2,
edge_mapping=edge_mapping
):
del merge_branch_node_ids[node_id]
if node_id in merge_branch_node_ids:
del merge_branch_node_ids[node_id]
elif cls._is_node2_after_node1(
node1_id=node_id2,
node2_id=node_id,
edge_mapping=edge_mapping
):
del merge_branch_node_ids[node_id2]
if node_id2 in merge_branch_node_ids:
del merge_branch_node_ids[node_id2]
branches_merge_node_ids: dict[str, str] = {}
for node_id, branch_node_ids in merge_branch_node_ids.items():