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

intentkit/skills/cookiefun/__init__.py

@@ -1,6 +1,5 @@
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.cookiefun.base import CookieFunBaseTool, logger
 from intentkit.skills.cookiefun.get_account_details import GetAccountDetails
@@ -35,7 +34,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[CookieFunBaseTool]:
     """Get all CookieFun skills."""
@@ -49,28 +47,27 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Get each skill using the cached getter
-    skills = [get_cookiefun_skill(name, store) for name in available_skills]
+    skills = [get_cookiefun_skill(name) for name in available_skills]
     logger.info("Returning %d CookieFun skills", len(skills))
     return skills
 
 
 def get_cookiefun_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> CookieFunBaseTool:
     """Get a CookieFun skill by name."""
 
     if name not in _cache:
         if name == "get_sectors":
-            _cache[name] = GetSectors(skill_store=store)
+            _cache[name] = GetSectors()
         elif name == "get_account_details":
-            _cache[name] = GetAccountDetails(skill_store=store)
+            _cache[name] = GetAccountDetails()
         elif name == "get_account_smart_followers":
-            _cache[name] = GetAccountSmartFollowers(skill_store=store)
+            _cache[name] = GetAccountSmartFollowers()
         elif name == "search_accounts":
-            _cache[name] = SearchAccounts(skill_store=store)
+            _cache[name] = SearchAccounts()
         elif name == "get_account_feed":
-            _cache[name] = GetAccountFeed(skill_store=store)
+            _cache[name] = GetAccountFeed()
         else:
             logger.error("Unknown CookieFun skill: %s", name)
             raise ValueError(f"Unknown CookieFun skill: {name}")

intentkit/skills/cookiefun/base.py

@@ -1,10 +1,8 @@
 import logging
-from typing import Type
 
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 logger = logging.getLogger(__name__)
@@ -15,10 +13,7 @@ class CookieFunBaseTool(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/cookiefun/get_account_details.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Type, Union
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
@@ -10,12 +10,12 @@ from intentkit.skills.cookiefun.constants import DEFAULT_HEADERS, ENDPOINTS
 class GetAccountDetailsInput(BaseModel):
     """Input for GetAccountDetails tool."""
 
-    username: Optional[str] = Field(
+    username: str | None = Field(
         default=None,
         description="Twitter username (either username or userId is required)",
     )
 
-    userId: Optional[str] = Field(
+    userId: str | None = Field(
         default=None,
         description="Twitter user ID (either username or userId is required)",
     )
@@ -26,14 +26,14 @@ class GetAccountDetails(CookieFunBaseTool):
 
     name: str = "cookiefun_get_account_details"
     description: str = "Retrieves detailed information about a Twitter account including followers, following, posts, metrics, and engagement data."
-    args_schema: Type[BaseModel] = GetAccountDetailsInput
+    args_schema: type[BaseModel] = GetAccountDetailsInput
 
     async def _arun(
         self,
-        username: Optional[str] = None,
-        userId: Optional[str] = None,
+        username: str | None = None,
+        userId: str | None = None,
         **kwargs,
-    ) -> Union[Dict[str, Any], str]:
+    ) -> dict[str, Any] | str:
         """
         Get detailed information about a Twitter account.
 

intentkit/skills/cookiefun/get_account_feed.py

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
@@ -33,42 +33,42 @@ class SortOrder(IntEnum):
 class GetAccountFeedInput(BaseModel):
     """Input for GetAccountFeed tool."""
 
-    username: Optional[str] = Field(
+    username: str | None = Field(
         default=None,
         description="Twitter username (either username or userId is required)",
     )
 
-    userId: Optional[str] = Field(
+    userId: str | None = Field(
         default=None,
         description="Twitter user ID (either username or userId is required)",
     )
 
-    startDate: Optional[str] = Field(
+    startDate: str | None = Field(
         default=None,
         description="Start date for filtering in format dd/mm/yyyy (default: 30 days ago)",
     )
 
-    endDate: Optional[str] = Field(
+    endDate: str | None = Field(
         default=None,
         description="End date for filtering in format dd/mm/yyyy (default: now)",
     )
 
-    type: Optional[int] = Field(
+    type: int | None = Field(
         default=None,
         description="Type of tweets to filter: 0 for Original, 1 for Reply, 2 for Quote (leave empty for all types)",
     )
 
-    hasMedia: Optional[bool] = Field(
+    hasMedia: bool | None = Field(
         default=None,
         description="Filter to only include tweets with media if true",
     )
 
-    sortBy: Optional[int] = Field(
+    sortBy: int | None = Field(
         default=None,
         description="Sort by: 0 for CreatedDate, 1 for Impressions",
     )
 
-    sortOrder: Optional[int] = Field(
+    sortOrder: int | None = Field(
         default=None,
         description="Sort order: 0 for Ascending, 1 for Descending",
     )
@@ -79,20 +79,20 @@ class GetAccountFeed(CookieFunBaseTool):
 
     name: str = "cookiefun_get_account_feed"
     description: str = "Retrieves a list of tweets for a specific Twitter account with various filtering options."
-    args_schema: Type[BaseModel] = GetAccountFeedInput
+    args_schema: type[BaseModel] = GetAccountFeedInput
 
     async def _arun(
         self,
-        username: Optional[str] = None,
-        userId: Optional[str] = None,
-        startDate: Optional[str] = None,
-        endDate: Optional[str] = None,
-        type: Optional[int] = None,
-        hasMedia: Optional[bool] = None,
-        sortBy: Optional[int] = None,
-        sortOrder: Optional[int] = None,
+        username: str | None = None,
+        userId: str | None = None,
+        startDate: str | None = None,
+        endDate: str | None = None,
+        type: int | None = None,
+        hasMedia: bool | None = None,
+        sortBy: int | None = None,
+        sortOrder: int | None = None,
         **kwargs,
-    ) -> Union[List[Dict[str, Any]], str]:
+    ) -> list[dict[str, Any]] | str:
         """
         Get the feed (tweets) of a Twitter account.
 

intentkit/skills/cookiefun/get_account_smart_followers.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
@@ -10,12 +10,12 @@ from intentkit.skills.cookiefun.constants import DEFAULT_HEADERS, ENDPOINTS
 class GetAccountSmartFollowersInput(BaseModel):
     """Input for GetAccountSmartFollowers tool."""
 
-    username: Optional[str] = Field(
+    username: str | None = Field(
         default=None,
         description="Twitter username (either username or userId is required)",
     )
 
-    userId: Optional[str] = Field(
+    userId: str | None = Field(
         default=None,
         description="Twitter user ID (either username or userId is required)",
     )
@@ -26,14 +26,14 @@ class GetAccountSmartFollowers(CookieFunBaseTool):
 
     name: str = "cookiefun_get_account_smart_followers"
     description: str = "Returns a list of top smart followers for a specific Twitter account, with detailed metrics about these followers."
-    args_schema: Type[BaseModel] = GetAccountSmartFollowersInput
+    args_schema: type[BaseModel] = GetAccountSmartFollowersInput
 
     async def _arun(
         self,
-        username: Optional[str] = None,
-        userId: Optional[str] = None,
+        username: str | None = None,
+        userId: str | None = None,
         **kwargs,
-    ) -> Union[List[Dict[str, Any]], str]:
+    ) -> list[dict[str, Any]] | str:
         """
         Get smart followers for a Twitter account.
 

intentkit/skills/cookiefun/get_sectors.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Type
+from typing import Any
 
 import httpx
 from pydantic import BaseModel
@@ -20,9 +20,9 @@ class GetSectors(CookieFunBaseTool):
     description: str = (
         "Returns a list of all available sectors in the CookieFun system."
     )
-    args_schema: Type[BaseModel] = GetSectorsInput
+    args_schema: type[BaseModel] = GetSectorsInput
 
-    async def _arun(self, **kwargs) -> List[Dict[str, Any]]:
+    async def _arun(self, **kwargs) -> list[dict[str, Any]]:
         """
         Get all available sectors from the CookieFun API.
 

intentkit/skills/cookiefun/search_accounts.py

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
@@ -38,17 +38,17 @@ class SearchAccountsInput(BaseModel):
         description="Search query to find Twitter accounts that authored tweets matching the criteria"
     )
 
-    type: Optional[int] = Field(
+    type: int | None = Field(
         default=None,
         description="Type of tweets to search for: 0 for Original, 1 for Reply, 2 for Quote (leave empty for all types)",
     )
 
-    sortBy: Optional[int] = Field(
+    sortBy: int | None = Field(
         default=None,
         description="Sort by: 0 for SmartEngagementPoints, 1 for Impressions, 2 for MatchingTweetsCount",
     )
 
-    sortOrder: Optional[int] = Field(
+    sortOrder: int | None = Field(
         default=None,
         description="Sort order: 0 for Ascending, 1 for Descending",
     )
@@ -59,16 +59,16 @@ class SearchAccounts(CookieFunBaseTool):
 
     name: str = "cookiefun_search_accounts"
     description: str = "Searches for Twitter accounts that authored tweets matching specified search criteria."
-    args_schema: Type[BaseModel] = SearchAccountsInput
+    args_schema: type[BaseModel] = SearchAccountsInput
 
     async def _arun(
         self,
         searchQuery: str,
-        type: Optional[int] = None,
-        sortBy: Optional[int] = None,
-        sortOrder: Optional[int] = None,
+        type: int | None = None,
+        sortBy: int | None = None,
+        sortOrder: int | None = None,
         **kwargs,
-    ) -> Union[List[Dict[str, Any]], str]:
+    ) -> list[dict[str, Any]] | str:
         """
         Search for Twitter accounts based on tweet content.
 

intentkit/skills/cryptocompare/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.cryptocompare.base import CryptoCompareBaseTool
 from intentkit.skills.cryptocompare.fetch_news import CryptoCompareFetchNews
@@ -44,7 +43,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[CryptoCompareBaseTool]:
     """Get all CryptoCompare skills.
@@ -52,7 +50,6 @@ async def get_skills(
     Args:
         config: The configuration for CryptoCompare skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of CryptoCompare skills.
@@ -69,7 +66,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_cryptocompare_skill(name, store)
+        skill = get_cryptocompare_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -77,13 +74,11 @@ async def get_skills(
 
 def get_cryptocompare_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> CryptoCompareBaseTool:
     """Get a CryptoCompare skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested CryptoCompare skill
@@ -91,39 +86,27 @@ def get_cryptocompare_skill(
 
     if name == "fetch_news":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchNews(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchNews()
         return _cache[name]
     elif name == "fetch_price":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchPrice(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchPrice()
         return _cache[name]
     elif name == "fetch_trading_signals":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchTradingSignals(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchTradingSignals()
         return _cache[name]
     elif name == "fetch_top_market_cap":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchTopMarketCap(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchTopMarketCap()
         return _cache[name]
     elif name == "fetch_top_exchanges":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchTopExchanges(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchTopExchanges()
         return _cache[name]
     elif name == "fetch_top_volume":
         if name not in _cache:
-            _cache[name] = CryptoCompareFetchTopVolume(
-                skill_store=store,
-            )
+            _cache[name] = CryptoCompareFetchTopVolume()
         return _cache[name]
     else:
         logger.warning(f"Unknown CryptoCompare skill: {name}")

intentkit/skills/cryptocompare/api.py

@@ -1,7 +1,6 @@
 """CryptoCompare API implementation and shared schemas."""
 
 import time
-from typing import List
 
 import httpx
 from pydantic import BaseModel, Field
@@ -25,7 +24,7 @@ class FetchPriceInput(BaseModel):
         ...,
         description="Base cryptocurrency symbol to get prices for (e.g., 'BTC', 'ETH')",
     )
-    to_symbols: List[str] = Field(
+    to_symbols: list[str] = Field(
         ...,
         description="List of target currencies (fiat or crypto) (e.g., ['USD', 'EUR', 'JPY'])",
     )
@@ -70,7 +69,7 @@ class FetchTopVolumeInput(BaseModel):
 
 
 # API Functions
-async def fetch_price(api_key: str, from_symbol: str, to_symbols: List[str]) -> dict:
+async def fetch_price(api_key: str, from_symbol: str, to_symbols: list[str]) -> dict:
     """
     Fetch current price for a cryptocurrency in multiple currencies.
     """

intentkit/skills/cryptocompare/base.py

@@ -1,13 +1,12 @@
 """Base class for all CryptoCompare tools."""
 
 import logging
-from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, List, Type
+from datetime import UTC, datetime, timedelta
+from typing import Any
 
 import httpx
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 from intentkit.utils.error import RateLimitExceeded
 
@@ -22,38 +21,29 @@ class CryptoCompareBaseTool(IntentKitSkill):
     This class provides common functionality for all CryptoCompare API tools:
     - Rate limiting
     - API client handling
-    - State management through skill_store
     """
 
     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:
         return "cryptocompare"
 
-    async def check_rate_limit(
-        self, agent_id: str, max_requests: int = 1, interval: int = 15
-    ) -> None:
+    async def check_rate_limit(self, max_requests: int = 1, interval: int = 15) -> None:
         """Check if the rate limit has been exceeded.
 
         Args:
-            agent_id: The ID of the agent.
             max_requests: Maximum number of requests allowed within the rate limit window.
             interval: Time interval in minutes for the rate limit window.
 
         Raises:
             RateLimitExceeded: If the rate limit has been exceeded.
         """
-        rate_limit = await self.skill_store.get_agent_skill_data(
-            agent_id, self.name, "rate_limit"
-        )
+        rate_limit = await self.get_agent_skill_data("rate_limit")
 
-        current_time = datetime.now(tz=timezone.utc)
+        current_time = datetime.now(tz=UTC)
 
         if (
             rate_limit
@@ -65,9 +55,7 @@ class CryptoCompareBaseTool(IntentKitSkill):
                 raise RateLimitExceeded("Rate limit exceeded")
 
             rate_limit["count"] += 1
-            await self.skill_store.save_agent_skill_data(
-                agent_id, self.name, "rate_limit", rate_limit
-            )
+            await self.save_agent_skill_data("rate_limit", rate_limit)
 
             return
 
@@ -76,13 +64,11 @@ class CryptoCompareBaseTool(IntentKitSkill):
             "count": 1,
             "reset_time": (current_time + timedelta(minutes=interval)).isoformat(),
         }
-        await self.skill_store.save_agent_skill_data(
-            agent_id, self.name, "rate_limit", new_rate_limit
-        )
+        await self.save_agent_skill_data("rate_limit", new_rate_limit)
         return
 
     async def fetch_price(
-        self, api_key: str, from_symbol: str, to_symbols: List[str]
+        self, api_key: str, from_symbol: str, to_symbols: list[str]
     ) -> dict:
         """Fetch current price for a cryptocurrency in multiple currencies.
 
@@ -277,7 +263,7 @@ class CryptoNews(BaseModel):
     tags: str
     categories: str
     source: str
-    source_info: Dict[str, Any] = Field(default_factory=dict)
+    source_info: dict[str, Any] = Field(default_factory=dict)
 
 
 class CryptoExchange(BaseModel):

intentkit/skills/cryptocompare/fetch_news.py

@@ -1,7 +1,6 @@
 """Tool for fetching cryptocurrency news via CryptoCompare API."""
 
 import logging
-from typing import List, Type
 
 from pydantic import BaseModel, Field
 
@@ -32,13 +31,13 @@ class CryptoCompareFetchNews(CryptoCompareBaseTool):
 
     name: str = "cryptocompare_fetch_news"
     description: str = "Fetch the latest cryptocurrency news for a specific token"
-    args_schema: Type[BaseModel] = CryptoCompareFetchNewsInput
+    args_schema: type[BaseModel] = CryptoCompareFetchNewsInput
 
     async def _arun(
         self,
         token: str,
         **kwargs,
-    ) -> List[CryptoNews]:
+    ) -> list[CryptoNews]:
         """Async implementation of the tool to fetch cryptocurrency news.
 
         Args:
@@ -46,7 +45,7 @@ class CryptoCompareFetchNews(CryptoCompareBaseTool):
             config: The configuration for the runnable, containing agent context.
 
         Returns:
-            List[CryptoNews]: A list of cryptocurrency news articles.
+            list[CryptoNews]: A list of cryptocurrency news articles.
 
         Raises:
             Exception: If there's an error accessing the CryptoCompare API.
@@ -56,7 +55,7 @@ class CryptoCompareFetchNews(CryptoCompareBaseTool):
             skill_config = context.agent.skill_config(self.category)
 
             # Check rate limit
-            await self.check_rate_limit(context.agent_id, max_requests=5, interval=60)
+            await self.check_rate_limit(max_requests=5, interval=60)
 
             # Get API key from context
             api_key = skill_config.get("api_key")

intentkit/skills/cryptocompare/fetch_price.py

@@ -1,7 +1,6 @@
 """Tool for fetching cryptocurrency prices via CryptoCompare API."""
 
 import logging
-from typing import List, Type
 
 from pydantic import BaseModel, Field
 
@@ -17,7 +16,7 @@ class CryptoCompareFetchPriceInput(BaseModel):
         ...,
         description="Base cryptocurrency symbol to get prices for (e.g., 'BTC', 'ETH')",
     )
-    to_symbols: List[str] = Field(
+    to_symbols: list[str] = Field(
         ...,
         description="List of target currencies (fiat or crypto) (e.g., ['USD', 'EUR', 'JPY'])",
     )
@@ -40,14 +39,14 @@ class CryptoCompareFetchPrice(CryptoCompareBaseTool):
     description: str = (
         "Fetch real-time cryptocurrency price data with multi-currency support"
     )
-    args_schema: Type[BaseModel] = CryptoCompareFetchPriceInput
+    args_schema: type[BaseModel] = CryptoCompareFetchPriceInput
 
     async def _arun(
         self,
         from_symbol: str,
-        to_symbols: List[str],
+        to_symbols: list[str],
         **kwargs,
-    ) -> List[CryptoPrice]:
+    ) -> list[CryptoPrice]:
         """Async implementation of the tool to fetch cryptocurrency prices.
 
         Args:
@@ -56,7 +55,7 @@ class CryptoCompareFetchPrice(CryptoCompareBaseTool):
             config: The configuration for the runnable, containing agent context.
 
         Returns:
-            List[CryptoPrice]: A list of cryptocurrency prices for each target currency.
+            list[CryptoPrice]: A list of cryptocurrency prices for each target currency.
 
         Raises:
             Exception: If there's an error accessing the CryptoCompare API.
@@ -66,7 +65,7 @@ class CryptoCompareFetchPrice(CryptoCompareBaseTool):
             skill_config = context.agent.skill_config(self.category)
 
             # Check rate limit
-            await self.check_rate_limit(context.agent_id, max_requests=10, interval=60)
+            await self.check_rate_limit(max_requests=10, interval=60)
 
             # Get API key from context
             api_key = skill_config.get("api_key")

intentkit/skills/cryptocompare/fetch_top_exchanges.py

@@ -1,7 +1,6 @@
 """Tool for fetching top exchanges for a cryptocurrency pair via CryptoCompare API."""
 
 import logging
-from typing import List, Type
 
 from pydantic import BaseModel, Field
 
@@ -44,7 +43,7 @@ class CryptoCompareFetchTopExchanges(CryptoCompareBaseTool):
     description: str = (
         "Fetch top exchanges for a cryptocurrency trading pair, ranked by volume"
     )
-    args_schema: Type[BaseModel] = CryptoCompareFetchTopExchangesInput
+    args_schema: type[BaseModel] = CryptoCompareFetchTopExchangesInput
 
     async def _arun(
         self,
@@ -52,7 +51,7 @@ class CryptoCompareFetchTopExchanges(CryptoCompareBaseTool):
         to_symbol: str = "USD",
         limit: int = 10,
         **kwargs,
-    ) -> List[CryptoExchange]:
+    ) -> list[CryptoExchange]:
         """Async implementation of the tool to fetch top exchanges for a cryptocurrency pair.
 
         Args:
@@ -62,7 +61,7 @@ class CryptoCompareFetchTopExchanges(CryptoCompareBaseTool):
             config: The configuration for the runnable, containing agent context.
 
         Returns:
-            List[CryptoExchange]: A list of top exchanges for the specified trading pair.
+            list[CryptoExchange]: A list of top exchanges for the specified trading pair.
 
         Raises:
             Exception: If there's an error accessing the CryptoCompare API.
@@ -72,7 +71,7 @@ class CryptoCompareFetchTopExchanges(CryptoCompareBaseTool):
             skill_config = context.agent.skill_config(self.category)
 
             # Check rate limit
-            await self.check_rate_limit(context.agent_id, max_requests=5, interval=60)
+            await self.check_rate_limit(max_requests=5, interval=60)
 
             # Get API key from context
             api_key = skill_config.get("api_key")