intentkit 0.6.13.dev2__py3-none-any.whl → 0.8.17__py3-none-any.whl

intentkit/skills/enso/__init__.py

@@ -1,9 +1,8 @@
 """Enso skills."""
 
 import logging
-from typing import List, NotRequired, TypedDict
+from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.enso.base import EnsoBaseTool
 from intentkit.skills.enso.best_yield import EnsoGetBestYield
@@ -36,13 +35,12 @@ class Config(SkillConfig):
 
     states: SkillStates
     api_token: NotRequired[str]
-    main_tokens: List[str]
+    main_tokens: NotRequired[list[str]]
 
 
 async def get_skills(
     config: Config,
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[EnsoBaseTool]:
     """Get all Enso skills."""
@@ -58,7 +56,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_enso_skill(name, store)
+        skill = get_enso_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -66,49 +64,31 @@ async def get_skills(
 
 def get_enso_skill(
     name: str,
-    skill_store: SkillStoreABC,
 ) -> EnsoBaseTool:
     """Get an Enso skill by name.
 
     Args:
         name: The name of the skill to get
-        skill_store: The skill store for persisting data
 
     Returns:
         The requested Enso skill
     """
     if name == "get_networks":
-        return EnsoGetNetworks(
-            skill_store=skill_store,
-        )
+        return EnsoGetNetworks()
     if name == "get_tokens":
-        return EnsoGetTokens(
-            skill_store=skill_store,
-        )
+        return EnsoGetTokens()
     if name == "get_prices":
-        return EnsoGetPrices(
-            skill_store=skill_store,
-        )
+        return EnsoGetPrices()
     if name == "get_wallet_approvals":
-        return EnsoGetWalletApprovals(
-            skill_store=skill_store,
-        )
+        return EnsoGetWalletApprovals()
     if name == "get_wallet_balances":
-        return EnsoGetWalletBalances(
-            skill_store=skill_store,
-        )
+        return EnsoGetWalletBalances()
     if name == "wallet_approve":
-        return EnsoWalletApprove(
-            skill_store=skill_store,
-        )
+        return EnsoWalletApprove()
     if name == "route_shortcut":
-        return EnsoRouteShortcut(
-            skill_store=skill_store,
-        )
+        return EnsoRouteShortcut()
     if name == "get_best_yield":
-        return EnsoGetBestYield(
-            skill_store=skill_store,
-        )
+        return EnsoGetBestYield()
     else:
         logger.warning(f"Unknown Enso skill: {name}")
         return None

intentkit/skills/enso/base.py

@@ -1,18 +1,16 @@
-from typing import Optional, Type
+from decimal import Decimal
 
-from cdp import EvmServerAccount
-from coinbase_agentkit import CdpEvmServerWalletProvider
-from langchain.tools.base import ToolException
+from coinbase_agentkit import CdpEvmWalletProvider
+from langchain_core.tools.base import ToolException
 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.config.config import config
 from intentkit.skills.base import IntentKitSkill
-from intentkit.utils.chain import ChainProvider, NetworkId
+from intentkit.utils.chain import ChainProvider, Network, network_to_id
 
 base_url = "https://api.enso.finance"
-default_chain_id = int(NetworkId.BaseMainnet)
 
 
 class EnsoBaseTool(IntentKitSkill):
@@ -20,39 +18,25 @@ class EnsoBaseTool(IntentKitSkill):
 
     name: str = Field(description="The name of the tool")
     description: str = Field(description="A description of what the tool does")
-    args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
+    args_schema: type[BaseModel]
 
-    async def get_account(self, context: AgentContext) -> Optional[EvmServerAccount]:
-        """Get the account object from the CDP client.
-
-        Args:
-            context: The skill context containing agent information.
-
-        Returns:
-            Optional[EvmServerAccount]: The account object if available.
-        """
-        client: CdpClient = await get_cdp_client(context.agent.id, self.skill_store)
-        return await client.get_account()
-
-    async def get_wallet_provider(
-        self, context: AgentContext
-    ) -> Optional[CdpEvmServerWalletProvider]:
+    async def get_wallet_provider(self, context: AgentContext) -> CdpEvmWalletProvider:
         """Get the wallet provider from the CDP client.
 
         Args:
             context: The skill context containing agent information.
 
         Returns:
-            Optional[CdpEvmServerWalletProvider]: The wallet provider if available.
+            CdpEvmWalletProvider | None: 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)
 
-    def get_chain_provider(self, context: AgentContext) -> Optional[ChainProvider]:
-        return self.skill_store.get_system_config("chain_provider")
+    async def get_wallet_address(self, context: AgentContext) -> str:
+        provider: CdpEvmWalletProvider = await self.get_wallet_provider(context)
+        return provider.get_address()
+
+    def get_chain_provider(self, context: AgentContext) -> ChainProvider | None:
+        return config.chain_provider
 
     def get_main_tokens(self, context: AgentContext) -> list[str]:
         skill_config = context.agent.skill_config(self.category)
@@ -60,12 +44,11 @@ class EnsoBaseTool(IntentKitSkill):
             return skill_config["main_tokens"]
         return []
 
-    def get_api_key(self) -> str:
-        context = self.get_context()
+    def get_api_token(self, context: AgentContext) -> str:
         skill_config = context.agent.skill_config(self.category)
         api_key_provider = skill_config.get("api_key_provider")
         if api_key_provider == "platform":
-            return self.skill_store.get_system_config("enso_api_token")
+            return config.enso_api_token
         # for backward compatibility, may only have api_token in skill_config
         elif skill_config.get("api_token"):
             return skill_config.get("api_token")
@@ -74,6 +57,38 @@ class EnsoBaseTool(IntentKitSkill):
                 f"Invalid API key provider: {api_key_provider}, or no api_token in config"
             )
 
+    def resolve_chain_id(
+        self, context: AgentContext, chain_id: int | None = None
+    ) -> int:
+        if chain_id:
+            return chain_id
+
+        agent = context.agent
+        try:
+            network = Network(agent.network_id)
+        except ValueError as exc:  # pragma: no cover - defensive
+            raise ToolException(
+                f"Unsupported network configured for agent: {agent.network_id}"
+            ) from exc
+
+        network_id = network_to_id.get(network)
+        if network_id is None:
+            raise ToolException(
+                f"Unable to determine chain id for network: {agent.network_id}"
+            )
+        return int(network_id)
+
     @property
     def category(self) -> str:
         return "enso"
+
+
+def format_amount_with_decimals(amount: object, decimals: int | None) -> str | None:
+    if amount is None or decimals is None:
+        return None
+
+    try:
+        value = Decimal(str(amount)) / (Decimal(10) ** decimals)
+        return format(value, "f")
+    except Exception:  # pragma: no cover - defensive
+        return None

intentkit/skills/enso/best_yield.py

@@ -1,17 +1,8 @@
-from typing import List, Optional, Type
-
 import httpx
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.skills.enso.base import (
-    EnsoBaseTool,
-    base_url,
-)
-from intentkit.utils.chain import NetworkId
-
-# Chain ID for Base Mainnet
-BASE_CHAIN_ID = int(NetworkId.BaseMainnet)
+from intentkit.skills.enso.base import EnsoBaseTool, base_url
 
 
 class EnsoGetBestYieldInput(BaseModel):
@@ -21,9 +12,9 @@ class EnsoGetBestYieldInput(BaseModel):
         "USDC",
         description="Symbol of the token to find the best yield for (e.g., 'USDC', 'ETH', 'USDT')",
     )
-    chain_id: int = Field(
-        BASE_CHAIN_ID,
-        description="The blockchain chain ID. Default is Base Mainnet (8453)",
+    chain_id: int | None = Field(
+        None,
+        description="The blockchain chain ID. Defaults to the agent's configured network.",
     )
     top_n: int = Field(
         5,
@@ -47,8 +38,8 @@ class YieldOption(BaseModel):
         None, description="Primary contract address for interacting with the protocol"
     )
     apy: float = Field(None, description="Annual Percentage Yield")
-    tvl: Optional[float] = Field(None, description="Total Value Locked in the protocol")
-    underlying_tokens: List[str] = Field(
+    tvl: float | None = Field(None, description="Total Value Locked in the protocol")
+    underlying_tokens: list[str] = Field(
         [], description="List of underlying token symbols"
     )
 
@@ -56,7 +47,7 @@ class YieldOption(BaseModel):
 class EnsoGetBestYieldOutput(BaseModel):
     """Output containing the best yield options."""
 
-    best_options: List[YieldOption] = Field(
+    best_options: list[YieldOption] = Field(
         [], description="List of best yield options sorted by APY (descending)"
     )
     token_symbol: str = Field(None, description="Symbol of the token searched for")
@@ -75,12 +66,12 @@ class EnsoGetBestYield(EnsoBaseTool):
         "Find the best yield options for a specific token (default: USDC) across all protocols "
         "on a blockchain network (default: Base). Results are sorted by APY in descending order."
     )
-    args_schema: Type[BaseModel] = EnsoGetBestYieldInput
+    args_schema: type[BaseModel] = EnsoGetBestYieldInput
 
     async def _arun(
         self,
         token_symbol: str = "USDC",
-        chain_id: int = BASE_CHAIN_ID,
+        chain_id: int | None = None,
         top_n: int = 5,
         **kwargs,
     ) -> EnsoGetBestYieldOutput:
@@ -89,7 +80,7 @@ class EnsoGetBestYield(EnsoBaseTool):
 
         Args:
             token_symbol (str): Symbol of the token to find the best yield for (default: USDC)
-            chain_id (int): The chain id of the network (default: Base Mainnet)
+            chain_id (int | None): The chain id of the network. Defaults to the agent's configured network.
             top_n (int): Number of top yield options to return
 
         Returns:
@@ -99,16 +90,17 @@ class EnsoGetBestYield(EnsoBaseTool):
             ToolException: If there's an error accessing the Enso API.
         """
         context = self.get_context()
+        resolved_chain_id = self.resolve_chain_id(context, chain_id)
         api_token = self.get_api_token(context)
 
         if not api_token:
             raise ToolException("No API token found for Enso Finance")
 
         # Get the chain name for the given chain ID
-        chain_name = await self._get_chain_name(api_token, chain_id)
+        chain_name = await self._get_chain_name(api_token, resolved_chain_id)
 
         # Get all protocols on the specified chain
-        protocols = await self._get_protocols(api_token, chain_id)
+        protocols = await self._get_protocols(api_token, resolved_chain_id)
 
         # Collect all yield options from all protocols
         all_yield_options = []
@@ -119,7 +111,7 @@ class EnsoGetBestYield(EnsoBaseTool):
 
             # Get yield-bearing tokens for this protocol
             tokens = await self._get_protocol_tokens(
-                api_token, chain_id, protocol_slug, token_symbol
+                api_token, resolved_chain_id, protocol_slug, token_symbol
             )
 
             # Process tokens to extract yield options
@@ -170,7 +162,7 @@ class EnsoGetBestYield(EnsoBaseTool):
         return EnsoGetBestYieldOutput(
             best_options=top_options,
             token_symbol=token_symbol,
-            chain_id=chain_id,
+            chain_id=resolved_chain_id,
             chain_name=chain_name,
         )
 

intentkit/skills/enso/networks.py

@@ -1,14 +1,11 @@
 import logging
-from typing import Type
 
 import httpx
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from .base import EnsoBaseTool, base_url
 
-logger = logging.getLogger(__name__)
-
 
 class EnsoGetNetworksInput(BaseModel):
     """
@@ -38,6 +35,9 @@ class EnsoGetNetworksOutput(BaseModel):
     )
 
 
+logger = logging.getLogger(__name__)
+
+
 class EnsoGetNetworks(EnsoBaseTool):
     """
     Tool for retrieving networks and their corresponding chainId, the output should be kept.
@@ -45,7 +45,7 @@ class EnsoGetNetworks(EnsoBaseTool):
 
     name: str = "enso_get_networks"
     description: str = "Retrieve networks supported by the Enso API"
-    args_schema: Type[BaseModel] = EnsoGetNetworksInput
+    args_schema: type[BaseModel] = EnsoGetNetworksInput
 
     async def _arun(self, **kwargs) -> EnsoGetNetworksOutput:
         """
@@ -82,12 +82,7 @@ class EnsoGetNetworks(EnsoBaseTool):
                         exclude_none=True
                     )
 
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id,
-                    "enso_get_networks",
-                    "networks",
-                    networks_memory,
-                )
+                await self.save_agent_skill_data("networks", networks_memory)
 
                 return EnsoGetNetworksOutput(res=networks)
             except httpx.RequestError as req_err:

intentkit/skills/enso/prices.py

@@ -1,16 +1,12 @@
-from typing import Type
-
 import httpx
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from .base import EnsoBaseTool, base_url, default_chain_id
+from .base import EnsoBaseTool, base_url
 
 
 class EnsoGetPricesInput(BaseModel):
-    chainId: int = Field(
-        default_chain_id, description="Blockchain chain ID of the token"
-    )
+    chainId: int | None = Field(None, description="Blockchain chain ID of the token")
     address: str = Field(
         "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
         description="Contract address of the token",
@@ -38,27 +34,26 @@ class EnsoGetPrices(EnsoBaseTool):
 
     name: str = "enso_get_prices"
     description: str = "Retrieve the price of a token by chain ID and contract address"
-    args_schema: Type[BaseModel] = EnsoGetPricesInput
+    args_schema: type[BaseModel] = EnsoGetPricesInput
 
     async def _arun(
         self,
         address: str,
-        chainId: int = default_chain_id,
+        chainId: int | None = None,
         **kwargs,
     ) -> EnsoGetPricesOutput:
         """
         Asynchronous function to request the token price from the API.
 
         Args:
-            chainId (int): The blockchain's chain ID.
+            chainId (int | None): The blockchain's chain ID. Defaults to the agent's configured network.
             address (str): Contract address of the token.
 
         Returns:
             EnsoGetPricesOutput: Token price response or error message.
         """
-        url = f"{base_url}/api/v1/prices/{str(chainId)}/{address}"
-
         context = self.get_context()
+        resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
 
         headers = {
@@ -68,7 +63,10 @@ class EnsoGetPrices(EnsoBaseTool):
 
         async with httpx.AsyncClient() as client:
             try:
-                response = await client.get(url, headers=headers)
+                response = await client.get(
+                    f"{base_url}/api/v1/prices/{str(resolved_chain_id)}/{address}",
+                    headers=headers,
+                )
                 response.raise_for_status()
                 json_dict = response.json()
 

intentkit/skills/enso/route.py

@@ -1,12 +1,10 @@
-from typing import Type
-
 import httpx
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.enso.networks import EnsoGetNetworks
 
-from .base import EnsoBaseTool, base_url, default_chain_id
+from .base import EnsoBaseTool, base_url, format_amount_with_decimals
 
 
 class EnsoRouteShortcutInput(BaseModel):
@@ -18,9 +16,9 @@ class EnsoRouteShortcutInput(BaseModel):
         False,
         description="Whether to broadcast the transaction or not, this is false by default.",
     )
-    chainId: int = Field(
-        default_chain_id,
-        description="(Optional) Chain ID of the network to execute the transaction on. the default value is the chain_id extracted from networks according to tokenIn and tokenOut",
+    chainId: int | None = Field(
+        None,
+        description="(Optional) Chain ID of the network to execute the transaction on. Defaults to the agent's configured network.",
     )
     amountIn: list[int] = Field(
         description="Amount of tokenIn to swap in wei, you should multiply user's requested value by token decimals."
@@ -155,14 +153,14 @@ class EnsoRouteShortcut(EnsoBaseTool):
 
     name: str = "enso_route_shortcut"
     description: str = "This tool is used specifically for broadcasting a route transaction calldata to the network. It should only be used when the user explicitly requests to broadcast a route transaction with routeId."
-    args_schema: Type[BaseModel] = EnsoRouteShortcutInput
+    args_schema: type[BaseModel] = EnsoRouteShortcutInput
 
     async def _arun(
         self,
         amountIn: list[int],
         tokenIn: list[str],
         tokenOut: list[str],
-        chainId: int = default_chain_id,
+        chainId: int | None = None,
         broadcast_requested: bool = False,
         **kwargs,
     ) -> EnsoRouteShortcutOutput:
@@ -173,7 +171,7 @@ class EnsoRouteShortcut(EnsoBaseTool):
             amountIn (list[int]): Amount of tokenIn to swap in wei, you should multiply user's requested value by token decimals.
             tokenIn (list[str]): Ethereum address of the token to swap or enter into a position from (For ETH, use 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee).
             tokenOut (list[str]): Ethereum address of the token to swap or enter into a position to (For ETH, use 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee).
-            chainId (int): The chain id of the network to be used for swap, deposit and routing.
+            chainId (int | None): The chain id of the network to be used for swap, deposit and routing. Defaults to the agent's configured network.
             broadcast_requested (bool): User should ask for broadcasting the transaction explicitly, otherwise it is always false.
 
         Returns:
@@ -181,35 +179,36 @@ class EnsoRouteShortcut(EnsoBaseTool):
         """
 
         context = self.get_context()
-        agent_id = context.agent_id
+        resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
-        account = await self.get_account(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:
                 network_name = None
-                networks = await self.skill_store.get_agent_skill_data(
-                    agent_id, "enso_get_networks", "networks"
+                networks = await self.get_agent_skill_data_raw(
+                    "enso_get_networks", "networks"
                 )
 
                 if networks:
+                    resolved_key = str(resolved_chain_id)
                     network_name = (
-                        networks.get(str(chainId)).get("name")
-                        if networks.get(str(chainId))
+                        networks.get(resolved_key).get("name")
+                        if networks.get(resolved_key)
                         else None
                     )
                 if network_name is None:
-                    networks = await EnsoGetNetworks(
-                        skill_store=self.skill_store,
-                    ).arun()
+                    networks = await EnsoGetNetworks().arun()
 
                     for network in networks.res:
-                        if network.id == chainId:
+                        if network.id == resolved_chain_id:
                             network_name = network.name
 
                 if not network_name:
                     raise ToolException(
-                        f"network name not found for chainId: {chainId}"
+                        f"network name not found for chainId: {resolved_chain_id}"
                     )
 
                 headers = {
@@ -217,8 +216,7 @@ class EnsoRouteShortcut(EnsoBaseTool):
                     "Authorization": f"Bearer {api_token}",
                 }
 
-                token_decimals = await self.skill_store.get_agent_skill_data(
-                    agent_id,
+                token_decimals = await self.get_agent_skill_data_raw(
                     "enso_get_tokens",
                     "decimals",
                 )
@@ -242,13 +240,13 @@ class EnsoRouteShortcut(EnsoBaseTool):
 
                 # Prepare query parameters
                 params = EnsoRouteShortcutInput(
-                    chainId=chainId,
+                    chainId=resolved_chain_id,
                     amountIn=amountIn,
                     tokenIn=tokenIn,
                     tokenOut=tokenOut,
                 ).model_dump(exclude_none=True)
 
-                params["fromAddress"] = account.address
+                params["fromAddress"] = wallet_address
 
                 response = await client.get(url, headers=headers, params=params)
                 response.raise_for_status()  # Raise HTTPError for non-2xx responses
@@ -256,26 +254,24 @@ class EnsoRouteShortcut(EnsoBaseTool):
 
                 res = EnsoRouteShortcutOutput(**json_dict)
                 res.network = network_name
-
-                res.amountOut = str(
-                    float(res.amountOut) / 10 ** token_decimals[tokenOut[0]]
+                decimals = token_decimals.get(tokenOut[0])
+                amount_out = format_amount_with_decimals(
+                    json_dict.get("amountOut"), decimals
                 )
+                if amount_out is not None:
+                    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:
                         # Send the transaction using the wallet provider
-                        tx_hash = wallet_provider.send_transaction(
-                            {
-                                "to": tx_data.get("to"),
-                                "data": tx_data.get("data", "0x"),
-                                "value": tx_data.get("value", 0),
-                            }
-                        )
+                        tx_params = {
+                            "to": tx_data.get("to"),
+                            "data": tx_data.get("data", "0x"),
+                            "value": tx_data.get("value", 0),
+                        }
+                        tx_hash = wallet_provider.send_transaction(tx_params)
 
                         # Wait for transaction confirmation
                         wallet_provider.wait_for_transaction_receipt(tx_hash)

intentkit/skills/enso/schema.json

@@ -5,7 +5,8 @@
   "description": "Integration with Enso Finance API providing DeFi trading and portfolio management capabilities across multiple blockchain networks",
   "x-icon": "https://ai.service.crestal.dev/skills/enso/enso.jpg",
   "x-tags": [
-    "Blockchain"
+    "Analytics",
+    "DeFi"
   ],
   "properties": {
     "enabled": {
@@ -209,4 +210,4 @@
     }
   },
   "additionalProperties": true
-}
+}