Merge branch 'dev' into npu_support

1 files changed, 10 insertions, 3 deletions

diff --git a/modules/ui_toprow.py b/modules/ui_toprow.py
index 88838f97..fbe705be 100644
--- a/modules/ui_toprow.py
+++ b/modules/ui_toprow.py
@@ -79,11 +79,11 @@ class Toprow:
     def create_prompts(self):

         with gr.Column(elem_id=f"{self.id_part}_prompt_container", elem_classes=["prompt-container-compact"] if self.is_compact else [], scale=6):

             with gr.Row(elem_id=f"{self.id_part}_prompt_row", elem_classes=["prompt-row"]):

-                self.prompt = gr.Textbox(label="Prompt", elem_id=f"{self.id_part}_prompt", show_label=False, lines=3, placeholder="Prompt (press Ctrl+Enter or Alt+Enter to generate)", elem_classes=["prompt"])

+                self.prompt = gr.Textbox(label="Prompt", elem_id=f"{self.id_part}_prompt", show_label=False, lines=3, placeholder="Prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])

                 self.prompt_img = gr.File(label="", elem_id=f"{self.id_part}_prompt_image", file_count="single", type="binary", visible=False)

 

             with gr.Row(elem_id=f"{self.id_part}_neg_prompt_row", elem_classes=["prompt-row"]):

-                self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{self.id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt (press Ctrl+Enter or Alt+Enter to generate)", elem_classes=["prompt"])

+                self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{self.id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])

 

         self.prompt_img.change(

             fn=modules.images.image_data,

@@ -106,8 +106,15 @@ class Toprow:
                 outputs=[],

             )

 

+            def interrupt_function():

+                if not shared.state.stopping_generation and shared.state.job_count > 1 and shared.opts.interrupt_after_current:

+                    shared.state.stop_generating()

+                    gr.Info("Generation will stop after finishing this image, click again to stop immediately.")

+                else:

+                    shared.state.interrupt()

+

             self.interrupt.click(

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

+                fn=interrupt_function,

                 inputs=[],

                 outputs=[],

             )