Update mcp/clinicaltrials.py

mcp/clinicaltrials.py

@@ -1,47 +1,31 @@
-#!/usr/bin/env python3
-"""
-Fetch clinical trials from ClinicalTrials.gov without external clients.
-"""
+# mcp/clinicaltrials.py
+import httpx, random
 
-import httpx
-import urllib.parse
-
-async def fetch_clinical_trials(
-    query: str,
-    max_studies: int = 10
-) -> list[dict]:
-    """
-    Query ClinicalTrials.gov study_fields API for NCTId, Title, Phase, Status.
-    Returns up to `max_studies` results.
-    """
-    # Build the API URL
-    base = "https://clinicaltrials.gov/api/query/study_fields"
-    params = {
-        "expr": query,
-        "fields": ",".join(["NCTId", "BriefTitle", "Phase", "OverallStatus"]),
-        "max_rnk": max_studies,
-        "fmt": "json",
-    }
-    url = f"{base}?{urllib.parse.urlencode(params)}"
+V2_URL = "https://clinicaltrials.gov/api/v2/studies"
+V1_URL = "https://clinicaltrials.gov/api/query/study_fields"
+UA_LIST = [
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64)…Chrome/125…",
+    "Mozilla/5.0 (Macintosh)…Safari/605…",
+    "Mozilla/5.0 (X11)…Firefox/126…"
+]
 
+async def search_trials(term: str, max_studies: int = 20) -> list[dict]:
+    ua = random.choice(UA_LIST)
     try:
-        async with httpx.AsyncClient(timeout=10) as client:
-            resp = await client.get(url)
-            resp.raise_for_status()
-            data = resp.json()
+        async with httpx.AsyncClient(headers={"User-Agent": ua}, timeout=12) as c:
+            r = await c.get(V2_URL, params={"query": term, "pageSize": max_studies})
+            if r.status_code == 200:
+                return r.json().get("studies", [])
+            raise httpx.HTTPStatusError("v2 failed", request=r.request, response=r)
     except Exception:
-        # In case of any network / parse error
-        return []
-
-    # Navigate JSON response
-    # API docs: https://clinicaltrials.gov/api/gui/ref/study_fields
-    studies = data.get("StudyFieldsResponse", {}).get("StudyFields", [])
-    output = []
-    for s in studies:
-        output.append({
-            "nctId": s.get("NCTId", [""])[0],
-            "briefTitle": s.get("BriefTitle", [""])[0],
-            "phase": s.get("Phase", [""])[0],
-            "status": s.get("OverallStatus", [""])[0],
-        })
-    return output
+        params = {
+            "expr": term,
+            "fields": "NCTId,BriefTitle,Phase,OverallStatus,StartDate",
+            "max_rnk": max_studies,
+            "min_rnk": 1,
+            "fmt": "json"
+        }
+        async with httpx.AsyncClient(headers={"User-Agent": ua}, timeout=12) as c:
+            r = await c.get(V1_URL, params=params)
+            r.raise_for_status()
+            return r.json().get("StudyFieldsResponse", {}).get("StudyFields", [])