updates

app.py

@@ -181,55 +181,49 @@ class VideoAnnotator:
         # Save current annotations before moving to next video
         save_status = "No annotations provided to save." # Default status
         if self.video_files:
-            # --- Start Edit: Check if annotations were actually provided ---
-            # Check if any annotation was actually selected
             annotations_provided = any(ann is not None for ann in current_annotations)
-            
             if annotations_provided:
-                save_status = self.save_annotation(*current_annotations) # Pass all, save_annotation filters None
+                save_status = self.save_annotation(*current_annotations)
                 logger.info(f"Save status before moving next: {save_status}")
             else:
                 logger.info("No annotations selected, skipping save before moving next.")
-            # --- End Edit ---
-        
+                save_status = "Skipped saving - no annotations selected."
+
         # Move to next video
         if self.current_video_idx < len(self.video_files) - 1:
             self.current_video_idx += 1
             logger.info(f"Moving to next video (index: {self.current_video_idx})")
-            # --- Start Edit: Return save status along with video and cleared annotations ---
-            return self.get_current_video(), *[None] * len(ANNOTATION_CATEGORIES), save_status 
+            # --- Start Edit: Return only the save status as the last element ---
+            return self.get_current_video(), *[None] * len(ANNOTATION_CATEGORIES), save_status
             # --- End Edit ---
         else:
             logger.info("Already at the last video")
-            # --- Start Edit: Return save status ---
+            # --- Start Edit: Return only the save status as the last element ---
             return self.get_current_video(), *[None] * len(ANNOTATION_CATEGORIES), "Already at the last video. " + save_status
             # --- End Edit ---
-    
+
     def prev_video(self, *current_annotations):
         # Save current annotations before moving to previous video
         save_status = "No annotations provided to save." # Default status
         if self.video_files:
-            # --- Start Edit: Check if annotations were actually provided ---
-            # Check if any annotation was actually selected
             annotations_provided = any(ann is not None for ann in current_annotations)
-
             if annotations_provided:
-                save_status = self.save_annotation(*current_annotations) # Pass all, save_annotation filters None
+                save_status = self.save_annotation(*current_annotations)
                 logger.info(f"Save status before moving previous: {save_status}")
             else:
                 logger.info("No annotations selected, skipping save before moving previous.")
-            # --- End Edit ---
+                save_status = "Skipped saving - no annotations selected."
 
         # Move to previous video
         if self.current_video_idx > 0:
             self.current_video_idx -= 1
             logger.info(f"Moving to previous video (index: {self.current_video_idx})")
-            # --- Start Edit: Return save status along with video and cleared annotations ---
+            # --- Start Edit: Return only the save status as the last element ---
             return self.get_current_video(), *[None] * len(ANNOTATION_CATEGORIES), save_status
             # --- End Edit ---
         else:
             logger.info("Already at the first video")
-            # --- Start Edit: Return save status ---
+            # --- Start Edit: Return only the save status as the last element ---
             return self.get_current_video(), *[None] * len(ANNOTATION_CATEGORIES), "Already at the first video. " + save_status
             # --- End Edit ---
 
@@ -244,36 +238,52 @@ def create_interface():
     with gr.Blocks() as demo:
         gr.Markdown("# Cricket Video Annotation Tool")
         
+        # --- Start Edit: Define progress update function ---
+        total_categories = len(ANNOTATION_CATEGORIES)
+        def update_progress(*annotation_values):
+            filled_count = sum(1 for val in annotation_values if val is not None)
+            return f"**Progress:** {filled_count} / {total_categories} categories selected"
+        # --- End Edit ---
+
         with gr.Row(): # Main row to hold video and controls side-by-side
-            with gr.Column(scale=2): # You could also adjust this scale (e.g., scale=2) to make it narrower
+            with gr.Column(scale=2): # Column for Video Player and Nav Buttons
                 video_player = gr.Video(
-                    value=annotator.get_current_video, 
-                    label="Current Video", 
-                    height=350 # Reduced height from 500 to 400 (adjust as needed)
+                    value=annotator.get_current_video,
+                    label="Current Video",
+                    height=350
                 )
-                # Status textbox below the video
-                status_textbox = gr.Textbox(label="Status", interactive=False)
+                # --- Start Edit: Rename status_textbox to status_display ---
+                status_display = gr.Textbox(label="Status", interactive=False) # For save/nav messages
+                # --- End Edit ---
+                with gr.Row():
+                    prev_btn = gr.Button("Previous Video")
+                    next_btn = gr.Button("Next Video")
 
-            with gr.Column(scale=2): # You could adjust this scale (e.g., scale=3) if you change the video column's scale
+            with gr.Column(scale=2): # Column for Annotations and Save Button
                 annotation_components = []
                 gr.Markdown("### Annotations") # Header for the annotation section
 
                 # Display annotation radio buttons vertically in this column
-                # You might still need two columns here if vertical space is tight
-                # For simplicity, let's try one column first.
                 for category, options in ANNOTATION_CATEGORIES.items():
                     radio = gr.Radio(
                         choices=options,
                         label=category,
-                        # info=f"Select {category}" # Removing info saves a bit of vertical space
                     )
                     annotation_components.append(radio)
 
-                # Buttons below the annotations, within the same column
-                with gr.Row():
-                    prev_btn = gr.Button("Previous Video")
-                    save_btn = gr.Button("Save Annotations", variant="primary")
-                    next_btn = gr.Button("Next Video")
+                # --- Start Edit: Add Progress Display and attach change listeners ---
+                progress_display = gr.Markdown(value=update_progress(*[None]*total_categories)) # Initial progress
+
+                # Attach change listener to each radio button
+                for radio in annotation_components:
+                    radio.change(
+                        fn=update_progress,
+                        inputs=annotation_components,
+                        outputs=progress_display
+                    )
+                # --- End Edit ---
+
+                save_btn = gr.Button("Save Annotations", variant="primary")
 
         # Initialize with first video and potential annotations (logic remains the same)
         current_video = annotator.get_current_video()
@@ -295,25 +305,31 @@ def create_interface():
                 # A more robust solution might involve a dedicated "load" button or
                 # returning initial component values from a setup function.
 
-        # Event handlers (ensure outputs match the new layout variables)
+        # Event handlers
         save_btn.click(
             fn=annotator.save_annotation,
             inputs=annotation_components,
-            outputs=status_textbox # Output to the status textbox defined earlier
+            # --- Start Edit: Output to status_display ---
+            outputs=status_display
+            # --- End Edit ---
         )
 
         next_btn.click(
             fn=annotator.next_video,
             inputs=annotation_components,
-            # Outputs: video, clear all radios, update status
-            outputs=[video_player] + annotation_components + [status_textbox]
+            # --- Start Edit: Output status to status_display. Progress updates via radio changes. ---
+            # Outputs: video, clear all radios, update status_display
+            outputs=[video_player] + annotation_components + [status_display]
+            # --- End Edit ---
         )
 
         prev_btn.click(
             fn=annotator.prev_video,
             inputs=annotation_components,
-            # Outputs: video, clear all radios, update status
-            outputs=[video_player] + annotation_components + [status_textbox]
+            # --- Start Edit: Output status to status_display. Progress updates via radio changes. ---
+            # Outputs: video, clear all radios, update status_display
+            outputs=[video_player] + annotation_components + [status_display]
+            # --- End Edit ---
         )
 
     return demo