Update app.py

app.py

@@ -5,11 +5,12 @@ import gradio as gr
 import requests
 import pandas as pd
 import json
-from tavily import TavilyClient
 import re
+from tavily import TavilyClient
 
 KYS_SAMPLE = "https://kys.udiseplus.gov.in/webapp/api/search-schools?searchType=3&searchParam={udise}"
 
+# List of valid state codes for UDISE (first 2 digits of UDISE code)
 # List of valid state codes for UDISE (first 2 digits of UDISE code)
 VALID_UDISE_STATE_CODES = [
     '01',  # Jammu & Kashmir
@@ -51,7 +52,6 @@ VALID_UDISE_STATE_CODES = [
     '37'   # Ladakh (added in newer datasets)
 ]
 
-
 def is_valid_udise(code):
     """Check if a string is a valid UDISE code."""
     if not (code and code.isdigit() and len(code) == 11):
@@ -200,7 +200,7 @@ def to_table_from_kys(kys_json):
         return pd.DataFrame()
 
 
-def search_workflow(school_name, state_name, search_key, use_search, use_kys):
+def search_workflow(school_name, state_name, search_key, use_search=True, use_kys=True):
     out = {"kys": None, "search": None, "suggestions": [], "first_candidate": None}
     payload_text = f"{school_name or ''} {state_name or ''} UDISE code".strip()
 
@@ -237,14 +237,7 @@ with the combined query `<school> <state> UDISE code`, then optionally calls KYS
         state_dropdown = gr.Dropdown(choices=STATES, label="State", value=STATES[0] if STATES else "", interactive=True, allow_custom_value=True)
 
     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_search = gr.Checkbox(value=True, label="Call Search API")
-        use_kys = gr.Checkbox(value=True, label="Call KYS by UDISE")
-
-    run = gr.Button("Search")
+    run = gr.Button("Search", variant="primary")
 
     # By default hide raw JSON outputs; users can toggle visibility with `show_raw_checkbox`
     show_raw_checkbox = gr.Checkbox(value=False, label="Show raw JSON outputs")
@@ -262,47 +255,55 @@ with the combined query `<school> <state> UDISE code`, then optionally calls KYS
 
     saved_key_state = gr.State("")
 
-    def on_run(school, state, key, save_key, use_s, use_k, saved_key):
+    def on_run(school, state, key, saved_key):
+        # Always use the saved key if it exists, otherwise use the provided key
         effective_key = saved_key if saved_key else key
-        res = search_workflow(school, state, effective_key, use_s, use_k)
+        # Always enable both search and KYS by default
+        res = search_workflow(school, state, effective_key, use_search=True, use_kys=True)
         tbl = pd.DataFrame()
         if res.get("search") and res["search"].get("ok"):
             tbl = json_to_table(res["search"]["data"])
+        
+        # Ensure suggestions is always a list and handle empty state
         suggestions = res.get("suggestions", [])
-        new_saved_key = saved_key
-        textbox_value = key
-        if save_key:
-            new_saved_key = key or saved_key
-            textbox_value = new_saved_key
+        if not suggestions:
+            suggestions = ["No UDISE codes found"]
+            
+        # Always save the key to state if a new one is provided
+        new_saved_key = key or saved_key
+            
         # Return the first candidate along with other values
         return (
             res.get("search"),  # output_json
             tbl,  # search_table
-            suggestions,  # suggestions_dropdown
+            {"choices": suggestions, "__type__": "update"},  # Update dropdown choices
             res.get("first_candidate", ""),  # This will update udise_input
             new_saved_key,  # saved_key_state
-            textbox_value,  # search_key
             res.get("kys")  # kys_output_json
         )
 
     run.click(
         on_run, 
-        inputs=[inp, state_dropdown, search_key, save_key_toggle, use_search, use_kys, saved_key_state], 
+        inputs=[inp, state_dropdown, search_key, saved_key_state], 
         outputs=[
             output_json, 
             search_table, 
             suggestions_dropdown, 
             udise_input,  # This will be updated with first_candidate
             saved_key_state, 
-            search_key, 
             kys_output_json
         ]
     )
 
     def on_select_suggestion(choice):
-        return choice or ""
+        # Only update if a valid choice is selected (not the placeholder)
+        return choice if choice and choice != "No UDISE codes found" else ""
 
-    suggestions_dropdown.change(on_select_suggestion, inputs=[suggestions_dropdown], outputs=[udise_input])
+    suggestions_dropdown.change(
+        on_select_suggestion, 
+        inputs=[suggestions_dropdown], 
+        outputs=[udise_input]
+    )
 
     def on_lookup_udise(udise_code):
         if not udise_code or not udise_code.strip().isdigit():
@@ -315,11 +316,6 @@ with the combined query `<school> <state> UDISE code`, then optionally calls KYS
 
     lookup_btn.click(on_lookup_udise, inputs=[udise_input], outputs=[kys_output_json, kys_table])
 
-    def on_clear_key(_):
-        return "", ""
-
-    clear_key_btn.click(on_clear_key, inputs=[saved_key_state], outputs=[saved_key_state, search_key])
-
     # Toggle visibility handler for raw JSON outputs
     def toggle_raw(visible: bool):
         return gr.update(visible=visible), gr.update(visible=visible)
@@ -330,9 +326,8 @@ with the combined query `<school> <state> UDISE code`, then optionally calls KYS
         """
 ---
 **Notes:**
-- 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.
+- Your API key is stored in-memory for the current session only.
+- It is not written to disk or logged.
 """
     )