up10

app.py

@@ -53,9 +53,11 @@ for idx, name in enumerate(files):
         temp = os.path.join(os.path.dirname(__file__), img, name)
         showcases.append(temp)
 
-def process(input_image, original_image, original_mask, selected_points, source_background, prompt, face_prompt):
-    if original_image is None or original_mask is None or len(selected_points)==0:
-        raise gr.Error('Please upload the input image and select the object you want to keep by clicking the mouse.')
+def process(input_image, original_image, original_mask, input_mask, selected_points, source_background, prompt, face_prompt):
+    if original_image is None:
+        raise gr.Error('Please upload the input image')
+    if (original_mask is None or len(selected_points)==0) and input_mask is None:
+        raise gr.Error("Please click the region where you want to keep unchanged, or upload a white-black Mask image where white color indicates region to be retained.")
     
     # load example image
     if isinstance(original_image, int):
@@ -63,7 +65,11 @@ def process(input_image, original_image, original_mask, selected_points, source_
             original_image = cv2.imread(image_name)
             original_image = cv2.cvtColor(original_image, cv2.COLOR_BGR2RGB)
 
-    original_mask = np.clip(255 - original_mask, 0, 255).astype(np.uint8)
+    if input_mask is not None:
+        H,W=original_image.shape[:2]
+        original_mask = cv2.resize(input_mask, (W, H))
+    else:
+        original_mask = np.clip(255 - original_mask, 0, 255).astype(np.uint8)
 
     request_id = str(uuid.uuid4())
     input_image_url = upload_np_2_oss(original_image, request_id+".png")
@@ -134,7 +140,7 @@ with block:
                 with gr.Row(equal_height=True):
                     gr.Markdown("""
                     - ⭐️ <b>step1：</b>Upload or select one image from Example
-                    - ⭐️ <b>step2：</b>Click on Input-image to select the object to be retained
+                    - ⭐️ <b>step2：</b>Click on Input-image to select the object to be retained (or upload a white-black Mask image, in which white color indicates the region you want to keep unchanged)
                     - ⭐️ <b>step3：</b>Input prompt or reference image (highly-recommended) for generating new contents
                     - ⭐️ <b>step4：</b>Click Run button
                     """)                          
@@ -159,6 +165,9 @@ with block:
                             with gr.Tabs(elem_classes=["feedback1"]):
                                 with gr.TabItem("Reference Image (Optional)"):
                                     source_background = gr.Image(type="numpy", label="Background Image")
+                            with gr.Tabs(elem_classes=["feedback1"]):
+                                with gr.TabItem("User-specified Mask Image (Optional)"):
+                                    input_mask = gr.Image(type="numpy", label="Mask Image")
                     
                         face_prompt = gr.Textbox(label="Face Prompt", value='good face, beautiful face, best quality')
                 with gr.Column():
@@ -187,6 +196,8 @@ with block:
         # image upload is too slow
         if min(img.shape[0], img.shape[1]) > 896:
             img = resize_image(img, 896)
+        if max(img.shape[0], img.shape[1])*1.0/min(img.shape[0], img.shape[1])>2.0:
+            raise gr.Error('image aspect ratio cannot be larger than 2.0')
         return img, img, [], None  # when new image is uploaded, `selected_points` should be empty
 
     input_image.upload(
@@ -294,7 +305,7 @@ with block:
         [gallery_flag]
     )
 
-    ips=[input_image, original_image, original_mask, selected_points, source_background, prompt, face_prompt]
+    ips=[input_image, original_image, original_mask, input_mask, selected_points, source_background, prompt, face_prompt]
     run_button.click(fn=process, inputs=ips, outputs=[result_gallery, request_id, gallery_flag])
 
 

css/style.css

@@ -39,7 +39,7 @@
         font-weight: bold;
 }
 #Image {
-        width: 60%;
+        width: 80%;
         margin:auto;
 }
 #ShowCase {