.

app.py

@@ -16,7 +16,8 @@ import os
 from video_highlight_detector import (
     load_model,
     BatchedVideoHighlightDetector,
-    get_video_duration_seconds
+    get_video_duration_seconds,
+    get_fixed_30s_segments
 )
 
 def load_examples(json_path: str) -> dict:
@@ -115,11 +116,6 @@ def create_ui(examples_path: str):
                     ]
                     return
 
-                current_status = ""
-                def progress_callback(current, total):
-                    nonlocal current_status
-                    current_status = f"Processing segments... {int((current/total) * 100)}% complete"
-
                 # Make accordion visible as soon as processing starts
                 yield [
                     "Loading model...",
@@ -133,8 +129,7 @@ def create_ui(examples_path: str):
                 detector = BatchedVideoHighlightDetector(
                     model, 
                     processor, 
-                    batch_size=8,
-                    progress_callback=progress_callback
+                    batch_size=8
                 )
 
                 yield [
@@ -159,30 +154,43 @@ def create_ui(examples_path: str):
                 highlights = detector.determine_highlights(video_desc)
                 formatted_highlights = f"#Highlights to search for: {highlights[:500] + '...' if len(highlights) > 500 else highlights}"
                 
-                yield [
-                    "Starting highlight detection...",
-                    formatted_desc,
-                    formatted_highlights,
-                    gr.update(visible=False),
-                    gr.update(visible=True)
-                ]
+                # Get all segments
+                segments = get_fixed_30s_segments(video)
+                total_segments = len(segments)
+                kept_segments = []
+                
+                # Process segments in batches with direct UI updates
+                for i in range(0, len(segments), detector.batch_size):
+                    batch_segments = segments[i:i + detector.batch_size]
+                    
+                    # Update progress
+                    progress = int((i / total_segments) * 100)
+                    yield [
+                        f"Processing segments... {progress}% complete",
+                        formatted_desc,
+                        formatted_highlights,
+                        gr.update(visible=False),
+                        gr.update(visible=True)
+                    ]
+                    
+                    # Process batch
+                    keep_flags = detector._process_segment_batch(
+                        video_path=video,
+                        segments=batch_segments,
+                        highlight_types=highlights,
+                        total_segments=total_segments,
+                        segments_processed=i
+                    )
+                    
+                    # Keep track of segments to include
+                    for segment, keep in zip(batch_segments, keep_flags):
+                        if keep:
+                            kept_segments.append(segment)
 
+                # Create final video
                 with tempfile.NamedTemporaryFile(suffix='.mp4', delete=False) as tmp_file:
                     temp_output = tmp_file.name
-
-                    # This will now call our progress_callback during processing
-                    detector.create_highlight_video(video, temp_output)
-                    
-                    # Keep yielding progress updates while processing
-                    while current_status:
-                        yield [
-                            current_status,
-                            formatted_desc,
-                            formatted_highlights,
-                            gr.update(visible=False),
-                            gr.update(visible=True)
-                        ]
-                        time.sleep(0.1)  # Small delay to prevent too frequent updates
+                    detector._concatenate_scenes(video, kept_segments, temp_output)
                 
                 yield [
                     "Processing complete!",