[SD] Add sendTo Upscaler

Signed-Off-by: Gaurav Shukla <gaurav@nod-labs.com>

apps/stable_diffusion/scripts/upscaler.py

@@ -97,6 +97,8 @@ def upscaler_inf(
         height,
         width,
         device,
+        use_lora=None,
+        use_stencil=None,
     )
     if (
         not global_obj.get_sd_obj()
@@ -177,7 +179,7 @@ def upscaler_inf(
     text_output += f"\nscheduler={args.scheduler}, device={device}"
     text_output += f"\nsteps={steps}, noise_level={noise_level}, guidance_scale={guidance_scale}, seed={seeds}"
     text_output += f"\nsize={height}x{width}, batch_count={batch_count}, batch_size={batch_size}, max_length={args.max_length}"
-    text_output += upscaler_obj.log
+    text_output += global_obj.get_sd_obj().log
     text_output += f"\nTotal image generation time: {total_time:.4f}sec"
 
     yield generated_imgs, text_output

apps/stable_diffusion/web/index.py

@@ -37,21 +37,25 @@ from apps.stable_diffusion.web.ui import (
     txt2img_sendto_img2img,
     txt2img_sendto_inpaint,
     txt2img_sendto_outpaint,
+    txt2img_sendto_upscaler,
     img2img_web,
     img2img_gallery,
     img2img_init_image,
     img2img_sendto_inpaint,
     img2img_sendto_outpaint,
+    img2img_sendto_upscaler,
     inpaint_web,
     inpaint_gallery,
     inpaint_init_image,
     inpaint_sendto_img2img,
     inpaint_sendto_outpaint,
+    inpaint_sendto_upscaler,
     outpaint_web,
     outpaint_gallery,
     outpaint_init_image,
     outpaint_sendto_img2img,
     outpaint_sendto_inpaint,
+    outpaint_sendto_upscaler,
     upscaler_web,
     upscaler_gallery,
     upscaler_init_image,
@@ -108,6 +112,12 @@ with gr.Blocks(
         [txt2img_gallery],
         [outpaint_init_image, tabs],
     )
+    register_button_click(
+        txt2img_sendto_upscaler,
+        4,
+        [txt2img_gallery],
+        [upscaler_init_image, tabs],
+    )
     register_button_click(
         img2img_sendto_inpaint,
         2,
@@ -120,6 +130,12 @@ with gr.Blocks(
         [img2img_gallery],
         [outpaint_init_image, tabs],
     )
+    register_button_click(
+        img2img_sendto_upscaler,
+        4,
+        [img2img_gallery],
+        [upscaler_init_image, tabs],
+    )
     register_button_click(
         inpaint_sendto_img2img,
         1,
@@ -132,6 +148,12 @@ with gr.Blocks(
         [inpaint_gallery],
         [outpaint_init_image, tabs],
     )
+    register_button_click(
+        inpaint_sendto_upscaler,
+        4,
+        [inpaint_gallery],
+        [upscaler_init_image, tabs],
+    )
     register_button_click(
         outpaint_sendto_img2img,
         1,
@@ -144,6 +166,12 @@ with gr.Blocks(
         [outpaint_gallery],
         [inpaint_init_image, tabs],
     )
+    register_button_click(
+        outpaint_sendto_upscaler,
+        4,
+        [outpaint_gallery],
+        [upscaler_init_image, tabs],
+    )
     register_button_click(
         upscaler_sendto_img2img,
         1,

apps/stable_diffusion/web/ui/__init__.py

@@ -4,6 +4,7 @@ from apps.stable_diffusion.web.ui.txt2img_ui import (
     txt2img_sendto_img2img,
     txt2img_sendto_inpaint,
     txt2img_sendto_outpaint,
+    txt2img_sendto_upscaler,
 )
 from apps.stable_diffusion.web.ui.img2img_ui import (
     img2img_web,
@@ -11,6 +12,7 @@ from apps.stable_diffusion.web.ui.img2img_ui import (
     img2img_init_image,
     img2img_sendto_inpaint,
     img2img_sendto_outpaint,
+    img2img_sendto_upscaler,
 )
 from apps.stable_diffusion.web.ui.inpaint_ui import (
     inpaint_web,
@@ -18,6 +20,7 @@ from apps.stable_diffusion.web.ui.inpaint_ui import (
     inpaint_init_image,
     inpaint_sendto_img2img,
     inpaint_sendto_outpaint,
+    inpaint_sendto_upscaler,
 )
 from apps.stable_diffusion.web.ui.outpaint_ui import (
     outpaint_web,
@@ -25,6 +28,7 @@ from apps.stable_diffusion.web.ui.outpaint_ui import (
     outpaint_init_image,
     outpaint_sendto_img2img,
     outpaint_sendto_inpaint,
+    outpaint_sendto_upscaler,
 )
 from apps.stable_diffusion.web.ui.upscaler_ui import (
     upscaler_web,

apps/stable_diffusion/web/ui/img2img_ui.py

@@ -201,6 +201,9 @@ with gr.Blocks(title="Image-to-Image") as img2img_web:
                     img2img_sendto_outpaint = gr.Button(
                         value="SendTo Outpaint"
                     )
+                    img2img_sendto_upscaler = gr.Button(
+                        value="SendTo Upscaler"
+                    )
 
         kwargs = dict(
             fn=img2img_inf,

apps/stable_diffusion/web/ui/inpaint_ui.py

@@ -203,6 +203,9 @@ with gr.Blocks(title="Inpainting") as inpaint_web:
                     inpaint_sendto_outpaint = gr.Button(
                         value="SendTo Outpaint"
                     )
+                    inpaint_sendto_upscaler = gr.Button(
+                        value="SendTo Upscaler"
+                    )
 
         kwargs = dict(
             fn=inpaint_inf,

apps/stable_diffusion/web/ui/outpaint_ui.py

@@ -220,6 +220,9 @@ with gr.Blocks(title="Outpainting") as outpaint_web:
                 with gr.Row():
                     outpaint_sendto_img2img = gr.Button(value="SendTo Img2Img")
                     outpaint_sendto_inpaint = gr.Button(value="SendTo Inpaint")
+                    outpaint_sendto_upscaler = gr.Button(
+                        value="SendTo Upscaler"
+                    )
 
         kwargs = dict(
             fn=outpaint_inf,

apps/stable_diffusion/web/ui/txt2img_ui.py

@@ -215,6 +215,9 @@ with gr.Blocks(title="Text-to-Image") as txt2img_web:
                     txt2img_sendto_outpaint = gr.Button(
                         value="SendTo Outpaint"
                     )
+                    txt2img_sendto_upscaler = gr.Button(
+                        value="SendTo Upscaler"
+                    )
 
         kwargs = dict(
             fn=txt2img_inf,

apps/stable_diffusion/web/ui/upscaler_ui.py

@@ -91,9 +91,15 @@ with gr.Blocks(title="Upscaler") as upscaler_web:
                             value=128,
                             step=128,
                             label="Height",
+                            interactive=False,
                         )
                         width = gr.Slider(
-                            128, 512, value=128, step=128, label="Width"
+                            128,
+                            512,
+                            value=128,
+                            step=128,
+                            label="Width",
+                            interactive=False,
                         )
                         precision = gr.Radio(
                             label="Precision",
@@ -103,6 +109,7 @@ with gr.Blocks(title="Upscaler") as upscaler_web:
                                 "fp32",
                             ],
                             visible=True,
+                            interactive=False,
                         )
                         max_length = gr.Radio(
                             label="Max Length",