wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-14 19:17:32 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Fix outputs shifting around when restoring from history

Browse Source
This commit is contained in:
space-nuko 2023-05-15 18:41:15 -05:00
parent f9ef1b6155
commit c13fe47de6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
execution.py
View File

@ -195,11 +195,15 @@ def get_output_data(obj, input_data_all_batches, server, unique_id, prompt_id):
all_outputs.append(output)
all_outputs_ui.append(output_ui)
outputs_ui_to_send = None
if any(all_outputs_ui):
outputs_ui_to_send = all_outputs_ui
# update the UI after each batch finishes
if server.client_id is not None:
message = {
"node": unique_id,
"output": all_outputs_ui, # list of outputs so far
"output": outputs_ui_to_send,
"prompt_id": prompt_id,
"batch_num": batch_num,
"total_batches": total_batches
@ -233,7 +237,10 @@ def recursive_execute(server, prompt, outputs, current_item, extra_data, execute
output_data_from_batches, output_ui_from_batches = get_output_data(obj, input_data_all_batches, server, unique_id, prompt_id)
outputs[unique_id] = output_data_from_batches
outputs_ui[unique_id] = output_ui_from_batches
if any(output_ui_from_batches):
outputs_ui[unique_id] = output_ui_from_batches
elif unique_id in outputs_ui:
outputs_ui.pop(unique_id)
executed.add(unique_id)
def recursive_will_execute(prompt, outputs, current_item):

2
web/scripts/app.js
View File

@ -353,8 +353,6 @@ export class ComfyApp {
node.prototype.onDrawBackground = function (ctx) {
if (!this.flags.collapsed) {
// Outputs returned by the frontend for each node are a list, one for each combinatorial batch run.
// With no combinatorial outputs, it's a list of length 1.
const outputs = app.nodeOutputs[this.id + ""]
if (outputs && this.batchOutputs !== outputs) {
this.batchOutputs = outputs;