Enhance ball rings with neon glow effect (additive blending)

app.py

@@ -580,6 +580,8 @@ class AppState:
         self.fx_ring_gamma: float = BALL_RING_INTENSITY_GAMMA
         self.fx_ring_duration: int = 30 # Default duration in frames
         self.fx_ring_scale_pct: float = RING_SIZE_SCALE_DEFAULT
+        self.manual_kick_frame: int | None = None
+        self.manual_impact_frame: int | None = None
 
     def __repr__(self):
         return f"AppState(video_frames={self.video_frames}, inference_session={self.inference_session is not None}, model={self.model is not None}, processor={self.processor is not None}, device={self.device}, dtype={self.dtype}, video_fps={self.video_fps}, masks_by_frame={self.masks_by_frame}, color_by_obj={self.color_by_obj}, clicks_by_frame_obj={self.clicks_by_frame_obj}, boxes_by_frame_obj={self.boxes_by_frame_obj}, composited_frames={self.composited_frames}, current_frame_idx={self.current_frame_idx}, current_obj_id={self.current_obj_id}, current_label={self.current_label}, current_clear_old={self.current_clear_old}, current_prompt_type={self.current_prompt_type}, pending_box_start={self.pending_box_start}, pending_box_start_frame_idx={self.pending_box_start_frame_idx}, pending_box_start_obj_id={self.pending_box_start_obj_id}, is_switching_model={self.is_switching_model}, model_repo_key={self.model_repo_key}, model_repo_id={self.model_repo_id}, session_repo_id={self.session_repo_id})"
@@ -1899,6 +1901,42 @@ def _build_yolo_plot(state: AppState):
     return fig
 
 
+def _jump_to_frame(state: AppState, target: int | None):
+    if state is None or state.num_frames == 0 or target is None:
+        return gr.update(), gr.update()
+    idx = int(np.clip(int(target), 0, state.num_frames - 1))
+    state.current_frame_idx = idx
+    return (
+        update_frame_display(state, idx),
+        gr.update(value=idx),
+    )
+
+
+def _jump_to_yolo_kick(state: AppState):
+    return _jump_to_frame(state, getattr(state, "yolo_kick_frame", None))
+
+
+def _jump_to_sam_kick(state: AppState):
+    return _jump_to_frame(state, _get_prioritized_kick_frame(state))
+
+
+def _jump_to_sam_impact(state: AppState):
+    impact = getattr(state, "impact_frame", None)
+    if impact is None:
+        frames = getattr(state, "impact_debug_frames", [])
+        if frames:
+            impact = frames[-1]
+    return _jump_to_frame(state, impact)
+
+
+def _jump_to_manual_kick(state: AppState):
+    return _jump_to_frame(state, getattr(state, "manual_kick_frame", None))
+
+
+def _jump_to_manual_impact(state: AppState):
+    return _jump_to_frame(state, getattr(state, "manual_impact_frame", None))
+
+
 def _format_impact_status(state: AppState) -> str:
     def fmt(value: int | None) -> str:
         return str(int(value)) if value is not None else "N/A"
@@ -1967,38 +2005,10 @@ def _format_kick_status(state: AppState) -> str:
     return f"Kick frame ≈ {frame}{time_part}"
 
 
-def _jump_to_frame(state: AppState, target: int | None):
-    if state is None or state.num_frames == 0 or target is None:
-        return gr.update(), gr.update(), gr.update(value=_format_impact_status(state), visible=True)
-    idx = int(np.clip(int(target), 0, state.num_frames - 1))
-    state.current_frame_idx = idx
-    return (
-        update_frame_display(state, idx),
-        gr.update(value=idx),
-        gr.update(value=_format_impact_status(state), visible=True),
-    )
-
-
-def _jump_to_yolo_kick(state: AppState):
-    return _jump_to_frame(state, getattr(state, "yolo_kick_frame", None))
-
-
-def _jump_to_sam_kick(state: AppState):
-    return _jump_to_frame(state, _get_prioritized_kick_frame(state))
-
-
-def _jump_to_sam_impact(state: AppState):
-    impact = getattr(state, "impact_frame", None)
-    if impact is None:
-        frames = getattr(state, "impact_debug_frames", [])
-        if frames:
-            impact = frames[-1]
-    return _jump_to_frame(state, impact)
-
-
 def _mark_kick_frame(state: AppState, frame_value: float):
     if state is None or state.num_frames == 0:
         propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(state)
+        button_updates = _kick_button_updates(state)
         return (
             gr.update(),
             gr.update(value="Load a video first.", visible=True),
@@ -2007,14 +2017,16 @@ def _mark_kick_frame(state: AppState, frame_value: float):
             propagate_main_update,
             detect_btn_update,
             propagate_player_update,
-            gr.update(value=_format_impact_status(state), visible=True),
+            *button_updates,
         )
     idx = int(np.clip(int(frame_value), 0, state.num_frames - 1))
     state.kick_frame = idx
+    state.manual_kick_frame = idx
     _compute_sam_window_from_kick(state, idx)
     state.current_frame_idx = idx
     msg = f"⚽ Kick frame manually set to {idx}"
     propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(state)
+    button_updates = _kick_button_updates(state)
     return (
         update_frame_display(state, idx),
         gr.update(value=msg, visible=True),
@@ -2023,13 +2035,14 @@ def _mark_kick_frame(state: AppState, frame_value: float):
         propagate_main_update,
         detect_btn_update,
         propagate_player_update,
-        gr.update(value=_format_impact_status(state), visible=True),
+        *button_updates,
     )
 
 
 def _mark_impact_frame(state: AppState, frame_value: float):
     if state is None or state.num_frames == 0:
         propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(state)
+        button_updates = _kick_button_updates(state)
         return (
             gr.update(),
             gr.update(value="Load a video first.", visible=True),
@@ -2038,12 +2051,14 @@ def _mark_impact_frame(state: AppState, frame_value: float):
             propagate_main_update,
             detect_btn_update,
             propagate_player_update,
-            gr.update(value=_format_impact_status(state), visible=True),
+            *button_updates,
         )
     idx = int(np.clip(int(frame_value), 0, state.num_frames - 1))
     state.impact_frame = idx
+    state.manual_impact_frame = idx
     msg = f"🚩 Impact frame manually set to {idx}"
     propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(state)
+    button_updates = _kick_button_updates(state)
     return (
         update_frame_display(state, idx),
         gr.update(value=msg, visible=True),
@@ -2052,9 +2067,38 @@ def _mark_impact_frame(state: AppState, frame_value: float):
         propagate_main_update,
         detect_btn_update,
         propagate_player_update,
-        gr.update(value=_format_impact_status(state), visible=True),
+        *button_updates,
+    )
+
+
+def _kick_button_updates(state: AppState) -> tuple[Any, ...]:
+    def fmt(label: str, value: int | None, clickable: bool = True):
+        text = f"{label} {value if value is not None else 'N/A'}"
+        return gr.update(value=text, interactive=clickable and value is not None)
+
+    yolo_kick = getattr(state, "yolo_kick_frame", None)
+    sam_kick = _get_prioritized_kick_frame(state)
+    sam_impact = getattr(state, "impact_frame", None)
+    if sam_impact is None:
+        frames = getattr(state, "impact_debug_frames", [])
+        if frames:
+            sam_impact = frames[-1]
+    manual_kick = getattr(state, "manual_kick_frame", None)
+    manual_impact = getattr(state, "manual_impact_frame", None)
+
+    return (
+        fmt("⚽ Kick", yolo_kick),
+        fmt("🚩 Impact", None, clickable=False),
+        fmt("⚽ Kick", sam_kick),
+        fmt("🚩 Impact", sam_impact),
+        fmt("⚽ Kick", manual_kick),
+        fmt("🚩 Impact", manual_impact),
     )
 
+
+def _impact_status_update(state: AppState):
+    return gr.update(value=_format_impact_status(state), visible=False)
+
 def _ball_has_masks(state: AppState, target_obj_id: int = BALL_OBJECT_ID) -> bool:
     if state is None:
         return False
@@ -2521,7 +2565,7 @@ def propagate_masks(GLOBAL_STATE: gr.State):
             gr.update(),
             _build_kick_plot(GLOBAL_STATE),
             _build_yolo_plot(GLOBAL_STATE),
-            gr.update(value=_format_impact_status(GLOBAL_STATE), visible=True),
+            _impact_status_update(GLOBAL_STATE),
             gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
             propagate_main_update,
             detect_btn_update,
@@ -2559,7 +2603,7 @@ def propagate_masks(GLOBAL_STATE: gr.State):
         gr.update(),
         _build_kick_plot(GLOBAL_STATE),
         _build_yolo_plot(GLOBAL_STATE),
-        _format_impact_status(GLOBAL_STATE),
+        _impact_status_update(GLOBAL_STATE),
         gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
         propagate_main_update,
         detect_btn_update,
@@ -2599,7 +2643,7 @@ def propagate_masks(GLOBAL_STATE: gr.State):
                     gr.update(value=frame_idx),
                     _build_kick_plot(GLOBAL_STATE),
                     _build_yolo_plot(GLOBAL_STATE),
-                    _format_impact_status(GLOBAL_STATE),
+                    _impact_status_update(GLOBAL_STATE),
                     gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
                     propagate_main_update,
                     detect_btn_update,
@@ -2623,7 +2667,7 @@ def propagate_masks(GLOBAL_STATE: gr.State):
         gr.update(value=target_frame),
         _build_kick_plot(GLOBAL_STATE),
         _build_yolo_plot(GLOBAL_STATE),
-        _format_impact_status(GLOBAL_STATE),
+        _impact_status_update(GLOBAL_STATE),
         gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
         propagate_main_update,
         detect_btn_update,
@@ -2644,7 +2688,7 @@ def reset_session(GLOBAL_STATE: gr.State) -> tuple[AppState, Image.Image, int, i
             "Session reset. Load a new video.",
             gr.update(visible=False, value=""),
             _build_kick_plot(GLOBAL_STATE),
-            _format_impact_status(GLOBAL_STATE),
+            _impact_status_update(GLOBAL_STATE),
             propagate_main_update,
             detect_btn_update,
             propagate_player_update,
@@ -2716,7 +2760,7 @@ def reset_session(GLOBAL_STATE: gr.State) -> tuple[AppState, Image.Image, int, i
         gr.update(visible=False, value=""),
         _build_kick_plot(GLOBAL_STATE),
         _build_yolo_plot(GLOBAL_STATE),
-        _format_impact_status(GLOBAL_STATE),
+        _impact_status_update(GLOBAL_STATE),
         propagate_main_update,
         detect_btn_update,
         propagate_player_update,
@@ -3002,11 +3046,20 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
                 interactive=True,
                 elem_id="frame-slider",
             )
-            impact_status = gr.Markdown(value=_format_impact_status(None), visible=True)
+            with gr.Row(equal_height=True):
+                gr.Markdown("YOLO13:")
+                yolo_kick_btn = gr.Button("⚽ Kick N/A", interactive=False, scale=0)
+                gr.Markdown("·")
+                yolo_impact_btn = gr.Button("🚩 Impact N/A", interactive=False, scale=0)
+                gr.Markdown(", SAM2:")
+                sam_kick_btn = gr.Button("⚽ Kick N/A", interactive=False, scale=0)
+                gr.Markdown("·")
+                sam_impact_btn = gr.Button("🚩 Impact N/A", interactive=False, scale=0)
+                gr.Markdown(", MANUAL:")
+                manual_kick_btn = gr.Button("⚽ Kick N/A", interactive=False, scale=0)
+                gr.Markdown("·")
+                manual_impact_btn = gr.Button("🚩 Impact N/A", interactive=False, scale=0)
             with gr.Row():
-                jump_yolo_kick_btn = gr.Button("Jump YOLO Kick ⚽", variant="secondary")
-                jump_sam_kick_btn = gr.Button("Jump SAM Kick ⚽", variant="secondary")
-                jump_sam_impact_btn = gr.Button("Jump SAM Impact 🚩", variant="secondary")
                 mark_kick_btn = gr.Button("Mark Kick ⚽", variant="primary")
                 mark_impact_btn = gr.Button("Mark Impact 🚩", variant="primary")
             with gr.Row():
@@ -3034,7 +3087,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
             propagate_player_btn = gr.Button("Propagate Player", variant="primary", interactive=False)
             ball_status = gr.Markdown(visible=False)
             propagate_status = gr.Markdown(visible=True)
-            impact_status = gr.Markdown("Impact frame: not computed")
+            impact_status = gr.Markdown("Impact frame: not computed", visible=False)
             with gr.Row():
                 obj_id_inp = gr.Number(value=1, precision=0, label="Object ID", scale=0)
                 label_radio = gr.Radio(choices=["positive", "negative"], value="positive", label="Point label")
@@ -3047,6 +3100,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
     def _on_video_change(GLOBAL_STATE: gr.State, video):
         GLOBAL_STATE, min_idx, max_idx, first_frame, status = init_video_session(GLOBAL_STATE, video)
         propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(GLOBAL_STATE)
+        button_updates = _kick_button_updates(GLOBAL_STATE)
         return (
             GLOBAL_STATE,
             gr.update(minimum=min_idx, maximum=max_idx, value=min_idx, interactive=True),
@@ -3055,7 +3109,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
             gr.update(visible=False, value=""),
             _build_kick_plot(GLOBAL_STATE),
             _build_yolo_plot(GLOBAL_STATE),
-            _format_impact_status(GLOBAL_STATE),
+            *button_updates,
             propagate_main_update,
             detect_btn_update,
             propagate_player_update,
@@ -3064,7 +3118,24 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
     video_in.change(
         _on_video_change,
         inputs=[GLOBAL_STATE, video_in],
-        outputs=[GLOBAL_STATE, frame_slider, preview, load_status, ball_status, kick_plot, yolo_plot, impact_status, propagate_btn, detect_player_btn, propagate_player_btn],
+        outputs=[
+            GLOBAL_STATE,
+            frame_slider,
+            preview,
+            load_status,
+            ball_status,
+            kick_plot,
+            yolo_plot,
+            yolo_kick_btn,
+            yolo_impact_btn,
+            sam_kick_btn,
+            sam_impact_btn,
+            manual_kick_btn,
+            manual_impact_btn,
+            propagate_btn,
+            detect_player_btn,
+            propagate_player_btn,
+        ],
         show_progress=True,
     )
 
@@ -3077,7 +3148,24 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
             examples=examples_list,
             inputs=[GLOBAL_STATE, video_in],
             fn=_on_video_change,
-            outputs=[GLOBAL_STATE, frame_slider, preview, load_status, ball_status, kick_plot, yolo_plot, impact_status, propagate_btn, detect_player_btn, propagate_player_btn],
+            outputs=[
+                GLOBAL_STATE,
+                frame_slider,
+                preview,
+                load_status,
+                ball_status,
+                kick_plot,
+                yolo_plot,
+                yolo_kick_btn,
+                yolo_impact_btn,
+                sam_kick_btn,
+                sam_impact_btn,
+                manual_kick_btn,
+                manual_impact_btn,
+                propagate_btn,
+                detect_player_btn,
+                propagate_player_btn,
+            ],
             label="Examples",
             cache_examples=False,
             examples_per_page=5,
@@ -3324,31 +3412,78 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
         inputs=[GLOBAL_STATE, frame_slider],
         outputs=preview,
     )
-
-    jump_yolo_kick_btn.click(
+    yolo_kick_btn.click(
         _jump_to_yolo_kick,
         inputs=[GLOBAL_STATE],
-        outputs=[preview, frame_slider, impact_status],
+        outputs=[preview, frame_slider],
     )
-    jump_sam_kick_btn.click(
+    sam_kick_btn.click(
         _jump_to_sam_kick,
         inputs=[GLOBAL_STATE],
-        outputs=[preview, frame_slider, impact_status],
+        outputs=[preview, frame_slider],
     )
-    jump_sam_impact_btn.click(
+    sam_impact_btn.click(
         _jump_to_sam_impact,
         inputs=[GLOBAL_STATE],
-        outputs=[preview, frame_slider, impact_status],
+        outputs=[preview, frame_slider],
+    )
+    manual_kick_btn.click(
+        _jump_to_manual_kick,
+        inputs=[GLOBAL_STATE],
+        outputs=[preview, frame_slider],
+    )
+    manual_impact_btn.click(
+        _jump_to_manual_impact,
+        inputs=[GLOBAL_STATE],
+        outputs=[preview, frame_slider],
     )
     mark_kick_btn.click(
         _mark_kick_frame,
         inputs=[GLOBAL_STATE, frame_slider],
-        outputs=[preview, ball_status, frame_slider, kick_plot, propagate_btn, detect_player_btn, propagate_player_btn, impact_status],
+        outputs=[
+            preview,
+            ball_status,
+            frame_slider,
+            kick_plot,
+            propagate_btn,
+            detect_player_btn,
+            propagate_player_btn,
+            yolo_kick_btn,
+            yolo_impact_btn,
+            sam_kick_btn,
+            sam_impact_btn,
+            manual_kick_btn,
+            manual_impact_btn,
+        ],
     )
     mark_impact_btn.click(
         _mark_impact_frame,
         inputs=[GLOBAL_STATE, frame_slider],
-        outputs=[preview, ball_status, frame_slider, kick_plot, propagate_btn, detect_player_btn, propagate_player_btn, impact_status],
+        outputs=[
+            preview,
+            ball_status,
+            frame_slider,
+            kick_plot,
+            propagate_btn,
+            detect_player_btn,
+            propagate_player_btn,
+            yolo_kick_btn,
+            yolo_impact_btn,
+            sam_kick_btn,
+            sam_impact_btn,
+            manual_kick_btn,
+            manual_impact_btn,
+        ],
+    )
+
+    def _refresh_kick_buttons(state_in: AppState):
+        return _kick_button_updates(state_in)
+
+    kick_timer = gr.Timer(0.6, active=True)
+    kick_timer(
+        fn=_refresh_kick_buttons,
+        inputs=[GLOBAL_STATE],
+        outputs=[yolo_kick_btn, yolo_impact_btn, sam_kick_btn, sam_impact_btn, manual_kick_btn, manual_impact_btn],
     )
 
     def _sync_obj_id(s: AppState, oid):
@@ -3390,7 +3525,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
         propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(s)
         return (
             _build_kick_plot(s),
-            _format_impact_status(s),
+            _impact_status_update(s),
             gr.update(value=_format_kick_status(s), visible=True),
             propagate_main_update,
             detect_btn_update,
@@ -3404,7 +3539,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
         propagate_main_update, detect_btn_update, propagate_player_update = _button_updates(s)
         return (
             _build_kick_plot(s),
-            _format_impact_status(s),
+            _impact_status_update(s),
             gr.update(value=_format_kick_status(s), visible=True),
             propagate_main_update,
             detect_btn_update,
@@ -3575,7 +3710,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
                 detect_btn_update,
                 propagate_player_update,
                 gr.update(),
-                gr.update(value=_format_impact_status(state_in), visible=True),
+                _impact_status_update(state_in),
             )
 
         if detection is None:
@@ -3662,7 +3797,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
                 gr.update(),
                 _build_kick_plot(GLOBAL_STATE),
                 _build_yolo_plot(GLOBAL_STATE),
-                _format_impact_status(GLOBAL_STATE),
+                _impact_status_update(GLOBAL_STATE),
                 gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
                 propagate_main_update,
                 detect_btn_update,
@@ -3676,7 +3811,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
                 gr.update(),
                 _build_kick_plot(GLOBAL_STATE),
                 _build_yolo_plot(GLOBAL_STATE),
-                _format_impact_status(GLOBAL_STATE),
+                _impact_status_update(GLOBAL_STATE),
                 gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
                 propagate_main_update,
                 detect_btn_update,
@@ -3709,7 +3844,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
             gr.update(),
             _build_kick_plot(GLOBAL_STATE),
             _build_yolo_plot(GLOBAL_STATE),
-            _format_impact_status(GLOBAL_STATE),
+            _impact_status_update(GLOBAL_STATE),
             gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
             propagate_main_update,
             detect_btn_update,
@@ -3755,7 +3890,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
                         gr.update(value=frame_idx),
                         _build_kick_plot(GLOBAL_STATE),
                         _build_yolo_plot(GLOBAL_STATE),
-                        _format_impact_status(GLOBAL_STATE),
+                        _impact_status_update(GLOBAL_STATE),
                         gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
                         propagate_main_update,
                         detect_btn_update,
@@ -3778,7 +3913,7 @@ with gr.Blocks(title="SAM2 Video (Transformers) - Interactive Segmentation", the
             gr.update(value=target_frame),
             _build_kick_plot(GLOBAL_STATE),
             _build_yolo_plot(GLOBAL_STATE),
-            _format_impact_status(GLOBAL_STATE),
+            _impact_status_update(GLOBAL_STATE),
             gr.update(value=_format_kick_status(GLOBAL_STATE), visible=True),
             propagate_main_update,
             detect_btn_update,