outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Restore the parts that were overwritten during conflict resolution. (#14141)

Browse Source
This commit is contained in:
Novice 2025-03-04 11:21:16 +08:00 committed by GitHub
parent 7ff527293a
commit 24d80000ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,8 +590,6 @@ class Graph(BaseModel):
start_node_id=node_id, start_node_id=node_id,
routes_node_ids=routes_node_ids, routes_node_ids=routes_node_ids,
) )
# Exclude conditional branch nodes
and all(edge.run_condition is None for edge in reverse_edge_mapping.get(node_id, []))
): ):
if node_id not in merge_branch_node_ids: if node_id not in merge_branch_node_ids:
merge_branch_node_ids[node_id] = [] merge_branch_node_ids[node_id] = []