Refactor to Maps function with exact 4-value returns

app.py

@@ -1019,56 +1019,68 @@ with gr.Blocks(title="AnatomyBot - MBBS Anatomy Tutor") as demo:
     
     # Event Handlers
     
-    # Navigation Logic
-    def navigate(nav_target):
-        """Handle navigation between views."""
-        # Returns: learning_col, viva_col, book_col, admin_col
-        # Also returns button variants: learning_btn, viva_btn, book_btn, admin_btn
-        
-        if nav_target == "learning":
+    # Navigation Logic - Maps function returns exactly 4 values for 4 columns
+    def Maps(mode):
+        """
+        Handle navigation between views with mutual exclusivity.
+        Returns exactly 4 gr.update() objects for:
+        [learning_col, viva_col, book_col, admin_col]
+        """
+        if mode == "learning":
             return (
-                gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False),
-                gr.update(variant="primary"), gr.update(variant="secondary"), gr.update(variant="secondary"), gr.update(variant="secondary")
+                gr.update(visible=True),   # learning_col
+                gr.update(visible=False),  # viva_col
+                gr.update(visible=False),  # book_col
+                gr.update(visible=False)   # admin_col
             )
-        elif nav_target == "viva":
+        elif mode == "viva":
             return (
-                gr.update(visible=False), gr.update(visible=True), gr.update(visible=False), gr.update(visible=False),
-                gr.update(variant="secondary"), gr.update(variant="primary"), gr.update(variant="secondary"), gr.update(variant="secondary")
+                gr.update(visible=False),  # learning_col
+                gr.update(visible=True),   # viva_col
+                gr.update(visible=False),  # book_col
+                gr.update(visible=False)   # admin_col
             )
-        elif nav_target == "book":
+        elif mode == "book":
             return (
-                gr.update(visible=False), gr.update(visible=False), gr.update(visible=True), gr.update(visible=False),
-                gr.update(variant="secondary"), gr.update(variant="secondary"), gr.update(variant="primary"), gr.update(variant="secondary")
+                gr.update(visible=False),  # learning_col
+                gr.update(visible=False),  # viva_col
+                gr.update(visible=True),   # book_col
+                gr.update(visible=False)   # admin_col
             )
-        elif nav_target == "admin":
+        elif mode == "admin":
             return (
-                gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=True),
-                gr.update(variant="secondary"), gr.update(variant="secondary"), gr.update(variant="secondary"), gr.update(variant="primary")
+                gr.update(visible=False),  # learning_col
+                gr.update(visible=False),  # viva_col
+                gr.update(visible=False),  # book_col
+                gr.update(visible=True)    # admin_col
             )
+        # Default to learning mode
         return (
-            gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False),
-            gr.update(variant="primary"), gr.update(variant="secondary"), gr.update(variant="secondary"), gr.update(variant="secondary")
+            gr.update(visible=True),   # learning_col
+            gr.update(visible=False),  # viva_col
+            gr.update(visible=False),  # book_col
+            gr.update(visible=False)   # admin_col
         )
 
     # Bind Navigation Buttons
     nav_learning_btn.click(
-        fn=lambda: navigate("learning"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("learning"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     )
     
     nav_viva_btn.click(
-        fn=lambda: navigate("viva"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("viva"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     )
     
     nav_book_btn.click(
-        fn=lambda: navigate("book"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("book"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     )
     
     nav_admin_btn.click(
-        fn=lambda: navigate("admin"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("admin"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     )
 
     # Welcome Screen Handler (now for modal)
@@ -1145,8 +1157,8 @@ with gr.Blocks(title="AnatomyBot - MBBS Anatomy Tutor") as demo:
             student_name_state  # Return student name (unchanged)
         ]
     ).then(
-        fn=lambda: navigate("viva"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("viva"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     ).then(
         fn=lambda: gr.update(value="🎯 Start VIVA Training", interactive=True),  # Reset button
         outputs=[start_viva_btn]
@@ -1238,8 +1250,8 @@ with gr.Blocks(title="AnatomyBot - MBBS Anatomy Tutor") as demo:
             question_audio, viva_greeting, student_name_state
         ]
     ).then(
-        fn=lambda: navigate("viva"),
-        outputs=[learning_col, viva_col, book_col, admin_col, nav_learning_btn, nav_viva_btn, nav_book_btn, nav_admin_btn]
+        fn=lambda: Maps("viva"),
+        outputs=[learning_col, viva_col, book_col, admin_col]
     ).then(
         fn=lambda: 0,
         outputs=[current_question_idx]