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

intentkit/skills/http/post.py

@@ -1,7 +1,8 @@
 import logging
-from typing import Any, Dict, Optional, Type, Union
+from typing import Any
 
 import httpx
+from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.http.base import HttpBaseTool
@@ -13,19 +14,19 @@ class HttpPostInput(BaseModel):
     """Input for HTTP POST request."""
 
     url: str = Field(description="The URL to send the POST request to")
-    data: Optional[Union[Dict[str, Any], str]] = Field(
+    data: dict[str, Any] | str | None = Field(
         description="The data to send in the request body. Can be a dictionary (will be sent as JSON) or a string",
         default=None,
     )
-    headers: Optional[Dict[str, str]] = Field(
+    headers: dict[str, str] | None = Field(
         description="Optional headers to include in the request",
         default=None,
     )
-    params: Optional[Dict[str, Any]] = Field(
+    params: dict[str, Any] | None = Field(
         description="Optional query parameters to include in the request",
         default=None,
     )
-    timeout: Optional[float] = Field(
+    timeout: float | None = Field(
         description="Request timeout in seconds (default: 30)",
         default=30.0,
     )
@@ -51,14 +52,14 @@ class HttpPost(HttpBaseTool):
         "Returns the response content as text. "
         "Use this when you need to send data to web APIs or submit forms."
     )
-    args_schema: Type[BaseModel] = HttpPostInput
+    args_schema: type[BaseModel] = HttpPostInput
 
     async def _arun(
         self,
         url: str,
-        data: Optional[Union[Dict[str, Any], str]] = None,
-        headers: Optional[Dict[str, str]] = None,
-        params: Optional[Dict[str, Any]] = None,
+        data: dict[str, Any] | str | None = None,
+        headers: dict[str, str] | None = None,
+        params: dict[str, Any] | None = None,
         timeout: float = 30.0,
         **kwargs,
     ) -> str:
@@ -100,12 +101,16 @@ class HttpPost(HttpBaseTool):
                 # Return response content
                 return f"Status: {response.status_code}\nContent: {response.text}"
 
-        except httpx.TimeoutException:
-            return f"Error: Request to {url} timed out after {timeout} seconds"
-        except httpx.HTTPStatusError as e:
-            return f"Error: HTTP {e.response.status_code} - {e.response.text}"
-        except httpx.RequestError as e:
-            return f"Error: Failed to connect to {url} - {str(e)}"
-        except Exception as e:
-            logger.error(f"Unexpected error in HTTP POST request: {e}")
-            return f"Error: Unexpected error occurred - {str(e)}"
+        except httpx.TimeoutException as exc:
+            raise ToolException(
+                f"Request to {url} timed out after {timeout} seconds"
+            ) from exc
+        except httpx.HTTPStatusError as exc:
+            raise ToolException(
+                f"HTTP {exc.response.status_code} - {exc.response.text}"
+            ) from exc
+        except httpx.RequestError as exc:
+            raise ToolException(f"Failed to connect to {url} - {str(exc)}") from exc
+        except Exception as exc:  # noqa: BLE001
+            logger.error("Unexpected error in HTTP POST request", exc_info=exc)
+            raise ToolException(f"Unexpected error occurred - {str(exc)}") from exc

intentkit/skills/http/put.py

@@ -1,7 +1,8 @@
 import logging
-from typing import Any, Dict, Optional, Type, Union
+from typing import Any
 
 import httpx
+from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.http.base import HttpBaseTool
@@ -13,19 +14,19 @@ class HttpPutInput(BaseModel):
     """Input for HTTP PUT request."""
 
     url: str = Field(description="The URL to send the PUT request to")
-    data: Optional[Union[Dict[str, Any], str]] = Field(
+    data: dict[str, Any] | str | None = Field(
         description="The data to send in the request body. Can be a dictionary (will be sent as JSON) or a string",
         default=None,
     )
-    headers: Optional[Dict[str, str]] = Field(
+    headers: dict[str, str] | None = Field(
         description="Optional headers to include in the request",
         default=None,
     )
-    params: Optional[Dict[str, Any]] = Field(
+    params: dict[str, Any] | None = Field(
         description="Optional query parameters to include in the request",
         default=None,
     )
-    timeout: Optional[float] = Field(
+    timeout: float | None = Field(
         description="Request timeout in seconds (default: 30)",
         default=30.0,
     )
@@ -51,14 +52,14 @@ class HttpPut(HttpBaseTool):
         "Returns the response content as text. "
         "Use this when you need to update or replace data on web APIs."
     )
-    args_schema: Type[BaseModel] = HttpPutInput
+    args_schema: type[BaseModel] = HttpPutInput
 
     async def _arun(
         self,
         url: str,
-        data: Optional[Union[Dict[str, Any], str]] = None,
-        headers: Optional[Dict[str, str]] = None,
-        params: Optional[Dict[str, Any]] = None,
+        data: dict[str, Any] | str | None = None,
+        headers: dict[str, str] | None = None,
+        params: dict[str, Any] | None = None,
         timeout: float = 30.0,
         **kwargs,
     ) -> str:
@@ -100,12 +101,16 @@ class HttpPut(HttpBaseTool):
                 # Return response content
                 return f"Status: {response.status_code}\nContent: {response.text}"
 
-        except httpx.TimeoutException:
-            return f"Error: Request to {url} timed out after {timeout} seconds"
-        except httpx.HTTPStatusError as e:
-            return f"Error: HTTP {e.response.status_code} - {e.response.text}"
-        except httpx.RequestError as e:
-            return f"Error: Failed to connect to {url} - {str(e)}"
-        except Exception as e:
-            logger.error(f"Unexpected error in HTTP PUT request: {e}")
-            return f"Error: Unexpected error occurred - {str(e)}"
+        except httpx.TimeoutException as exc:
+            raise ToolException(
+                f"Request to {url} timed out after {timeout} seconds"
+            ) from exc
+        except httpx.HTTPStatusError as exc:
+            raise ToolException(
+                f"HTTP {exc.response.status_code} - {exc.response.text}"
+            ) from exc
+        except httpx.RequestError as exc:
+            raise ToolException(f"Failed to connect to {url} - {str(exc)}") from exc
+        except Exception as exc:  # noqa: BLE001
+            logger.error("Unexpected error in HTTP PUT request", exc_info=exc)
+            raise ToolException(f"Unexpected error occurred - {str(exc)}") from exc

intentkit/skills/lifi/__init__.py

@@ -1,7 +1,6 @@
 import logging
-from typing import Any, List, Optional, TypedDict
+from typing import Any, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.token_execute import TokenExecute
@@ -23,15 +22,14 @@ class Config(SkillConfig):
     """Configuration for LiFi skills."""
 
     states: SkillStates
-    default_slippage: Optional[float] = 0.03
-    allowed_chains: Optional[List[str]] = None
-    max_execution_time: Optional[int] = 300
+    default_slippage: float | None = 0.03
+    allowed_chains: list[str] | None = None
+    max_execution_time: int | None = 300
 
 
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_: Any,
 ) -> list[LiFiBaseTool]:
     """Get all LiFi skills."""
@@ -60,7 +58,7 @@ async def get_skills(
     skills: list[LiFiBaseTool] = []
     for name in available_skills:
         try:
-            skill = get_lifi_skill(name, store, config)
+            skill = get_lifi_skill(name, config)
             skills.append(skill)
             logger.info(f"[LiFi_Skills] Successfully loaded skill: {name}")
         except Exception as e:
@@ -73,7 +71,6 @@ async def get_skills(
 
 def get_lifi_skill(
     name: str,
-    store: SkillStoreABC,
     config: Config,
 ) -> LiFiBaseTool:
     """Get a LiFi skill by name."""
@@ -108,7 +105,6 @@ def get_lifi_skill(
                 logger.info(f"[LiFi_Skills] Allowed chains: {allowed_chains}")
 
             _cache[cache_key] = TokenQuote(
-                skill_store=store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
             )
@@ -129,7 +125,6 @@ def get_lifi_skill(
             )
 
             _cache[cache_key] = TokenExecute(
-                skill_store=store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
                 max_execution_time=max_execution_time,

intentkit/skills/lifi/base.py

@@ -1,8 +1,5 @@
-from typing import Type
-
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -11,10 +8,7 @@ class LiFiBaseTool(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]
 
     @property
     def category(self) -> str:

intentkit/skills/lifi/token_execute.py

@@ -1,12 +1,11 @@
 import asyncio
-from typing import Any, Dict, List, Optional, Type
+from typing import Any
 
 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_wallet_provider as get_agent_wallet_provider
 from intentkit.models.agent import Agent
 from intentkit.skills.lifi.base import LiFiBaseTool
@@ -64,36 +63,34 @@ class TokenExecute(LiFiBaseTool):
         "Use token_quote first to check rates and fees before executing.\n"
         "Supports all major chains like Ethereum, Polygon, Arbitrum, Optimism, Base, and more."
     )
-    args_schema: Type[BaseModel] = TokenExecuteInput
+    args_schema: type[BaseModel] = TokenExecuteInput
     api_url: str = LIFI_API_URL
 
     # Configuration options
     default_slippage: float = 0.03
-    allowed_chains: Optional[List[str]] = None
+    allowed_chains: list[str] | None = None
     max_execution_time: int = 300
-    quote_tool: Optional[TokenQuote] = Field(default=None, exclude=True)
+    quote_tool: TokenQuote | None = Field(default=None, exclude=True)
 
     def __init__(
         self,
-        skill_store: SkillStoreABC,
         default_slippage: float = 0.03,
-        allowed_chains: Optional[List[str]] = None,
+        allowed_chains: list[str] | None = None,
         max_execution_time: int = 300,
     ) -> None:
         """Initialize the TokenExecute skill with configuration options."""
-        super().__init__(skill_store=skill_store)
+        super().__init__()
         self.default_slippage = default_slippage
         self.allowed_chains = allowed_chains
         self.max_execution_time = max_execution_time
         # Initialize quote tool if not set
         if not self.quote_tool:
             self.quote_tool = TokenQuote(
-                skill_store=skill_store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
             )
 
-    def _format_quote_result(self, data: Dict[str, Any]) -> str:
+    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")
@@ -107,7 +104,7 @@ class TokenExecute(LiFiBaseTool):
         from_token: str,
         to_token: str,
         from_amount: str,
-        slippage: Optional[float] = None,
+        slippage: float | None = None,
         **kwargs,
     ) -> str:
         """Execute a token transfer."""
@@ -211,7 +208,7 @@ class TokenExecute(LiFiBaseTool):
         from_amount: str,
         slippage: float,
         from_address: str,
-    ) -> Dict[str, Any] | str:
+    ) -> dict[str, Any] | str:
         """Get quote from LiFi API."""
         api_params = build_quote_params(
             from_chain,
@@ -253,8 +250,8 @@ class TokenExecute(LiFiBaseTool):
         return data
 
     async def _handle_token_approval(
-        self, wallet_provider: CdpEvmWalletProvider, quote_data: Dict[str, Any]
-    ) -> Optional[str]:
+        self, wallet_provider: CdpEvmWalletProvider, quote_data: dict[str, Any]
+    ) -> str | None:
         """Handle ERC20 token approval if needed."""
         estimate = quote_data.get("estimate", {})
         approval_address = estimate.get("approvalAddress")
@@ -279,7 +276,7 @@ class TokenExecute(LiFiBaseTool):
     async def _execute_transfer_transaction(
         self,
         wallet_provider: CdpEvmWalletProvider,
-        quote_data: Dict[str, Any],
+        quote_data: dict[str, Any],
         from_address: str,
     ) -> str:
         """Execute the main transfer transaction."""
@@ -313,7 +310,7 @@ class TokenExecute(LiFiBaseTool):
         tx_hash: str,
         from_chain: str,
         to_chain: str,
-        quote_data: Dict[str, Any],
+        quote_data: dict[str, Any],
     ) -> str:
         """Finalize transfer and return formatted result."""
         self.logger.info(f"Transaction sent: {tx_hash}")
@@ -420,7 +417,7 @@ class TokenExecute(LiFiBaseTool):
         token_address: str,
         approval_address: str,
         amount: str,
-    ) -> Optional[str]:
+    ) -> str | None:
         """Check if token allowance is sufficient and set approval if needed."""
         try:
             # Normalize addresses

intentkit/skills/lifi/token_quote.py

@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Type
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.utils import (
     LIFI_API_URL,
@@ -53,21 +52,20 @@ class TokenQuote(LiFiBaseTool):
         "Use this tool to check rates, fees, and estimated time for token transfers without executing them.\n"
         "Supports all major chains like Ethereum, Polygon, Arbitrum, Optimism, Base, and more."
     )
-    args_schema: Type[BaseModel] = TokenQuoteInput
+    args_schema: type[BaseModel] = TokenQuoteInput
     api_url: str = LIFI_API_URL
 
     # Configuration options
     default_slippage: float = 0.03
-    allowed_chains: Optional[List[str]] = None
+    allowed_chains: list[str] | None = None
 
     def __init__(
         self,
-        skill_store: SkillStoreABC,
         default_slippage: float = 0.03,
-        allowed_chains: Optional[List[str]] = None,
+        allowed_chains: list[str] | None = None,
     ) -> None:
         """Initialize the TokenQuote skill with configuration options."""
-        super().__init__(skill_store=skill_store)
+        super().__init__()
         self.default_slippage = default_slippage
         self.allowed_chains = allowed_chains
 
@@ -78,7 +76,7 @@ class TokenQuote(LiFiBaseTool):
         from_token: str,
         to_token: str,
         from_amount: str,
-        slippage: Optional[float] = None,
+        slippage: float | None = None,
         **kwargs,
     ) -> str:
         """Get a quote for token transfer."""
@@ -140,7 +138,7 @@ class TokenQuote(LiFiBaseTool):
             self.logger.error("LiFi_Error: %s", str(e))
             return f"An unexpected error occurred: {str(e)}"
 
-    def _format_quote_result(self, data: Dict[str, Any]) -> str:
+    def _format_quote_result(self, data: dict[str, Any]) -> str:
         """Format quote result into human-readable text."""
         try:
             # Get basic info

intentkit/skills/lifi/utils.py

@@ -5,7 +5,7 @@ Common utilities and helper functions for LiFi token transfer skills.
 """
 
 from decimal import ROUND_DOWN, Decimal, InvalidOperation
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
 
 import httpx
 from web3 import Web3
@@ -72,8 +72,8 @@ def validate_inputs(
     to_token: str,
     from_amount: str,
     slippage: float,
-    allowed_chains: Optional[List[str]] = None,
-) -> Optional[str]:
+    allowed_chains: list[str] | None = None,
+) -> str | None:
     """
     Validate all input parameters for LiFi operations.
 
@@ -180,7 +180,7 @@ def handle_api_response(
     from_chain: str,
     to_token: str,
     to_chain: str,
-) -> Tuple[Optional[Dict[str, Any]], Optional[str]]:
+) -> tuple[dict[str, Any] | None, str | None]:
     """
     Handle LiFi API response and return data or error message.
 
@@ -341,8 +341,8 @@ def build_quote_params(
     to_token: str,
     from_amount: str,
     slippage: float,
-    from_address: Optional[str] = None,
-) -> Dict[str, Any]:
+    from_address: str | None = None,
+) -> dict[str, Any]:
     """
     Build parameters for LiFi quote API request.
 
@@ -385,7 +385,7 @@ def is_native_token(token_address: str) -> bool:
     )
 
 
-def _convert_hex_or_decimal(value: Any) -> Optional[int]:
+def _convert_hex_or_decimal(value: Any) -> int | None:
     """Convert LiFi transaction numeric values into integers."""
 
     if value is None:
@@ -409,9 +409,9 @@ def _convert_hex_or_decimal(value: Any) -> Optional[int]:
 
 
 def prepare_transaction_params(
-    transaction_request: Dict[str, Any],
-    wallet_address: Optional[str] = None,
-) -> Dict[str, Any]:
+    transaction_request: dict[str, Any],
+    wallet_address: str | None = None,
+) -> dict[str, Any]:
     """Prepare transaction parameters for the CDP wallet provider."""
 
     to_address = transaction_request.get("to")
@@ -421,7 +421,7 @@ def prepare_transaction_params(
     if not to_address:
         raise Exception("Transaction request is missing destination address")
 
-    tx_params: Dict[str, Any] = {
+    tx_params: dict[str, Any] = {
         "to": Web3.to_checksum_address(to_address),
         "data": data,
     }
@@ -465,7 +465,7 @@ def prepare_transaction_params(
     return tx_params
 
 
-def format_quote_basic_info(data: Dict[str, Any]) -> Dict[str, Any]:
+def format_quote_basic_info(data: dict[str, Any]) -> dict[str, Any]:
     """
     Extract and format basic quote information.
 
@@ -503,7 +503,7 @@ def format_quote_basic_info(data: Dict[str, Any]) -> Dict[str, Any]:
     }
 
 
-def format_fees_and_gas(data: Dict[str, Any]) -> Tuple[str, str]:
+def format_fees_and_gas(data: dict[str, Any]) -> tuple[str, str]:
     """
     Format fee and gas cost information from quote data.
 
@@ -517,7 +517,7 @@ def format_fees_and_gas(data: Dict[str, Any]) -> Tuple[str, str]:
 
     # Extract gas and fee costs
     gas_costs = estimate.get("gasCosts", [])
-    fee_costs: List[Dict[str, Any]] = []
+    fee_costs: list[dict[str, Any]] = []
 
     # Collect fee information from included steps
     for step in data.get("includedSteps", []):
@@ -584,7 +584,7 @@ def format_fees_and_gas(data: Dict[str, Any]) -> Tuple[str, str]:
     return fees_text, gas_text
 
 
-def format_route_info(data: Dict[str, Any]) -> str:
+def format_route_info(data: dict[str, Any]) -> str:
     """
     Format routing information from quote data.
 
@@ -681,7 +681,7 @@ def get_explorer_url(chain_id: int, tx_hash: str) -> str:
 
 
 def format_transaction_result(
-    tx_hash: str, chain_id: int, token_info: Optional[Dict[str, str]] = None
+    tx_hash: str, chain_id: int, token_info: dict[str, str] | None = None
 ) -> str:
     """
     Format transaction result with explorer link.

intentkit/skills/moralis/__init__.py

@@ -1,9 +1,9 @@
 """Wallet Portfolio Skills for IntentKit."""
 
 import logging
-from typing import Dict, List, NotRequired, TypedDict
+from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config as system_config
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.moralis.base import WalletBaseTool
 from intentkit.skills.moralis.fetch_chain_portfolio import FetchChainPortfolio
@@ -28,21 +28,19 @@ class Config(SkillConfig):
 
     api_key: str
     states: SkillStates
-    supported_chains: NotRequired[Dict[str, bool]] = {"evm": True, "solana": True}
+    supported_chains: NotRequired[dict[str, bool]] = {"evm": True, "solana": True}
 
 
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
-) -> List[WalletBaseTool]:
+) -> list[WalletBaseTool]:
     """Get all Wallet Portfolio skills.
 
     Args:
         config: Skill configuration
         is_private: Whether the request is from an authenticated user
-        store: Skill store for persistence
         chain_provider: Optional chain provider for blockchain interactions
         **_: Additional arguments
 
@@ -67,12 +65,12 @@ async def get_skills(
     if config.get("api_key_provider") == "agent_owner":
         api_key = config.get("api_key")
     else:
-        api_key = store.get_system_config("moralis_api_key")
+        api_key = system_config.moralis_api_key
 
     # Get each skill using the getter
     result = []
     for name in available_skills:
-        skill = get_wallet_skill(name, api_key, store)
+        skill = get_wallet_skill(name, api_key)
         if skill:
             result.append(skill)
     return result
@@ -81,7 +79,6 @@ async def get_skills(
 def get_wallet_skill(
     name: str,
     api_key: str,
-    store: SkillStoreABC,
 ) -> WalletBaseTool:
     """Get a specific Wallet Portfolio skill by name.
 
@@ -106,5 +103,4 @@ def get_wallet_skill(
 
     return skill_classes[name](
         api_key=api_key,
-        skill_store=store,
     )

intentkit/skills/moralis/api.py

@@ -1,7 +1,6 @@
 """API interface for wallet data providers (EVM chains and Solana)."""
 
 import logging
-from typing import Dict
 
 import httpx
 
@@ -163,7 +162,7 @@ async def fetch_net_worth(api_key: str, address: str) -> dict:
 #############################################
 
 
-async def fetch_solana_api(api_key: str, endpoint: str, params: Dict = None) -> Dict:
+async def fetch_solana_api(api_key: str, endpoint: str, params: dict = None) -> dict:
     """Base function for Solana API calls using Moralis.
 
     Args:
@@ -200,7 +199,7 @@ async def fetch_solana_api(api_key: str, endpoint: str, params: Dict = None) ->
 
 async def get_solana_portfolio(
     api_key: str, address: str, network: str = "mainnet"
-) -> Dict:
+) -> dict:
     """Get complete portfolio for a Solana wallet.
 
     Args:
@@ -217,7 +216,7 @@ async def get_solana_portfolio(
 
 async def get_solana_balance(
     api_key: str, address: str, network: str = "mainnet"
-) -> Dict:
+) -> dict:
     """Get native SOL balance.
 
     Args:
@@ -234,7 +233,7 @@ async def get_solana_balance(
 
 async def get_solana_spl_tokens(
     api_key: str, address: str, network: str = "mainnet"
-) -> Dict:
+) -> dict:
     """Get SPL token balances.
 
     Args:
@@ -249,7 +248,7 @@ async def get_solana_spl_tokens(
     return await fetch_solana_api(api_key, endpoint)
 
 
-async def get_solana_nfts(api_key: str, address: str, network: str = "mainnet") -> Dict:
+async def get_solana_nfts(api_key: str, address: str, network: str = "mainnet") -> dict:
     """Get NFTs owned by a Solana wallet.
 
     Args:
@@ -266,7 +265,7 @@ async def get_solana_nfts(api_key: str, address: str, network: str = "mainnet")
 
 async def get_token_price(
     api_key: str, token_address: str, network: str = "mainnet"
-) -> Dict:
+) -> dict:
     """Get token price by mint address.
 
     Args: