Update app.py

app.py

@@ -1,11 +1,14 @@
-# tavily_kys_space.py
-# Gradio app for Hugging Face Spaces (Tavily API key textbox + Save key in session)
+# search_kys_space.py
+# Gradio app for Hugging Face Spaces (uses Search API via Tavily SDK internally)
 
 import gradio as gr
 import requests
 import pandas as pd
+import json
+from tavily import TavilyClient
 
 KYS_SAMPLE = "https://kys.udiseplus.gov.in/webapp/api/search-schools?searchType=3&searchParam={udise}"
+STATES = ["Arunachal Pradesh", "Assam", "Karnataka", "Kerala", "Tamil Nadu", "Maharashtra"]
 
 
 def call_kys_by_udise(udise_code):
@@ -19,29 +22,17 @@ def call_kys_by_udise(udise_code):
         return {"ok": False, "error": str(e), "url": url}
 
 
-def call_tavily(tavily_url, api_key, payload_text):
-    headers = {"Accept": "application/json"}
-    if api_key:
-        headers["Authorization"] = api_key
-    body = {"query": payload_text}
-
+def call_search_sdk(api_key, payload_text):
     try:
-        resp = requests.post(tavily_url, json=body, headers=headers, timeout=12)
-        resp.raise_for_status()
-        return {"ok": True, "url": tavily_url, "status_code": resp.status_code, "data": resp.json()}
+        client = TavilyClient(api_key)
+        resp = client.search(query=payload_text)
+        return {"ok": True, "data": resp}
     except Exception as e:
-        try:
-            params = {"q": payload_text}
-            resp = requests.get(tavily_url, params=params, headers=headers, timeout=12)
-            resp.raise_for_status()
-            return {"ok": True, "url": resp.url, "status_code": resp.status_code, "data": resp.json()}
-        except Exception as e2:
-            return {"ok": False, "error": f"POST failed: {e}; GET failed: {e2}"}
+        return {"ok": False, "error": str(e)}
 
 
-def extract_udise_candidates_from_tavily(tavily_json):
+def extract_udise_candidates_from_search(search_json):
     found = set()
-
     def walk(obj):
         if isinstance(obj, dict):
             for v in obj.values():
@@ -55,8 +46,7 @@ def extract_udise_candidates_from_tavily(tavily_json):
             for t in tokens:
                 if t.isdigit() and 6 <= len(t) <= 14:
                     found.add(t)
-
-    walk(tavily_json)
+    walk(search_json)
     return sorted(list(found))
 
 
@@ -86,79 +76,78 @@ def to_table_from_kys(kys_json):
         return pd.DataFrame()
 
 
-def search_workflow(school_name_or_udise, tavily_url, tavily_key, use_tavily, use_kys):
-    out = {"kys": None, "tavily": None, "suggestions": []}
+def search_workflow(school_name, state_name, search_key, use_search, use_kys):
+    out = {"kys": None, "search": None, "suggestions": []}
+    payload_text = f"{school_name or ''} {state_name or ''} UDISE code".strip()
 
-    if use_tavily and tavily_url:
-        tavily_res = call_tavily(tavily_url, tavily_key, school_name_or_udise or "")
-        out["tavily"] = tavily_res
-        if tavily_res.get("ok"):
-            candidates = extract_udise_candidates_from_tavily(tavily_res["data"])
+    if use_search:
+        search_res = call_search_sdk(search_key, payload_text)
+        out["search"] = search_res
+        if search_res.get("ok"):
+            candidates = extract_udise_candidates_from_search(search_res["data"])
             out["suggestions"] = candidates
     else:
-        out["tavily"] = {"ok": False, "error": "Tavily disabled or no URL provided"}
+        out["search"] = {"ok": False, "error": "Search disabled or SDK not used"}
 
-    if use_kys and school_name_or_udise and school_name_or_udise.strip().isdigit() and 6 <= len(school_name_or_udise.strip()) <= 14:
-        kys_res = call_kys_by_udise(school_name_or_udise.strip())
+    if use_kys and school_name and school_name.strip().isdigit() and 6 <= len(school_name.strip()) <= 14:
+        kys_res = call_kys_by_udise(school_name.strip())
         out["kys"] = kys_res
 
     return out
 
 
 with gr.Blocks() as demo:
-    # Fixed: properly terminated Markdown strings
-    gr.Markdown('''# Tavily + KYS Search (Hugging Face Space)
+    gr.Markdown(
+        """
+# Provide your API key in the textbox.
 
-Enter a school name or a UDISE code, Tavily endpoint, and optionally an API key.
-Use the 'Save key in session' toggle to keep the key for the current browser session.''')
+Enter a school name and select the state; the app calls Search 
+with the combined query `<school> <state> UDISE code`, then optionally calls KYS.
+"""
+    )
 
     with gr.Row():
-        inp = gr.Textbox(label="School name", placeholder="'Govt High School...'", lines=1)
-        tavily_url = gr.Textbox(label="Tavily endpoint URL (POST/GET)", placeholder="https://your-tavily.example/api/search")
+        inp = gr.Textbox(label="School name", placeholder="e.g. GOVT SEC SCHOOL DARLONG", lines=1)
+        state_dropdown = gr.Dropdown(choices=STATES, label="State", value=STATES[0] if STATES else "", interactive=True, searchable=True)
 
-    # Tavily API key textbox + save toggle
-    tavily_key = gr.Textbox(label="Tavily API Key (optional)", placeholder="Bearer ... or APIKEY ...", lines=1)
+    search_key = gr.Textbox(label="Search API Key (required)", placeholder="api-key...", lines=1)
     save_key_toggle = gr.Checkbox(value=False, label="Save key in session (keeps key between interactions)")
     clear_key_btn = gr.Button("Clear saved key")
 
     with gr.Row():
-        use_tavily = gr.Checkbox(value=True, label="Call Tavily")
+        use_search = gr.Checkbox(value=True, label="Call Search API")
         use_kys = gr.Checkbox(value=True, label="Call KYS by UDISE")
 
-    run = gr.Button("Search Tavily")
+    run = gr.Button("Search")
 
-    output_json = gr.JSON(label="Raw Tavily Output (JSON)")
-    tavily_table = gr.DataFrame(headers=None, label="Search Results (table)")
+    output_json = gr.JSON(label="Raw Search Output (JSON)")
+    search_table = gr.DataFrame(headers=None, label="Search results (table)")
 
-    gr.Markdown("### UDISE candidates found in search results")
-    suggestions_dropdown = gr.Dropdown(choices=[], label="UDISE candidates")
+    gr.Markdown("### UDISE candidates found in Search results")
+    suggestions_dropdown = gr.Dropdown(choices=[], label="UDISE candidates (from Search)")
     udise_input = gr.Textbox(label="UDISE to lookup (editable)", placeholder="Pick a candidate or type a UDISE code...", lines=1)
     lookup_btn = gr.Button("Lookup UDISE (Call KYS)")
 
     kys_output_json = gr.JSON(label="KYS Raw Output")
     kys_table = gr.DataFrame(headers=None, label="KYS results (table)")
 
-    # A small gr.State to persist the saved key value inside the session
     saved_key_state = gr.State("")
 
-    def on_run(school, turl, tkey, save_key, utav, ukys, saved_key):
-        # Determine effective key: if save_key and saved_key present use saved_key, else use tkey
-        effective_key = saved_key if saved_key else tkey
-        res = search_workflow(school, turl, effective_key, utav, ukys)
-        tav_df = pd.DataFrame()
-        if res.get("tavily") and res["tavily"].get("ok"):
-            tav_df = json_to_table(res["tavily"]["data"])
+    def on_run(school, state, key, save_key, use_s, use_k, saved_key):
+        effective_key = saved_key if saved_key else key
+        res = search_workflow(school, state, effective_key, use_s, use_k)
+        tbl = pd.DataFrame()
+        if res.get("search") and res["search"].get("ok"):
+            tbl = json_to_table(res["search"]["data"])
         suggestions = res.get("suggestions", [])
-        # If user asked to save the key for session, return it into saved_key_state and keep the textbox value
         new_saved_key = saved_key
-        textbox_value = tkey
+        textbox_value = key
         if save_key:
-            new_saved_key = tkey or saved_key
+            new_saved_key = key or saved_key
             textbox_value = new_saved_key
-        return res.get("tavily"), tav_df, suggestions, new_saved_key, textbox_value
+        return res.get("search"), tbl, suggestions, new_saved_key, textbox_value
 
-    # run.click outputs: tavily json, tavily table, suggestions dropdown, saved_key_state, tavily_key (textbox)
-    run.click(on_run, inputs=[inp, tavily_url, tavily_key, save_key_toggle, use_tavily, use_kys, saved_key_state], outputs=[output_json, tavily_table, suggestions_dropdown, saved_key_state, tavily_key])
+    run.click(on_run, inputs=[inp, state_dropdown, search_key, save_key_toggle, use_search, use_kys, saved_key_state], outputs=[output_json, search_table, suggestions_dropdown, saved_key_state, search_key])
 
     def on_select_suggestion(choice):
         return choice or ""
@@ -176,18 +165,20 @@ Use the 'Save key in session' toggle to keep the key for the current browser ses
 
     lookup_btn.click(on_lookup_udise, inputs=[udise_input], outputs=[kys_output_json, kys_table])
 
-    # Clear saved key handler: empties both the saved_key_state and the textbox
     def on_clear_key(_):
         return "", ""
 
-    clear_key_btn.click(on_clear_key, inputs=[saved_key_state], outputs=[saved_key_state, tavily_key])
+    clear_key_btn.click(on_clear_key, inputs=[saved_key_state], outputs=[saved_key_state, search_key])
 
-    gr.Markdown('''---
+    gr.Markdown(
+        """
+---
 **Notes:**
-- The 'Save key in session' toggle will keep the key active for the current browser session and across interactions in the Space UI.
-- The key is stored only in-memory for the session (not written to disk) and is not logged.
-- Use the 'Clear saved key' button to remove it from the session.''')
-
+- The 'Save key in session' toggle keeps the key active for the current session.
+- The key is stored only in-memory (not written to disk) and is not logged.
+- Use 'Clear saved key' to remove it from the session.
+"""
+    )
 
 if __name__ == "__main__":
     demo.launch()