wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-02 13:22:32 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Update caching hash recursion

Browse Source
This commit is contained in:
xmarre 2026-03-14 10:31:07 +01:00
parent 3568b82b76
commit 1af99b2e81
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
comfy_execution/caching.py
View File

@ -122,8 +122,14 @@ def _sanitize_signature_input(obj, depth=0, max_depth=32):
# the foreign object and risk crashing on custom container semantics. # the foreign object and risk crashing on custom container semantics.
return Unhashable() return Unhashable()
def to_hashable(obj): def to_hashable(obj, depth=0, max_depth=32, seen=None):
"""Convert prompt-safe built-in values into a stable hashable representation.""" """Convert prompt-safe built-in values into a stable hashable representation."""
if depth >= max_depth:
return Unhashable()
if seen is None:
seen = set()
# Restrict recursion to plain built-in containers. Some custom nodes insert # Restrict recursion to plain built-in containers. Some custom nodes insert
# runtime objects into prompt inputs for dynamic graph paths; walking those # runtime objects into prompt inputs for dynamic graph paths; walking those
# objects as generic Mappings / Sequences is unsafe and can destabilize the # objects as generic Mappings / Sequences is unsafe and can destabilize the
@ -131,16 +137,32 @@ def to_hashable(obj):
obj_type = type(obj) obj_type = type(obj)
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:
return ("dict", frozenset((to_hashable(k), to_hashable(v)) for k, v in obj.items())) if obj_type in (dict, list, tuple, set, frozenset):
obj_id = id(obj)
if obj_id in seen:
return Unhashable()
seen = seen | {obj_id}
if obj_type is dict:
return (
"dict",
frozenset(
(
to_hashable(k, depth + 1, max_depth, seen),
to_hashable(v, depth + 1, max_depth, seen),
)
for k, v in obj.items()
),
)
elif obj_type is list: elif obj_type is list:
return ("list", tuple(to_hashable(i) for i in obj)) return ("list", tuple(to_hashable(i, depth + 1, max_depth, seen) for i in obj))
elif obj_type is tuple: elif obj_type is tuple:
return ("tuple", tuple(to_hashable(i) for i in obj)) return ("tuple", tuple(to_hashable(i, depth + 1, max_depth, seen) for i in obj))
elif obj_type is set: elif obj_type is set:
return ("set", frozenset(to_hashable(i) for i in obj)) return ("set", frozenset(to_hashable(i, depth + 1, max_depth, seen) for i in obj))
elif obj_type is frozenset: elif obj_type is frozenset:
return ("frozenset", frozenset(to_hashable(i) for i in obj)) return ("frozenset", frozenset(to_hashable(i, depth + 1, max_depth, seen) for i in obj))
else: else:
return Unhashable() return Unhashable()