updates

app.py

@@ -238,91 +238,90 @@ def create_interface():
     success = annotator.load_videos_from_hf()
     
     if not success:
-        logger.error("Failed to load videos. Using demo mode with sample video.")
-        # In real app, you might want to provide a sample video or show an error
+        logger.error("Failed to load videos. Interface might not function correctly.")
+        # Handle the error appropriately, maybe show a message in the UI
     
     with gr.Blocks() as demo:
         gr.Markdown("# Cricket Video Annotation Tool")
         
-        with gr.Row():
-            video_player = gr.Video(
-                value=annotator.get_current_video,  # Function to load the raw video
-                inputs=[],  # No inputs needed for loading the video
-                
-                # outputs=gr.Video(label="Current Video")  # Output type is video
-            )
-        
-        annotation_components = []
-        
-        with gr.Row():
-            with gr.Column():
-                for category, options in list(ANNOTATION_CATEGORIES.items())[:4]:
-                    radio = gr.Radio(
-                        choices=options,
-                        label=category,
-                        info=f"Select {category}"
-                    )
-                    annotation_components.append(radio)
-            
-            with gr.Column():
-                for category, options in list(ANNOTATION_CATEGORIES.items())[4:]:
+        # --- Start Edit: Reorganize layout ---
+        with gr.Row(): # Main row to hold video and controls side-by-side
+            with gr.Column(scale=3): # Assign more horizontal space to the video column
+                video_player = gr.Video(
+                    value=annotator.get_current_video, # Keep using the function loader
+                    label="Current Video", # Add a label for clarity
+                    height=500 # Set a fixed height (adjust as needed for your screen)
+                )
+                # Status textbox below the video
+                status_textbox = gr.Textbox(label="Status", interactive=False)
+
+            with gr.Column(scale=2): # Assign less space to the controls column
+                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}"
+                        # info=f"Select {category}" # Removing info saves a bit of vertical space
                     )
                     annotation_components.append(radio)
-        
-        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 a Textbox for status messages from next/prev ---
-        status_textbox = gr.Textbox(label="Status", interactive=False) 
+
+                # 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")
         # --- End Edit ---
-            
-        # Initialize with first video
+
+
+        # Initialize with first video and potential annotations (logic remains the same)
         current_video = annotator.get_current_video()
         if current_video:
-            logger.info(f"Setting video player with video: {current_video}")
-            video_player.value = current_video
-            
-            # Try to load existing annotations
+            logger.info(f"Setting initial video player value: {current_video}")
+            # The video_player will call annotator.get_current_video on load,
+            # so explicitly setting value might be redundant unless get_current_video changes state.
+            # video_player.value = current_video # Let's rely on the function loader
+
             existing_annotations = annotator.load_existing_annotation()
             if existing_annotations:
                 logger.info(f"Loading existing annotations: {existing_annotations}")
-                for i, category in enumerate(ANNOTATION_CATEGORIES.keys()):
-                    if category in existing_annotations:
-                        annotation_components[i].value = existing_annotations[category]
-        
-        # Event handlers
+                # Need to return initial values for components if loading annotations
+                # This part is tricky with function loading. Let's adjust.
+
+                # We might need a separate function to load initial state
+                # Or adjust how initial values are set.
+                # For now, let's assume the user starts fresh or loads via next/prev.
+                # 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)
         save_btn.click(
             fn=annotator.save_annotation,
             inputs=annotation_components,
-            # --- Start Edit: Update output for save button ---
-            outputs=status_textbox # Changed from gr.Textbox(label="Status")
-            # --- End Edit ---
+            outputs=status_textbox # Output to the status textbox defined earlier
         )
-        
+
         next_btn.click(
             fn=annotator.next_video,
             inputs=annotation_components,
-            # --- Start Edit: Update outputs for next button ---
+            # Outputs: video, clear all radios, update status
             outputs=[video_player] + annotation_components + [status_textbox]
-            # --- End Edit ---
         )
-        
+
         prev_btn.click(
             fn=annotator.prev_video,
             inputs=annotation_components,
-            # --- Start Edit: Update outputs for prev button ---
+            # Outputs: video, clear all radios, update status
             outputs=[video_player] + annotation_components + [status_textbox]
-            # --- End Edit ---
         )
-        
+
     return demo
 
 if __name__ == "__main__":
     demo = create_interface()
+    # Consider adding share=True for easier testing if needed
     demo.launch(allowed_paths=["/"])