Merge branch 'master' into api-authorization

1 files changed, 13 insertions, 2 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 5dce7f3b..5dd97754 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -69,8 +69,11 @@ sample_img2img = sample_img2img if os.path.exists(sample_img2img) else None
 css_hide_progressbar = """

 .wrap .m-12 svg { display:none!important; }

 .wrap .m-12::before { content:"Loading..." }

+.wrap .z-20 svg { display:none!important; }

+.wrap .z-20::before { content:"Loading..." }

 .progress-bar { display:none!important; }

 .meta-text { display:none!important; }

+.meta-text-center { display:none!important; }

 """

 

 # Using constants for these since the variation selector isn't visible.

@@ -142,7 +145,7 @@ def save_files(js_data, images, do_make_zip, index):
                 filenames.append(os.path.basename(txt_fullfn))

                 fullfns.append(txt_fullfn)

 

-        writer.writerow([data["prompt"], data["seed"], data["width"], data["height"], data["sampler"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])

+        writer.writerow([data["prompt"], data["seed"], data["width"], data["height"], data["sampler_name"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])

 

     # Make Zip

     if do_make_zip:

@@ -1249,7 +1252,9 @@ def create_ui(wrap_gradio_gpu_call):
                             gr.HTML(value="")

 

                         with gr.Column():

-                            run_preprocess = gr.Button(value="Preprocess", variant='primary')

+                            with gr.Row():

+                                interrupt_preprocessing = gr.Button("Interrupt")

+                                run_preprocess = gr.Button(value="Preprocess", variant='primary')

 

                     process_split.change(

                         fn=lambda show: gr_show(show),

@@ -1422,6 +1427,12 @@ def create_ui(wrap_gradio_gpu_call):
             outputs=[],

         )

 

+        interrupt_preprocessing.click(

+            fn=lambda: shared.state.interrupt(),

+            inputs=[],

+            outputs=[],

+        )

+

     def create_setting_component(key, is_quicksettings=False):

         def fun():

             return opts.data[key] if key in opts.data else opts.data_labels[key].default