Update app.py

app.py

@@ -1,25 +1,17 @@
-# app.py
 import os
 import pandas as pd
 import gradio as gr
 from huggingface_hub import hf_hub_download
 
 # ----------------------------------------------------
-# Import search & admin modules
+# Imports
 # ----------------------------------------------------
 from searchschool import (
     DEFAULT_STATE_KEY,
-    on_search_web,
     load_master_for_state,
     update_blocks,
     search_candidates,
-)
-
-from admin_patterns import (
-    load_pattern_config,
-    load_global_patterns_for_editor,
-    load_state_patterns_for_editor,
-    save_global_patterns_from_editor,
+    on_search_web,
 )
 
 # ----------------------------------------------------
@@ -29,15 +21,12 @@ HF_SCHOOLS_DATASET = "Apf-AI4Good/Schools"
 MASTER_ALL_STATES_FILE = "master_all_states.csv"
 MASTER_STATE_COL = "School_State__c"
 
-# ----------------------------------------------------
-# Load ADMIN password
-# ----------------------------------------------------
 ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", None)
 if not ADMIN_PASSWORD:
-    print("⚠ ADMIN_PASSWORD environment variable not set.")
+    print("⚠ ADMIN_PASSWORD not set")
 
 # ----------------------------------------------------
-# 🔹 LOAD STATE LIST ONCE (APP STARTUP)
+# Load states ONCE
 # ----------------------------------------------------
 def load_state_choices_once():
     path = hf_hub_download(
@@ -45,118 +34,132 @@ def load_state_choices_once():
         repo_type="dataset",
         filename=MASTER_ALL_STATES_FILE,
     )
-
     df = pd.read_csv(path, dtype=str)
+    return sorted(df[MASTER_STATE_COL].dropna().str.upper().unique().tolist())
 
-    states = (
-        df[MASTER_STATE_COL]
-        .dropna()
-        .str.upper()
-        .unique()
-        .tolist()
-    )
+STATE_CHOICES = load_state_choices_once()
 
-    return sorted(states)
+# ----------------------------------------------------
+# UI RENDER HELPERS
+# ----------------------------------------------------
+def render_header(show_score=True):
+    with gr.Row():
+        gr.Markdown("**School Name**")
+        gr.Markdown("**UDISE Code**")
+        gr.Markdown("**State**")
+        gr.Markdown("**District**")
+        gr.Markdown("**Block**")
+        if show_score:
+            gr.Markdown("**Score**")
 
 
-STATE_CHOICES = load_state_choices_once()
+def render_results(rows, show_score=True):
+    comps = []
+
+    if not rows:
+        comps.append(gr.Markdown("❌ No results found."))
+        return comps
+
+    render_header(show_score)
+
+    for r in rows:
+        with gr.Row():
+            comps.append(
+                gr.Textbox(
+                    r.get("School_Name", ""),
+                    interactive=False,
+                    show_copy_button=True,
+                    container=False,
+                )
+            )
+            comps.append(
+                gr.Textbox(
+                    r.get("UDISE_Code", ""),
+                    interactive=False,
+                    show_copy_button=True,
+                    container=False,
+                )
+            )
+            comps.append(gr.Markdown(r.get("State", "")))
+            comps.append(gr.Markdown(r.get("District", "")))
+            comps.append(gr.Markdown(r.get("Block", "")))
+            if show_score:
+                comps.append(gr.Markdown(f"{r.get('Score', 0):.2f}"))
+
+    return comps
+
+# ----------------------------------------------------
+# Wrapped search functions
+# ----------------------------------------------------
+def rapid_search_and_render(name, state, district, block):
+    candidates, _ = search_candidates(name, state, district, block)
+    return render_results(candidates, show_score=True)
+
+def web_search_and_render(name, state, district, block):
+    results = on_search_web(name, state, district, block)
+    return render_results(results, show_score=False)
+
+# ----------------------------------------------------
+# Unlock Web Search
+# ----------------------------------------------------
+def unlock_web_search(pwd):
+    if pwd == ADMIN_PASSWORD:
+        return gr.update(interactive=True), "🔓 Web search unlocked."
+    return gr.update(interactive=False), "❌ Invalid password."
 
 # ----------------------------------------------------
 # Gradio App
 # ----------------------------------------------------
-with gr.Blocks(title="State School Fuzzy Matcher (with gated Admin)") as demo:
+with gr.Blocks(title="State School Fuzzy Matcher") as demo:
     gr.Markdown(
         """
         # State School Fuzzy Matcher (RapidFuzz)
 
-        - Public: Search tab
-        - Admin: Patterns editor (password protected)
+        **Flow**
+        1. Use Rapid search first  
+        2. Unlock Web search only if required  
         """
     )
 
-    # ================= SEARCH TAB =================
-    with gr.Tab("Search"):
-        with gr.Row():
-            state_dd = gr.Dropdown(
-                label="State",
-                choices=STATE_CHOICES,
-                value=DEFAULT_STATE_KEY if DEFAULT_STATE_KEY in STATE_CHOICES else None,
-                interactive=True,
-            )
-
-        with gr.Row():
-            district_dd = gr.Dropdown(label="District", choices=[], value=None, interactive=True)
-            block_dd = gr.Dropdown(label="Block", choices=[], value=None, interactive=True)
-
-        school_input = gr.Textbox(
-            label="Input School Name",
-            placeholder="Type school name from marksheet..."
-        )
-
-        search_btn = gr.Button("Find Candidates")
-
-        gr.Markdown("### Candidates (top matches)")
-        candidates_table = gr.Dataframe(
-            headers=["School_Name", "State", "District", "Block", "UDISE_Code", "Score"],
-            datatype=["str", "str", "str", "str", "str", "number"],
-            interactive=False,
+    # ================= SEARCH INPUTS =================
+    with gr.Row():
+        state_dd = gr.Dropdown(
+            label="State",
+            choices=STATE_CHOICES,
+            value=DEFAULT_STATE_KEY if DEFAULT_STATE_KEY in STATE_CHOICES else None,
         )
 
-        gr.Markdown("### Best Candidate")
-        best_table = gr.Dataframe(
-            headers=["School_Name", "State", "District", "Block", "UDISE_Code", "Score"],
-            datatype=["str", "str", "str", "str", "str", "number"],
-            interactive=False,
-        )
-
-    # ================= ADMIN TAB =================
-    with gr.Tab("Admin"):
-        gr.Markdown("### Admin — Patterns Editor")
+    with gr.Row():
+        district_dd = gr.Dropdown(label="District", interactive=True)
+        block_dd = gr.Dropdown(label="Block", interactive=True)
 
-        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_panel = gr.Column(visible=False)
-
-        with admin_panel:
-            global_df = gr.Dataframe(
-                value=load_global_patterns_for_editor(),
-                headers=["pattern", "replacement"],
-                datatype=["str", "str"],
-                interactive=True,
-                row_count=5,
-            )
+    school_input = gr.Textbox(
+        label="School Name",
+        placeholder="Enter school name from marksheet",
+    )
 
-            save_global_btn = gr.Button("💾 Save Global Patterns")
-            global_status = gr.Markdown("")
+    search_btn = gr.Button("🔍 Find Candidates")
 
-            existing_state_keys = sorted(load_pattern_config().get("states", {}).keys())
+    # ================= RAPID RESULTS =================
+    gr.Markdown("### 🔎 Rapid Search Results")
+    rapid_results_container = gr.Column()
 
-            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,
-                )
-                new_state_tb = gr.Textbox(
-                    label="Or type new state key",
-                    placeholder="e.g. KARNATAKA",
-                )
+    # ================= WEB SEARCH =================
+    gr.Markdown("### 🌐 Web Search (Locked)")
+    gr.Markdown(
+        "Use only if Rapid search does not give a confident match."
+    )
 
-            state_df = gr.Dataframe(
-                value=pd.DataFrame(columns=["pattern", "replacement"]),
-                headers=["pattern", "replacement"],
-                datatype=["str", "str"],
-                interactive=True,
-                row_count=3,
-            )
+    unlock_pwd = gr.Textbox(
+        label="Admin Password",
+        type="password",
+        placeholder="Enter password to unlock web search",
+    )
+    unlock_btn = gr.Button("Unlock Web Search")
+    web_status = gr.Markdown("")
 
-            load_state_btn = gr.Button("Load patterns for selected / new state")
+    search_web_btn = gr.Button("Search Web", interactive=False)
+    web_results_container = gr.Column()
 
     # ================= Wiring =================
     state_dd.change(
@@ -165,12 +168,6 @@ with gr.Blocks(title="State School Fuzzy Matcher (with gated Admin)") as demo:
         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,
@@ -178,56 +175,22 @@ with gr.Blocks(title="State School Fuzzy Matcher (with gated Admin)") as demo:
     )
 
     search_btn.click(
-        fn=search_candidates,
-        inputs=[school_input, state_dd, district_dd, block_dd],
-        outputs=[candidates_table, best_table],
-    )
-
-    # ensure at top of file you have: from web_search import tavily_search
-
-    # --- inside Search tab UI, after search_btn etc. ---
-    gr.Markdown("### Web search — find UDISE codes on the web")
-    gr.Markdown("### Use Judiciously - Only if you didnt find or couldnt confirm the school in the above list")
-    search_web_btn = gr.Button("Search Web")
-    
-    web_schools_table = gr.Dataframe(
-        headers=["School_Name", "State", "District", "Block", "UDISE_Code"],
-        datatype=["str", "str", "str", "str", "str"],
-        interactive=False
-    )
-
-    search_web_btn.click(
-        fn=on_search_web,
+        fn=rapid_search_and_render,
         inputs=[school_input, state_dd, district_dd, block_dd],
-        outputs=[web_schools_table]
+        outputs=rapid_results_container,
     )
 
-    # ---------------- Admin gating ----------------
-    def try_unlock(pwd: str):
-        if ADMIN_PASSWORD is None:
-            return gr.update(visible=False), "❌ ADMIN_PASSWORD not configured", None
-        if pwd == ADMIN_PASSWORD:
-            return gr.update(visible=True), "🔓 Admin panel unlocked.", True
-        return gr.update(visible=False), "❌ Wrong password.", False
-
     unlock_btn.click(
-        fn=try_unlock,
+        fn=unlock_web_search,
         inputs=unlock_pwd,
-        outputs=[admin_panel, unlock_status, unlock_pwd],
-    )
-
-    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,
+        outputs=[search_web_btn, web_status],
     )
 
-    load_state_btn.click(
-        fn=load_state_patterns_for_editor,
-        inputs=[state_pattern_dd, new_state_tb],
-        outputs=state_df,
+    search_web_btn.click(
+        fn=web_search_and_render,
+        inputs=[school_input, state_dd, district_dd, block_dd],
+        outputs=web_results_container,
     )
 
-
 if __name__ == "__main__":
     demo.launch()