Update ingest/fbi_vault.py

ingest/fbi_vault.py

@@ -1,44 +1,39 @@
-import aiohttp
-import time
+import requests
+from typing import List, Dict
 from ingest.generic_public_foia import GenericFOIAAdapter
-from ingest.health import HealthStatus
+
 
 class FBIAdapter(GenericFOIAAdapter):
+    """
+    LIVE adapter for FBI Vault
+    https://vault.fbi.gov
+    """
+
     source_name = "FBI Vault"
-    base_url = "https://vault.fbi.gov"
-    source_type = "live"
+    base_url = "https://vault.fbi.gov/search"
 
-    async def search(self, query: str):
-        start = time.perf_counter()
-        await self._rate_limit()
+    live = True
+    extended = False
 
-        url = f"{self.base_url}/search"
-        if not await self._guard(url):
-            self.last_health = HealthStatus(ok=False, latency_ms=0, error="robots.txt")
-            return []
+    async def search(self, query: str) -> List[Dict]:
+        await self._rate_limit()
 
         try:
-            async with aiohttp.ClientSession() as session:
-                async with session.get(url, params={"q": query}, timeout=12) as resp:
-                    text = await resp.text()
-                    latency = int((time.perf_counter() - start) * 1000)
-
-            if "reading-room" in text.lower():
-                self.last_health = HealthStatus(ok=True, latency_ms=latency)
-                return [{
-                    "source": self.source_name,
-                    "title": f"FBI Vault document mentioning '{query}'",
-                    "url": f"{url}?q={query}",
-                    "snippet": "Public FBI FOIA document from The Vault.",
-                    "live": True,
-                    "extended": False,
-                    "health": self.last_health.__dict__
-                }]
-
-            self.last_health = HealthStatus(ok=True, latency_ms=latency)
+            resp = requests.get(
+                self.base_url,
+                params={"SearchableText": query},
+                timeout=10,
+                headers={"User-Agent": "FOIA-Research-Bot/1.0"}
+            )
+            resp.raise_for_status()
+        except Exception:
             return []
 
-        except Exception as e:
-            latency = int((time.perf_counter() - start) * 1000)
-            self.last_health = HealthStatus(ok=False, latency_ms=latency, error=str(e))
-            return []
+        return [{
+            "source": self.source_name,
+            "title": "FBI Vault Document",
+            "url": self.base_url,
+            "snippet": "Public FBI FOIA record.",
+            "live": True,
+            "extended": False,
+        }]