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

intentkit/skills/defillama/volumes/fetch_options_overview.py

@@ -1,7 +1,5 @@
 """Tool for fetching options overview data via DeFi Llama API."""
 
-from typing import Dict, List, Optional, Type
-
 from pydantic import BaseModel, Field
 
 from intentkit.skills.defillama.api import fetch_options_overview
@@ -20,16 +18,14 @@ Returns detailed metrics including:
 class ProtocolMethodology(BaseModel):
     """Model representing protocol methodology data."""
 
-    UserFees: Optional[str] = Field(None, description="User fees description")
-    Fees: Optional[str] = Field(None, description="Fees description")
-    Revenue: Optional[str] = Field(None, description="Revenue description")
-    ProtocolRevenue: Optional[str] = Field(
+    UserFees: str | None = Field(None, description="User fees description")
+    Fees: str | None = Field(None, description="Fees description")
+    Revenue: str | None = Field(None, description="Revenue description")
+    ProtocolRevenue: str | None = Field(
         None, description="Protocol revenue description"
     )
-    HoldersRevenue: Optional[str] = Field(
-        None, description="Holders revenue description"
-    )
-    SupplySideRevenue: Optional[str] = Field(
+    HoldersRevenue: str | None = Field(None, description="Holders revenue description")
+    SupplySideRevenue: str | None = Field(
         None, description="Supply side revenue description"
     )
 
@@ -42,23 +38,23 @@ class Protocol(BaseModel):
     defillamaId: str = Field(..., description="DeFi Llama ID")
     category: str = Field(..., description="Protocol category")
     logo: str = Field(..., description="Logo URL")
-    chains: List[str] = Field(..., description="Supported chains")
+    chains: list[str] = Field(..., description="Supported chains")
     module: str = Field(..., description="Protocol module")
-    total24h: Optional[float] = Field(None, description="24-hour total")
-    total7d: Optional[float] = Field(None, description="7-day total")
-    total30d: Optional[float] = Field(None, description="30-day total")
-    total1y: Optional[float] = Field(None, description="1-year total")
-    totalAllTime: Optional[float] = Field(None, description="All-time total")
-    change_1d: Optional[float] = Field(None, description="24-hour change percentage")
-    change_7d: Optional[float] = Field(None, description="7-day change percentage")
-    change_1m: Optional[float] = Field(None, description="30-day change percentage")
-    methodology: Optional[ProtocolMethodology] = Field(
+    total24h: float | None = Field(None, description="24-hour total")
+    total7d: float | None = Field(None, description="7-day total")
+    total30d: float | None = Field(None, description="30-day total")
+    total1y: float | None = Field(None, description="1-year total")
+    totalAllTime: float | None = Field(None, description="All-time total")
+    change_1d: float | None = Field(None, description="24-hour change percentage")
+    change_7d: float | None = Field(None, description="7-day change percentage")
+    change_1m: float | None = Field(None, description="30-day change percentage")
+    methodology: ProtocolMethodology | None = Field(
         None, description="Protocol methodology"
     )
-    breakdown24h: Optional[Dict[str, Dict[str, float]]] = Field(
+    breakdown24h: dict[str, dict[str, float]] | None = Field(
         None, description="24-hour breakdown by chain"
     )
-    breakdown30d: Optional[Dict[str, Dict[str, float]]] = Field(
+    breakdown30d: dict[str, dict[str, float]] | None = Field(
         None, description="30-day breakdown by chain"
     )
 
@@ -73,9 +69,9 @@ class FetchOptionsOverviewResponse(BaseModel):
     change_1d: float = Field(..., description="24-hour change percentage")
     change_7d: float = Field(..., description="7-day change percentage")
     change_1m: float = Field(..., description="30-day change percentage")
-    allChains: List[str] = Field(..., description="List of all chains")
-    protocols: List[Protocol] = Field(..., description="List of protocols")
-    error: Optional[str] = Field(None, description="Error message if any")
+    allChains: list[str] = Field(..., description="List of all chains")
+    protocols: list[Protocol] = Field(..., description="List of protocols")
+    error: str | None = Field(None, description="Error message if any")
 
 
 class DefiLlamaFetchOptionsOverview(DefiLlamaBaseTool):
@@ -86,9 +82,9 @@ class DefiLlamaFetchOptionsOverview(DefiLlamaBaseTool):
 
     Example:
         overview_tool = DefiLlamaFetchOptionsOverview(
-            skill_store=store,
+            ,
             agent_id="agent_123",
-            agent_store=agent_store
+            agent=agent
         )
         result = await overview_tool._arun()
     """
@@ -101,7 +97,7 @@ class DefiLlamaFetchOptionsOverview(DefiLlamaBaseTool):
 
         pass
 
-    args_schema: Type[BaseModel] = EmptyArgsSchema
+    args_schema: type[BaseModel] = EmptyArgsSchema
 
     async def _arun(self, **kwargs) -> FetchOptionsOverviewResponse:
         """Fetch overview data for all options protocols.

intentkit/skills/defillama/yields/fetch_pool_chart.py

@@ -1,7 +1,5 @@
 """Tool for fetching pool chart data via DeFi Llama API."""
 
-from typing import List, Optional, Type
-
 from pydantic import BaseModel, Field
 
 from intentkit.skills.defillama.api import fetch_pool_chart
@@ -23,11 +21,11 @@ class PoolDataPoint(BaseModel):
 
     timestamp: str = Field(..., description="ISO formatted timestamp of the data point")
     tvlUsd: float = Field(..., description="Total Value Locked in USD")
-    apy: Optional[float] = Field(None, description="Total APY including rewards")
-    apyBase: Optional[float] = Field(None, description="Base APY without rewards")
-    apyReward: Optional[float] = Field(None, description="Additional APY from rewards")
-    il7d: Optional[float] = Field(None, description="7-day impermanent loss")
-    apyBase7d: Optional[float] = Field(None, description="7-day base APY")
+    apy: float | None = Field(None, description="Total APY including rewards")
+    apyBase: float | None = Field(None, description="Base APY without rewards")
+    apyReward: float | None = Field(None, description="Additional APY from rewards")
+    il7d: float | None = Field(None, description="7-day impermanent loss")
+    apyBase7d: float | None = Field(None, description="7-day base APY")
 
 
 class FetchPoolChartInput(BaseModel):
@@ -40,10 +38,10 @@ class FetchPoolChartResponse(BaseModel):
     """Response schema for pool chart data."""
 
     status: str = Field("success", description="Response status")
-    data: List[PoolDataPoint] = Field(
+    data: list[PoolDataPoint] = Field(
         default_factory=list, description="List of historical data points"
     )
-    error: Optional[str] = Field(None, description="Error message if any")
+    error: str | None = Field(None, description="Error message if any")
 
 
 class DefiLlamaFetchPoolChart(DefiLlamaBaseTool):
@@ -54,9 +52,9 @@ class DefiLlamaFetchPoolChart(DefiLlamaBaseTool):
 
     Example:
         chart_tool = DefiLlamaFetchPoolChart(
-            skill_store=store,
+            ,
             agent_id="agent_123",
-            agent_store=agent_store
+            agent=agent
         )
         result = await chart_tool._arun(
             pool_id="747c1d2a-c668-4682-b9f9-296708a3dd90"
@@ -65,7 +63,7 @@ class DefiLlamaFetchPoolChart(DefiLlamaBaseTool):
 
     name: str = "defillama_fetch_pool_chart"
     description: str = FETCH_POOL_CHART_PROMPT
-    args_schema: Type[BaseModel] = FetchPoolChartInput
+    args_schema: type[BaseModel] = FetchPoolChartInput
 
     async def _arun(self, pool_id: str) -> FetchPoolChartResponse:
         """Fetch historical chart data for the given pool.

intentkit/skills/defillama/yields/fetch_pools.py

@@ -1,7 +1,5 @@
 """Tool for fetching pool data via DeFi Llama API."""
 
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 from intentkit.skills.defillama.api import fetch_pools
@@ -21,13 +19,13 @@ Returns data including:
 class PredictionData(BaseModel):
     """Model representing prediction data for a pool."""
 
-    predictedClass: Optional[str] = Field(
+    predictedClass: str | None = Field(
         None, description="Predicted direction of APY movement"
     )
-    predictedProbability: Optional[float] = Field(
+    predictedProbability: float | None = Field(
         None, description="Probability of the prediction"
     )
-    binnedConfidence: Optional[int] = Field(None, description="Confidence level bucket")
+    binnedConfidence: int | None = Field(None, description="Confidence level bucket")
 
 
 class PoolData(BaseModel):
@@ -37,38 +35,36 @@ class PoolData(BaseModel):
     project: str = Field(..., description="Protocol or project name")
     symbol: str = Field(..., description="Token or pool symbol")
     tvlUsd: float = Field(..., description="Total Value Locked in USD")
-    apyBase: Optional[float] = Field(None, description="Base APY without rewards")
-    apyReward: Optional[float] = Field(None, description="Additional APY from rewards")
-    apy: Optional[float] = Field(None, description="Total APY including rewards")
-    rewardTokens: Optional[list[str]] = Field(
+    apyBase: float | None = Field(None, description="Base APY without rewards")
+    apyReward: float | None = Field(None, description="Additional APY from rewards")
+    apy: float | None = Field(None, description="Total APY including rewards")
+    rewardTokens: list[str] | None = Field(
         None, description="List of reward token addresses"
     )
-    pool: Optional[str] = Field(None, description="Pool identifier")
-    apyPct1D: Optional[float] = Field(None, description="1-day APY percentage change")
-    apyPct7D: Optional[float] = Field(None, description="7-day APY percentage change")
-    apyPct30D: Optional[float] = Field(None, description="30-day APY percentage change")
+    pool: str | None = Field(None, description="Pool identifier")
+    apyPct1D: float | None = Field(None, description="1-day APY percentage change")
+    apyPct7D: float | None = Field(None, description="7-day APY percentage change")
+    apyPct30D: float | None = Field(None, description="30-day APY percentage change")
     stablecoin: bool = Field(False, description="Whether pool involves stablecoins")
     ilRisk: str = Field("no", description="Impermanent loss risk assessment")
     exposure: str = Field("single", description="Asset exposure type")
-    predictions: Optional[PredictionData] = Field(
+    predictions: PredictionData | None = Field(
         None, description="APY movement predictions"
     )
-    poolMeta: Optional[str] = Field(None, description="Additional pool metadata")
-    mu: Optional[float] = Field(None, description="Mean APY value")
-    sigma: Optional[float] = Field(None, description="APY standard deviation")
-    count: Optional[int] = Field(None, description="Number of data points")
+    poolMeta: str | None = Field(None, description="Additional pool metadata")
+    mu: float | None = Field(None, description="Mean APY value")
+    sigma: float | None = Field(None, description="APY standard deviation")
+    count: int | None = Field(None, description="Number of data points")
     outlier: bool = Field(False, description="Whether pool is an outlier")
-    underlyingTokens: Optional[list[str]] = Field(
+    underlyingTokens: list[str] | None = Field(
         None, description="List of underlying token addresses"
     )
-    il7d: Optional[float] = Field(None, description="7-day impermanent loss")
-    apyBase7d: Optional[float] = Field(None, description="7-day base APY")
-    apyMean30d: Optional[float] = Field(None, description="30-day mean APY")
-    volumeUsd1d: Optional[float] = Field(None, description="24h volume in USD")
-    volumeUsd7d: Optional[float] = Field(None, description="7-day volume in USD")
-    apyBaseInception: Optional[float] = Field(
-        None, description="Base APY since inception"
-    )
+    il7d: float | None = Field(None, description="7-day impermanent loss")
+    apyBase7d: float | None = Field(None, description="7-day base APY")
+    apyMean30d: float | None = Field(None, description="30-day mean APY")
+    volumeUsd1d: float | None = Field(None, description="24h volume in USD")
+    volumeUsd7d: float | None = Field(None, description="7-day volume in USD")
+    apyBaseInception: float | None = Field(None, description="Base APY since inception")
 
 
 class FetchPoolsResponse(BaseModel):
@@ -76,7 +72,7 @@ class FetchPoolsResponse(BaseModel):
 
     status: str = Field("success", description="Response status")
     data: list[PoolData] = Field(default_factory=list, description="List of pool data")
-    error: Optional[str] = Field(None, description="Error message if any")
+    error: str | None = Field(None, description="Error message if any")
 
 
 class DefiLlamaFetchPools(DefiLlamaBaseTool):
@@ -87,9 +83,9 @@ class DefiLlamaFetchPools(DefiLlamaBaseTool):
 
     Example:
         pools_tool = DefiLlamaFetchPools(
-            skill_store=store,
+            ,
             agent_id="agent_123",
-            agent_store=agent_store
+            agent=agent
         )
         result = await pools_tool._arun()
     """

intentkit/skills/dexscreener/__init__.py

@@ -1,102 +1,97 @@
-import logging
-from typing import Optional, TypedDict
-
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import SkillConfig, SkillState
-from intentkit.skills.dexscreener.base import DexScreenerBaseTool
-from intentkit.skills.dexscreener.get_pair_info import GetPairInfo
-from intentkit.skills.dexscreener.get_token_pairs import GetTokenPairs
-from intentkit.skills.dexscreener.get_tokens_info import GetTokensInfo
-from intentkit.skills.dexscreener.search_token import SearchToken
-
-# Cache skills at the system level, because they are stateless
-_cache: dict[str, DexScreenerBaseTool] = {}
-
-logger = logging.getLogger(__name__)
-
-
-class SkillStates(TypedDict):
-    search_token: SkillState
-    get_pair_info: SkillState
-    get_token_pairs: SkillState
-    get_tokens_info: SkillState
-
-
-_SKILL_NAME_TO_CLASS_MAP: dict[str, type[DexScreenerBaseTool]] = {
-    "search_token": SearchToken,
-    "get_pair_info": GetPairInfo,
-    "get_token_pairs": GetTokenPairs,
-    "get_tokens_info": GetTokensInfo,
-}
-
-
-class Config(SkillConfig):
-    """Configuration for DexScreener skills."""
-
-    enabled: bool
-    states: SkillStates
-
-
-async def get_skills(
-    config: "Config",
-    is_private: bool,
-    store: SkillStoreABC,
-    **_,
-) -> list[DexScreenerBaseTool]:
-    """Get all DexScreener skills.
-
-    Args:
-        config: The configuration for DexScreener skills.
-        is_private: Whether to include private skills.
-        store: The skill store for persisting data.
-
-    Returns:
-        A list of DexScreener skills.
-    """
-
-    available_skills = []
-
-    # Include skills based on their state
-    for skill_name, state in config["states"].items():
-        if state == "disabled":
-            continue
-        elif state == "public" or (state == "private" and is_private):
-            available_skills.append(skill_name)
-
-    logger.debug(f"Available Skills {available_skills}")
-    logger.debug(f"Hardcoded Skills {_SKILL_NAME_TO_CLASS_MAP}")
-
-    # Get each skill using the cached getter
-    result = []
-    for name in available_skills:
-        skill = get_dexscreener_skills(name, store)
-        if skill:
-            result.append(skill)
-    return result
-
-
-def get_dexscreener_skills(
-    name: str,
-    store: SkillStoreABC,
-) -> Optional[DexScreenerBaseTool]:
-    """Get a DexScreener skill by name.
-
-    Args:
-        name: The name of the skill to get
-        store: The skill store for persisting data
-
-    Returns:
-        The requested DexScreener skill
-    """
-
-    # Return from cache immediately if already exists
-    if name in _cache:
-        return _cache[name]
-
-    skill_class = _SKILL_NAME_TO_CLASS_MAP.get(name)
-    if not skill_class:
-        logger.warning(f"Unknown Dexscreener skill: {name}")
-        return None
-
-    _cache[name] = skill_class(skill_store=store)
-    return _cache[name]
+import logging
+from typing import TypedDict
+
+from intentkit.skills.base import SkillConfig, SkillState
+from intentkit.skills.dexscreener.base import DexScreenerBaseTool
+from intentkit.skills.dexscreener.get_pair_info import GetPairInfo
+from intentkit.skills.dexscreener.get_token_pairs import GetTokenPairs
+from intentkit.skills.dexscreener.get_tokens_info import GetTokensInfo
+from intentkit.skills.dexscreener.search_token import SearchToken
+
+# Cache skills at the system level, because they are stateless
+_cache: dict[str, DexScreenerBaseTool] = {}
+
+logger = logging.getLogger(__name__)
+
+
+class SkillStates(TypedDict):
+    search_token: SkillState
+    get_pair_info: SkillState
+    get_token_pairs: SkillState
+    get_tokens_info: SkillState
+
+
+_SKILL_NAME_TO_CLASS_MAP: dict[str, type[DexScreenerBaseTool]] = {
+    "search_token": SearchToken,
+    "get_pair_info": GetPairInfo,
+    "get_token_pairs": GetTokenPairs,
+    "get_tokens_info": GetTokensInfo,
+}
+
+
+class Config(SkillConfig):
+    """Configuration for DexScreener skills."""
+
+    enabled: bool
+    states: SkillStates
+
+
+async def get_skills(
+    config: "Config",
+    is_private: bool,
+    **_,
+) -> list[DexScreenerBaseTool]:
+    """Get all DexScreener skills.
+
+    Args:
+        config: The configuration for DexScreener skills.
+        is_private: Whether to include private skills.
+
+    Returns:
+        A list of DexScreener skills.
+    """
+
+    available_skills = []
+
+    # Include skills based on their state
+    for skill_name, state in config["states"].items():
+        if state == "disabled":
+            continue
+        elif state == "public" or (state == "private" and is_private):
+            available_skills.append(skill_name)
+
+    logger.debug(f"Available Skills {available_skills}")
+    logger.debug(f"Hardcoded Skills {_SKILL_NAME_TO_CLASS_MAP}")
+
+    # Get each skill using the cached getter
+    result = []
+    for name in available_skills:
+        skill = get_dexscreener_skills(name)
+        if skill:
+            result.append(skill)
+    return result
+
+
+def get_dexscreener_skills(
+    name: str,
+) -> DexScreenerBaseTool | None:
+    """Get a DexScreener skill by name.
+
+    Args:
+        name: The name of the skill to get
+
+    Returns:
+        The requested DexScreener skill
+    """
+
+    # Return from cache immediately if already exists
+    if name in _cache:
+        return _cache[name]
+
+    skill_class = _SKILL_NAME_TO_CLASS_MAP.get(name)
+    if not skill_class:
+        logger.warning(f"Unknown Dexscreener skill: {name}")
+        return None
+
+    _cache[name] = skill_class()
+    return _cache[name]