Fix editor bug

app.py

@@ -48,9 +48,11 @@ def fcf_inpaint(G, org_img, erased_img, mask):
     comp_img = mask.to(device) * pred_img + (1 - mask).to(device) * org_img.to(device)
     return comp_img
 
-def show_images(img):
+def show_images(img, width, height):
     """ Display a batch of images inline. """
-    return Image.fromarray(img)
+    img = Image.fromarray(img)
+    img = img.resize((width, height))
+    return img
 
 def denorm(img):
     img = np.asarray(img[0].cpu(), dtype=np.float32).transpose(1, 2, 0)
@@ -74,29 +76,30 @@ def inpaint(input_img, mask, option):
                 output_dir='output',
                 visualization=True)
         mask = Image.fromarray(result[0]['mask'])
+        mask = mask.convert('L')
     else:
         mask = mask.resize((width,height))
-    mask = mask.convert('L')
 
     if width != 512 or height != 512:
         input_img = input_img.resize((512, 512))
         mask = mask.resize((512, 512))
     
-    
+    rgb = input_img.convert('RGB')
+    rgb = np.array(rgb)
+
+    mask = np.array(mask)
     if option == 'Manual':
-        mask = (np.array(mask) - np.array(input_img.convert('L'))) > 0.
-        mask = mask * 1.
-        kernel = np.ones((5, 5), np.uint8)
+        mask = (mask[:, :, 0] == rgb[:, :, 0]) * (mask[:, :, 1] == rgb[:, :, 1]) * (mask[:, :, 2] == rgb[:, :, 2])
+        mask = 1. - mask.astype(np.float32) * 1.
+        kernel = np.ones((3, 3), np.uint8)
         mask = cv2.dilate(mask, kernel) 
         mask = mask * 255.
 
-    mask = np.array(mask) / 255.
+    mask /= 255.
     mask_tensor = torch.from_numpy(mask).to(torch.float32)
     mask_tensor = mask_tensor.unsqueeze(0)
     mask_tensor = mask_tensor.unsqueeze(0).to(device)
 
-    rgb = input_img.convert('RGB')
-    rgb = np.array(rgb)
     rgb = rgb.transpose(2,0,1)
     rgb = torch.from_numpy(rgb.astype(np.float32)).unsqueeze(0)
     rgb = (rgb.to(torch.float32) / 127.5 - 1).to(device)
@@ -109,10 +112,10 @@ def inpaint(input_img, mask, option):
     rgb_erased = denorm(rgb_erased)
     comp_img = denorm(comp_img)
 
-    return show_images(rgb_erased), show_images(comp_img)
+    return show_images(rgb_erased, width, height), show_images(comp_img, width, height)
 
 gradio_inputs = [gr.inputs.Image(type='pil',
-                                 tool=None,
+                                 tool="editor",
                                  label="Image"),
                 # gr.inputs.Image(type='pil',source="canvas", label="Mask", invert_colors=True),
                 gr.inputs.Image(type='pil',
@@ -126,25 +129,27 @@ gradio_outputs = [gr.outputs.Image(label='Image with Hole'),
 
 examples = [['test_512/person512.png', 'test_512/person512.png', 'Automatic'],
             ['test_512/a_org.png', 'test_512/a_overlay.png', 'Manual'],
-            ['test_512/b_org.png', 'test_512/b_overlay.png', 'Manual'],
-            ['test_512/c_org.png', 'test_512/c_overlay.png', 'Manual'],
-            ['test_512/d_org.png', 'test_512/d_overlay.png', 'Manual'],
-            ['test_512/e_org.png', 'test_512/e_overlay.png', 'Manual'],
             ['test_512/f_org.png', 'test_512/f_overlay.png', 'Manual'],
             ['test_512/g_org.png', 'test_512/g_overlay.png', 'Manual'],
             ['test_512/h_org.png', 'test_512/h_overlay.png', 'Manual'],
-            ['test_512/i_org.png', 'test_512/i_overlay.png', 'Manual']]
+            ['test_512/i_org.png', 'test_512/i_overlay.png', 'Manual'],
+            ['test_512/b_org.png', 'test_512/b_overlay.png', 'Manual'],
+            ['test_512/c_org.png', 'test_512/c_overlay.png', 'Manual'],
+            ['test_512/d_org.png', 'test_512/d_overlay.png', 'Manual'],
+            ['test_512/e_org.png', 'test_512/e_overlay.png', 'Manual']]
 
 title = "FcF-Inpainting"
 
 description = "<p style='color:royalblue; font-weight: w300;'>  \
-                [Note: Queue time may take upto 20 seconds! The image and mask are resized to 512x512 before inpainting.] To use FcF-Inpainting: <br> \
-                (1) <span style='color:#E0B941;'>Upload </span> an Image to <span style='color:#E0B941;'>both</span> input boxes (Image and Mask) below. <br>  \
-                (2a) <span style='color:#E0B941;'>Manual Option:</span> Draw a mask (hole) using the brush (click on the edit button in the top right of the Mask View and select draw option). <br>  \
+                [Note: Queue time may take up to 20 seconds! The image and mask are resized to 512x512 before inpainting.] To use FcF-Inpainting: <br> \
+                (1) <span style='color:#E0B941;'>Upload the Same Image to both</span> input boxes (Image and Mask) below. <br>  \
+                (2a) <span style='color:#E0B941;'>Manual Option:</span> The TUI Image Editor used by gradio <a style='color: #E0B941;' href='https://github.com/gradio-app/gradio/issues/1810' target='_blank'>changes the image when saved</a>. We compute the mask after comparing the two inputs. Therefore, we need to save both inputs: <br> \
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - <span style='color:#E0B941;'>Image:</span> Click on the edit button on the top-right and save without making any changes. <br> \
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - <span style='color:#E0B941;'>Mask:</span> Draw a mask (hole) using the brush (click on the edit button in the top right of the Mask View and select the draw option). <br> \
                 (2b) <span style='color:#E0B941;'>Automatic Option:</span> This option will generate a mask using a pretrained U2Net model. <br>  \
-                (3) Click on Submit and witness the MAGIC! 🪄 ✨ ✨</p>"
+                (3) Click on <span style='color:#E0B941;'>Submit</span> and witness the MAGIC! 🪄 ✨ ✨</p>"
 
-article = "<p style='color: #E0B941; text-align: center'><a style='color: #E0B941;' href='https://github.com/SHI-Labs/FcF-Inpainting' target='_blank'> Keys to Better Image Inpainting: Structure and Texture Go Hand in Hand</a> | <a style='color: #E0B941;' href='https://github.com/SHI-Labs/FcF-Inpainting' target='_blank'>Github Repo</a></p>"
+article = "<p style='color: #E0B941; text-align: center'> <a style='color: #E0B941;' href='https://praeclarumjj3.github.io/fcf-inpainting/' target='_blank'>Project Page</a> | <a style='color: #E0B941;' href='https://github.com/SHI-Labs/FcF-Inpainting' target='_blank'> Keys to Better Image Inpainting: Structure and Texture Go Hand in Hand</a> | <a style='color: #E0B941;' href='https://github.com/SHI-Labs/FcF-Inpainting' target='_blank'>Github Repo</a></p>"
 
 css = ".image-preview {height: 32rem; width: auto;} .output-image {height: 32rem; width: auto;} .panel-buttons { display: flex; flex-direction: row;}"
 
@@ -158,5 +163,4 @@ iface = gr.Interface(fn=inpaint, inputs=gradio_inputs,
                      allow_flagging="never",
                      examples=examples, title=title,
                      description=description, article=article)
-iface.launch(enable_queue=True,
-                     share=True, server_name="0.0.0.0")
+iface.launch(enable_queue=True)

requirements.txt

@@ -1,8 +1,8 @@
-icecream
+icecream==2.1.0
 opencv-python-headless
 paddlepaddle
 paddlehub
-psutil
+psutil==5.8.0
 click 
 requests
 matplotlib
@@ -22,6 +22,6 @@ pydrive2
 pandas
 easydict
 kornia==0.5.0
-gradio
+gradio==2.9.4
 ipython
-Jinja2
+Jinja2