Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7c8a4cc

Browse files
Merge pull requestAUTOMATIC1111#16202 from light-and-ray/do_not_break_progressbar_on_non-job_actions
[bug] do not break progressbar on non-job actions (add wrap_gradio_call_no_job)
2 parents5d26c6a +589dda3 commit7c8a4cc

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

‎modules/call_queue.py‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,22 @@ def f(*args, **kwargs):
4747

4848

4949
defwrap_gradio_call(func,extra_outputs=None,add_stats=False):
50+
@wraps(func)
51+
deff(*args,**kwargs):
52+
try:
53+
res=func(*args,**kwargs)
54+
finally:
55+
shared.state.skipped=False
56+
shared.state.interrupted=False
57+
shared.state.stopping_generation=False
58+
shared.state.job_count=0
59+
shared.state.job=""
60+
returnres
61+
62+
returnwrap_gradio_call_no_job(f,extra_outputs,add_stats)
63+
64+
65+
defwrap_gradio_call_no_job(func,extra_outputs=None,add_stats=False):
5066
@wraps(func)
5167
deff(*args,extra_outputs_array=extra_outputs,**kwargs):
5268
run_memmon=shared.opts.memmon_poll_rate>0andnotshared.mem_mon.disabledandadd_stats
@@ -66,9 +82,6 @@ def f(*args, extra_outputs_array=extra_outputs, **kwargs):
6682
arg_str+=f" (Argument list truncated at{max_debug_str_len}/{len(arg_str)} characters)"
6783
errors.report(f"{message}\n{arg_str}",exc_info=True)
6884

69-
shared.state.job=""
70-
shared.state.job_count=0
71-
7285
ifextra_outputs_arrayisNone:
7386
extra_outputs_array= [None,'']
7487

@@ -77,11 +90,6 @@ def f(*args, extra_outputs_array=extra_outputs, **kwargs):
7790

7891
devices.torch_gc()
7992

80-
shared.state.skipped=False
81-
shared.state.interrupted=False
82-
shared.state.stopping_generation=False
83-
shared.state.job_count=0
84-
8593
ifnotadd_stats:
8694
returntuple(res)
8795

@@ -123,3 +131,4 @@ def f(*args, extra_outputs_array=extra_outputs, **kwargs):
123131
returntuple(res)
124132

125133
returnf
134+

‎modules/ui.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
importgradio.utils
1111
importnumpyasnp
1212
fromPILimportImage,PngImagePlugin# noqa: F401
13-
frommodules.call_queueimportwrap_gradio_gpu_call,wrap_queued_call,wrap_gradio_call
13+
frommodules.call_queueimportwrap_gradio_gpu_call,wrap_queued_call,wrap_gradio_call,wrap_gradio_call_no_job# noqa: F401
1414

1515
frommodulesimportgradio_extensons,sd_schedulers# noqa: F401
1616
frommodulesimportsd_hijack,sd_models,script_callbacks,ui_extensions,deepbooru,extra_networks,ui_common,ui_postprocessing,progress,ui_loadsave,shared_items,ui_settings,timer,sysinfo,ui_checkpoint_merger,scripts,sd_samplers,processing,ui_extra_networks,ui_toprow,launch_utils
@@ -889,7 +889,7 @@ def select_img2img_tab(tab):
889889
))
890890

891891
image.change(
892-
fn=wrap_gradio_call(modules.extras.run_pnginfo),
892+
fn=wrap_gradio_call_no_job(modules.extras.run_pnginfo),
893893
inputs=[image],
894894
outputs=[html,generation_info,html2],
895895
)

‎modules/ui_common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def open_folder(f, images=None, index=None):
231231
)
232232

233233
save.click(
234-
fn=call_queue.wrap_gradio_call(save_files),
234+
fn=call_queue.wrap_gradio_call_no_job(save_files),
235235
_js="(x, y, z, w) => [x, y, false, selected_gallery_index()]",
236236
inputs=[
237237
res.generation_info,
@@ -247,7 +247,7 @@ def open_folder(f, images=None, index=None):
247247
)
248248

249249
save_zip.click(
250-
fn=call_queue.wrap_gradio_call(save_files),
250+
fn=call_queue.wrap_gradio_call_no_job(save_files),
251251
_js="(x, y, z, w) => [x, y, true, selected_gallery_index()]",
252252
inputs=[
253253
res.generation_info,

‎modules/ui_extensions.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -624,37 +624,37 @@ def create_ui():
624624
)
625625

626626
install_extension_button.click(
627-
fn=modules.ui.wrap_gradio_call(install_extension_from_index,extra_outputs=[gr.update(),gr.update()]),
627+
fn=modules.ui.wrap_gradio_call_no_job(install_extension_from_index,extra_outputs=[gr.update(),gr.update()]),
628628
inputs=[extension_to_install,selected_tags,showing_type,filtering_type,sort_column,search_extensions_text],
629629
outputs=[available_extensions_table,extensions_table,install_result],
630630
)
631631

632632
search_extensions_text.change(
633-
fn=modules.ui.wrap_gradio_call(search_extensions,extra_outputs=[gr.update()]),
633+
fn=modules.ui.wrap_gradio_call_no_job(search_extensions,extra_outputs=[gr.update()]),
634634
inputs=[search_extensions_text,selected_tags,showing_type,filtering_type,sort_column],
635635
outputs=[available_extensions_table,install_result],
636636
)
637637

638638
selected_tags.change(
639-
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
639+
fn=modules.ui.wrap_gradio_call_no_job(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
640640
inputs=[selected_tags,showing_type,filtering_type,sort_column,search_extensions_text],
641641
outputs=[available_extensions_table,install_result]
642642
)
643643

644644
showing_type.change(
645-
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
645+
fn=modules.ui.wrap_gradio_call_no_job(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
646646
inputs=[selected_tags,showing_type,filtering_type,sort_column,search_extensions_text],
647647
outputs=[available_extensions_table,install_result]
648648
)
649649

650650
filtering_type.change(
651-
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
651+
fn=modules.ui.wrap_gradio_call_no_job(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
652652
inputs=[selected_tags,showing_type,filtering_type,sort_column,search_extensions_text],
653653
outputs=[available_extensions_table,install_result]
654654
)
655655

656656
sort_column.change(
657-
fn=modules.ui.wrap_gradio_call(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
657+
fn=modules.ui.wrap_gradio_call_no_job(refresh_available_extensions_for_tags,extra_outputs=[gr.update()]),
658658
inputs=[selected_tags,showing_type,filtering_type,sort_column,search_extensions_text],
659659
outputs=[available_extensions_table,install_result]
660660
)
@@ -667,7 +667,7 @@ def create_ui():
667667
install_result=gr.HTML(elem_id="extension_install_result")
668668

669669
install_button.click(
670-
fn=modules.ui.wrap_gradio_call(lambda*args: [gr.update(),*install_extension_from_url(*args)],extra_outputs=[gr.update(),gr.update()]),
670+
fn=modules.ui.wrap_gradio_call_no_job(lambda*args: [gr.update(),*install_extension_from_url(*args)],extra_outputs=[gr.update(),gr.update()]),
671671
inputs=[install_dirname,install_url,install_branch],
672672
outputs=[install_url,extensions_table,install_result],
673673
)

‎modules/ui_settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importgradioasgr
22

33
frommodulesimportui_common,shared,script_callbacks,scripts,sd_models,sysinfo,timer,shared_items
4-
frommodules.call_queueimportwrap_gradio_call
4+
frommodules.call_queueimportwrap_gradio_call_no_job
55
frommodules.optionsimportoptions_section
66
frommodules.sharedimportopts
77
frommodules.ui_componentsimportFormRow
@@ -295,7 +295,7 @@ def add_quicksettings(self):
295295

296296
defadd_functionality(self,demo):
297297
self.submit.click(
298-
fn=wrap_gradio_call(lambda*args:self.run_settings(*args),extra_outputs=[gr.update()]),
298+
fn=wrap_gradio_call_no_job(lambda*args:self.run_settings(*args),extra_outputs=[gr.update()]),
299299
inputs=self.components,
300300
outputs=[self.text_settings,self.result],
301301
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp