wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-07 20:12:35 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixed not taking rawLink into account.

Browse Source
This commit is contained in:
Deluxe233 2026-01-26 03:50:50 -05:00
parent 232995856e
commit 38ab4e3c76
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
comfy_execution/caching.py
View File

@ -157,7 +157,7 @@ class CacheKeySetUpdatableInputSignature(CacheKeySet):
assert ancestor_id in self.node_sig_cache assert ancestor_id in self.node_sig_cache
signatures.append(self.node_sig_cache[ancestor_id]) signatures.append(self.node_sig_cache[ancestor_id])
logging.debug(f"signature for {node_id}:\n{signatures}") logging.debug(f"signature for node {node_id}: {signatures}")
return to_hashable(signatures) return to_hashable(signatures)
async def get_immediate_node_signature(self, node_id, ancestor_order_mapping: dict, inputs: dict): async def get_immediate_node_signature(self, node_id, ancestor_order_mapping: dict, inputs: dict):
@ -202,6 +202,11 @@ class CacheKeySetUpdatableInputSignature(CacheKeySet):
return ancestors, order_mapping, input_hashes return ancestors, order_mapping, input_hashes
def get_ordered_ancestry_internal(self, node_id): def get_ordered_ancestry_internal(self, node_id):
def get_hashable(obj):
try:
return throw_on_unhashable(obj)
except:
return Unhashable
ancestors = [] ancestors = []
input_hashes = {} input_hashes = {}
@ -214,26 +219,25 @@ class CacheKeySetUpdatableInputSignature(CacheKeySet):
input_data_all, _, _ = self.is_changed.get_input_data(node_id) input_data_all, _, _ = self.is_changed.get_input_data(node_id)
inputs = self.dynprompt.get_node(node_id)["inputs"] inputs = self.dynprompt.get_node(node_id)["inputs"]
for key in sorted(inputs.keys()): for key in sorted(inputs.keys()):
input = inputs[key]
if key in input_data_all: if key in input_data_all:
if is_link(input): if is_link(inputs[key]):
ancestor_id = input[0] ancestor_id = inputs[key][0]
try: hashable = get_hashable(input_data_all[key])
# Replace link with input's hash if hashable is Unhashable or is_link(input_data_all[key]):
hashable = throw_on_unhashable(input_data_all[key])
input_hashes[key] = hash(hashable)
except:
# Link still needed # Link still needed
input_hashes[key] = input input_hashes[key] = inputs[key]
if ancestor_id not in ancestors: if ancestor_id not in ancestors:
ancestors.append(ancestor_id) ancestors.append(ancestor_id)
else: else:
try: # Replace link with input's hash
hashable = throw_on_unhashable(input)
input_hashes[key] = hash(hashable) input_hashes[key] = hash(hashable)
except: else:
logging.warning(f"Node {node_id} cannot be cached due to whatever this thing is: {input}") hashable = get_hashable(inputs[key])
if hashable is Unhashable:
logging.warning(f"Node {node_id} cannot be cached due to whatever this thing is: {inputs[key]}")
input_hashes[key] = Unhashable() input_hashes[key] = Unhashable()
else:
input_hashes[key] = hash(hashable)
self.ancestry_cache[node_id] = ancestors self.ancestry_cache[node_id] = ancestors
return self.ancestry_cache[node_id], input_hashes return self.ancestry_cache[node_id], input_hashes