Update web-demos/hugging_face/app.py

web-demos/hugging_face/app.py

@@ -156,23 +156,6 @@ def get_end_number(track_pause_number_slider, video_state, interactive_state):
 
     return video_state["painted_images"][track_pause_number_slider],interactive_state, operation_log, operation_log
 
-def draw_refine(video_state, template_frame):
-    if isinstance(template_frame, dict) and "mask" in template_frame:
-        mask = template_frame["mask"]
-        if mask is not None:
-            mask = (np.array(mask) > 127).astype(np.uint8)
-            painted_image = mask_painter(
-                video_state["origin_images"][video_state["select_frame_number"]].copy(),
-                mask,
-                mask_color=1
-            )
-            video_state["masks"][video_state["select_frame_number"]] = mask
-            video_state["painted_images"][video_state["select_frame_number"]] = painted_image
-            operation_log = [("Manual mask added by drawing", "Normal")]
-            return painted_image, video_state, operation_log, operation_log
-    operation_log = [("No mask drawn", "Error")]
-    return video_state["painted_images"][video_state["select_frame_number"]], video_state, operation_log, operation_log
-
 # use sam to get the mask
 def sam_refine(video_state, point_prompt, click_state, interactive_state, evt:gr.SelectData):
     """
@@ -209,26 +192,17 @@ def sam_refine(video_state, point_prompt, click_state, interactive_state, evt:gr
                      ("[Optional]", "Click image"), (": Try to click the image shown in step2 if you want to generate more masks.\n", None)]
     return painted_image, video_state, interactive_state, operation_log, operation_log
 
-def add_multi_mask(video_state, interactive_state, mask_dropdown, mask_input_mode, template_frame):
+def add_multi_mask(video_state, interactive_state, mask_dropdown):
     try:
-        if mask_input_mode == "Click":
-            # 🟢 Стандартная логика SAM
-            mask = video_state["masks"][video_state["select_frame_number"]]
-        else:
-            # ⚪ Рисованная маска
-            drawn_mask = template_frame  # это уже numpy-массив из gr.Sketchpad
-            if drawn_mask is None:
-                raise ValueError("No mask was drawn.")
-            mask = (np.array(drawn_mask)[:, :, 0] > 127).astype(np.uint8)  # бинаризация
-
+        mask = video_state["masks"][video_state["select_frame_number"]]
         interactive_state["multi_mask"]["masks"].append(mask)
         interactive_state["multi_mask"]["mask_names"].append("mask_{:03d}".format(len(interactive_state["multi_mask"]["masks"])))
         mask_dropdown.append("mask_{:03d}".format(len(interactive_state["multi_mask"]["masks"])))
 
         select_frame, _, _ = show_mask(video_state, interactive_state, mask_dropdown)
         operation_log = [("",""),("Added a mask, use the mask select for target tracking or inpainting.","Normal")]
-    except Exception as e:
-        operation_log = [(f"Error: {str(e)}", "Error"), ("","")]
+    except:
+        operation_log = [("Please click the image in step2 to generate masks.", "Error"), ("","")]
 
     return interactive_state, gr.update(choices=interactive_state["multi_mask"]["mask_names"], value=mask_dropdown), select_frame, [[],[]], operation_log, operation_log
 
@@ -635,65 +609,50 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as iface:
                                             value=10,)
   
     with gr.Column():
-    # Step 1: Upload video
+        # input video
         gr.Markdown("## Step1: Upload video")
         with gr.Row(equal_height=True):
             with gr.Column(scale=2):      
                 video_input = gr.Video(elem_classes="video")
                 extract_frames_button = gr.Button(value="Get video info", interactive=True, variant="primary") 
             with gr.Column(scale=2):
-                run_status = gr.HighlightedText(value=[("",""), ("Try to upload your video and click the Get video info button to get started!", "Normal")],
+                run_status = gr.HighlightedText(value=[("",""), ("Try to upload your video and click the Get video info button to get started! (Kindly ensure that the uploaded video consists of fewer than 500 frames in total)", "Normal")],
                                                 color_map={"Normal": "green", "Error": "red", "Clear clicks": "gray", "Add mask": "green", "Remove mask": "red"})
                 video_info = gr.Textbox(label="Video Info")
-
-    # Step 2: Add masks
+                
+        
+        # add masks
         step2_title = gr.Markdown("---\n## Step2: Add masks", visible=False)
         with gr.Row(equal_height=True):
             with gr.Column(scale=2):
                 brush_settings = gr.Brush(
-                    default_size=10,
-                    colors=["#FFFFFF"],
+                    default_size=2,
+                    colors=["#FFFFFF"],  # Белый цвет кисти
                     default_color="#FFFFFF"
                 )
-                template_frame = gr.Sketchpad(label="Draw mask manually or click to add",canvas_size=(1920, 1080),type="numpy",interactive=True,visible=False,tool="brush",   brush=4,elem_id="template_frame",elem_classes="image")
-
-
+                template_frame = gr.Image(type="pil",interactive=True, elem_id="template_frame", visible=False, elem_classes="image")
                 image_selection_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Track start frame", visible=False)
                 track_pause_number_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Track end frame", visible=False)
             with gr.Column(scale=2, elem_classes="jc_center"):
-                run_status2 = gr.HighlightedText(value=[("",""), ("Use click or draw to select mask, then track or inpaint.", "Normal")],
+                run_status2 = gr.HighlightedText(value=[("",""), ("Try to upload your video and click the Get video info button to get started! (Kindly ensure that the uploaded video consists of fewer than 500 frames in total)", "Normal")],
                                                  color_map={"Normal": "green", "Error": "red", "Clear clicks": "gray", "Add mask": "green", "Remove mask": "red"},
                                                  visible=False)
-                mask_input_mode = gr.Radio(
-                    choices=["Click", "Draw"],
-                    value="Click",
-                    label="Select Mask Input Mode",
-                    interactive=True,
-                    visible=True
-                )
-                mask_mode_selector = gr.Radio(
-                    choices=["Click", "Draw"],
-                    value="Click",
-                    label="Mask input mode",
-                    interactive=True,
-                    visible=False
-                )
-                point_prompt = gr.Radio(
-                    choices=["Positive", "Negative"],
-                    value="Positive",
-                    label="Point prompt",
-                    interactive=True,
-                    visible=False,
-                    min_width=100,
-                    scale=1
-                )
-                with gr.Row(elem_classes="mask_button_group"):
-                    Add_mask_button = gr.Button(value="Add mask", interactive=True, visible=False, elem_classes="add_button")
-                    remove_mask_button = gr.Button(value="Remove mask", interactive=True, visible=False, elem_classes="remove_button")
-                    clear_button_click = gr.Button(value="Clear clicks", interactive=True, visible=False, elem_classes="clear_button")
+                with gr.Column():
+                    point_prompt = gr.Radio(
+                        choices=["Positive", "Negative"],
+                        value="Positive",
+                        label="Point prompt",
+                        interactive=True,
+                        visible=False,
+                        min_width=100,
+                        scale=1,)
+                    with gr.Row(elem_classes="mask_button_group"):
+                        Add_mask_button = gr.Button(value="Add mask", interactive=True, visible=False, elem_classes="add_button")
+                        remove_mask_button = gr.Button(value="Remove mask", interactive=True, visible=False, elem_classes="remove_button")
+                        clear_button_click = gr.Button(value="Clear clicks", interactive=True, visible=False, elem_classes="clear_button")
                 mask_dropdown = gr.Dropdown(multiselect=True, value=[], label="Mask selection", info=".", visible=False)
-
-    # Step 3: Tracking & Inpainting
+            
+        # output video
         step3_title = gr.Markdown("---\n## Step3: Track masks and get the inpainting result", visible=False)
         with gr.Row(equal_height=True):
             with gr.Column(scale=2):
@@ -724,9 +683,9 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as iface:
     
     # click select image to get mask using sam
     template_frame.select(
-        fn=lambda *args: sam_refine(*args) if args[4] == "Click" else draw_refine(args[1], args[0]),
-        inputs=[template_frame, video_state, point_prompt, click_state, mask_mode_selector, interactive_state],
-        outputs=[template_frame, video_state, run_status, run_status2]
+        fn=sam_refine,
+        inputs=[video_state, point_prompt, click_state, interactive_state],
+        outputs=[template_frame, video_state, interactive_state, run_status, run_status2]
     )