Update app.py

app.py

@@ -1,12 +1,16 @@
+# ====================================================
+# app.py — State School Fuzzy Matcher (Village Enabled)
+# ====================================================
+
 import os
+import json
 import pandas as pd
 import gradio as gr
-from huggingface_hub import hf_hub_download
-import json
 from functools import lru_cache
+from huggingface_hub import hf_hub_download
 
 # ----------------------------------------------------
-# Imports
+# External search logic
 # ----------------------------------------------------
 from searchschool import (
     search_candidates,
@@ -17,51 +21,61 @@ from searchschool import (
 # CONFIG
 # ----------------------------------------------------
 HF_SCHOOLS_DATASET = "Apf-AI4Good/Schools"
-MASTER_ALL_STATES_FILE = "master_all_states.csv"
-MASTER_STATE_COL = "School_State__c"
+STATE_HIERARCHY_PARQUET = "state_district_block_villages.parquet"
 
 ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", None)
 if not ADMIN_PASSWORD:
     print("⚠ ADMIN_PASSWORD not set")
 
 # ----------------------------------------------------
-# Load states ONCE
+# Load hierarchy ONCE from Hugging Face (Parquet)
 # ----------------------------------------------------
 @lru_cache(maxsize=1)
 def load_state_hierarchy():
-    path = hf_hub_download(
+    parquet_path = hf_hub_download(
         repo_id=HF_SCHOOLS_DATASET,
         repo_type="dataset",
-        filename="state_district_block.json",
+        filename=STATE_HIERARCHY_PARQUET,
     )
-    with open(path, "r", encoding="utf-8") as f:
-        return json.load(f)
 
-STATE_HIER = load_state_hierarchy()
-STATE_CHOICES = sorted(STATE_HIER.keys())
+    df = pd.read_parquet(parquet_path)
 
+    required_cols = {"State", "District", "Block", "Village"}
+    missing = required_cols - set(df.columns)
+    if missing:
+        raise ValueError(f"Missing columns in parquet: {missing}")
 
+    hier = {}
+    for _, r in df.iterrows():
+        hier \
+            .setdefault(r["State"], {}) \
+            .setdefault(r["District"], {}) \
+            .setdefault(r["Block"], set()) \
+            .add(r["Village"])
+
+    # Convert sets → sorted lists
+    for s in hier:
+        for d in hier[s]:
+            for b in hier[s][d]:
+                hier[s][d][b] = sorted(hier[s][d][b])
+
+    return hier
+
+
+STATE_HIER = load_state_hierarchy()
+STATE_CHOICES = sorted(STATE_HIER.keys())
 
 # ----------------------------------------------------
 # 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**")
-
-
 def render_results_md(df, show_score=True):
     if df is None or df.empty:
         return "❌ No results found."
 
-    # Header
-    headers = ["School Name", "UDISE Code", "State", "District", "Block"]
+    headers = [
+        "School Name", "UDISE Code",
+        "State", "District", "Block", "Village"
+    ]
     if show_score:
         headers.append("Score")
 
@@ -75,6 +89,7 @@ def render_results_md(df, show_score=True):
             str(r.get("State", "")),
             str(r.get("District", "")),
             str(r.get("Block", "")),
+            str(r.get("Village", "")),
         ]
         if show_score:
             score = r.get("Score", "")
@@ -84,77 +99,102 @@ def render_results_md(df, show_score=True):
 
     return md
 
+
 def render_best_md(df):
     if df is None or df.empty:
         return "❌ No confident best match found."
 
-    headers = ["School Name", "UDISE Code", "State", "District", "Block", "Score"]
+    headers = [
+        "School Name", "UDISE Code",
+        "State", "District", "Block", "Village", "Score"
+    ]
 
     md = "| " + " | ".join(headers) + " |\n"
     md += "| " + " | ".join(["---"] * len(headers)) + " |\n"
 
     r = df.iloc[0]
-
     row = [
         str(r.get("School_Name", "")),
         str(r.get("UDISE_Code", "")),
         str(r.get("State", "")),
         str(r.get("District", "")),
         str(r.get("Block", "")),
+        str(r.get("Village", "")),
         f"{float(r.get('Score', 0)):.2f}",
     ]
 
     md += "| " + " | ".join(row) + " |\n"
-
     return md
 
-
-
-
+# ----------------------------------------------------
+# Cascading dropdown handlers
+# ----------------------------------------------------
 def on_state_change(state):
     if not state:
         return (
             gr.update(choices=[], value=None),
             gr.update(choices=[], value=None),
+            gr.update(choices=[], value=None),
         )
 
-    districts = sorted(STATE_HIER.get(state, {}).keys())
-
+    districts = sorted(STATE_HIER[state].keys())
     return (
         gr.update(choices=districts, value=None),
         gr.update(choices=[], value=None),
+        gr.update(choices=[], value=None),
     )
 
+
 def on_district_change(state, district):
     if not state or not district:
-        return gr.update(choices=[], value=None)
-
-    blocks = STATE_HIER.get(state, {}).get(district, [])
+        return (
+            gr.update(choices=[], value=None),
+            gr.update(choices=[], value=None),
+        )
 
-    return gr.update(choices=blocks, value=None)
+    blocks = sorted(STATE_HIER[state][district].keys())
+    return (
+        gr.update(choices=blocks, value=None),
+        gr.update(choices=[], value=None),
+    )
 
 
+def on_block_change(state, district, block):
+    if not state or not district or not block:
+        return gr.update(choices=[], value=None)
 
+    villages = STATE_HIER[state][district][block]
+    return gr.update(choices=villages, value=None)
 
 # ----------------------------------------------------
-# Wrapped search functions
+# Search wrappers
 # ----------------------------------------------------
-def rapid_search_and_render(name, state, district, block):
-    candidates, best = search_candidates(name, state, district, block)
-
-    table_md = render_results_md(candidates, show_score=True)
-    best_md = render_best_md(best)
-
-    return table_md, best_md
+def rapid_search_and_render(name, state, district, block, village):
+    candidates, best = search_candidates(
+        name=name,
+        state=state,
+        district=district,
+        block=block,
+        village=village,
+    )
+    return (
+        render_results_md(candidates, show_score=True),
+        render_best_md(best),
+    )
 
 
-def web_search_and_render(name, state, district, block):
-    results = on_search_web(name, state, district, block)
+def web_search_and_render(name, state, district, block, village):
+    results = on_search_web(
+        name=name,
+        state=state,
+        district=district,
+        block=block,
+        village=village,
+    )
     return render_results_md(results, show_score=False)
 
-
 # ----------------------------------------------------
-# Unlock Web Search
+# Admin unlock
 # ----------------------------------------------------
 def unlock_web_search(pwd):
     if pwd == ADMIN_PASSWORD:
@@ -165,24 +205,13 @@ def unlock_web_search(pwd):
 # Gradio App
 # ----------------------------------------------------
 with gr.Blocks(title="State School Fuzzy Matcher") as demo:
-    gr.Markdown(
-        """
-        # Find School UDISE Code
-        
-        """
-    )
-
-    # ================= SEARCH INPUTS =================
-    with gr.Row():
-        state_dd = gr.Dropdown(
-            label="State",
-            choices=STATE_CHOICES,
-            value=None,
-        )
+    gr.Markdown("# Find School UDISE Code")
 
-    with gr.Row():
-        district_dd = gr.Dropdown(label="District", interactive=True)
-        block_dd = gr.Dropdown(label="Block", interactive=True)
+    # ---------- Inputs ----------
+    state_dd = gr.Dropdown(label="State", choices=STATE_CHOICES)
+    district_dd = gr.Dropdown(label="District", interactive=True)
+    block_dd = gr.Dropdown(label="Block", interactive=True)
+    village_dd = gr.Dropdown(label="Village", interactive=True)
 
     school_input = gr.Textbox(
         label="School Name",
@@ -191,24 +220,18 @@ with gr.Blocks(title="State School Fuzzy Matcher") as demo:
 
     search_btn = gr.Button("🔍 Find Schools")
 
-    # ================= RAPID RESULTS =================
+    # ---------- Rapid Search ----------
     gr.Markdown("### 🔎 Rapid Search Results")
     rapid_results_md = gr.Markdown()
 
     gr.Markdown("### ⭐ Best Rapid Match")
     best_result_md = gr.Markdown()
 
-
-    # ================= WEB SEARCH =================
+    # ---------- Web Search ----------
     gr.Markdown("### 🌐 Web Search (Locked)")
-    gr.Markdown(
-        "Use only if Rapid search does not give a confident match."
-    )
-
     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("")
@@ -216,37 +239,45 @@ with gr.Blocks(title="State School Fuzzy Matcher") as demo:
     search_web_btn = gr.Button("Search Web", interactive=False)
     web_results_md = gr.Markdown()
 
-    # ================= Wiring =================
+    # ---------- Wiring ----------
     state_dd.change(
-        fn=on_state_change,
+        on_state_change,
         inputs=state_dd,
-        outputs=[district_dd, block_dd],
+        outputs=[district_dd, block_dd, village_dd],
     )
-    
+
     district_dd.change(
-        fn=on_district_change,
+        on_district_change,
         inputs=[state_dd, district_dd],
-        outputs=block_dd,
+        outputs=[block_dd, village_dd],
     )
 
+    block_dd.change(
+        on_block_change,
+        inputs=[state_dd, district_dd, block_dd],
+        outputs=village_dd,
+    )
 
     search_btn.click(
-    fn=rapid_search_and_render,
-    inputs=[school_input, state_dd, district_dd, block_dd],
-    outputs=[rapid_results_md, best_result_md],
+        rapid_search_and_render,
+        inputs=[school_input, state_dd, district_dd, block_dd, village_dd],
+        outputs=[rapid_results_md, best_result_md],
     )
 
     unlock_btn.click(
-        fn=unlock_web_search,
+        unlock_web_search,
         inputs=unlock_pwd,
         outputs=[search_web_btn, web_status],
     )
 
     search_web_btn.click(
-    fn=web_search_and_render,
-    inputs=[school_input, state_dd, district_dd, block_dd],
-    outputs=web_results_md,
+        web_search_and_render,
+        inputs=[school_input, state_dd, district_dd, block_dd, village_dd],
+        outputs=web_results_md,
     )
 
+# ----------------------------------------------------
+# Entry point
+# ----------------------------------------------------
 if __name__ == "__main__":
     demo.launch()