diff --git a/javascript/progressBar.js b/javascript/progressBar.js index f0e19e725..5c148836b 100644 --- a/javascript/progressBar.js +++ b/javascript/progressBar.js @@ -34,7 +34,7 @@ function checkPaused(state) { } function setProgress(res) { - const elements = ['txt2img_generate', 'img2img_generate', 'extras_generate', 'control_generate', 'video_generate']; + const elements = ['txt2img_generate', 'img2img_generate', 'extras_generate', 'control_generate', 'video_generate', 'framepack_generate']; const progress = res?.progress || 0; const job = res?.job || ''; let perc = ''; diff --git a/javascript/ui.js b/javascript/ui.js index 9a5f2b794..b8112d523 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -189,10 +189,6 @@ function get_img2img_tab_index(...args) { function create_submit_args(args) { const res = Array.from(args); - // As it is currently, txt2img and img2img send back the previous output args (txt2img_gallery, generation_info, html_info) whenever you generate a new image. - // This can lead to uploading a huge gallery of previously generated images, which leads to an unnecessary delay between submitting and beginning to generate. - // I don't know why gradio is sending outputs along with inputs, but we can prevent sending the image gallery here, which seems to be an issue for some. - // If gradio at some point stops sending outputs, this may break something if (Array.isArray(res[res.length - 3])) res[res.length - 3] = null; return res; } diff --git a/modules/call_queue.py b/modules/call_queue.py index b33a9b6b2..6963ca8a5 100644 --- a/modules/call_queue.py +++ b/modules/call_queue.py @@ -95,7 +95,7 @@ def wrap_gradio_call(func, extra_outputs=None, add_stats=False, name=None): if ram['used'] > 0: cpu += f"| RAM {ram['used']} GB" cpu += f" {round(100.0 * ram['used'] / ram['total'])}%" if ram['total'] > 0 else '' - if isinstance(res, list): + if isinstance(res, list) and isinstance(res[-1], str): res[-1] += f"
Time: {elapsed_text} | {summary} {gpu} {cpu}