update

app.py

@@ -13,21 +13,28 @@ def sanitize_prompt(prompt):
   return sanitized_prompt
 
 #@spaces.GPU(duration=120)
-def process_images(image1, image2,inpaint_radius,blur_radius,edge_expand):
-    if image1!=None:
-        pass
-        #image1.save("input.jpg","JPEG")
-    if image2!= None:
-        
-        pass
-        #image2.save("mask.jpg","JPEG")
-    if image1!=None and image2!=None:
-        
-        output = opencvinpaint.process_image(image1,image2,inpaint_radius,blur_radius,edge_expand)
+def process_images(image1, image2=None,inpaint_radius=3,blur_radius=25,edge_expand=8,inpaint_mode="Telea"):
+    # I'm not sure when this happen
+    if not isinstance(image1, dict):
+        if image2 == None:
+             print("empty mask")
+             return image1
+        else:
+            image1 = dict({'background': image1, 'layers': [image2]})
+
+    if image2!=None:
+         mask = image2
+    else:
+         if len(image1['layers']) == 0:
+              print("empty mask")
+              return image
+         mask = image1['layers'][0]
+
+
+    output = opencvinpaint.process_image(image1["background"],mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode)
         
-        return output
+    return output
     
-    return None
 
 # code from https://huggingface.co/spaces/diffusers/stable-diffusion-xl-inpainting/blob/main/app.py
 def read_file(file_path: str) -> str:
@@ -38,30 +45,43 @@ def read_file(file_path: str) -> str:
 
     return content
 
+css="""
+#col-left {
+    margin: 0 auto;
+    max-width: 640px;
+}
+#col-right {
+    margin: 0 auto;
+    max-width: 640px;
+}
+"""
+
 #css=css,
-demo_blocks = gr.Blocks( elem_id="demo-container")
+demo_blocks = gr.Blocks(css=css, elem_id="demo-container")
 with demo_blocks as demo:
-    gr.HTML(read_file("demo_header.html"))
+    with gr.Column():
+        gr.HTML(read_file("demo_header.html"))
     with gr.Row():
                 with gr.Column():
-                    image = gr.Image(sources=['upload','clipboard'],  elem_id="image_upload", type="pil", label="Upload",height=400)
-                    with gr.Row(elem_id="prompt-container",  equal_height=True):
+                    image = gr.ImageEditor(sources=['upload','clipboard'],transforms=[],image_mode='RGB', layers=False,  elem_id="image_upload", type="pil", label="Upload",brush=gr.Brush(colors=["#333"], color_mode="fixed"))
+                    with gr.Row(elem_id="prompt-container",  equal_height=False):
                         with gr.Row():
                             btn = gr.Button("Inpaint!", elem_id="run_button")
-                    image_mask = gr.Image(sources=['upload','clipboard'],  elem_id="mask_upload", type="pil", label="Mask_Upload",height=400)
+                    image_mask = gr.Image(sources=['upload','clipboard'],  elem_id="mask_upload", type="pil", label="Mask_Upload",height=400, value=None)
                     with gr.Accordion(label="Advanced Settings", open=False):
                         with gr.Row( equal_height=True):
                             inpaint_radius = gr.Number(value=3, minimum=1.0, maximum=20.0, step=1, label="Inpaint Radius")
                             blur_radius = gr.Number(value=25, minimum=0.0, maximum=50.0, step=1, label="Blur Radius")
                             edge_expand = gr.Number(value=8, minimum=0.0, maximum=20.0, step=1, label="Edge Expand")
-                            
+                    with gr.Row(equal_height=True):
+                            modes = ["Telea", "Navier-Stokes"]
+                            inpaint_mode = gr.Dropdown(label="modes", choices=modes, value="Telea") 
                 with gr.Column():
-                    image_out = gr.Image(sources=[],label="Output", elem_id="output-img", height=400)
-                    with gr.Group(elem_id="share-btn-container", visible=False) as share_btn_container:
-                        pass
+                    image_out = gr.Image(sources=[],label="Output", elem_id="output-img")
+                    
             
 
-    btn.click(fn=process_images, inputs=[image, image_mask,inpaint_radius,blur_radius,edge_expand], outputs =image_out, api_name='run')
+    btn.click(fn=process_images, inputs=[image, image_mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode], outputs =image_out, api_name='run')
     gr.Examples(
                examples=[["examples/street.jpg", "examples/street_mask.jpg"]]
 ,

opencvinpaint.py

@@ -43,7 +43,7 @@ def blend_rgb_images(image1: np.ndarray, image2: np.ndarray, mask: np.ndarray) -
 
     return blended.astype(np.uint8)
 
-def process_image(image,mask_image,inpaint_radius,blur_radius,edge_expand):
+def process_image(image,mask_image,inpaint_radius,blur_radius,edge_expand,inpaint_mode):
     #print(blur_radius,",",edge_expand)
     cv_image = pil_to_cv(image)
 
@@ -53,7 +53,8 @@ def process_image(image,mask_image,inpaint_radius,blur_radius,edge_expand):
     mask = gray3d_to_2d(cv_gray)
     cv2.imwrite("_mask.jpg",mask)
     cv2.imwrite("_image.jpg",cv_image)
-    img_inpainted = cv2.inpaint(cv_image, mask,inpaint_radius, cv2.INPAINT_TELEA)
+    mode = cv2.INPAINT_TELEA if inpaint_mode == "Telea" else cv2.INPAINT_NS
+    img_inpainted = cv2.inpaint(cv_image, mask,inpaint_radius, mode)
     if debug:
         cv2.imwrite("close_eye_inpaint.jpg",img_inpainted)