wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-22 09:33:29 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add cycle detection to signature input sanitization

Browse Source
This commit is contained in:
xmarre 2026-03-14 12:04:31 +01:00
parent 1451001f64
commit 31ba844624
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
comfy_execution/caching.py
View File

@ -85,22 +85,32 @@ def _sanitized_sort_key(obj, depth=0, max_depth=32):
return (obj_type.__module__, obj_type.__qualname__, "OPAQUE") return (obj_type.__module__, obj_type.__qualname__, "OPAQUE")
def _sanitize_signature_input(obj, depth=0, max_depth=32): def _sanitize_signature_input(obj, depth=0, max_depth=32, seen=None):
"""Normalize signature inputs to safe built-in containers. """Normalize signature inputs to safe built-in containers.
Preserves built-in container type and replaces opaque runtime values with Unhashable(). Preserves built-in container type, replaces opaque runtime values with
Unhashable(), and stops safely on cycles or excessive depth.
""" """
if depth >= max_depth: if depth >= max_depth:
return Unhashable() return Unhashable()
if seen is None:
seen = set()
obj_type = type(obj) obj_type = type(obj)
if obj_type in (dict, list, tuple, set, frozenset):
obj_id = id(obj)
if obj_id in seen:
return Unhashable()
next_seen = seen | {obj_id}
if obj_type in (int, float, str, bool, bytes, type(None)): if obj_type in (int, float, str, bool, bytes, type(None)):
return obj return obj
elif obj_type is dict: elif obj_type is dict:
sanitized_items = [ sanitized_items = [
( (
_sanitize_signature_input(key, depth + 1, max_depth), _sanitize_signature_input(key, depth + 1, max_depth, next_seen),
_sanitize_signature_input(value, depth + 1, max_depth), _sanitize_signature_input(value, depth + 1, max_depth, next_seen),
) )
for key, value in obj.items() for key, value in obj.items()
] ]
@ -112,13 +122,13 @@ def _sanitize_signature_input(obj, depth=0, max_depth=32):
) )
return {key: value for key, value in sanitized_items} return {key: value for key, value in sanitized_items}
elif obj_type is list: elif obj_type is list:
return [_sanitize_signature_input(item, depth + 1, max_depth) for item in obj] return [_sanitize_signature_input(item, depth + 1, max_depth, next_seen) for item in obj]
elif obj_type is tuple: elif obj_type is tuple:
return tuple(_sanitize_signature_input(item, depth + 1, max_depth) for item in obj) return tuple(_sanitize_signature_input(item, depth + 1, max_depth, next_seen) for item in obj)
elif obj_type is set: elif obj_type is set:
return {_sanitize_signature_input(item, depth + 1, max_depth) for item in obj} return {_sanitize_signature_input(item, depth + 1, max_depth, next_seen) for item in obj}
elif obj_type is frozenset: elif obj_type is frozenset:
return frozenset(_sanitize_signature_input(item, depth + 1, max_depth) for item in obj) return frozenset(_sanitize_signature_input(item, depth + 1, max_depth, next_seen) for item in obj)
else: else:
# Execution-cache signatures should be built from prompt-safe values. # Execution-cache signatures should be built from prompt-safe values.
# If a custom node injects a runtime object here, mark it unhashable so # If a custom node injects a runtime object here, mark it unhashable so