fixing batching for loading data

components/review_dashboard_page.py

@@ -479,25 +479,26 @@ class ReviewDashboardPage:
                 gr.update(value="❌ Reject")  # Reset reject button text
             )
 
-        def navigate_review_fn(items, current_idx, direction):
+        def navigate_and_load_fn(items, current_idx, direction, session):
+            """Combined navigation and loading function"""
             if not items:
-                return 0, False
+                return items, 0
+            
+            # Navigate
             if direction == "next":
                 new_idx = min(current_idx + 1, len(items) - 1)
                 # Only load more items when user reaches the LAST item of a batch
                 should_load_more = (new_idx == len(items) - 1 and len(items) % 5 == 0)
                 if should_load_more:
                     log.info(f"User reached end of loaded items ({new_idx}/{len(items)}), will load more items")
-                return new_idx, should_load_more
+                    # Load more items
+                    updated_items = load_more_items_fn(items, session, current_batch_size=10)
+                    return updated_items, new_idx
+                else:
+                    return items, new_idx
             else:  # prev
-                return max(current_idx - 1, 0), False
-        
-        def conditional_load_more_fn(items, session, should_load_more):
-            """Load more items if needed, otherwise return existing items"""
-            if should_load_more:
-                log.info("Loading more items for navigation...")
-                return load_more_items_fn(items, session, current_batch_size=10)  # Reduced from 50 to 10 items
-            return items
+                new_idx = max(current_idx - 1, 0)
+                return items, new_idx
 
         def save_validation_fn(items, idx, session, approved: bool, rejection_reason: str = ""):
             if not items or idx >= len(items):
@@ -712,9 +713,9 @@ class ReviewDashboardPage:
                 fn=lambda: update_ui_interactive_state(False),
                 outputs=self.interactive_ui_elements
             ).then(
-                fn=navigate_review_fn,
-                inputs=[self.items_state, self.idx_state, gr.State(direction)],
-                outputs=self.idx_state
+                fn=lambda items, idx, session, dir=direction: navigate_and_load_fn(items, idx, dir, session),
+                inputs=[self.items_state, self.idx_state, session_state],
+                outputs=[self.items_state, self.idx_state]
             ).then(
                 fn=show_current_review_item_fn,
                 inputs=[self.items_state, self.idx_state, session_state],
@@ -748,9 +749,9 @@ class ReviewDashboardPage:
             fn=lambda: gr.update(value="❌ Reject"),  # Reset reject button
             outputs=[self.btn_reject]
         ).then(
-            fn=lambda items, idx: navigate_review_fn(items, idx, "next"),
-            inputs=[self.items_state, self.idx_state],
-            outputs=[self.idx_state]
+            fn=lambda items, idx, session: navigate_and_load_fn(items, idx, "next", session),
+            inputs=[self.items_state, self.idx_state, session_state],
+            outputs=[self.items_state, self.idx_state]
         ).then(
             fn=show_current_review_item_fn,
             inputs=[self.items_state, self.idx_state, session_state],
@@ -771,9 +772,9 @@ class ReviewDashboardPage:
             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],
-            outputs=[self.idx_state]
+            fn=lambda items, idx, session, rejection_mode: navigate_and_load_fn(items, idx, "next", session) if not rejection_mode else (items, idx),
+            inputs=[self.items_state, self.idx_state, session_state, self.rejection_mode_active],
+            outputs=[self.items_state, self.idx_state]
         ).then(
             fn=lambda items, idx, session, rejection_mode: show_current_review_item_fn(items, idx, session) if not rejection_mode else (
                 str(items[idx]["tts_id"]) if items and idx < len(items) else "",
@@ -799,9 +800,9 @@ class ReviewDashboardPage:
 
         # Skip button (just navigate to next)
         self.btn_skip.click(
-            fn=navigate_review_fn,
-            inputs=[self.items_state, self.idx_state, gr.State("next")],
-            outputs=self.idx_state
+            fn=lambda items, idx, session: navigate_and_load_fn(items, idx, "next", session),
+            inputs=[self.items_state, self.idx_state, session_state],
+            outputs=[self.items_state, self.idx_state]
         ).then(
             fn=show_current_review_item_fn,
             inputs=[self.items_state, self.idx_state, session_state],