Update mcp/clients.py

mcp/clients.py

@@ -1,30 +1,30 @@
 # mcp/clients.py
-import os, httpx, asyncio
+```python
+import os, httpx
 from functools import lru_cache
 from typing import Any, Dict
 
-class APIError(Exception): pass
+class APIError(Exception):
+    pass
 
 class BaseClient:
-    def __init__(self, base: str, api_key_env: str = None):
-        self.base = base
+    def __init__(self, base_url: str, api_key_env: str = None):
+        self.base = base_url.rstrip("/")
         self.key = os.getenv(api_key_env) if api_key_env else None
         self._client = httpx.AsyncClient(timeout=10)
 
     async def request(self, method: str, path: str, **kwargs) -> Any:
-        # automatically attach API key if present
+        url = f"{self.base}/{path.lstrip('/')}"
+        headers = kwargs.pop("headers", {})
         if self.key:
-            if "headers" not in kwargs: kwargs["headers"] = {}
-            kwargs["headers"]["Authorization"] = f"Bearer {self.key}"
-        url = f"{self.base.rstrip('/')}/{path.lstrip('/')}"
-        resp = await self._client.request(method, url, **kwargs)
+            headers["Authorization"] = f"Bearer {self.key}"
+        response = await self._client.request(method, url, headers=headers, **kwargs)
         try:
-            resp.raise_for_status()
+            response.raise_for_status()
         except httpx.HTTPStatusError as e:
-            raise APIError(f"{resp.status_code} @ {url}") from e
-        # auto-parse JSON or text
-        ct = resp.headers.get("Content-Type","")
-        return resp.json() if ct.startswith("application/json") else resp.text
+            raise APIError(f"{response.status_code} @ {url}") from e
+        content_type = response.headers.get("Content-Type", "")
+        return response.json() if content_type.startswith("application/json") else response.text
 
     async def close(self):
-        await self._client.aclose()
+        await self._client.aclose()