return new objects instead gr.update; self check latest entry in persönliche weihnachtsgrüße

webui.py

@@ -19,8 +19,8 @@ EXAMPLE_GREETINGS = [
 ]
 
 def generate(*args):
-    yield gr.update(value=modules.html.make_progress_html(1, "0/30")), \
-          gr.update()
+    yield gr.HTML(value=modules.html.make_progress_html(1, "0/30")), \
+          gr.Image()
 
     while worker.is_working:
         time.sleep(0.1)
@@ -35,12 +35,12 @@ def generate(*args):
             flag, product = worker.outputs.pop(0)
             if flag == 'preview':
                 percentage, title, image = product
-                yield gr.update(value=modules.html.make_progress_html(percentage, title)), \
-                      gr.update(value=image) if image is not None else gr.update()
+                yield gr.HTML(value=modules.html.make_progress_html(percentage, title)), \
+                      gr.Image(value=image) if image is not None else gr.Image()
             if flag == 'results':
                 image = product[0]
-                yield gr.update(value=""), \
-                      gr.update(value=image)
+                yield gr.HTML(value=""), \
+                      gr.Image(value=image)
                 finished = True
     return
 
@@ -48,10 +48,10 @@ def translate_promt_example(prompt_de):
     return [x for x in PROMPT_EXAMPLES if x[0] == prompt_de][0][1]
 
 def toggle_greet_visibility(is_visible):
-    return gr.update(visible=is_visible)
+    return gr.Row(visible=is_visible)
 
 def __toggle_generate_state(is_preview):
-    return gr.update(visible=is_preview), gr.update(visible=not is_preview), gr.update(interactive=not is_preview)
+    return gr.Image(visible=is_preview), gr.Image(visible=not is_preview), gr.Button(interactive=not is_preview)
 
 def prepare_generate():
     return __toggle_generate_state(True)
@@ -60,8 +60,8 @@ def finish_generate():
     return __toggle_generate_state(False)
 
 def debounce():
-    time.sleep(0.5)
-    return gr.update()
+    time.sleep(5)
+    return
 
 def pil_image_with_overlay(pil_image, toggle_greet, greet):
     image = ImageDraw.Draw(pil_image, "RGBA")
@@ -86,7 +86,13 @@ def pil_image_with_overlay(pil_image, toggle_greet, greet):
     return image._image
 
 def make_overlay(image, toggle_greet, greet):
-    return gr.update(value=pil_image_with_overlay(image, toggle_greet, greet))
+    return gr.Image(value=pil_image_with_overlay(image, toggle_greet, greet)), gr.Textbox(value=greet)
+
+def verify_latest_overlay(image, toggle_greet, greet, greet_active):
+    if greet != greet_active:
+        return make_overlay(image, toggle_greet, greet)
+    else:
+        return gr.Image(), gr.Textbox()
 
 shared.gradio_root = gr.Blocks(title='QualityMinds AI Christmas Card Maker', css=modules.html.css, theme=gr.themes.Default(primary_hue=QM_COLOR))
 with shared.gradio_root:
@@ -131,6 +137,7 @@ with shared.gradio_root:
     with greeting_row:
         with gr.Column():
             greet = gr.Textbox(value=EXAMPLE_GREETINGS[0], placeholder="", interactive=True, container=False, lines=2, max_lines=2)
+            greet_active = gr.Textbox(value=EXAMPLE_GREETINGS[0], visible=False)
             greet_examples = gr.Examples(elem_id="greet-examples", examples=EXAMPLE_GREETINGS, inputs=[greet])
 
 
@@ -141,12 +148,12 @@ with shared.gradio_root:
 
     promt_example_de.change(fn=translate_promt_example, inputs=[promt_example_de], outputs=[prompt], queue=False)
     toggle_greet.change(fn=toggle_greet_visibility, inputs=[toggle_greet], outputs=[greeting_row], queue=False, show_progress=False)\
-                .then(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed], show_progress=False, queue=False)
-    greet.change(fn=debounce, outputs=[generated_image_overlayed], queue=False, show_progress=False)\
-         .then(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed], queue=False, show_progress=False)
+                .then(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], show_progress=False, queue=False)
+    greet.change(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], queue=False, show_progress=False)
+    greet_active.change(fn=verify_latest_overlay, inputs=[generated_image_raw, toggle_greet, greet, greet_active], outputs=[generated_image_overlayed, greet_active], queue=False,  show_progress=False)
     run_button.click(fn=prepare_generate, outputs=[generated_image_raw, generated_image_overlayed, run_button], queue=False)\
               .then(fn=generate, inputs=[prompt, style_selection], outputs=[progress_html, generated_image_raw], queue=True)\
-              .then(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed], queue=False)\
+              .then(fn=make_overlay, inputs=[generated_image_raw, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], queue=False)\
               .then(fn=finish_generate, outputs=[generated_image_raw, generated_image_overlayed, run_button], queue=False)
 
 shared.gradio_root.queue(concurrency_count=1, api_open=False)