wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-08 10:47:32 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

object storage application fix2

Browse Source
This commit is contained in:
Dr.Lt.Data 2023-07-01 10:43:59 +09:00
parent 5372c5e8b5
commit 10fb995928
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
worklist_execution.py
View File

@ -125,6 +125,15 @@ def get_class_def(prompt, unique_id):
return class_def return class_def
def get_class_type(prompt, unique_id):
if 'class_type' in prompt[unique_id]:
class_type = prompt[unique_id]['class_type']
else:
class_type = "DummyNode"
return class_type
def get_next_nodes_map(prompt): def get_next_nodes_map(prompt):
next_nodes = {} next_nodes = {}
for key, value in prompt.items(): for key, value in prompt.items():
@ -218,7 +227,7 @@ def worklist_execute(server, prompt, outputs, extra_data, prompt_id, outputs_ui,
unique_id = get_work() unique_id = get_work()
inputs = prompt[unique_id]['inputs'] inputs = prompt[unique_id]['inputs']
class_type = prompt[unique_id]['class_type'] class_type = get_class_type(prompt, unique_id)
class_def = get_class_def(prompt, unique_id) class_def = get_class_def(prompt, unique_id)
print_dbg(lambda: f"work: {unique_id} ({class_def.__name__}) / worklist: {list(worklist.queue)}") print_dbg(lambda: f"work: {unique_id} ({class_def.__name__}) / worklist: {list(worklist.queue)}")
@ -457,17 +466,17 @@ class PromptExecutor:
d = self.outputs.pop(o) d = self.outputs.pop(o)
del d del d
# Next, remove the subsequent outputs since they will not be executed to_delete = []
to_delete = [] for o in self.object_storage:
for o in self.outputs: if o[0] not in prompt:
if (o not in current_outputs) and (o not in executed): to_delete += [o]
to_delete += [o] else:
if o in self.old_prompt: p = prompt[o[0]]
d = self.old_prompt.pop(o) if o[1] != p['class_type']:
del d to_delete += [o]
for o in to_delete: for o in to_delete:
d = self.outputs.pop(o) d = self.object_storage.pop(o)
del d del d
def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]): def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]):
nodes.interrupt_processing(False) nodes.interrupt_processing(False)