Update app.py

app.py

@@ -15,11 +15,9 @@ from ingest.dod_special_extended import (
     SpecialActivitiesExtendedAdapter
 )
 
-BASE_ADAPTERS = [
-    CIAAdapter(),      # stub
-    FBIAdapter(),      # live
-]
+import saved_searches
 
+BASE_ADAPTERS = [CIAAdapter(), FBIAdapter()]
 EXTENDED_ADAPTERS = [
     CIAExtendedAdapter(),
     NSAExtendedAdapter(),
@@ -30,12 +28,8 @@ EXTENDED_ADAPTERS = [
     SpecialActivitiesExtendedAdapter()
 ]
 
-
-async def federated_search_async(query: str, extended_mode: bool) -> List[Dict]:
-    adapters = list(BASE_ADAPTERS)
-    if extended_mode:
-        adapters.extend(EXTENDED_ADAPTERS)
-
+async def federated_search_async(query: str, extended: bool):
+    adapters = BASE_ADAPTERS + (EXTENDED_ADAPTERS if extended else [])
     tasks = [a.search(query) for a in adapters]
     results = await asyncio.gather(*tasks, return_exceptions=True)
 
@@ -45,32 +39,29 @@ async def federated_search_async(query: str, extended_mode: bool) -> List[Dict]:
             flat.extend(r)
     return flat
 
-
-def format_result(r: Dict) -> str:
+def badge(r):
+    h = r.get("health", {})
+    latency = f"{h.get('latency_ms','?')}ms"
+    status = "🟢" if h.get("ok") else "🔴"
     if r.get("extended"):
-        badge = "🟣 LIVE (Extended)"
-    else:
-        badge = "🟢 LIVE" if r.get("live") else "⚪ STUB"
+        return f"🟣 EXT · {status} {latency}"
+    return "🟢 LIVE" if r.get("live") else "⚪ STUB"
 
+def render(r):
     return f"""
 ### {r['title']}
-**{badge} · {r['source']}**
+**{badge(r)} · {r['source']}**
 
 {r['snippet']}
 
 🔗 {r['url']}
 """
 
-
-def run_search(query: str, hide_stubs: bool, extended_mode: bool):
+def run_search(query, hide_stubs, extended):
     loop = asyncio.get_event_loop()
-    if loop.is_running():
-        task = asyncio.create_task(federated_search_async(query, extended_mode))
-        results = loop.run_until_complete(task)
-    else:
-        results = loop.run_until_complete(
-            federated_search_async(query, extended_mode)
-        )
+    results = loop.run_until_complete(federated_search_async(query, extended))
+
+    saved_searches.save(query, extended)
 
     if hide_stubs:
         results = [r for r in results if r.get("live")]
@@ -78,30 +69,44 @@ def run_search(query: str, hide_stubs: bool, extended_mode: bool):
     if not results:
         return "No results found."
 
-    return "\n\n---\n\n".join(format_result(r) for r in results)
+    return "\n\n---\n\n".join(render(r) for r in results)
 
+def show_saved():
+    rows = saved_searches.list_saved()
+    if not rows:
+        return "No saved searches yet."
+    return "\n".join(
+        f"- **{r['query']}** (extended={r['extended']})"
+        for r in rows
+    )
 
-with gr.Blocks() as demo:
+with gr.Blocks(css="""
+.gradio-container { max-width: 1100px }
+""") as demo:
     gr.Markdown("# 📜 FOIA Federated Search")
     gr.Markdown(
-        "Search across public government FOIA reading rooms.\n\n"
-        "- ⚪ Stub = placeholder\n"
-        "- 🟢 Live = public indexed source\n"
-        "- 🟣 Extended = advanced public sources (opt-in)"
+        "Transparent federated search across public FOIA reading rooms.\n\n"
+        "**Badges**: ⚪ Stub · 🟢 Live · 🟣 Extended · 🔴 Unhealthy"
     )
 
-    query = gr.Textbox(label="Search term")
-    hide_stubs = gr.Checkbox(label="Hide stub sources", value=False)
-    extended_mode = gr.Checkbox(
-        label="Enable Extended Features (advanced public agencies)",
-        value=False
-    )
+    with gr.Row():
+        query = gr.Textbox(label="Search term", scale=3)
+        hide_stubs = gr.Checkbox(label="Hide stub sources", value=False)
+        extended = gr.Checkbox(
+            label="Enable Extended Features",
+            value=False,
+            info="Advanced public sources. Disabled by default."
+        )
+
     output = gr.Markdown()
+    saved = gr.Markdown()
 
-    gr.Button("Search").click(
-        run_search,
-        inputs=[query, hide_stubs, extended_mode],
-        outputs=output
-    )
+    with gr.Row():
+        gr.Button("Search").click(
+            run_search,
+            inputs=[query, hide_stubs, extended],
+            outputs=output
+        )
+        gr.Button("Saved Searches").click(show_saved, outputs=saved)
 
 demo.launch()