Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

execution: Add anti-cycle validation (#13169)

rattus2327fa1c9086
diff --git a/execution.py b/execution.py
index 5e02dffb2..e15eb4bda 100644
--- a/execution.py
+++ b/execution.py
@@ -811,11 +811,30 @@ class PromptExecutor:
self._notify_prompt_lifecycle("end", prompt_id)
-async def validate_inputs(prompt_id, prompt, item, validated):
+async def validate_inputs(prompt_id, prompt, item, validated, visiting=None):
+ if visiting is None:
+ visiting = []
+
unique_id = item
if unique_id in validated:
return validated[unique_id]
+ if unique_id in visiting:
+ cycle_path_nodes = visiting[visiting.index(unique_id):] + [unique_id]
+ cycle_nodes = list(dict.fromkeys(cycle_path_nodes))
+ cycle_path = " -> ".join(f"{node_id} ({prompt[node_id]['class_type']})" for node_id in cycle_path_nodes)
+ for node_id in cycle_nodes:
+ validated[node_id] = (False, [{
+ "type": "dependency_cycle",
+ "message": "Dependency cycle detected",
+ "details": cycle_path,
+ "extra_info": {
+ "node_id": node_id,
+ "cycle_nodes": cycle_nodes,
+ }
+ }], node_id)
+ return validated[unique_id]
+
inputs = prompt[unique_id]['inputs']
class_type = prompt[unique_id]['class_type']
obj_class = nodes.NODE_CLASS_MAPPINGS[class_type]
@@ -899,7 +918,11 @@ async def validate_inputs(prompt_id, prompt, item, validated):
errors.append(error)
continue
try:
- r = await validate_inputs(prompt_id, prompt, o_id, validated)
+ visiting.append(unique_id)
+ try:
+ r = await validate_inputs(prompt_id, prompt, o_id, validated, visiting)
+ finally:
+ visiting.pop()
if r[0] is False:
# `r` will be set in `validated[o_id]` already
valid = False
@@ -1048,10 +1071,13 @@ async def validate_inputs(prompt_id, prompt, item, validated):
errors.append(error)
continue
- if len(errors) > 0 or valid is not True:
- ret = (False, errors, unique_id)
- else:
- ret = (True, [], unique_id)
+ ret = validated.get(unique_id, (True, [], unique_id))
+ # Recursive cycle detection may have already populated an error on us. Join it.
+ ret = (
+ ret[0] and valid is True and not errors,
+ ret[1] + [error for error in errors if error not in ret[1]],
+ unique_id,
+ )
validated[unique_id] = ret
return ret