intentkit 0.8.17.dev1__py3-none-any.whl → 0.8.17.dev2__py3-none-any.whl

intentkit/models/skill.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import csv
 import json
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 from pathlib import Path
-from typing import Annotated, Any, Dict, Optional
+from typing import Annotated, Any
 
 from intentkit.models.base import Base
 from intentkit.models.db import get_session
@@ -46,7 +48,7 @@ class AgentSkillDataTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -58,7 +60,7 @@ class AgentSkillDataCreate(BaseModel):
     agent_id: Annotated[str, Field(description="ID of the agent this data belongs to")]
     skill: Annotated[str, Field(description="Name of the skill this data is for")]
     key: Annotated[str, Field(description="Key for this specific piece of data")]
-    data: Annotated[Dict[str, Any], Field(description="JSON data stored for this key")]
+    data: Annotated[dict[str, Any], Field(description="JSON data stored for this key")]
 
     async def save(self) -> "AgentSkillData":
         """Save or update skill data.
@@ -157,7 +159,7 @@ class AgentSkillData(AgentSkillDataCreate):
             return result or 0
 
     @classmethod
-    async def get(cls, agent_id: str, skill: str, key: str) -> Optional[dict]:
+    async def get(cls, agent_id: str, skill: str, key: str) -> dict | None:
         """Get skill data for an agent.
 
         Args:
@@ -232,7 +234,7 @@ class ChatSkillDataTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -245,7 +247,7 @@ class ChatSkillDataCreate(BaseModel):
     skill: Annotated[str, Field(description="Name of the skill this data is for")]
     key: Annotated[str, Field(description="Key for this specific piece of data")]
     agent_id: Annotated[str, Field(description="ID of the agent that owns this chat")]
-    data: Annotated[Dict[str, Any], Field(description="JSON data stored for this key")]
+    data: Annotated[dict[str, Any], Field(description="JSON data stored for this key")]
 
     async def save(self) -> "ChatSkillData":
         """Save or update skill data.
@@ -296,7 +298,7 @@ class ChatSkillData(ChatSkillDataCreate):
     ]
 
     @classmethod
-    async def get(cls, chat_id: str, skill: str, key: str) -> Optional[dict]:
+    async def get(cls, chat_id: str, skill: str, key: str) -> dict | None:
         """Get skill data for a chat.
 
         Args:
@@ -353,20 +355,20 @@ class ChatSkillData(ChatSkillDataCreate):
             await db.commit()
 
 
-def _skill_parse_bool(value: Optional[str]) -> bool:
+def _skill_parse_bool(value: str | None) -> bool:
     if value is None:
         return False
     return value.strip().lower() in {"true", "1", "yes"}
 
 
-def _skill_parse_optional_int(value: Optional[str]) -> Optional[int]:
+def _skill_parse_optional_int(value: str | None) -> int | None:
     if value is None:
         return None
     value = value.strip()
     return int(value) if value else None
 
 
-def _skill_parse_decimal(value: Optional[str], default: str = "0") -> Decimal:
+def _skill_parse_decimal(value: str | None, default: str = "0") -> Decimal:
     value = (value or "").strip()
     if not value:
         value = default
@@ -381,14 +383,14 @@ def _load_default_skills() -> tuple[dict[str, "Skill"], dict[tuple[str, str], "S
         logger.warning("Default skills CSV not found at %s", path)
         return {}, {}
 
-    by_name: dict[str, "Skill"] = {}
-    by_category_config: dict[tuple[str, str], "Skill"] = {}
+    by_name: dict[str, Skill] = {}
+    by_category_config: dict[tuple[str, str], Skill] = {}
 
     with path.open(newline="", encoding="utf-8") as csvfile:
         reader = csv.DictReader(csvfile)
         for row in reader:
             try:
-                timestamp = datetime.now(timezone.utc)
+                timestamp = datetime.now(UTC)
                 price_default = row.get("price") or "1"
                 skill = Skill(
                     name=row["name"],
@@ -447,7 +449,7 @@ class SkillTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -464,10 +466,8 @@ class Skill(BaseModel):
     name: Annotated[str, Field(description="Name of the skill")]
     enabled: Annotated[bool, Field(description="Is this skill enabled?")]
     category: Annotated[str, Field(description="Category of the skill")]
-    config_name: Annotated[Optional[str], Field(description="Config name of the skill")]
-    price_level: Annotated[
-        Optional[int], Field(description="Price level for this skill")
-    ]
+    config_name: Annotated[str | None, Field(description="Config name of the skill")]
+    price_level: Annotated[int | None, Field(description="Price level for this skill")]
     price: Annotated[
         Decimal, Field(description="Price for this skill", default=Decimal("1"))
     ]
@@ -475,11 +475,9 @@ class Skill(BaseModel):
         Decimal,
         Field(description="Price for this skill with self key", default=Decimal("1")),
     ]
-    rate_limit_count: Annotated[Optional[int], Field(description="Rate limit count")]
-    rate_limit_minutes: Annotated[
-        Optional[int], Field(description="Rate limit minutes")
-    ]
-    author: Annotated[Optional[str], Field(description="Author of the skill")]
+    rate_limit_count: Annotated[int | None, Field(description="Rate limit count")]
+    rate_limit_minutes: Annotated[int | None, Field(description="Rate limit minutes")]
+    author: Annotated[str | None, Field(description="Author of the skill")]
     created_at: Annotated[
         datetime, Field(description="Timestamp when this record was created")
     ]
@@ -488,7 +486,7 @@ class Skill(BaseModel):
     ]
 
     @staticmethod
-    async def get(name: str) -> Optional["Skill"]:
+    async def get(name: str) -> Skill | None:
         """Get a skill by name with Redis caching.
 
         The skill is cached in Redis for 3 minutes.
@@ -537,7 +535,7 @@ class Skill(BaseModel):
         return None
 
     @staticmethod
-    async def get_by_config_name(category: str, config_name: str) -> Optional["Skill"]:
+    async def get_by_config_name(category: str, config_name: str) -> "Skill" | None:
         """Get a skill by category and config_name.
 
         Args:
@@ -573,7 +571,7 @@ class Skill(BaseModel):
             async with get_session() as db:
                 return await cls.get_all(session=db)
 
-        skills: dict[str, "Skill"] = {
+        skills: dict[str, Skill] = {
             name: skill.model_copy(deep=True)
             for name, skill in DEFAULT_SKILLS_BY_NAME.items()
         }

intentkit/models/user.py

@@ -1,7 +1,7 @@
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from decimal import ROUND_HALF_UP, Decimal
-from typing import Annotated, Optional, Type, TypeVar
+from typing import Annotated, TypeVar
 
 from intentkit.models.base import Base
 from intentkit.models.credit import CreditAccount
@@ -13,7 +13,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 logger = logging.getLogger(__name__)
 
-
 # TypeVar for User model constraint
 UserModelType = TypeVar("UserModelType", bound="User")
 UserTableType = TypeVar("UserTableType", bound="UserTable")
@@ -23,10 +22,10 @@ class UserRegistry:
     """Registry for extended model classes."""
 
     def __init__(self):
-        self._user_table_class: Optional[Type[UserTableType]] = None
-        self._user_model_class: Optional[Type[UserModelType]] = None
+        self._user_table_class: type[UserTableType] | None = None
+        self._user_model_class: type[UserModelType] | None = None
 
-    def register_user_table(self, user_table_class: Type[UserTableType]) -> None:
+    def register_user_table(self, user_table_class: type[UserTableType]) -> None:
         """Register extended UserTable class.
 
         Args:
@@ -34,11 +33,11 @@ class UserRegistry:
         """
         self._user_table_class = user_table_class
 
-    def get_user_table_class(self) -> Type[UserTableType]:
+    def get_user_table_class(self) -> type[UserTableType]:
         """Get registered UserTable class or default."""
         return self._user_table_class or UserTable
 
-    def register_user_model(self, user_model_class: Type[UserModelType]) -> None:
+    def register_user_model(self, user_model_class: type[UserModelType]) -> None:
         """Register extended UserModel class.
 
         Args:
@@ -46,7 +45,7 @@ class UserRegistry:
         """
         self._user_model_class = user_model_class
 
-    def get_user_model_class(self) -> Type[UserModelType]:
+    def get_user_model_class(self) -> type[UserModelType]:
         """Get registered UserModel class or default."""
         return self._user_model_class or User
 
@@ -114,7 +113,7 @@ class UserTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -131,27 +130,27 @@ class UserUpdate(BaseModel):
     nft_count: Annotated[
         int, Field(default=0, description="Number of NFTs owned by the user")
     ]
-    email: Annotated[Optional[str], Field(None, description="User's email address")]
+    email: Annotated[str | None, Field(None, description="User's email address")]
     x_username: Annotated[
-        Optional[str], Field(None, description="User's X (Twitter) username")
+        str | None, Field(None, description="User's X (Twitter) username")
     ]
     github_username: Annotated[
-        Optional[str], Field(None, description="User's GitHub username")
+        str | None, Field(None, description="User's GitHub username")
     ]
     telegram_username: Annotated[
-        Optional[str], Field(None, description="User's Telegram username")
+        str | None, Field(None, description="User's Telegram username")
     ]
     extra: Annotated[
-        Optional[dict], Field(None, description="Additional user information")
+        dict | None, Field(None, description="Additional user information")
     ]
     evm_wallet_address: Annotated[
-        Optional[str], Field(None, description="User's EVM wallet address")
+        str | None, Field(None, description="User's EVM wallet address")
     ]
     solana_wallet_address: Annotated[
-        Optional[str], Field(None, description="User's Solana wallet address")
+        str | None, Field(None, description="User's Solana wallet address")
     ]
     linked_accounts: Annotated[
-        Optional[dict], Field(None, description="User's linked accounts information")
+        dict | None, Field(None, description="User's linked accounts information")
     ]
 
     async def _update_quota_for_nft_count(
@@ -165,7 +164,7 @@ class UserUpdate(BaseModel):
             new_nft_count: Current NFT count
         """
         # Generate upstream_tx_id
-        timestamp = datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")
+        timestamp = datetime.now(UTC).strftime("%Y%m%d%H%M%S")
         upstream_tx_id = f"nft_{id}_{timestamp}"
 
         # Calculate new quota values based on nft_count
@@ -286,7 +285,7 @@ class User(UserUpdate):
     ]
 
     @classmethod
-    async def get(cls, user_id: str) -> Optional[UserModelType]:
+    async def get(cls, user_id: str) -> UserModelType | None:
         """Get a user by ID.
 
         Args:
@@ -301,7 +300,7 @@ class User(UserUpdate):
     @classmethod
     async def get_in_session(
         cls, session: AsyncSession, user_id: str
-    ) -> Optional[UserModelType]:
+    ) -> UserModelType | None:
         """Get a user by ID using the provided session.
 
         Args:
@@ -324,7 +323,7 @@ class User(UserUpdate):
         return user_model_class.model_validate(user)
 
     @classmethod
-    async def get_by_tg(cls, telegram_username: str) -> Optional[UserModelType]:
+    async def get_by_tg(cls, telegram_username: str) -> UserModelType | None:
         """Get a user by telegram username.
 
         Args:

intentkit/skills/acolyt/ask.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, Literal, Type
+from typing import Literal
 
 import httpx
 from pydantic import BaseModel, Field
@@ -48,7 +48,6 @@ class AcolytAskGpt(AcolytBaseTool):
     - DEX & Trading: Get the 24-hour trading volume for tokens, Identify which DEX has the highest liquidity for tokens, Obtain the buy/sell ratio for tokens over specific time periods. Compare price changes across different timeframes for tokens. List trading pairs with over a value in liquidity for tokens.
     - Overall Metrics: Identify projects with the highest smart engagement relative to their market cap, Determine which agents have the best mindshare relative to their market cap. Compare the percentage of smart followers across the top n AI agents by market cap
 
-
     Attributes:
         name (str): Name of the tool, specifically "acolyt_ask_gpt".
         description (str): Comprehensive description of the tool's purpose and functionality.
@@ -64,9 +63,9 @@ class AcolytAskGpt(AcolytBaseTool):
         DEX & Trading: 24h volume, top DEX liquidity, buy/sell ratio, price change comparison, high liquidity pairs.
         Overall: Smart engagement/market cap ratio, mindshare/market cap ratio, smart follower percentage comparison across top AI agents.
         """
-    args_schema: Type[BaseModel] = AcolytAskGptInput
+    args_schema: type[BaseModel] = AcolytAskGptInput
 
-    async def _arun(self, question: str, **kwargs) -> Dict:
+    async def _arun(self, question: str, **kwargs) -> dict:
         """Run the tool to get answer from Acolyt GPT.
 
         Args:

intentkit/skills/acolyt/base.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
@@ -14,7 +12,7 @@ class AcolytBaseTool(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]
+    args_schema: type[BaseModel]
 
     def get_api_key(self) -> str:
         context = self.get_context()

intentkit/skills/aixbt/base.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from pydantic import BaseModel, Field
 
 from intentkit.skills.base import IntentKitSkill
@@ -10,7 +8,7 @@ class AIXBTBaseTool(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]
+    args_schema: type[BaseModel]
 
     @property
     def category(self) -> str:

intentkit/skills/aixbt/projects.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, Optional, Type
+from typing import Any
 
 import httpx
 from langchain_core.tools import ToolException
@@ -17,23 +17,23 @@ class ProjectsInput(BaseModel):
         default=10,
         description="Number of projects to return (max 50)",
     )
-    name: Optional[str] = Field(
+    name: str | None = Field(
         default=None,
         description="Filter projects by name (case-insensitive regex match)",
     )
-    ticker: Optional[str] = Field(
+    ticker: str | None = Field(
         default=None,
         description="Filter projects by ticker symbol (case-insensitive match)",
     )
-    xHandle: Optional[str] = Field(
+    xHandle: str | None = Field(
         default=None,
         description="Filter projects by X/Twitter handle",
     )
-    minScore: Optional[float] = Field(
+    minScore: float | None = Field(
         default=None,
         description="Minimum score threshold",
     )
-    chain: Optional[str] = Field(
+    chain: str | None = Field(
         default=None,
         description="Filter projects by blockchain",
     )
@@ -53,18 +53,18 @@ class AIXBTProjects(AIXBTBaseTool):
         "detailed information on recent developments. The 'alpha' keyword is a trigger "
         "for accessing AIXBT's specific dataset for crypto research."
     )
-    args_schema: Type[BaseModel] = ProjectsInput
+    args_schema: type[BaseModel] = ProjectsInput
 
     async def _arun(
         self,
         limit: int = 10,
-        name: Optional[str] = None,
-        ticker: Optional[str] = None,
-        xHandle: Optional[str] = None,
-        minScore: Optional[float] = None,
-        chain: Optional[str] = None,
+        name: str | None = None,
+        ticker: str | None = None,
+        xHandle: str | None = None,
+        minScore: float | None = None,
+        chain: str | None = None,
         **kwargs,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """
         Search for cryptocurrency projects using AIXBT API.
 

intentkit/skills/allora/base.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
@@ -14,7 +12,7 @@ class AlloraBaseTool(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]
+    args_schema: type[BaseModel]
 
     def get_api_key(self) -> str:
         context = self.get_context()

intentkit/skills/allora/price.py

@@ -1,4 +1,4 @@
-from typing import Literal, Type
+from typing import Literal
 
 import httpx
 from langchain_core.tools.base import ToolException
@@ -57,7 +57,6 @@ class AlloraGetPrice(AlloraBaseTool):
     The Allora Price Prediction Feed tool fetches the price prediction feed from the Allora API.
     Ethereum (ETH) or Bitcoin (BTC) price predictions (5-minute, 8-hour)
 
-
     Attributes:
         name (str): Name of the tool, specifically "get_price_prediction".
         description (str): Comprehensive description of the tool's purpose and functionality.
@@ -69,7 +68,7 @@ class AlloraGetPrice(AlloraBaseTool):
         The Allora Price Prediction Feed tool fetches the price prediction feed from the Allora API.
         Ethereum (ETH) or Bitcoin (BTC) price predictions (5-minute, 8-hour)
         """
-    args_schema: Type[BaseModel] = AlloraGetPriceInput
+    args_schema: type[BaseModel] = AlloraGetPriceInput
 
     def _run(self, question: str) -> AlloraGetPriceOutput:
         """Run the tool to get the token price prediction from Allora API.

intentkit/skills/base.py

@@ -1,15 +1,10 @@
 import logging
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from typing import (
-    TYPE_CHECKING,
     Any,
-    Callable,
-    Dict,
     Literal,
     NotRequired,
-    Optional,
     TypedDict,
-    Union,
 )
 
 from coinbase_agentkit import (
@@ -29,6 +24,7 @@ from redis.exceptions import RedisError
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.clients import get_wallet_provider
+from intentkit.models.agent import Agent
 from intentkit.models.redis import get_redis
 from intentkit.models.skill import (
     AgentSkillData,
@@ -38,9 +34,6 @@ from intentkit.models.skill import (
 )
 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"]
 APIKeyProviderValue = Literal["platform", "agent_owner"]
@@ -50,9 +43,9 @@ class SkillConfig(TypedDict):
     """Abstract base class for skill configuration."""
 
     enabled: bool
-    states: Dict[str, SkillState | SkillOwnerState]
+    states: dict[str, SkillState | SkillOwnerState]
     api_key_provider: NotRequired[APIKeyProviderValue]
-    __extra__: NotRequired[Dict[str, Any]]
+    __extra__: NotRequired[dict[str, Any]]
 
 
 class IntentKitSkill(BaseTool):
@@ -61,15 +54,15 @@ class IntentKitSkill(BaseTool):
     """
 
     # overwrite the value of BaseTool
-    handle_tool_error: Optional[Union[bool, str, Callable[[ToolException], str]]] = (
+    handle_tool_error: bool | str | Callable[[ToolException], str] | None = (
         lambda e: f"tool error: {e}"
     )
     """Handle the content of the ToolException thrown."""
 
     # overwrite the value of BaseTool
-    handle_validation_error: Optional[
-        Union[bool, str, Callable[[Union[ValidationError, ValidationErrorV1]], str]]
-    ] = lambda e: f"validation error: {e}"
+    handle_validation_error: (
+        bool | str | Callable[[ValidationError | ValidationErrorV1], str] | None
+    ) = lambda e: f"validation error: {e}"
     """Handle the content of the ValidationError thrown."""
 
     # Logger for the class
@@ -258,7 +251,7 @@ class IntentKitSkill(BaseTool):
     async def get_agent_skill_data(
         self,
         key: str,
-    ) -> Optional[Dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         """Retrieve persisted data for this skill scoped to the active agent."""
         return await self.get_agent_skill_data_raw(self.name, key)
 
@@ -266,12 +259,12 @@ class IntentKitSkill(BaseTool):
         self,
         skill_name: str,
         key: str,
-    ) -> Optional[Dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         """Retrieve persisted data for a specific skill scoped to the active agent."""
         context = self.get_context()
         return await AgentSkillData.get(context.agent_id, skill_name, key)
 
-    async def save_agent_skill_data(self, key: str, data: Dict[str, Any]) -> None:
+    async def save_agent_skill_data(self, key: str, data: dict[str, Any]) -> None:
         """Persist data for this skill scoped to the active agent."""
         await self.save_agent_skill_data_raw(self.name, key, data)
 
@@ -279,7 +272,7 @@ class IntentKitSkill(BaseTool):
         self,
         skill_name: str,
         key: str,
-        data: Dict[str, Any],
+        data: dict[str, Any],
     ) -> None:
         """Persist data for a specific skill scoped to the active agent."""
         context = self.get_context()
@@ -299,12 +292,12 @@ class IntentKitSkill(BaseTool):
     async def get_thread_skill_data(
         self,
         key: str,
-    ) -> Optional[Dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         """Retrieve persisted data for this skill scoped to the active chat."""
         context = self.get_context()
         return await ChatSkillData.get(context.chat_id, self.name, key)
 
-    async def save_thread_skill_data(self, key: str, data: Dict[str, Any]) -> None:
+    async def save_thread_skill_data(self, key: str, data: dict[str, Any]) -> None:
         """Persist data for this skill scoped to the active chat."""
         context = self.get_context()
         skill_data = ChatSkillDataCreate(
@@ -321,7 +314,7 @@ async def get_agentkit_actions(
     agent_id: str,
     provider_factories: Sequence[Callable[[], object]],
     *,
-    agent: Optional["Agent"] = None,
+    agent: Agent | None = None,
 ) -> list[Action]:
     """Build an AgentKit instance and return its actions."""
 

intentkit/skills/basename/__init__.py

@@ -1,9 +1,10 @@
 """Basename AgentKit skills."""
 
-from typing import TYPE_CHECKING, Optional, TypedDict
+from typing import TypedDict
 
 from coinbase_agentkit import basename_action_provider
 
+from intentkit.models.agent import Agent
 from intentkit.skills.base import (
     SkillConfig,
     SkillState,
@@ -12,9 +13,6 @@ 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
@@ -30,7 +28,7 @@ async def get_skills(
     config: "Config",
     is_private: bool,
     agent_id: str,
-    agent: Optional["Agent"] = None,
+    agent: Agent | None = None,
     **_,
 ) -> list[BasenameBaseTool]:
     """Get all Basename skills."""

intentkit/skills/carv/__init__.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Literal, Optional, TypedDict
+from typing import Literal, TypedDict
 
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.carv.base import CarvBaseTool
@@ -9,7 +9,6 @@ from intentkit.skills.carv.token_info_and_price import TokenInfoAndPriceTool
 
 logger = logging.getLogger(__name__)
 
-
 _cache: dict[str, CarvBaseTool] = {}
 
 _SKILL_NAME_TO_CLASS_MAP: dict[str, type[CarvBaseTool]] = {
@@ -28,14 +27,14 @@ class SkillStates(TypedDict):
 class Config(SkillConfig):
     enabled: bool
     states: SkillStates  # type: ignore
-    api_key_provider: Optional[Literal["agent_owner", "platform"]]
+    api_key_provider: Literal["agent_owner", "platform"] | None
 
     # conditionally required
-    api_key: Optional[str]
+    api_key: str | None
 
     # optional
-    rate_limit_number: Optional[int]
-    rate_limit_minutes: Optional[int]
+    rate_limit_number: int | None
+    rate_limit_minutes: int | None
 
 
 async def get_skills(
@@ -57,7 +56,7 @@ async def get_skills(
     if not config.get("enabled", False):
         return []
 
-    available_skills: List[CarvBaseTool] = []
+    available_skills: list[CarvBaseTool] = []
     skill_states = config.get("states", {})
 
     # Iterate through all known skills defined in the map
@@ -81,7 +80,7 @@ async def get_skills(
 
 def get_carv_skill(
     name: str,
-) -> Optional[CarvBaseTool]:
+) -> CarvBaseTool | None:
     """
     Factory function to retrieve a cached CARV skill instance by name.