do not send original image from client for overlay, but use (log) path on server instead

modules/async_worker.py

@@ -54,20 +54,19 @@ def worker():
                 f'{step}/{total_steps}',
                 y)])
 
-        img = pipeline.process(p_txt, n_txt, steps, switch, width, height, seed, callback=callback)
-
-        for x in img:
-            d = [
-                ('Prompt', prompt),
-                ('Style', style_selection),
-                ('Seed', seed)
-            ]
-            for n, w in loras:
-                if n != 'None':
-                    d.append((f'LoRA [{n}] weight', w))
-            log(x, d)
-
-        outputs.append(['results', img])
+        img = pipeline.process(p_txt, n_txt, steps, switch, width, height, seed, callback=callback)[0]
+
+        d = [
+            ('Prompt', prompt),
+            ('Style', style_selection),
+            ('Seed', seed)
+        ]
+        for n, w in loras:
+            if n != 'None':
+                d.append((f'LoRA [{n}] weight', w))
+        img_path=log(img, d)
+
+        outputs.append(['results', [img, img_path]])
         return
 
     while True:

modules/private_logger.py

@@ -34,4 +34,4 @@ def log(img, dic):
 
     print(f'Image generated with private log at: {html_name}')
 
-    return
+    return local_temp_filename

webui.py

@@ -7,8 +7,8 @@ from PIL import Image, ImageDraw, ImageFont
 
 from modules.sdxl_styles import style_keys, aspect_ratios
 
-QM_LOGO=Image.open("resources/qm_logo.png")
-QM_COLOR=Color(name="qm", c50="#effaed",c100="#def5db",c200="#64b445",c300="#c6eec0",c400="#b9ebb3",c500="#64b445",c600="#55993b",c700="#467e30",c800="#325a23",c900="#233f18",c950="#192d11")
+QM_LOGO  = Image.open("resources/qm_logo.png")
+QM_COLOR = Color(name="qm", c50="#effaed",c100="#def5db",c200="#64b445",c300="#c6eec0",c400="#b9ebb3",c500="#64b445",c600="#55993b",c700="#467e30",c800="#325a23",c900="#233f18",c950="#192d11")
 PROMPT_EXAMPLES = [["Der Weihnachtsmann mit seinem Sack voller Geschenke", "Santa Claus with his sack full of gifts"], 
                    ["Malerisches Winterdorf in einer Schneekugel", "Scenic winter village inside a snow globe"], 
                    ["Niedliche Pinguine in Schals und Mützen eingewickelt", "Cute penguins wrapped up in scarves and hats"]]
@@ -17,10 +17,12 @@ EXAMPLE_GREETINGS = [
     "Frohes Fest und viele glückliche Momente mit deinen Liebsten!",
     "Zauberhafte Weihnachten für dich!"
 ]
+INIT_IMAGE_PATH = "resources/init.png"
 
 def generate(*args):
     yield gr.HTML(value=modules.html.make_progress_html(1, "0/30")), \
-          gr.Image()
+          gr.Image(), \
+          gr.Text()
 
     while worker.is_working:
         time.sleep(0.1)
@@ -36,11 +38,13 @@ def generate(*args):
             if flag == 'preview':
                 percentage, title, image = product
                 yield gr.HTML(value=modules.html.make_progress_html(percentage, title)), \
-                      gr.Image(value=image) if image is not None else gr.Image()
+                      gr.Image(value=image) if image is not None else gr.Image(), \
+                      gr.Text()
             if flag == 'results':
-                image = product[0]
+                image, image_path = product
                 yield gr.HTML(value=""), \
-                      gr.Image(value=image)
+                      gr.Image(value=image), \
+                      gr.Text(value=image_path)
                 finished = True
     return
 
@@ -63,8 +67,8 @@ def debounce():
     time.sleep(0.5)
     return
 
-def pil_image_with_overlay(pil_image, toggle_greet, greet):
-    image = ImageDraw.Draw(pil_image, "RGBA")
+def overlay_image(image_path, toggle_greet, greet):
+    image = ImageDraw.Draw(Image.open(image_path), "RGBA")
     HEIGHT, TEXT_PADDING, TEXTBOX_HEIGHT  = 100, 32, 56
     TEXTBOX_WIDTH = 1280-HEIGHT-4*TEXT_PADDING
     
@@ -86,7 +90,7 @@ def pil_image_with_overlay(pil_image, toggle_greet, greet):
     return image._image
 
 def make_overlay(image, toggle_greet, greet):
-    return gr.Image(value=pil_image_with_overlay(image, toggle_greet, greet)), gr.Textbox(value=greet)
+    return gr.Image(value=overlay_image(image, toggle_greet, greet)), gr.Textbox(value=greet)
 
 def verify_latest_overlay(image, toggle_greet, greet, greet_active):
     if greet != greet_active:
@@ -141,21 +145,22 @@ with shared.gradio_root:
             greet_examples = gr.Examples(elem_id="greet-examples", examples=EXAMPLE_GREETINGS, inputs=[greet])
 
 
-    generated_image_raw = gr.Image(visible=False, type='pil', label="Erstelle Weihnachtskarte...", elem_classes="generated-image", width=1280,
-                                   value="resources/init.png", interactive=False, show_share_button=False, show_download_button=False)
+    generated_image = gr.Image(visible=False, type='pil', label="Erstelle Weihnachtskarte...", elem_classes="generated-image", width=1280,
+                                   value=INIT_IMAGE_PATH, interactive=False, show_share_button=False, show_download_button=False)
     generated_image_overlayed = gr.Image(label="Weihnachtskarte", type='pil', elem_classes="generated-image", width=1280,
-                                         value=pil_image_with_overlay(Image.open("resources/init.png"), toggle_greet.value, greet.value))
+                                         value=overlay_image(INIT_IMAGE_PATH, toggle_greet.value, greet.value))
+    generated_image_path = gr.Text(visible=False, value=INIT_IMAGE_PATH)
 
     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, greet_active], show_progress=False, queue=False)
+                .then(fn=make_overlay, inputs=[generated_image_path, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], show_progress=False, queue=False)
     greet.change(fn=debounce, queue=False, show_progress=False)\
-         .then(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, greet_active], queue=False)\
-              .then(fn=finish_generate, outputs=[generated_image_raw, generated_image_overlayed, run_button], queue=False)
+         .then(fn=make_overlay, inputs=[generated_image_path, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], queue=False, show_progress=False)
+    greet_active.change(fn=verify_latest_overlay, inputs=[generated_image_path, 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, generated_image_overlayed, run_button], queue=False)\
+              .then(fn=generate, inputs=[prompt, style_selection], outputs=[progress_html, generated_image, generated_image_path], queue=True)\
+              .then(fn=make_overlay, inputs=[generated_image_path, toggle_greet, greet], outputs=[generated_image_overlayed, greet_active], queue=False)\
+              .then(fn=finish_generate, outputs=[generated_image, generated_image_overlayed, run_button], queue=False)
 
 shared.gradio_root.queue(concurrency_count=1, api_open=False)
 shared.gradio_root.launch(server_name="0.0.0.0", show_api=False)