intentkit 0.7.5.dev16__py3-none-any.whl → 0.7.5.dev18__py3-none-any.whl

intentkit/skills/enso/wallet.py

@@ -4,23 +4,13 @@ import httpx
 from langchain.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 EnsoGetBalancesInput(BaseModel):
-    """
-    Input model for retrieving wallet balances.
-    """
+    """Input model for retrieving wallet balances."""
 
-    chainId: int = Field(
-        default_chain_id, description="Chain ID of the blockchain network"
-    )
-    # eoaAddress: str = Field(
-    #     description="Address of the eoa with which to associate the ensoWallet for balances"
-    # )
-    # useEoa: bool = Field(
-    #     description="If true returns balances for the provided eoaAddress, instead of the associated ensoWallet"
-    # )
+    chainId: int | None = Field(None, description="Chain ID of the blockchain network")
 
 
 class WalletBalance(BaseModel):
@@ -31,9 +21,7 @@ class WalletBalance(BaseModel):
 
 
 class EnsoGetBalancesOutput(BaseModel):
-    """
-    Output model for retrieving wallet balances.
-    """
+    """Output model for retrieving wallet balances."""
 
     res: list[WalletBalance] | None = Field(
         None, description="The wallet's balances along with token details."
@@ -41,15 +29,7 @@ class EnsoGetBalancesOutput(BaseModel):
 
 
 class EnsoGetWalletBalances(EnsoBaseTool):
-    """
-    This tool allows querying for first 20 token balances of a specific wallet
-    and blockchain network.
-
-    Attributes:
-        name (str): Name of the tool, specifically "enso_get_wallet_balances".
-        description (str): Comprehensive description of the tool's purpose and functionality.
-        args_schema (Type[BaseModel]): Schema for input arguments, specifying expected parameters.
-    """
+    """Retrieve token balances of a wallet on a specified blockchain network."""
 
     name: str = "enso_get_wallet_balances"
     description: str = (
@@ -59,61 +39,48 @@ class EnsoGetWalletBalances(EnsoBaseTool):
 
     async def _arun(
         self,
-        chainId: int = default_chain_id,
-        **kwargs,
+        chainId: int | None = None,
+        **_: object,
     ) -> EnsoGetBalancesOutput:
-        """
-        Run the tool to get token balances of a wallet.
-
-        Args:
-            chainId (int): Chain ID of the blockchain network.
-
-        Returns:
-            EnsoGetBalancesOutput: The list of balances or an error message.
-        """
-        url = f"{base_url}/api/v1/wallet/balances"
-
         context = self.get_context()
+        resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
-        account = await self.get_account(context)
+        wallet_address = await self.get_wallet_address(context)
+
         headers = {
             "accept": "application/json",
             "Authorization": f"Bearer {api_token}",
         }
 
-        params = EnsoGetBalancesInput(chainId=chainId).model_dump(exclude_none=True)
-        params["eoaAddress"] = account.address
+        params = EnsoGetBalancesInput(chainId=resolved_chain_id).model_dump(
+            exclude_none=True
+        )
+        params["eoaAddress"] = wallet_address
         params["useEoa"] = True
 
         async with httpx.AsyncClient() as client:
             try:
-                # Send the GET request
-                response = await client.get(url, headers=headers, params=params)
+                response = await client.get(
+                    f"{base_url}/api/v1/wallet/balances",
+                    headers=headers,
+                    params=params,
+                )
                 response.raise_for_status()
-
-                # Map the response JSON into the WalletBalance model
                 json_dict = response.json()[:20]
                 res = [WalletBalance(**item) for item in json_dict]
-
-                # Return the parsed response
                 return EnsoGetBalancesOutput(res=res)
             except httpx.RequestError as req_err:
                 raise ToolException("request error from Enso API") from req_err
             except httpx.HTTPStatusError as http_err:
                 raise ToolException("http error from Enso API") from http_err
-            except Exception as e:
-                raise ToolException(f"error from Enso API: {e}") from e
+            except Exception as exc:  # pragma: no cover - defensive
+                raise ToolException(f"error from Enso API: {exc}") from exc
 
 
 class EnsoGetApprovalsInput(BaseModel):
-    """
-    Input model for retrieving wallet approvals.
-    """
+    """Input model for retrieving wallet approvals."""
 
-    chainId: int = Field(
-        default_chain_id, description="Chain ID of the blockchain network"
-    )
-    fromAddress: str = Field(description="Address of the wallet")
+    chainId: int | None = Field(None, description="Chain ID of the blockchain network")
     routingStrategy: Literal["ensowallet", "router", "delegate"] | None = Field(
         None, description="Routing strategy to use"
     )
@@ -126,9 +93,7 @@ class WalletAllowance(BaseModel):
 
 
 class EnsoGetApprovalsOutput(BaseModel):
-    """
-    Output model for retrieving wallet approvals.
-    """
+    """Output model for retrieving wallet approvals."""
 
     res: list[WalletAllowance] | None = Field(
         None, description="Response containing the list of token approvals."
@@ -136,42 +101,24 @@ class EnsoGetApprovalsOutput(BaseModel):
 
 
 class EnsoGetWalletApprovals(EnsoBaseTool):
-    """
-    This tool allows querying for first 50 token spend approvals associated with a specific wallet
-    and blockchain network.
-
-    Attributes:
-        name (str): Name of the tool, specifically "enso_get_wallet_approvals".
-        description (str): Comprehensive description of the tool's purpose and functionality.
-        args_schema (Type[BaseModel]): Schema for input arguments, specifying expected parameters.
-    """
+    """Retrieve token spend approvals for a wallet on a specified blockchain network."""
 
     name: str = "enso_get_wallet_approvals"
     description: str = (
         "Retrieve token spend approvals for a wallet on a specified blockchain network."
     )
-    args_schema: Type[BaseModel] = EnsoGetApprovalsOutput
+    args_schema: Type[BaseModel] = EnsoGetApprovalsInput
 
     async def _arun(
         self,
-        chainId: int = default_chain_id,
-        **kwargs,
+        chainId: int | None = None,
+        routingStrategy: Literal["ensowallet", "router", "delegate"] | None = None,
+        **_: object,
     ) -> EnsoGetApprovalsOutput:
-        """
-        Run the tool to get token approvals for a wallet.
-
-        Args:
-            chainId (int): Chain ID of the blockchain network.
-            **kwargs: optional kwargs for the tool with args schema defined in EnsoGetApprovalsInput.
-
-        Returns:
-            EnsoGetApprovalsOutput: The list of approvals or an error message.
-        """
-        url = f"{base_url}/api/v1/wallet/approvals"
-
         context = self.get_context()
+        resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
-        account = await self.get_account(context)
+        wallet_address = await self.get_wallet_address(context)
 
         headers = {
             "accept": "application/json",
@@ -179,26 +126,21 @@ class EnsoGetWalletApprovals(EnsoBaseTool):
         }
 
         params = EnsoGetApprovalsInput(
-            chainId=chainId,
-            fromAddress=account.address,
-        )
-
-        if kwargs.get("routingStrategy"):
-            params.routingStrategy = kwargs["routingStrategy"]
+            chainId=resolved_chain_id,
+            routingStrategy=routingStrategy,
+        ).model_dump(exclude_none=True)
+        params["fromAddress"] = wallet_address
 
         async with httpx.AsyncClient() as client:
             try:
-                # Send the GET request
                 response = await client.get(
-                    url, headers=headers, params=params.model_dump(exclude_none=True)
+                    f"{base_url}/api/v1/wallet/approvals",
+                    headers=headers,
+                    params=params,
                 )
                 response.raise_for_status()
-
-                # Map the response JSON into the ApprovalsResponse model
                 json_dict = response.json()[:50]
                 res = [WalletAllowance(**item) for item in json_dict]
-
-                # Return the parsed response
                 return EnsoGetApprovalsOutput(res=res)
             except httpx.RequestError as req_err:
                 raise ToolException(
@@ -208,29 +150,23 @@ class EnsoGetWalletApprovals(EnsoBaseTool):
                 raise ToolException(
                     f"http error from Enso API: {http_err}"
                 ) from http_err
-            except Exception as e:
-                raise ToolException(f"error from Enso API: {e}") from e
+            except Exception as exc:  # pragma: no cover - defensive
+                raise ToolException(f"error from Enso API: {exc}") from exc
 
 
 class EnsoWalletApproveInput(BaseModel):
-    """
-    Input model for approve the wallet.
-    """
+    """Input model for approving token spend for the wallet."""
 
     tokenAddress: str = Field(description="ERC20 token address of the token to approve")
     amount: int = Field(description="Amount of tokens to approve in wei")
-    chainId: int = Field(
-        default_chain_id, description="Chain ID of the blockchain network"
-    )
+    chainId: int | None = Field(None, description="Chain ID of the blockchain network")
     routingStrategy: Literal["ensowallet", "router", "delegate"] | None = Field(
         None, description="Routing strategy to use"
     )
 
 
 class EnsoWalletApproveOutput(BaseModel):
-    """
-    Output model for approve token for the wallet.
-    """
+    """Output model for approve token for the wallet."""
 
     gas: str | None = Field(None, description="The gas estimate for the transaction")
     token: str | None = Field(None, description="The token address to approve")
@@ -239,133 +175,82 @@ class EnsoWalletApproveOutput(BaseModel):
 
 
 class EnsoWalletApproveArtifact(BaseModel):
-    """
-    Output model for approve token for the wallet.
-    """
+    """Artifact returned after broadcasting an approval transaction."""
 
-    tx: object | None = Field(None, description="The tx object to use in `ethers`")
+    tx: object | None = Field(
+        None, description="The transaction object to use in `ethers`"
+    )
     txHash: str | None = Field(None, description="The transaction hash")
 
 
 class EnsoWalletApprove(EnsoBaseTool):
-    """
-    This tool is used specifically for broadcasting a ERC20 token spending approval transaction to the network.
-    It should only be used when the user explicitly requests to broadcast an approval transaction with a specific amount for a certain token.
-
-    **Example Usage:**
-
-    "Broadcast an approval transaction for 10 USDC to the wallet."
-
-    **Important:**
-    - This tool should be used with extreme caution.
-    - Approving token spending grants another account permission to spend your tokens.
-
-    Attributes:
-        name (str): Name of the tool, specifically "enso_wallet_approve".
-        description (str): Comprehensive description of the tool's purpose and functionality.
-        args_schema (Type[BaseModel]): Schema for input arguments, specifying expected parameters.
-    """
+    """Broadcast an ERC20 token spending approval transaction."""
 
     name: str = "enso_wallet_approve"
-    description: str = "This tool is used specifically for broadcasting a ERC20 token spending approval transaction to the network. It should only be used when the user explicitly requests to broadcast an approval transaction with a specific amount for a certain token."
+    description: str = (
+        "This tool is used specifically for broadcasting a ERC20 token spending approval transaction to the "
+        "network. It should only be used when the user explicitly requests to broadcast an approval transaction "
+        "with a specific amount for a certain token."
+    )
     args_schema: Type[BaseModel] = EnsoWalletApproveInput
     response_format: str = "content_and_artifact"
 
-    # def _run(
-    #     self,
-    #     tokenAddress: str,
-    #     amount: int,
-    #     chainId: int = default_chain_id,
-    #     **kwargs,
-    # ) -> Tuple[EnsoBroadcastWalletApproveOutput, EnsoBroadcastWalletApproveArtifact]:
-    #     """Run the tool to approve enso router for a wallet.
-
-    #     Returns:
-    #         Tuple[EnsoBroadcastWalletApproveOutput, EnsoBroadcastWalletApproveArtifact]: A structured output containing the result of token approval.
-
-    #     Raises:
-    #         Exception: If there's an error accessing the Enso API.
-    #     """
-    #     raise NotImplementedError("Use _arun instead")
-
     async def _arun(
         self,
         tokenAddress: str,
         amount: int,
-        chainId: int = default_chain_id,
-        **kwargs,
+        chainId: int | None = None,
+        routingStrategy: Literal["ensowallet", "router", "delegate"] | None = None,
+        **_: object,
     ) -> Tuple[EnsoWalletApproveOutput, EnsoWalletApproveArtifact]:
-        """
-        Run the tool to approve enso router for a wallet.
-
-        Args:
-            tokenAddress (str): ERC20 token address of the token to approve.
-            amount (int): Amount of tokens to approve in wei.
-            chainId (int): Chain ID of the blockchain network.
-            **kwargs: optional kwargs for the tool with args schema defined in EnsoGetApproveInput.
-
-        Returns:
-            Tuple[EnsoBroadcastWalletApproveOutput, EnsoBroadcastWalletApproveArtifact]: The list of approve transaction output or an error message.
-        """
-        url = f"{base_url}/api/v1/wallet/approve"
         context = self.get_context()
+        resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
-        account = await self.get_account(context)
+        wallet_address = await self.get_wallet_address(context)
 
         headers = {
             "accept": "application/json",
             "Authorization": f"Bearer {api_token}",
         }
 
-        from_address = account.address
-
         params = EnsoWalletApproveInput(
             tokenAddress=tokenAddress,
             amount=amount,
-            chainId=chainId,
-        )
-
-        if kwargs.get("routingStrategy"):
-            params.routingStrategy = kwargs["routingStrategy"]
-
-        params = params.model_dump(exclude_none=True)
+            chainId=resolved_chain_id,
+            routingStrategy=routingStrategy,
+        ).model_dump(exclude_none=True)
+        params["fromAddress"] = wallet_address
 
-        params["fromAddress"] = from_address
-
-        with httpx.Client() as client:
+        async with httpx.AsyncClient() as client:
             try:
-                # Send the GET request
-                response = client.get(url, headers=headers, params=params)
+                response = await client.get(
+                    f"{base_url}/api/v1/wallet/approve",
+                    headers=headers,
+                    params=params,
+                )
                 response.raise_for_status()
 
-                # Map the response JSON into the WalletApproveTransaction model
                 json_dict = response.json()
                 content = EnsoWalletApproveOutput(**json_dict)
                 artifact = EnsoWalletApproveArtifact(**json_dict)
 
-                # 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),
+                            "from": wallet_address,
                         }
                     )
 
-                    # Wait for transaction confirmation
                     wallet_provider.wait_for_transaction_receipt(tx_hash)
                     artifact.txHash = tx_hash
                 else:
-                    # For now, return without executing the transaction if no tx data
                     artifact.txHash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
-                # Return the parsed response
                 return (content, artifact)
             except httpx.RequestError as req_err:
                 raise ToolException(
@@ -375,5 +260,5 @@ class EnsoWalletApprove(EnsoBaseTool):
                 raise ToolException(
                     f"http error from Enso API: {http_err}"
                 ) from http_err
-            except Exception as e:
-                raise ToolException(f"error from Enso API: {e}") from e
+            except Exception as exc:  # pragma: no cover - defensive
+                raise ToolException(f"error from Enso API: {exc}") from exc

intentkit/skills/lifi/__init__.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Optional, TypedDict
+from typing import Any, List, Optional, TypedDict
 
 from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
@@ -32,10 +32,10 @@ async def get_skills(
     config: "Config",
     is_private: bool,
     store: SkillStoreABC,
-    **_,
+    **_: Any,
 ) -> list[LiFiBaseTool]:
     """Get all LiFi skills."""
-    available_skills = []
+    available_skills: list[str] = []
 
     # Log configuration
     logger.info(f"[LiFi_Skills] Initializing with config: {config}")
@@ -57,7 +57,7 @@ async def get_skills(
     logger.info(f"[LiFi_Skills] Available skills: {available_skills}")
 
     # Get each skill using the cached getter
-    skills = []
+    skills: list[LiFiBaseTool] = []
     for name in available_skills:
         try:
             skill = get_lifi_skill(name, store, config)

intentkit/skills/lifi/token_execute.py

@@ -2,11 +2,12 @@ import asyncio
 from typing import Any, Dict, List, Optional, Type
 
 import httpx
+from coinbase_agentkit import CdpEvmWalletProvider
 from pydantic import BaseModel, Field
 from web3 import Web3
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.clients import get_cdp_client
+from intentkit.clients import CdpClient, get_cdp_client
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.token_quote import TokenQuote
 from intentkit.skills.lifi.utils import (
@@ -69,7 +70,7 @@ class TokenExecute(LiFiBaseTool):
     default_slippage: float = 0.03
     allowed_chains: Optional[List[str]] = None
     max_execution_time: int = 300
-    quote_tool: TokenQuote = Field(default=None, exclude=True)
+    quote_tool: Optional[TokenQuote] = Field(default=None, exclude=True)
 
     def __init__(
         self,
@@ -77,7 +78,7 @@ class TokenExecute(LiFiBaseTool):
         default_slippage: float = 0.03,
         allowed_chains: Optional[List[str]] = None,
         max_execution_time: int = 300,
-    ):
+    ) -> None:
         """Initialize the TokenExecute skill with configuration options."""
         super().__init__(skill_store=skill_store)
         self.default_slippage = default_slippage
@@ -93,6 +94,8 @@ class TokenExecute(LiFiBaseTool):
 
     def _format_quote_result(self, data: Dict[str, Any]) -> str:
         """Format the quote result in a readable format."""
+        if self.quote_tool is None:
+            raise RuntimeError("Quote tool is not initialized")
         # Use the same formatting as token_quote
         return self.quote_tool._format_quote_result(data)
 
@@ -103,7 +106,7 @@ class TokenExecute(LiFiBaseTool):
         from_token: str,
         to_token: str,
         from_amount: str,
-        slippage: float = None,
+        slippage: Optional[float] = None,
         **kwargs,
     ) -> str:
         """Execute a token transfer."""
@@ -168,7 +171,9 @@ class TokenExecute(LiFiBaseTool):
 
                 # Step 3: Execute transaction
                 tx_hash = await self._execute_transfer_transaction(
-                    cdp_wallet_provider, quote_data
+                    cdp_wallet_provider,
+                    quote_data,
+                    from_address,
                 )
 
                 # Step 4: Monitor status and return result
@@ -180,10 +185,12 @@ class TokenExecute(LiFiBaseTool):
             self.logger.error("LiFi_Error: %s", str(e))
             return f"An unexpected error occurred: {str(e)}"
 
-    async def _get_cdp_wallet_provider(self, agent_id: str):
+    async def _get_cdp_wallet_provider(
+        self, agent_id: str
+    ) -> CdpEvmWalletProvider | str:
         """Get CDP wallet provider with error handling."""
         try:
-            cdp_client = await get_cdp_client(agent_id, self.skill_store)
+            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."
 
@@ -207,7 +214,7 @@ class TokenExecute(LiFiBaseTool):
         from_amount: str,
         slippage: float,
         from_address: str,
-    ) -> Dict[str, Any]:
+    ) -> Dict[str, Any] | str:
         """Get quote from LiFi API."""
         api_params = build_quote_params(
             from_chain,
@@ -249,7 +256,7 @@ class TokenExecute(LiFiBaseTool):
         return data
 
     async def _handle_token_approval(
-        self, wallet_provider, quote_data: Dict[str, Any]
+        self, wallet_provider: CdpEvmWalletProvider, quote_data: Dict[str, Any]
     ) -> Optional[str]:
         """Handle ERC20 token approval if needed."""
         estimate = quote_data.get("estimate", {})
@@ -273,13 +280,18 @@ class TokenExecute(LiFiBaseTool):
             raise Exception(f"Failed to approve token: {str(e)}")
 
     async def _execute_transfer_transaction(
-        self, wallet_provider, quote_data: Dict[str, Any]
+        self,
+        wallet_provider: CdpEvmWalletProvider,
+        quote_data: Dict[str, Any],
+        from_address: str,
     ) -> str:
         """Execute the main transfer transaction."""
         transaction_request = quote_data.get("transactionRequest")
 
         try:
-            tx_params = prepare_transaction_params(transaction_request)
+            tx_params = prepare_transaction_params(
+                transaction_request, wallet_address=from_address
+            )
             self.logger.info(
                 f"Sending transaction to {tx_params['to']} with value {tx_params['value']}"
             )
@@ -407,7 +419,7 @@ class TokenExecute(LiFiBaseTool):
 
     async def _check_and_set_allowance(
         self,
-        wallet_provider,
+        wallet_provider: CdpEvmWalletProvider,
         token_address: str,
         approval_address: str,
         amount: str,

intentkit/skills/lifi/token_quote.py

@@ -65,7 +65,7 @@ class TokenQuote(LiFiBaseTool):
         skill_store: SkillStoreABC,
         default_slippage: float = 0.03,
         allowed_chains: Optional[List[str]] = None,
-    ):
+    ) -> None:
         """Initialize the TokenQuote skill with configuration options."""
         super().__init__(skill_store=skill_store)
         self.default_slippage = default_slippage
@@ -78,7 +78,7 @@ class TokenQuote(LiFiBaseTool):
         from_token: str,
         to_token: str,
         from_amount: str,
-        slippage: float = None,
+        slippage: Optional[float] = None,
         **kwargs,
     ) -> str:
         """Get a quote for token transfer."""