Upload app.py

app.py

@@ -222,14 +222,20 @@ def render_fema_block(fema_res: Dict[str, Any]) -> str:
         return str(err)
     cas_url = fema_res.get("cas_url")
     name_url = fema_res.get("name_url")
+    combo_url = fema_res.get("combo_url")
     alt = fema_res.get("alt_url")
-    if not cas_url and not name_url and not alt:
+    search_api = fema_res.get("search_api_url")
+    if not cas_url and not name_url and not combo_url and not alt and not search_api:
         return "FEMA link unavailable."
     lines = ["A FEMA risk assessment for this chemical is available:"]
     if cas_url:
         lines.append(f"- [Search by CAS]({cas_url})")
     if name_url:
         lines.append(f"- [Search by Chemical Name]({name_url})")
+    if combo_url:
+        lines.append(f"- [Search by CAS + Name]({combo_url})")
+    if search_api:
+        lines.append(f"- [Generic FEMA search (alt)]({search_api})")
     if alt:
         lines.append(f"- [Generic FEMA search]({alt})")
     return "\n".join(lines)
@@ -277,7 +283,9 @@ async def run_search(query: str) -> Dict[str, Any]:
             cas = pub.get("resolved_cas") or q
 
         # CTX is CAS-first (but we allow name too; resolver will try both)
-        ctx_task = ctx_src.fetch_ctx_genetox(q, http) if q else asyncio.sleep(0, result={"ok": False})
+        pub_dtxsid = pub.get("dtxsid") if isinstance(pub, dict) else None
+        ctx_query = pub_dtxsid or q
+        ctx_task = ctx_src.fetch_ctx_genetox(ctx_query, http) if ctx_query else asyncio.sleep(0, result={"ok": False})
         ntp_task = ntp.search_technical_reports(cas, http, limit=8)
 
         ctx_res, ntp_res = await asyncio.gather(ctx_task, ntp_task)