From 2f6ebbf87699220854d4893d5f217c8760ba6049 Mon Sep 17 00:00:00 2001
From: lllyasviel <lyuminzhang@outlook.com>
Date: Thu, 28 Dec 2023 08:04:12 -0800
Subject: [PATCH] some fix for previous PRs

---
 fooocus_version.py        |  2 +-
 modules/meta_parser.py    |  8 ++++++--
 modules/private_logger.py |  2 +-
 webui.py                  | 19 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/fooocus_version.py b/fooocus_version.py
index 2511cfc7..b8f79381 100644
--- a/fooocus_version.py
+++ b/fooocus_version.py
@@ -1 +1 @@
-version = '2.1.855'
+version = '2.1.856'
diff --git a/modules/meta_parser.py b/modules/meta_parser.py
index 78d73978..07b42a16 100644
--- a/modules/meta_parser.py
+++ b/modules/meta_parser.py
@@ -3,7 +3,7 @@ import gradio as gr
 import modules.config
 
 
-def load_parameter_button_click(raw_prompt_txt):
+def load_parameter_button_click(raw_prompt_txt, is_generating):
     loaded_parameter_dict = json.loads(raw_prompt_txt)
     assert isinstance(loaded_parameter_dict, dict)
 
@@ -128,7 +128,11 @@ def load_parameter_button_click(raw_prompt_txt):
         results.append(gr.update())
         results.append(gr.update())
 
-    results.append(gr.update(visible=True))
+    if is_generating:
+        results.append(gr.update())
+    else:
+        results.append(gr.update(visible=True))
+    
     results.append(gr.update(visible=False))
 
     for i in range(1, 6):
diff --git a/modules/private_logger.py b/modules/private_logger.py
index 022d4f8f..968bd4f5 100644
--- a/modules/private_logger.py
+++ b/modules/private_logger.py
@@ -43,7 +43,7 @@ def log(img, dic):
         "</style>"
     )
 
-js = (
+    js = (
         """<script>
         function to_clipboard(txt) { 
         txt = decodeURIComponent(txt);
diff --git a/webui.py b/webui.py
index ae0be2a6..53861090 100644
--- a/webui.py
+++ b/webui.py
@@ -513,7 +513,9 @@ with shared.gradio_root:
         ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt]
         ctrls += ip_ctrls
 
-        def parse_meta(raw_prompt_txt):
+        state_is_generating = gr.State(False)
+
+        def parse_meta(raw_prompt_txt, is_generating):
             loaded_json = None
             try:
                 if '{' in raw_prompt_txt:
@@ -525,13 +527,16 @@ with shared.gradio_root:
                 loaded_json = None
 
             if loaded_json is None:
-                return gr.update(), gr.update(), gr.update(visible=False)
+                if is_generating:
+                    return gr.update(), gr.update(), gr.update()
+                else:
+                    return gr.update(), gr.update(visible=True), gr.update(visible=False)
 
             return json.dumps(loaded_json), gr.update(visible=False), gr.update(visible=True)
 
-        prompt.input(parse_meta, inputs=prompt, outputs=[prompt, generate_button, load_parameter_button], queue=False, show_progress=False)
+        prompt.input(parse_meta, inputs=[prompt, state_is_generating], outputs=[prompt, generate_button, load_parameter_button], queue=False, show_progress=False)
 
-        load_parameter_button.click(modules.meta_parser.load_parameter_button_click, inputs=prompt, outputs=[
+        load_parameter_button.click(modules.meta_parser.load_parameter_button_click, inputs=[prompt, state_is_generating], outputs=[
             advanced_checkbox,
             image_number,
             prompt,
@@ -557,11 +562,13 @@ with shared.gradio_root:
             load_parameter_button
         ] + lora_ctrls, queue=False, show_progress=False)
 
-        generate_button.click(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), []), outputs=[stop_button, skip_button, generate_button, gallery]) \
+        generate_button.click(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), [], True),
+                              outputs=[stop_button, skip_button, generate_button, gallery, state_is_generating]) \
             .then(fn=refresh_seed, inputs=[seed_random, image_seed], outputs=image_seed) \
             .then(advanced_parameters.set_all_advanced_parameters, inputs=adps) \
             .then(fn=generate_clicked, inputs=ctrls, outputs=[progress_html, progress_window, progress_gallery, gallery]) \
-            .then(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=False), gr.update(visible=False)), outputs=[generate_button, stop_button, skip_button]) \
+            .then(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), gr.update(visible=False, interactive=False), False),
+                  outputs=[generate_button, stop_button, skip_button, state_is_generating]) \
             .then(fn=lambda: None, _js='playNotification').then(fn=lambda: None, _js='refresh_grid_delayed')
 
         for notification_file in ['notification.ogg', 'notification.mp3']: