intentkit 0.7.5.dev23__py3-none-any.whl → 0.7.5.dev25__py3-none-any.whl

intentkit/models/llm.py

@@ -7,6 +7,7 @@ from enum import Enum
 from pathlib import Path
 from typing import Annotated, Any, Optional
 
+from intentkit.config.config import config
 from intentkit.models.app_setting import AppSetting
 from intentkit.models.base import Base
 from intentkit.models.db import get_session
@@ -346,7 +347,7 @@ class LLMModel(BaseModel):
         return model_info
 
     # This will be implemented by subclasses to return the appropriate LLM instance
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return the LLM instance based on the configuration."""
         raise NotImplementedError("Subclasses must implement create_instance")
 
@@ -364,7 +365,7 @@ class LLMModel(BaseModel):
 class OpenAILLM(LLMModel):
     """OpenAI LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatOpenAI instance."""
         from langchain_openai import ChatOpenAI
 
@@ -394,6 +395,9 @@ class OpenAILLM(LLMModel):
         elif self.model_name == "gpt-5":
             kwargs["reasoning_effort"] = "low"
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         logger.debug(f"Creating ChatOpenAI instance with kwargs: {kwargs}")
 
         return ChatOpenAI(**kwargs)
@@ -402,7 +406,7 @@ class OpenAILLM(LLMModel):
 class DeepseekLLM(LLMModel):
     """Deepseek LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatDeepseek instance."""
 
         from langchain_deepseek import ChatDeepSeek
@@ -429,13 +433,16 @@ class DeepseekLLM(LLMModel):
         if info.api_base:
             kwargs["api_base"] = info.api_base
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         return ChatDeepSeek(**kwargs)
 
 
 class XAILLM(LLMModel):
     """XAI (Grok) LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatXAI instance."""
 
         from langchain_xai import ChatXAI
@@ -458,8 +465,8 @@ class XAILLM(LLMModel):
         if info.supports_presence_penalty:
             kwargs["presence_penalty"] = self.presence_penalty
 
-        if self.model_name in ["grok-3", "grok-3-mini"]:
-            kwargs["search_parameters"] = {"mode": "auto"}
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
 
         return ChatXAI(**kwargs)
 
@@ -467,7 +474,7 @@ class XAILLM(LLMModel):
 class GatewayzLLM(LLMModel):
     """Gatewayz AI LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatOpenAI instance configured for Eternal AI."""
         from langchain_openai import ChatOpenAI
 
@@ -478,6 +485,7 @@ class GatewayzLLM(LLMModel):
             "api_key": config.gatewayz_api_key,
             "base_url": info.api_base,
             "timeout": info.timeout,
+            "max_completion_tokens": 999,
         }
 
         # Add optional parameters based on model support
@@ -490,13 +498,16 @@ class GatewayzLLM(LLMModel):
         if info.supports_presence_penalty:
             kwargs["presence_penalty"] = self.presence_penalty
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         return ChatOpenAI(**kwargs)
 
 
 class EternalLLM(LLMModel):
     """Eternal AI LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatOpenAI instance configured for Eternal AI."""
         from langchain_openai import ChatOpenAI
 
@@ -522,13 +533,16 @@ class EternalLLM(LLMModel):
         if info.supports_presence_penalty:
             kwargs["presence_penalty"] = self.presence_penalty
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         return ChatOpenAI(**kwargs)
 
 
 class ReigentLLM(LLMModel):
     """Reigent LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatOpenAI instance configured for Reigent."""
         from langchain_openai import ChatOpenAI
 
@@ -544,13 +558,16 @@ class ReigentLLM(LLMModel):
             },
         }
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         return ChatOpenAI(**kwargs)
 
 
 class VeniceLLM(LLMModel):
     """Venice LLM configuration."""
 
-    async def create_instance(self, config: Any) -> BaseChatModel:
+    async def create_instance(self, params: dict[str, Any] = {}) -> BaseChatModel:
         """Create and return a ChatOpenAI instance configured for Venice."""
         from langchain_openai import ChatOpenAI
 
@@ -562,6 +579,9 @@ class VeniceLLM(LLMModel):
             "timeout": info.timeout,
         }
 
+        # Update kwargs with params to allow overriding
+        kwargs.update(params)
+
         return ChatOpenAI(**kwargs)
 
 

intentkit/skills/base.py

@@ -1,6 +1,16 @@
 import logging
 from collections.abc import Sequence
-from typing import Any, Callable, Dict, Literal, NotRequired, Optional, TypedDict, Union
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Literal,
+    NotRequired,
+    Optional,
+    TypedDict,
+    Union,
+)
 
 from coinbase_agentkit import (
     Action,
@@ -21,10 +31,13 @@ from web3 import Web3
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.clients import CdpClient, get_cdp_client
+from intentkit.clients import get_wallet_provider
 from intentkit.clients.web3 import get_web3_client
 from intentkit.models.redis import get_redis
-from intentkit.utils.error import RateLimitExceeded
+from intentkit.utils.error import IntentKitAPIError, RateLimitExceeded
+
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
 
 SkillState = Literal["disabled", "public", "private"]
 SkillOwnerState = Literal["disabled", "private"]
@@ -175,13 +188,32 @@ class IntentKitSkill(BaseTool):
 
 async def get_agentkit_actions(
     agent_id: str,
-    store: SkillStoreABC,
+    _store: SkillStoreABC,
     provider_factories: Sequence[Callable[[], object]],
+    *,
+    agent: Optional["Agent"] = None,
 ) -> list[Action]:
     """Build an AgentKit instance and return its actions."""
 
-    cdp_client: CdpClient = await get_cdp_client(agent_id, store)
-    wallet_provider: CdpEvmWalletProvider = await cdp_client.get_wallet_provider()
+    if agent is None:
+        try:
+            context = IntentKitSkill.get_context()
+        except ValueError as exc:  # pragma: no cover - defensive guard
+            raise IntentKitAPIError(
+                500,
+                "AgentContextMissing",
+                "Agent context is required to initialize AgentKit actions.",
+            ) from exc
+        agent = context.agent
+
+    if agent.id != agent_id:
+        raise IntentKitAPIError(
+            400,
+            "AgentMismatch",
+            "The requested agent does not match the active context agent.",
+        )
+
+    wallet_provider: CdpEvmWalletProvider = await get_wallet_provider(agent)
 
     agent_kit = AgentKit(
         AgentKitConfig(

intentkit/skills/basename/__init__.py

@@ -1,6 +1,6 @@
 """Basename AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import basename_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.basename.base import BasenameBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     BasenameActionProvider_register_basename: SkillState
@@ -29,6 +32,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[BasenameBaseTool]:
     """Get all Basename skills."""
@@ -40,7 +44,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [basename_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [basename_action_provider], agent=agent
+    )
     tools: list[BasenameBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/cdp/__init__.py

@@ -1,6 +1,6 @@
 """CDP wallet interaction skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import (
     cdp_api_action_provider,
@@ -17,6 +17,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.cdp.base import CDPBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     WalletActionProvider_get_balance: SkillState
@@ -40,6 +43,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[CDPBaseTool]:
     """Get all CDP skills.
@@ -71,6 +75,7 @@ async def get_skills(
             cdp_api_action_provider,
             cdp_evm_wallet_action_provider,
         ],
+        agent=agent,
     )
     tools = []
     for skill in available_skills:

intentkit/skills/enso/base.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.clients import CdpClient, get_cdp_client
+from intentkit.clients import get_wallet_provider as get_agent_wallet_provider
 from intentkit.skills.base import IntentKitSkill
 from intentkit.utils.chain import ChainProvider, Network, network_to_id
 
@@ -24,9 +24,7 @@ class EnsoBaseTool(IntentKitSkill):
         description="The skill store for persisting data"
     )
 
-    async def get_wallet_provider(
-        self, context: AgentContext
-    ) -> Optional[CdpEvmWalletProvider]:
+    async def get_wallet_provider(self, context: AgentContext) -> CdpEvmWalletProvider:
         """Get the wallet provider from the CDP client.
 
         Args:
@@ -35,15 +33,11 @@ class EnsoBaseTool(IntentKitSkill):
         Returns:
             Optional[CdpEvmWalletProvider]: The wallet provider if available.
         """
-        client: CdpClient = await get_cdp_client(context.agent.id, self.skill_store)
-        return await client.get_wallet_provider()
+        return await get_agent_wallet_provider(context.agent)
 
     async def get_wallet_address(self, context: AgentContext) -> str:
-        client: CdpClient = await get_cdp_client(context.agent.id, self.skill_store)
-        provider_config = await client.get_provider_config()
-        if not provider_config.address:
-            raise ToolException("wallet address not found for agent")
-        return provider_config.address
+        provider: CdpEvmWalletProvider = await self.get_wallet_provider(context)
+        return provider.get_address()
 
     def get_chain_provider(self, context: AgentContext) -> Optional[ChainProvider]:
         return self.skill_store.get_system_config("chain_provider")

intentkit/skills/enso/route.py

@@ -184,7 +184,9 @@ class EnsoRouteShortcut(EnsoBaseTool):
         agent_id = context.agent_id
         resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
-        wallet_address = await self.get_wallet_address(context)
+        # Use the wallet provider to send the transaction
+        wallet_provider = await self.get_wallet_provider(context)
+        wallet_address = wallet_provider.get_address()
 
         async with httpx.AsyncClient() as client:
             try:
@@ -266,9 +268,6 @@ class EnsoRouteShortcut(EnsoBaseTool):
                     res.amountOut = amount_out
 
                 if broadcast_requested:
-                    # Use the wallet provider to send the transaction
-                    wallet_provider = await self.get_wallet_provider(context)
-
                     # Extract transaction data from the Enso API response
                     tx_data = json_dict.get("tx", {})
                     if tx_data:
@@ -277,7 +276,6 @@ class EnsoRouteShortcut(EnsoBaseTool):
                             "to": tx_data.get("to"),
                             "data": tx_data.get("data", "0x"),
                             "value": tx_data.get("value", 0),
-                            "from": wallet_address,
                         }
                         tx_hash = wallet_provider.send_transaction(tx_params)
 

intentkit/skills/erc20/__init__.py

@@ -1,6 +1,6 @@
 """ERC20 AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import erc20_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.erc20.base import ERC20BaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     ERC20ActionProvider_get_balance: SkillState
@@ -30,6 +33,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[ERC20BaseTool]:
     """Get all ERC20 skills."""
@@ -41,7 +45,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [erc20_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [erc20_action_provider], agent=agent
+    )
     tools: list[ERC20BaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/erc721/__init__.py

@@ -1,6 +1,6 @@
 """ERC721 AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import erc721_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.erc721.base import ERC721BaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     Erc721ActionProvider_get_balance: SkillState
@@ -31,6 +34,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[ERC721BaseTool]:
     """Get all ERC721 skills."""
@@ -42,7 +46,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [erc721_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [erc721_action_provider], agent=agent
+    )
     tools: list[ERC721BaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/lifi/token_execute.py

@@ -7,7 +7,8 @@ from pydantic import BaseModel, Field
 from web3 import Web3
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.clients import CdpClient, get_cdp_client
+from intentkit.clients import get_wallet_provider as get_agent_wallet_provider
+from intentkit.models.agent import Agent
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.token_quote import TokenQuote
 from intentkit.skills.lifi.utils import (
@@ -130,14 +131,14 @@ class TokenExecute(LiFiBaseTool):
 
             # Get agent context for CDP wallet
             context = self.get_context()
-            agent_id = context.agent_id
+            agent = context.agent
 
             self.logger.info(
                 f"Executing LiFi transfer: {from_amount} {from_token} on {from_chain} -> {to_token} on {to_chain}"
             )
 
             # Get CDP wallet provider
-            cdp_wallet_provider = await self._get_cdp_wallet_provider(agent_id)
+            cdp_wallet_provider = await self._get_cdp_wallet_provider(agent)
             if isinstance(cdp_wallet_provider, str):  # Error message
                 return cdp_wallet_provider
 
@@ -186,15 +187,11 @@ class TokenExecute(LiFiBaseTool):
             return f"An unexpected error occurred: {str(e)}"
 
     async def _get_cdp_wallet_provider(
-        self, agent_id: str
+        self, agent: Agent
     ) -> CdpEvmWalletProvider | str:
         """Get CDP wallet provider with error handling."""
         try:
-            cdp_client: CdpClient = await get_cdp_client(agent_id, self.skill_store)
-            if not cdp_client:
-                return "CDP client not available. Please ensure your agent has CDP wallet configuration."
-
-            cdp_wallet_provider = await cdp_client.get_wallet_provider()
+            cdp_wallet_provider = await get_agent_wallet_provider(agent)
             if not cdp_wallet_provider:
                 return "CDP wallet provider not configured. Please set up your agent's CDP wallet first."
 

intentkit/skills/morpho/__init__.py

@@ -1,6 +1,6 @@
 """Morpho AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import morpho_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.morpho.base import MorphoBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     MorphoActionProvider_deposit: SkillState
@@ -30,6 +33,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[MorphoBaseTool]:
     """Get all Morpho skills."""
@@ -41,7 +45,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [morpho_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [morpho_action_provider], agent=agent
+    )
     tools: list[MorphoBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/pyth/__init__.py

@@ -1,6 +1,6 @@
 """Pyth AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import pyth_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.pyth.base import PythBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     PythActionProvider_fetch_price: SkillState
@@ -30,6 +33,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[PythBaseTool]:
     """Get all Pyth skills."""
@@ -41,7 +45,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [pyth_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [pyth_action_provider], agent=agent
+    )
     tools: list[PythBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/superfluid/__init__.py

@@ -1,6 +1,6 @@
 """Superfluid AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import superfluid_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.superfluid.base import SuperfluidBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     SuperfluidActionProvider_create_flow: SkillState
@@ -31,6 +34,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[SuperfluidBaseTool]:
     """Get all Superfluid skills."""
@@ -42,7 +46,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [superfluid_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [superfluid_action_provider], agent=agent
+    )
     tools: list[SuperfluidBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/weth/__init__.py

@@ -1,6 +1,6 @@
 """WETH AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import weth_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.weth.base import WethBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     WethActionProvider_wrap_eth: SkillState
@@ -29,6 +32,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[WethBaseTool]:
     """Get all WETH skills."""
@@ -40,7 +44,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [weth_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [weth_action_provider], agent=agent
+    )
     tools: list[WethBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/wow/__init__.py

@@ -1,6 +1,6 @@
 """WOW AgentKit skills."""
 
-from typing import TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import wow_action_provider
 
@@ -13,6 +13,9 @@ from intentkit.skills.base import (
 )
 from intentkit.skills.wow.base import WowBaseTool
 
+if TYPE_CHECKING:
+    from intentkit.models.agent import Agent
+
 
 class SkillStates(TypedDict):
     WowActionProvider_buy_token: SkillState
@@ -31,6 +34,7 @@ async def get_skills(
     is_private: bool,
     store: SkillStoreABC,
     agent_id: str,
+    agent: Optional["Agent"] = None,
     **_,
 ) -> list[WowBaseTool]:
     """Get all WOW skills."""
@@ -42,7 +46,9 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(agent_id, store, [wow_action_provider])
+    actions = await get_agentkit_actions(
+        agent_id, store, [wow_action_provider], agent=agent
+    )
     tools: list[WowBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/xmtp/price.py

@@ -1,5 +1,6 @@
 from typing import Literal, Type
 
+from langchain.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.clients.cdp import get_origin_cdp_client
@@ -43,13 +44,13 @@ class XmtpGetSwapPrice(XmtpBaseTool):
             "optimism-mainnet",
         ]
         if agent.network_id not in supported_networks:
-            raise ValueError(
+            raise ToolException(
                 f"Swap price only supported on {', '.join(supported_networks)}. Current: {agent.network_id}"
             )
 
         network_for_cdp = self.get_cdp_network(agent.network_id)
 
-        cdp_client = get_origin_cdp_client(self.skill_store)
+        cdp_client = get_origin_cdp_client()
         # Note: Don't use async with context manager as get_origin_cdp_client returns a managed global client
         price = await cdp_client.evm.get_swap_price(
             from_token=from_token,