Update mcp/disgenet.py

mcp/disgenet.py

@@ -1,68 +1,58 @@
-#!/usr/bin/env python3
-"""MedGenesis – DisGeNET async helper (disease → gene associations).
-
-Features
-~~~~~~~~
-* Accepts optional Bearer token via env **`DISGENET_KEY`** (rate‑limit free).
-* Endpoint: `https://www.disgenet.org/api/gda/disease/<disease_name>`
-* Back‑off retry (2×, 4×) for 429/5xx.
-* LRU cache (24 h, 512 queries) to minimise API calls.
-* Returns top *N* rows (default = 10) as `list[dict]`.
 """
-from __future__ import annotations
+disgenet.py  ·  Disease-Gene associations helper
+Docs: https://www.disgenet.com/downloads  (REST v1)   🛈
+
+Change-log
+──────────
+• 2025-06-25  – .org → .COM redirect (301) broke calls.
+               We now default to https://www.disgenet.com/api
+               and still follow redirects if they add a CDN later.
+• Graceful retry + 24 h LRU-cache.
+• Empty list on any error so orchestrator never crashes.
+"""
 
+from __future__ import annotations
 import os, asyncio, httpx
 from functools import lru_cache
-from typing import List, Dict, Any
+from typing import List, Dict
 
-_BASE = "https://www.disgenet.org/api/gda/disease"
-_TOKEN = os.getenv("DISGENET_KEY")
-_HEADERS = {"Authorization": f"Bearer {_TOKEN}"} if (_TOKEN := os.getenv("DISGENET_KEY")) else {}
-_TIMEOUT = 15
+_TOKEN  = os.getenv("DISGENET_KEY")            # optional Bearer token
+_BASE   = "https://www.disgenet.com/api"       # ← new canonical host
+_HDRS   = {"Accept": "application/json"}
+if _TOKEN:
+    _HDRS["Authorization"] = f"Bearer {_TOKEN}"
 
-# ---------------------------------------------------------------------
-# Internal fetch with retry
-# ---------------------------------------------------------------------
-async def _fetch(url: str, *, retries: int = 3) -> List[Dict[str, Any]]:
-    delay = 2
-    for _ in range(retries):
-        async with httpx.AsyncClient(timeout=_TIMEOUT, headers=_HEADERS) as cli:
-            resp = await cli.get(url, params={"source": "ALL", "format": "json"})
-            if resp.status_code == 200:
-                return resp.json()
-            if resp.status_code in {429, 500, 503}:
-                await asyncio.sleep(delay)
-                delay *= 2
-                continue
-            resp.raise_for_status()
-    return []  # final fallback
+_TIMEOUT = 12
+_RETRIES = 2
 
-# ---------------------------------------------------------------------
-# Public API – cached 24 h
-# ---------------------------------------------------------------------
+# ────────────────────────────────────────────────────────────────────
 @lru_cache(maxsize=512)
-async def disease_to_genes(disease_name: str, *, limit: int = 10) -> List[Dict]:
-    """Return up to *limit* gene‑association dicts for *disease_name*.
-
-    Parameters
-    ----------
-    disease_name : str
-        Free‑text disease label (e.g. "glioblastoma"). Internally converted
-        to lowercase and URL‑encoded.
-    limit : int, optional
-        Maximum number of rows to return (default = 10).
+async def disease_to_genes(disease_name: str,
+                           limit: int = 10) -> List[Dict]:
     """
-    url = f"{_BASE}/{disease_name.lower()}"
-    data = await _fetch(url)
-    return data[:limit]
-
-
-# ---------------------------------------------------------------------
-# CLI demo
-# ---------------------------------------------------------------------
-if __name__ == "__main__":
-    import json
-    async def _demo():
-        out = await disease_to_genes("glioblastoma", limit=5)
-        print(json.dumps(out[:2], indent=2))
-    asyncio.run(_demo())
+    Return top-N gene associations for *disease_name*.
+    Empty list on failure or if none found.
+    """
+    url = f"{_BASE}/gda/disease/{disease_name.lower()}"
+    params = {"source": "ALL", "format": "json"}
+
+    async def _one_call() -> List[Dict]:
+        async with httpx.AsyncClient(timeout=_TIMEOUT,
+                                     headers=_HDRS,
+                                     follow_redirects=True) as cli:
+            r = await cli.get(url, params=params)
+            if r.status_code == 404:
+                return []
+            r.raise_for_status()
+            return r.json()[:limit]
+
+    delay = 0.0
+    for _ in range(_RETRIES):
+        try:
+            return await _one_call()
+        except (httpx.HTTPStatusError, httpx.ReadTimeout):
+            await asyncio.sleep(delay or 0.7)
+            delay = 0.0            # retry only once
+        except Exception:
+            break
+    return []                      # graceful fallback