Update app.py

app.py

@@ -227,11 +227,14 @@ model_inpaint = None
 
 
 def inpaint(image, invert):
-    color = HWC3(image["image"])
+#    color = HWC3(image["image"])
+    color = HWC3(image["background"])
     if(invert):
-        alpha = image["mask"][:, :, 0:1]
+#        alpha = image["mask"][:, :, 0:1]
+        alpha = image["layers"][0][:, :, 3:]
     else:
-        alpha = 255 - image["mask"][:, :, 0:1]
+#        alpha = 255 - image["mask"][:, :, 0:1]
+        alpha = 255 - image["layers"][0][:, :, 3:]
     result = np.concatenate([color, alpha], axis=2)
     return [result]
 
@@ -248,7 +251,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=canny, inputs=[input_image, resolution, low_threshold, high_threshold], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -260,7 +264,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=hed, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -272,7 +277,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=pidi, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -286,7 +292,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=384, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=mlsd, inputs=[input_image, resolution, value_threshold, distance_threshold], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -298,7 +305,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=384, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=midas, inputs=[input_image, resolution], outputs=[gallery])
 
 
@@ -311,7 +319,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=zoe, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -323,7 +332,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=normalbae, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -335,7 +345,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=dwpose, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -348,7 +359,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=openpose, inputs=[input_image, resolution, hand_and_face], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -361,7 +373,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=lineart_anime, inputs=[input_image, resolution, invert], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -375,7 +388,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=lineart, inputs=[input_image, resolution, coarse, invert], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -383,11 +397,13 @@ with block:
         gr.Markdown("## InPaint")
     with gr.Row():
         with gr.Column():
-            input_image = gr.Image(source='upload', type="numpy", tool="sketch", height=512)
+#            input_image = gr.Image(source='upload', type="numpy", tool="sketch", height=512)
+           input_image = gr.ImageMask(sources="upload", type="numpy", height="auto")
             invert = gr.Checkbox(label='Invert Mask', value=False)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=inpaint, inputs=[input_image, invert], outputs=[gallery])
 
 #    with gr.Row():
@@ -410,7 +426,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=oneformer_coco, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -422,7 +439,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=640, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=oneformer_ade20k, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -434,7 +452,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=content_shuffler, inputs=[input_image, resolution], outputs=[gallery])
 
     gr.Markdown("<hr>")
@@ -446,7 +465,8 @@ with block:
             resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
             run_button = gr.Button(label="Run")
         with gr.Column():
-            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+#            gallery = gr.Gallery(label="Generated images", show_label=False).style(height="auto")
+            gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
     run_button.click(fn=color_shuffler, inputs=[input_image, resolution], outputs=[gallery])