wayfinder-paths 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

wayfinder_paths/core/clients/PoolClient.py

@@ -9,7 +9,7 @@ from typing import Any, NotRequired, Required, TypedDict
 
 from wayfinder_paths.core.clients.AuthClient import AuthClient
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class PoolData(TypedDict):
@@ -23,10 +23,10 @@ class PoolData(TypedDict):
     chain_code: Required[str]
     apy: NotRequired[float]
     tvl: NotRequired[float]
-    llama_apy_pct: NotRequired[float | None]
-    llama_tvl_usd: NotRequired[float | None]
-    llama_stablecoin: NotRequired[bool | None]
-    llama_il_risk: NotRequired[str | None]
+    apy: NotRequired[float | None]
+    tvlUsd: NotRequired[float | None]
+    stablecoin: NotRequired[bool | None]
+    ilRisk: NotRequired[str | None]
     network: NotRequired[str | None]
 
 
@@ -41,71 +41,35 @@ class LlamaMatch(TypedDict):
     """Llama match data structure"""
 
     id: Required[str]
-    llama_apy_pct: Required[float]
-    llama_tvl_usd: Required[float]
-    llama_stablecoin: Required[bool]
-    llama_il_risk: Required[str]
+    apy: Required[float]
+    tvlUsd: Required[float]
+    stablecoin: Required[bool]
+    ilRisk: Required[str]
     network: Required[str]
 
 
-class LlamaReport(TypedDict):
-    """Llama report data structure"""
-
-    identifier: Required[str]
-    apy: NotRequired[float | None]
-    tvl: NotRequired[float | None]
-
-
 class PoolClient(WayfinderClient):
     """Client for pool-related read operations"""
 
     def __init__(self, api_key: str | None = None):
         super().__init__(api_key=api_key)
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}"
+        self.api_base_url = f"{get_api_base_url()}"
         self._auth_client: AuthClient | None = AuthClient(api_key=api_key)
 
+    async def get_pools(self) -> dict[str, LlamaMatch]:
+        url = f"{self.api_base_url}/pools/"
+        response = await self._request("GET", url, headers={})
+        response.raise_for_status()
+        data = response.json()
+        return data.get("data", data)
+
     async def get_pools_by_ids(
         self,
         *,
         pool_ids: str,
-        merge_external: bool | None = None,
     ) -> PoolList:
-        """
-        Fetch pools by comma-separated pool ids.
-
-        Example:
-        GET /api/v1/public/pools/?pool_ids=a,b&merge_external=false
-        """
-        url = f"{self.api_base_url}/public/pools/"
+        url = f"{self.api_base_url}/pools/"
         params: dict[str, Any] = {"pool_ids": pool_ids}
-        if merge_external is not None:
-            params["merge_external"] = "true" if merge_external else "false"
-        response = await self._request("GET", url, params=params, headers={})
-        response.raise_for_status()
-        data = response.json()
-        return data.get("data", data)
-
-    async def get_llama_matches(self) -> dict[str, LlamaMatch]:
-        """
-        Fetch Llama matches for pools.
-
-        GET /api/v1/public/pools/llama/matches/
-        """
-        url = f"{self.api_base_url}/public/pools/llama/matches/"
-        response = await self._request("GET", url, headers={})
-        response.raise_for_status()
-        data = response.json()
-        return data.get("data", data)
-
-    async def get_llama_reports(self, *, identifiers: str) -> dict[str, LlamaReport]:
-        """
-        Fetch Llama reports using identifiers (token ids, address_network, or pool ids).
-
-        Example:
-        GET /api/v1/public/pools/llama/reports/?identifiers=pool-1,usd-coin
-        """
-        url = f"{self.api_base_url}/public/pools/llama/reports/"
-        params = {"identifiers": identifiers}
         response = await self._request("GET", url, params=params, headers={})
         response.raise_for_status()
         data = response.json()

wayfinder_paths/core/clients/TokenClient.py

@@ -9,7 +9,7 @@ from typing import NotRequired, Required, TypedDict
 
 from wayfinder_paths.core.clients.AuthClient import AuthClient
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class TokenDetails(TypedDict):
@@ -63,7 +63,7 @@ class TokenClient(WayfinderClient):
         Returns:
             Full token data including price information
         """
-        url = f"{settings.WAYFINDER_API_URL}/public/tokens/detail/"
+        url = f"{get_api_base_url()}/public/tokens/detail/"
         params = {
             "query": token_id,
             "get_chart": "false",
@@ -80,7 +80,7 @@ class TokenClient(WayfinderClient):
         Fetch the native gas token for a given chain code via public endpoint.
         Example: GET /api/v1/public/tokens/gas/?chain_code=base
         """
-        url = f"{settings.WAYFINDER_API_URL}/public/tokens/gas/"
+        url = f"{get_api_base_url()}/public/tokens/gas/"
         params = {"chain_code": chain_code}
         # Public endpoint: do not pass auth headers
         response = await self._request("GET", url, params=params, headers={})

wayfinder_paths/core/clients/WalletClient.py

@@ -9,7 +9,7 @@ from typing import NotRequired, Required, TypedDict
 
 from wayfinder_paths.core.clients.AuthClient import AuthClient
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class TokenBalance(TypedDict):
@@ -36,7 +36,7 @@ class PoolBalance(TypedDict):
 class WalletClient(WayfinderClient):
     def __init__(self, api_key: str | None = None):
         super().__init__(api_key=api_key)
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}"
+        self.api_base_url = get_api_base_url()
         self._auth_client = AuthClient(api_key=api_key)
 
     async def get_token_balance_for_wallet(

wayfinder_paths/core/clients/WayfinderClient.py

@@ -6,8 +6,8 @@ from typing import Any
 import httpx
 from loguru import logger
 
+from wayfinder_paths.core.config import get_api_base_url
 from wayfinder_paths.core.constants.base import DEFAULT_HTTP_TIMEOUT
-from wayfinder_paths.core.settings import settings
 
 
 class WayfinderClient:
@@ -19,7 +19,7 @@ class WayfinderClient:
             api_key: Optional API key for service account authentication.
                     If provided, uses API key auth. Otherwise falls back to config.json.
         """
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}/"
+        self.api_base_url = f"{get_api_base_url()}/"
         timeout = httpx.Timeout(DEFAULT_HTTP_TIMEOUT)
         self.client = httpx.AsyncClient(timeout=timeout)
 
@@ -33,7 +33,7 @@ class WayfinderClient:
 
     def set_bearer_token(self, token: str) -> None:
         """
-        Set runtime OAuth/JWT Bearer token for Django-backed Wayfinder services.
+        Set runtime OAuth/JWT Bearer token for Wayfinder services.
         """
         self.headers["Authorization"] = f"Bearer {token}"
         self._access_token = token
@@ -57,7 +57,7 @@ class WayfinderClient:
         try:
             logger.info("Attempting to refresh access token")
             start_time = time.time()
-            url = f"{settings.WAYFINDER_API_URL}/auth/token/refresh/"
+            url = f"{get_api_base_url()}/auth/token/refresh/"
             payload = {"refresh": self._refresh_token}
             response = await self.client.post(
                 url, json=payload, headers={"Content-Type": "application/json"}
@@ -83,16 +83,15 @@ class WayfinderClient:
 
     def _load_config_credentials(self) -> dict[str, str | None]:
         """
-        Load credentials from config.json. Path can be overridden via WAYFINDER_CONFIG_PATH.
+        Load credentials from config.json.
         Expected shape:
         {
           "user": { "username": ..., "password": ..., "refresh_token": ..., "api_key": ... },
           "system": { "api_key": ... }
         }
         """
-        path = os.getenv("WAYFINDER_CONFIG_PATH", "config.json")
         try:
-            with open(path) as f:
+            with open("config.json") as f:
                 cfg = json.load(f)
             user = cfg.get("user", {}) if isinstance(cfg, dict) else {}
             system = cfg.get("system", {}) if isinstance(cfg, dict) else {}
@@ -103,7 +102,7 @@ class WayfinderClient:
                 "api_key": user.get("api_key") or system.get("api_key"),
             }
         except (FileNotFoundError, json.JSONDecodeError, OSError) as e:
-            logger.debug(f"Could not load config file at {path}: {e}")
+            logger.debug(f"Could not load config file at config.json: {e}")
             return {
                 "username": None,
                 "password": None,
@@ -111,7 +110,7 @@ class WayfinderClient:
                 "api_key": None,
             }
         except Exception as e:
-            logger.warning(f"Unexpected error loading config file at {path}: {e}")
+            logger.warning(f"Unexpected error loading config file at config.json: {e}")
             return {
                 "username": None,
                 "password": None,
@@ -155,7 +154,7 @@ class WayfinderClient:
 
         if username and password:
             try:
-                url = f"{settings.WAYFINDER_API_URL}/auth/token/"
+                url = f"{get_api_base_url()}/auth/token/"
                 payload = {"username": username, "password": password}
                 response = await self.client.post(
                     url,

wayfinder_paths/core/clients/protocols.py

@@ -25,7 +25,6 @@ if TYPE_CHECKING:
     )
     from wayfinder_paths.core.clients.PoolClient import (
         LlamaMatch,
-        LlamaReport,
         PoolList,
     )
     from wayfinder_paths.core.clients.TokenClient import (
@@ -191,19 +190,14 @@ class PoolClientProtocol(Protocol):
         self,
         *,
         pool_ids: str,
-        merge_external: bool | None = None,
     ) -> PoolList:
         """Fetch pools by comma-separated pool ids"""
         ...
 
-    async def get_llama_matches(self) -> dict[str, LlamaMatch]:
+    async def get_pools(self) -> dict[str, LlamaMatch]:
         """Fetch Llama matches for pools"""
         ...
 
-    async def get_llama_reports(self, *, identifiers: str) -> dict[str, LlamaReport]:
-        """Fetch Llama reports using identifiers"""
-        ...
-
 
 class BRAPClientProtocol(Protocol):
     """Protocol for BRAP (Bridge/Router/Adapter Protocol) quote operations"""