gradio 5.27.0

app.py

@@ -444,23 +444,28 @@ def get_target_anno(img, keypts):
 
     return img, target_pose, target_cond, keypts, gr.update(), True
 
-def visualize_ref(ref):
+def visualize_ref(ref, ex_mask):
     if ref is None:
         return None
     
     # from user or from example
-    h, w = ref["background"].shape[:2]
-    if ref["layers"][0].sum() == 0:
-        if ref["background"][:, :, -1].sum() == h * w * 255:
-            from_example = False
-        else:
-            from_example = True
-    else:
+    # h, w = ref["background"].shape[:2]
+    # if ref["layers"][0].sum() == 0:
+    #     if ref["background"][:, :, -1].sum() == h * w * 255:
+    #         from_example = False
+    #     else:
+    #         from_example = True
+    # else:
+    #     from_example = False
+    if ex_mask is None:
         from_example = False
+    else:
+        from_example = True
 
     # inpaint mask
     if from_example:
-        inpaint_mask = ref["background"][:, :, -1]
+        # inpaint_mask = ref["background"][:, :, -1]
+        inpaint_mask = (np.all(ex_mask > 245, axis=-1)).astype(np.uint8)*128 + 64
         inpainted = inpaint_mask.copy()
         inpaint_mask = cv2.resize(
            inpaint_mask, opts.image_size, interpolation=cv2.INTER_AREA
@@ -483,6 +488,20 @@ def visualize_ref(ref):
         gr.Warning("Run botton not enabled? Please try again.", duration=10)
     return img, inpaint_mask
 
+def make_composite(img, mask):
+    if mask is None:
+        return gr.update()
+    mask = (np.all(mask > 245, axis=-1)).astype(np.uint8)*128 + 64
+    # composite = np.concatenate((img[..., :3], mask[..., None]), axis=-1)
+    composite = {
+        "background": img[..., :3],
+        "layers": [
+            mask,
+        ],
+        "composite": np.concatenate((img[..., :3], mask[..., None]), axis=-1),
+    }
+    return composite
+
 def get_kps(img, keypoints, side: Literal["right", "left"], evt: gr.SelectData):
     if keypoints is None:
         keypoints = [[], []]
@@ -639,8 +658,11 @@ def sample_diff(ref_cond, target_cond, target_keypts, num_gen, seed, cfg):
     return results, results_pose
 
 @spaces_120_fn
-def ready_sample(img_cropped, inpaint_mask, keypts, keypts_np):
-    img = cv2.resize(img_cropped["background"][..., :3], opts.image_size, interpolation=cv2.INTER_AREA)
+def ready_sample(img_cropped, img_original, ex_mask, inpaint_mask, keypts, keypts_np):
+    if ex_mask is None:
+        img = cv2.resize(img_cropped["background"][..., :3], opts.image_size, interpolation=cv2.INTER_AREA)
+    else:
+        img = cv2.resize(img_original[..., :3], opts.image_size, interpolation=cv2.INTER_AREA)
     sam_predictor.set_image(img)
     if keypts is None and keypts_np is not None:
         keypts = keypts_np
@@ -956,6 +978,7 @@ def fix_clear_all():
         42,
         3.0,
         10,
+        None
     )
 
 def enable_component(image1, image2):
@@ -1138,18 +1161,18 @@ fix_example_kpts = [
     ["bad_hands/7_kpts.png", 3.0, 42],
 ]
 fix_example_all = [
-    ["bad_hands/1.jpg", "bad_hands/1_composite.png", "bad_hands/1_kpts.png", 3.0, 1224],
-    ["bad_hands/3.jpg", "bad_hands/3_composite.png", "bad_hands/3_kpts.png", 1.0, 42],
-    ["bad_hands/4.jpg", "bad_hands/4_composite.png", "bad_hands/4_kpts.png", 2.0, 42],
-    ["bad_hands/5.jpg", "bad_hands/5_composite.png", "bad_hands/5_kpts.png", 3.0, 42],
-    ["bad_hands/6.jpg", "bad_hands/6_composite.png", "bad_hands/6_kpts.png", 3.0, 1348],
-    ["bad_hands/7.jpg", "bad_hands/7_composite.png", "bad_hands/7_kpts.png", 3.0, 42],
+    ["bad_hands/1.jpg", "bad_hands/1_composite.png", "bad_hands/1_mask.jpg", "bad_hands/1_kpts.png", 3.0, 1224],
+    ["bad_hands/3.jpg", "bad_hands/3_composite.png", "bad_hands/3_mask.jpg", "bad_hands/3_kpts.png", 1.0, 42],
+    ["bad_hands/4.jpg", "bad_hands/4_composite.png", "bad_hands/4_mask.jpg", "bad_hands/4_kpts.png", 2.0, 42],
+    ["bad_hands/5.jpg", "bad_hands/5_composite.png", "bad_hands/5_mask.jpg", "bad_hands/5_kpts.png", 3.0, 42],
+    ["bad_hands/6.jpg", "bad_hands/6_composite.png", "bad_hands/6_mask.jpg", "bad_hands/6_kpts.png", 3.0, 1348],
+    ["bad_hands/7.jpg", "bad_hands/7_composite.png", "bad_hands/7_mask.jpg", "bad_hands/7_kpts.png", 3.0, 42],
 ]
 for i in range(len(fix_example_kpts)):
     npy_path = fix_example_kpts[i][0].replace("_kpts.png", ".npy")
     fix_example_kpts[i].append(npy_path)
 for i in range(len(fix_example_all)):
-    npy_path = fix_example_all[i][2].replace("_kpts.png", ".npy")
+    npy_path = fix_example_all[i][3].replace("_kpts.png", ".npy")
     fix_example_all[i].append(npy_path)
 
 custom_css = """
@@ -1199,6 +1222,10 @@ custom_css = """
 #fix_examples_all table tr td:nth-child(6) {
     display: none !important;
 }
+#fix_examples_all table tr th:nth-child(7),
+#fix_examples_all table tr td:nth-child(7) {
+    display: none !important;
+}
 #fix_examples_all table tr:first-child {
     display: none !important;
 }
@@ -1906,6 +1933,7 @@ with gr.Blocks(css=custom_css, theme="soft") as demo:
         fix_target_cond = gr.State(value=None)
         fix_latent = gr.State(value=None)
         fix_inpaint_latent = gr.State(value=None)
+        fix_ex_mask = gr.Image(value=None, visible=False)
         
         # more options
         with gr.Accordion(label="More options", open=False):
@@ -2162,9 +2190,9 @@ with gr.Blocks(css=custom_css, theme="soft") as demo:
         with gr.Row():
             gr.Examples(
                 fix_example_all,
-                inputs=[fix_crop, fix_ref, fix_kp_all, fix_cfg, fix_seed, fix_kpts_path],
+                inputs=[fix_crop, fix_ref, fix_ex_mask, fix_kp_all, fix_cfg, fix_seed, fix_kpts_path],
                 examples_per_page=20,
-                postprocess=False,
+                postprocess=True,
                 elem_id="fix_examples_all",
             )
         with gr.Row():
@@ -2196,10 +2224,12 @@ with gr.Blocks(css=custom_css, theme="soft") as demo:
                     gr.HTML(tut1_example)
 
         # listeners
+        # fix_ex_mask.change(make_composite, [fix_crop, fix_ex_mask], fix_ref)
+        fix_crop.input(lambda x: gr.update(None), fix_crop, fix_ex_mask)
         fix_crop.change(stash_original, fix_crop, fix_original)  # fix_original: (real_H, real_W, 3)
         fix_crop.change(stay_crop, [fix_crop, fix_crop_coord], [fix_crop_coord, fix_ref])
         fix_crop.select(process_crop, [fix_crop, fix_crop_coord], [fix_crop_coord, fix_ref, fix_crop])
-        fix_ref.change(visualize_ref, [fix_ref], [fix_img, fix_inpaint_mask])
+        fix_ref.change(visualize_ref, [fix_ref, fix_ex_mask], [fix_img, fix_inpaint_mask])
         fix_img.change(lambda x: x, [fix_img], [fix_kp_right])
         fix_img.change(lambda x: x, [fix_img], [fix_kp_left])
         fix_ref.change(
@@ -2266,7 +2296,7 @@ with gr.Blocks(css=custom_css, theme="soft") as demo:
         fix_kpts_np.change(enable_component, [fix_inpaint_mask, fix_kpts_np], fix_run)
         fix_run.click(
             ready_sample,
-            [fix_ref, fix_inpaint_mask, fix_kpts, fix_kpts_np],
+            [fix_ref, fix_original, fix_ex_mask, fix_inpaint_mask, fix_kpts, fix_kpts_np],
             [
                 fix_ref_cond,
                 fix_target_cond,
@@ -2324,6 +2354,7 @@ with gr.Blocks(css=custom_css, theme="soft") as demo:
                 fix_seed,
                 fix_cfg,
                 fix_quality,
+                fix_ex_mask,
             ],
         )
         fix_clear.click(

prepare_examples.py

@@ -85,15 +85,15 @@ def visualize_hand(all_joints, img, side=["right", "left"], n_avail_joints=21):
     # print(f"Saved composite image {masked_pth.replace('_mask.jpg', '_composite.png')}")
 
 '''visualize keypoint example'''
-data_dir = "bad_hands"
-kpts_paths = sorted(glob.glob(os.path.join(data_dir, "*.npy")))
-for kpts_pth in kpts_paths:
-    img_pth = kpts_pth.replace(".npy", ".jpg")
-    kpts = np.load(kpts_pth)
-    img = np.array(Image.open(img_pth))
-    h, w = img.shape[:2]
-    kpts = kpts / np.array([256,256]) * np.array([w, h])
-    kpts_vis = visualize_hand(kpts, img)
-    save_path = kpts_pth.replace(".npy", "_kpts.png")
-    kpts_vis = Image.fromarray(kpts_vis).save(save_path)
-    print(f"Saved {save_path}")
+# data_dir = "bad_hands"
+# kpts_paths = sorted(glob.glob(os.path.join(data_dir, "*.npy")))
+# for kpts_pth in kpts_paths:
+#     img_pth = kpts_pth.replace(".npy", ".jpg")
+#     kpts = np.load(kpts_pth)
+#     img = np.array(Image.open(img_pth))
+#     h, w = img.shape[:2]
+#     kpts = kpts / np.array([256,256]) * np.array([w, h])
+#     kpts_vis = visualize_hand(kpts, img)
+#     save_path = kpts_pth.replace(".npy", "_kpts.png")
+#     kpts_vis = Image.fromarray(kpts_vis).save(save_path)
+#     print(f"Saved {save_path}")