[SD] Fix few things in sendTo feature (#1132)

apps/stable_diffusion/scripts/img2img.py

@@ -220,7 +220,7 @@ def img2img_inf(
     text_output += img2img_obj.log
     text_output += f"\nTotal image generation time: {total_time:.4f}sec"
 
-    return generated_imgs, generated_imgs[0], text_output
+    return generated_imgs, text_output
 
 
 if __name__ == "__main__":

apps/stable_diffusion/scripts/inpaint.py

@@ -175,7 +175,7 @@ def inpaint_inf(
     text_output += inpaint_obj.log
     text_output += f"\nTotal image generation time: {total_time:.4f}sec"
 
-    return generated_imgs, generated_imgs[0], text_output
+    return generated_imgs, text_output
 
 
 if __name__ == "__main__":

apps/stable_diffusion/scripts/outpaint.py

@@ -190,7 +190,7 @@ def outpaint_inf(
     text_output += outpaint_obj.log
     text_output += f"\nTotal image generation time: {total_time:.4f}sec"
 
-    return generated_imgs, generated_imgs[0], text_output
+    return generated_imgs, text_output
 
 
 if __name__ == "__main__":

apps/stable_diffusion/scripts/txt2img.py

@@ -172,7 +172,7 @@ def txt2img_inf(
     # text_output += txt2img_obj.log
     text_output += f"\nTotal image generation time: {total_time:.4f}sec"
 
-    yield generated_imgs, generated_imgs[0], text_output
+    yield generated_imgs, text_output
 
 
 if __name__ == "__main__":

apps/stable_diffusion/web/index.py

@@ -29,22 +29,22 @@ dark_theme = resource_path("ui/css/sd_dark_theme.css")
 
 from apps.stable_diffusion.web.ui import (
     txt2img_web,
-    txt2img_output,
+    txt2img_gallery,
     txt2img_sendto_img2img,
     txt2img_sendto_inpaint,
     txt2img_sendto_outpaint,
     img2img_web,
-    img2img_output,
+    img2img_gallery,
     img2img_init_image,
     img2img_sendto_inpaint,
     img2img_sendto_outpaint,
     inpaint_web,
-    inpaint_output,
+    inpaint_gallery,
     inpaint_init_image,
     inpaint_sendto_img2img,
     inpaint_sendto_outpaint,
     outpaint_web,
-    outpaint_output,
+    outpaint_gallery,
     outpaint_init_image,
     outpaint_sendto_img2img,
     outpaint_sendto_inpaint,
@@ -54,7 +54,7 @@ from apps.stable_diffusion.web.ui import (
 def register_button_click(button, selectedid, inputs, outputs):
     button.click(
         lambda x: (
-            x,
+            x[0]["name"] if len(x) != 0 else None,
             gr.Tabs.update(selected=selectedid),
         ),
         inputs,
@@ -78,33 +78,57 @@ with gr.Blocks(
     register_button_click(
         txt2img_sendto_img2img,
         1,
-        [txt2img_output],
+        [txt2img_gallery],
         [img2img_init_image, tabs],
     )
     register_button_click(
         txt2img_sendto_inpaint,
         2,
-        [txt2img_output],
+        [txt2img_gallery],
         [inpaint_init_image, tabs],
     )
     register_button_click(
         txt2img_sendto_outpaint,
         3,
-        [txt2img_output],
+        [txt2img_gallery],
         [outpaint_init_image, tabs],
     )
     register_button_click(
         img2img_sendto_inpaint,
         2,
-        [txt2img_output],
+        [img2img_gallery],
         [inpaint_init_image, tabs],
     )
     register_button_click(
         img2img_sendto_outpaint,
         3,
-        [txt2img_output],
+        [img2img_gallery],
         [outpaint_init_image, tabs],
     )
+    register_button_click(
+        inpaint_sendto_img2img,
+        1,
+        [inpaint_gallery],
+        [img2img_init_image, tabs],
+    )
+    register_button_click(
+        inpaint_sendto_outpaint,
+        3,
+        [inpaint_gallery],
+        [outpaint_init_image, tabs],
+    )
+    register_button_click(
+        outpaint_sendto_img2img,
+        1,
+        [outpaint_gallery],
+        [img2img_init_image, tabs],
+    )
+    register_button_click(
+        outpaint_sendto_inpaint,
+        2,
+        [outpaint_gallery],
+        [inpaint_init_image, tabs],
+    )
 
 
 sd_web.queue()

apps/stable_diffusion/web/ui/__init__.py

@@ -1,27 +1,27 @@
 from apps.stable_diffusion.web.ui.txt2img_ui import (
     txt2img_web,
-    txt2img_output,
+    txt2img_gallery,
     txt2img_sendto_img2img,
     txt2img_sendto_inpaint,
     txt2img_sendto_outpaint,
 )
 from apps.stable_diffusion.web.ui.img2img_ui import (
     img2img_web,
-    img2img_output,
+    img2img_gallery,
     img2img_init_image,
     img2img_sendto_inpaint,
     img2img_sendto_outpaint,
 )
 from apps.stable_diffusion.web.ui.inpaint_ui import (
     inpaint_web,
-    inpaint_output,
+    inpaint_gallery,
     inpaint_init_image,
     inpaint_sendto_img2img,
     inpaint_sendto_outpaint,
 )
 from apps.stable_diffusion.web.ui.outpaint_ui import (
     outpaint_web,
-    outpaint_output,
+    outpaint_gallery,
     outpaint_init_image,
     outpaint_sendto_img2img,
     outpaint_sendto_inpaint,

apps/stable_diffusion/web/ui/img2img_ui.py

@@ -196,9 +196,6 @@ with gr.Blocks(title="Image-to-Image") as img2img_web:
                         show_label=False,
                         elem_id="gallery",
                     ).style(grid=[2])
-                    img2img_output = gr.Image(
-                        visible=False,
-                    )
                     std_output = gr.Textbox(
                         value="Nothing to show.",
                         lines=1,
@@ -241,7 +238,7 @@ with gr.Blocks(title="Image-to-Image") as img2img_web:
                 save_metadata_to_json,
                 save_metadata_to_png,
             ],
-            outputs=[img2img_gallery, img2img_output, std_output],
+            outputs=[img2img_gallery, std_output],
             show_progress=args.progress_bar,
         )
 

apps/stable_diffusion/web/ui/inpaint_ui.py

@@ -181,9 +181,6 @@ with gr.Blocks(title="Inpainting") as inpaint_web:
                         show_label=False,
                         elem_id="gallery",
                     ).style(grid=[2])
-                    inpaint_output = gr.Image(
-                        visible=False,
-                    )
                     std_output = gr.Textbox(
                         value="Nothing to show.",
                         lines=1,
@@ -224,7 +221,7 @@ with gr.Blocks(title="Inpainting") as inpaint_web:
                 save_metadata_to_json,
                 save_metadata_to_png,
             ],
-            outputs=[inpaint_gallery, inpaint_output, std_output],
+            outputs=[inpaint_gallery, std_output],
             show_progress=args.progress_bar,
         )
 

apps/stable_diffusion/web/ui/outpaint_ui.py

@@ -214,9 +214,6 @@ with gr.Blocks(title="Outpainting") as outpaint_web:
                         show_label=False,
                         elem_id="gallery",
                     ).style(grid=[2])
-                    outpaint_output = gr.Image(
-                        visible=False,
-                    )
                     std_output = gr.Textbox(
                         value="Nothing to show.",
                         lines=1,
@@ -260,7 +257,7 @@ with gr.Blocks(title="Outpainting") as outpaint_web:
                 save_metadata_to_json,
                 save_metadata_to_png,
             ],
-            outputs=[outpaint_gallery, outpaint_output, std_output],
+            outputs=[outpaint_gallery, std_output],
             show_progress=args.progress_bar,
         )
 

apps/stable_diffusion/web/ui/txt2img_ui.py

@@ -187,9 +187,6 @@ with gr.Blocks(title="Text-to-Image") as txt2img_web:
                         show_label=False,
                         elem_id="gallery",
                     ).style(grid=[2])
-                    txt2img_output = gr.Image(
-                        visible=False,
-                    )
                     std_output = gr.Textbox(
                         value="Nothing to show.",
                         lines=1,
@@ -230,7 +227,7 @@ with gr.Blocks(title="Text-to-Image") as txt2img_web:
                 save_metadata_to_json,
                 save_metadata_to_png,
             ],
-            outputs=[txt2img_gallery, txt2img_output, std_output],
+            outputs=[txt2img_gallery, std_output],
             show_progress=args.progress_bar,
         )