Update app.py

app.py

@@ -3,14 +3,13 @@ import os
 import pandas as pd
 import gradio as gr
 
-# Import functions from other modules
+# Import search & admin modules (searchschool.py unchanged)
 from searchschool import (
     STATE_HF_FILES,
     DEFAULT_STATE_KEY,
     load_master_for_state,
     update_blocks,
     search_candidates,
-    MASTER_SCHOOL_COL,
 )
 from admin_patterns import (
     load_pattern_config,
@@ -27,11 +26,13 @@ ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", None)
 if not ADMIN_PASSWORD:
     print("⚠ ADMIN_PASSWORD environment variable not set. Set ADMIN_PASSWORD secret in HF Space settings.")
 
-# Build Gradio UI
-with gr.Blocks(title="State School Fuzzy Matcher (modular)") as demo:
+with gr.Blocks(title="State School Fuzzy Matcher (with gated Admin)") as demo:
     gr.Markdown(
         """
         # State School Fuzzy Matcher (RapidFuzz)
+
+        - Public: Search tab
+        - Admin: Patterns editor (hidden until unlocked with admin password)
         """
     )
 
@@ -65,51 +66,90 @@ with gr.Blocks(title="State School Fuzzy Matcher (modular)") as demo:
             interactive=False
         )
 
-    # ----- ADMIN TAB -----
+    # ----- ADMIN TAB (hidden until unlock) -----
     with gr.Tab("Admin"):
-        gr.Markdown("### Admin — Patterns (password required to save)")
-        admin_pwd = gr.Textbox(label="Admin Password", type="password", placeholder="Enter admin password to save changes")
-
-        # Global patterns editor (load fresh)
-        global_df = gr.Dataframe(
-            value=load_global_patterns_for_editor(),
-            headers=["pattern", "replacement"],
-            datatype=["str", "str"],
-            interactive=True,
-            row_count=(len(load_pattern_config().get("global", [])) or 1),
-        )
-        save_global_btn = gr.Button("💾 Save Global Patterns")
-        global_status = gr.Markdown("")
+        gr.Markdown("### Admin — Patterns (enter password to unlock editor)")
 
-        # State-specific patterns editor
-        existing_state_keys = sorted(load_pattern_config().get("states", {}).keys())
-        with gr.Row():
-            state_pattern_dd = gr.Dropdown(label="Existing state key", choices=existing_state_keys, value=existing_state_keys[0] if existing_state_keys else None, interactive=True)
-            new_state_tb = gr.Textbox(label="Or type new state key", placeholder="e.g. KARNATAKA")
-        state_df = gr.Dataframe(value=pd.DataFrame(columns=["pattern", "replacement"]), headers=["pattern", "replacement"], datatype=["str", "str"], interactive=True, row_count=3)
-        load_state_btn = gr.Button("Load patterns for selected / new state")
-        save_state_btn = gr.Button("💾 Save State Patterns")
-        state_status = gr.Markdown("")
-
-        # Debug controls
-        refresh_btn = gr.Button("🔄 Refresh patterns.json from disk")
-        refresh_status = gr.Markdown("")
-        show_file_btn = gr.Button("🗂 Show patterns.json file info (path + preview)")
-        debug_info_md = gr.Markdown("")
-
-    # ----- Wiring -----
+        # Unlock area (visible by default)
+        unlock_pwd = gr.Textbox(label="Admin Password", type="password", placeholder="Enter admin password and click Unlock")
+        unlock_btn = gr.Button("Unlock Admin Panel")
+        unlock_status = gr.Markdown("")
+
+        # Admin editors wrapped inside a Column that starts hidden
+        admin_panel = gr.Column(visible=False)
+
+        with admin_panel:
+            # Global patterns editor (loaded fresh)
+            global_df = gr.Dataframe(
+                value=load_global_patterns_for_editor(),
+                headers=["pattern", "replacement"],
+                datatype=["str", "str"],
+                interactive=True,
+                row_count=(len(load_pattern_config().get("global", [])) or 1),
+            )
+            save_global_btn = gr.Button("💾 Save Global Patterns")
+            global_status = gr.Markdown("")
+
+            # State specific editor
+            existing_state_keys = sorted(load_pattern_config().get("states", {}).keys())
+            with gr.Row():
+                state_pattern_dd = gr.Dropdown(label="Existing state key", choices=existing_state_keys, value=existing_state_keys[0] if existing_state_keys else None, interactive=True)
+                new_state_tb = gr.Textbox(label="Or type new state key", placeholder="e.g. KARNATAKA")
+            state_df = gr.Dataframe(value=pd.DataFrame(columns=["pattern", "replacement"]), headers=["pattern", "replacement"], datatype=["str", "str"], interactive=True, row_count=3)
+            load_state_btn = gr.Button("Load patterns for selected / new state")
+            save_state_btn = gr.Button("💾 Save State Patterns")
+            state_status = gr.Markdown("")
+
+            # Debug + Refresh
+            refresh_btn = gr.Button("🔄 Refresh patterns.json from disk")
+            refresh_status = gr.Markdown("")
+            show_file_btn = gr.Button("🗂 Show patterns.json file info (path + preview)")
+            debug_info_md = gr.Markdown("")
+
+        # Lock button to hide again (optional)
+        lock_btn = gr.Button("Lock Admin Panel")
+        lock_status = gr.Markdown("")
+
+    # -------- Wiring: Search --------
     state_dd.change(fn=load_master_for_state, inputs=state_dd, outputs=[district_dd, block_dd])
     demo.load(fn=load_master_for_state, inputs=state_dd, outputs=[district_dd, block_dd])
     district_dd.change(fn=update_blocks, inputs=district_dd, outputs=block_dd)
     search_btn.click(fn=search_candidates, inputs=[school_input, state_dd, district_dd, block_dd], outputs=[candidates_table, best_table])
 
-    # Admin wiring (password passed to save functions)
-    save_global_btn.click(fn=lambda df, pwd: save_global_patterns_from_editor(df, pwd, ADMIN_PASSWORD), inputs=[global_df, admin_pwd], outputs=global_status)
+    # -------- Wiring: Admin gating --------
+    def try_unlock(pwd: str):
+        if ADMIN_PASSWORD is None:
+            return gr.update(visible=False), "❌ ADMIN_PASSWORD not configured in environment", None
+        if pwd == ADMIN_PASSWORD:
+            return gr.update(visible=True), "🔓 Admin panel unlocked.", True
+        else:
+            return gr.update(visible=False), "❌ Wrong password.", False
+
+    unlock_btn.click(fn=try_unlock, inputs=unlock_pwd, outputs=[admin_panel, unlock_status, unlock_pwd])
+
+    def do_lock():
+        return gr.update(visible=False), "🔒 Admin panel locked."
+
+    lock_btn.click(fn=do_lock, inputs=None, outputs=[admin_panel, lock_status])
+
+    # -------- Wiring: Admin actions (inside admin_panel) --------
+    # Save global (server still checks password inside save function)
+    save_global_btn.click(fn=lambda df, pwd: save_global_patterns_from_editor(df, pwd, ADMIN_PASSWORD),
+                          inputs=[global_df, unlock_pwd],
+                          outputs=global_status)
+
+    # Load state patterns into editor (view-only)
     load_state_btn.click(fn=load_state_patterns_for_editor, inputs=[state_pattern_dd, new_state_tb], outputs=state_df)
-    save_state_btn.click(fn=lambda state_sel, new_state, df, pwd: save_state_patterns_from_editor(state_sel, new_state, df, pwd, ADMIN_PASSWORD), inputs=[state_pattern_dd, new_state_tb, state_df, admin_pwd], outputs=state_status)
 
+    # Save state patterns
+    save_state_btn.click(fn=lambda state_sel, new_state, df, pwd: save_state_patterns_from_editor(state_sel, new_state, df, pwd, ADMIN_PASSWORD),
+                         inputs=[state_pattern_dd, new_state_tb, state_df, unlock_pwd],
+                         outputs=state_status)
+
+    # Refresh & show file info
     refresh_btn.click(fn=refresh_pattern_config, inputs=None, outputs=refresh_status)
     show_file_btn.click(fn=show_patterns_file_info, inputs=None, outputs=debug_info_md)
 
+
 if __name__ == "__main__":
     demo.launch()