auto-load enabled and progress bar

components/review_dashboard_page.py

@@ -106,13 +106,6 @@ class ReviewDashboardPage:
     def register_callbacks(self, login_page, session_state: gr.State, root_blocks: gr.Blocks):
         self.header.register_callbacks(login_page, self, session_state)
 
-        # Register progress update callback
-        self.load_trigger.change(
-            fn=get_review_progress_fn,
-            inputs=[session_state],
-            outputs=self.header.progress_display
-        )
-
         def update_ui_interactive_state(is_interactive: bool):
             updates = []
             for elem in self.interactive_ui_elements:
@@ -183,6 +176,58 @@ class ReviewDashboardPage:
                 
             return validation_status, is_deleted
 
+        def get_review_progress_fn(session):
+            """Calculate review progress for the current reviewer"""
+            user_id = session.get("user_id")
+            username = session.get("username")
+            
+            if not user_id or not username:
+                return "Review Progress: N/A"
+            
+            # Check if user is a reviewer
+            if username not in conf.REVIEW_MAPPING.values():
+                return "Review Progress: N/A (Not a reviewer)"
+            
+            # Find target annotator
+            target_annotator = None
+            for annotator_name, reviewer_name in conf.REVIEW_MAPPING.items():
+                if reviewer_name == username:
+                    target_annotator = annotator_name
+                    break
+            
+            if not target_annotator:
+                return "Review Progress: N/A (No target annotator)"
+            
+            with get_db() as db:
+                try:
+                    # Get target annotator's ID
+                    target_annotator_obj = db.query(Annotator).filter_by(name=target_annotator).first()
+                    if not target_annotator_obj:
+                        return f"Review Progress: Error (Annotator '{target_annotator}' not found)"
+                    
+                    # Count total annotations for target annotator
+                    total_count = db.query(Annotation).filter(
+                        Annotation.annotator_id == target_annotator_obj.id
+                    ).count()
+                    
+                    # Count reviewed annotations (have validation from this reviewer)
+                    reviewed_count = db.query(Annotation).join(
+                        Validation, Annotation.id == Validation.annotation_id
+                    ).filter(
+                        Annotation.annotator_id == target_annotator_obj.id,
+                        Validation.validator_id == user_id
+                    ).count()
+                    
+                    if total_count > 0:
+                        percentage = (reviewed_count / total_count) * 100
+                        return f"**Review Progress:** {reviewed_count}/{total_count} ({percentage:.1f}%) - Reviewing {target_annotator}'s work"
+                    else:
+                        return f"**Review Progress:** No items found for {target_annotator}"
+                        
+                except Exception as e:
+                    log.error(f"Error calculating review progress for user {user_id}: {e}")
+                    return "Review Progress: Error calculating progress"
+
         def load_review_items_fn(session):
             user_id = session.get("user_id")
             username = session.get("username")
@@ -378,81 +423,12 @@ class ReviewDashboardPage:
                 current_item["annotated_at"],
                 current_item["validation_status"],
                 "", # Placeholder for annotator_name
-                gr.update(value=None, autoplay=False),  # Reset audio (will be loaded manually)
+                gr.update(value=None, autoplay=False),
                 gr.update(visible=rejection_visible, value=rejection_reason),
                 False,  # Reset rejection mode
                 gr.update(value="❌ Reject")  # Reset reject button text
             )
 
-        def get_review_progress_fn(session):
-            """Get progress for reviewer showing how many items they've reviewed"""
-            user_id = session.get("user_id")
-            username = session.get("username")
-            
-            if not user_id or not username:
-                return "Review Progress: N/A"
-            
-            # Check if user is a reviewer
-            if username not in conf.REVIEW_MAPPING.values():
-                return "Review Progress: N/A (Not a reviewer)"
-                
-            # Find which annotator this user should review
-            target_annotator = None
-            for annotator_name, reviewer_name in conf.REVIEW_MAPPING.items():
-                if reviewer_name == username:
-                    target_annotator = annotator_name
-                    break
-                    
-            if not target_annotator:
-                return "Review Progress: N/A (No assignment)"
-            
-            with get_db() as db:
-                try:
-                    # Get target annotator's ID
-                    target_annotator_obj = db.query(Annotator).filter_by(name=target_annotator).first()
-                    if not target_annotator_obj:
-                        return "Review Progress: N/A (Annotator not found)"
-                    
-                    # Count total annotations by target annotator
-                    total_annotations = db.query(Annotation).filter(
-                        Annotation.annotator_id == target_annotator_obj.id
-                    ).count()
-                    
-                    # Count reviewed annotations (both approved and rejected)
-                    reviewed_count = db.query(Validation).filter(
-                        Validation.validator_id == user_id
-                    ).join(
-                        Annotation, Validation.annotation_id == Annotation.id
-                    ).filter(
-                        Annotation.annotator_id == target_annotator_obj.id
-                    ).count()
-                    
-                    if total_annotations > 0:
-                        percent = (reviewed_count / total_annotations) * 100
-                        bar_length = 20  # Length of the progress bar
-                        filled_length = int(bar_length * reviewed_count // total_annotations)
-                        bar = '█' * filled_length + '░' * (bar_length - filled_length)
-                        return f"Review Progress: {bar} {reviewed_count}/{total_annotations} ({percent:.1f}%)"
-                    else:
-                        return "Review Progress: No items to review"
-                        
-                except Exception as e:
-                    log.error(f"Error calculating review progress: {e}")
-                    return "Review Progress: Error calculating"
-
-        def auto_load_audio_on_navigate_fn(filename_to_load):
-            """Auto-load audio when navigating between items for smooth UX"""
-            if not filename_to_load:
-                return None, None, gr.update(value=None, autoplay=False)
-            try:
-                log.info(f"Auto-loading audio for navigation: {filename_to_load}")
-                sr, wav = LOADER.load_audio(filename_to_load)
-                log.info(f"Auto-loaded audio: {filename_to_load} (SR: {sr}, Length: {len(wav)} samples)")
-                return (sr, wav), (sr, wav.copy()), gr.update(value=(sr, wav), autoplay=True)
-            except Exception as e:
-                log.error(f"Auto audio load failed for {filename_to_load}: {e}")
-                return None, None, gr.update(value=None, autoplay=False)
-
         def navigate_review_fn(items, current_idx, direction):
             if not items:
                 return 0
@@ -674,6 +650,10 @@ class ReviewDashboardPage:
             fn=load_review_items_fn,
             inputs=[session_state],
             outputs=[self.items_state, self.idx_state, self.review_info] + review_display_outputs
+        ).then(
+            fn=get_review_progress_fn,
+            inputs=[session_state],
+            outputs=[self.header.progress_display]
         ).then(
             fn=lambda: (None, gr.update(value=None)), # Clear audio state
             outputs=[self.original_audio_state, self.audio]
@@ -685,7 +665,7 @@ class ReviewDashboardPage:
         # Audio loading is now manual only via the Load Audio button
         # Removed automatic filename.change callback to prevent slow loading during initialization
 
-        # Navigation buttons with auto-audio loading
+        # Navigation buttons
         for btn, direction in [(self.btn_prev, "prev"), (self.btn_next, "next")]:
             btn.click(
                 fn=lambda: update_ui_interactive_state(False),
@@ -699,8 +679,8 @@ class ReviewDashboardPage:
                 inputs=[self.items_state, self.idx_state, session_state],
                 outputs=review_display_outputs
             ).then(
-                # Auto-load audio on navigation for smooth UX
-                fn=auto_load_audio_on_navigate_fn,
+                # Auto-load audio with autoplay for smooth navigation
+                fn=download_voice_fn,
                 inputs=[self.filename],
                 outputs=[self.audio, self.original_audio_state, self.audio]
             ).then(
@@ -711,22 +691,21 @@ class ReviewDashboardPage:
                 outputs=self.interactive_ui_elements
             )
 
-        # Approve/Reject buttons with auto-audio loading and progress updates
+        # Approve/Reject buttons
         self.btn_approve.click(
             fn=lambda items, idx, session: save_validation_fn(items, idx, session, approved=True, rejection_reason=""), # Pass empty rejection_reason
             inputs=[self.items_state, self.idx_state, session_state],
             outputs=[self.items_state, self.current_validation_status, self.rejection_reason_input] 
+        ).then(
+            fn=get_review_progress_fn,  # Update progress after approval
+            inputs=[session_state],
+            outputs=[self.header.progress_display]
         ).then(
             fn=lambda: False,  # Reset rejection mode
             outputs=[self.rejection_mode_active]
         ).then(
             fn=lambda: gr.update(value="❌ Reject"),  # Reset reject button
             outputs=[self.btn_reject]
-        ).then(
-            # Update progress after approval
-            fn=get_review_progress_fn,
-            inputs=[session_state],
-            outputs=self.header.progress_display
         ).then(
             fn=lambda items, idx: navigate_review_fn(items, idx, "next"),
             inputs=[self.items_state, self.idx_state],
@@ -736,8 +715,8 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, session_state],
             outputs=review_display_outputs
         ).then(
-            # Auto-load audio for next item
-            fn=auto_load_audio_on_navigate_fn,
+            # Auto-load audio with autoplay after moving to next item
+            fn=download_voice_fn,
             inputs=[self.filename],
             outputs=[self.audio, self.original_audio_state, self.audio]
         )
@@ -747,10 +726,9 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, session_state, self.rejection_reason_input, self.rejection_mode_active],
             outputs=[self.items_state, self.current_validation_status, self.rejection_reason_input, self.rejection_mode_active, self.btn_reject]
         ).then(
-            # Update progress after rejection (only if completed)
-            fn=lambda session, rejection_mode: get_review_progress_fn(session) if not rejection_mode else "",
-            inputs=[session_state, self.rejection_mode_active],
-            outputs=self.header.progress_display
+            fn=lambda items, idx, session, rejection_mode: get_review_progress_fn(session) if not rejection_mode else "",  # Update progress only after successful rejection
+            inputs=[self.items_state, self.idx_state, session_state, self.rejection_mode_active],
+            outputs=[self.header.progress_display]
         ).then(
             fn=lambda items, idx, rejection_mode: navigate_review_fn(items, idx, "next") if not rejection_mode else idx,
             inputs=[self.items_state, self.idx_state, self.rejection_mode_active],
@@ -772,13 +750,13 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, session_state, self.rejection_mode_active],
             outputs=review_display_outputs
         ).then(
-            # Auto-load audio for next item (only if completed rejection)
-            fn=lambda filename, rejection_mode: auto_load_audio_on_navigate_fn(filename) if not rejection_mode else (None, None, gr.update()),
+            # Auto-load audio with autoplay only if we moved to next item (not in rejection mode)
+            fn=lambda filename, rejection_mode: download_voice_fn(filename) if not rejection_mode else (None, None, gr.update(value=None, autoplay=False)),
             inputs=[self.filename, self.rejection_mode_active],
             outputs=[self.audio, self.original_audio_state, self.audio]
         )
 
-        # Skip button (just navigate to next) with auto-audio loading
+        # Skip button (just navigate to next)
         self.btn_skip.click(
             fn=navigate_review_fn,
             inputs=[self.items_state, self.idx_state, gr.State("next")],
@@ -788,13 +766,13 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, session_state],
             outputs=review_display_outputs
         ).then(
-            # Auto-load audio for next item
-            fn=auto_load_audio_on_navigate_fn,
+            # Auto-load audio with autoplay after skipping
+            fn=download_voice_fn,
             inputs=[self.filename],
             outputs=[self.audio, self.original_audio_state, self.audio]
         )
 
-        # Jump button with auto-audio loading
+        # Jump button
         self.btn_jump.click(
             fn=jump_by_data_id_fn,
             inputs=[self.items_state, self.jump_data_id_input, self.idx_state],
@@ -804,8 +782,8 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, session_state],
             outputs=review_display_outputs
         ).then(
-            # Auto-load audio for jumped item
-            fn=auto_load_audio_on_navigate_fn,
+            # Auto-load audio with autoplay after jumping
+            fn=download_voice_fn,
             inputs=[self.filename],
             outputs=[self.audio, self.original_audio_state, self.audio]
         ).then(