Browse Source

fix: improve merge branch node ID checks in graph engine (#12128)

Signed-off-by: -LAN- <laipz8200@outlook.com>
-LAN- 3 months ago
parent
commit
26b5680913
1 changed files with 2 additions and 2 deletions
  1. 2 2
      api/core/workflow/graph_engine/entities/graph.py

+ 2 - 2
api/core/workflow/graph_engine/entities/graph.py

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