intentkit 0.7.5.dev3__py3-none-any.whl → 0.8.34.dev7__py3-none-any.whl

intentkit/skills/token/token_search.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, List, Optional, Type
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -14,15 +14,15 @@ class TokenSearchInput(BaseModel):
     query: str = Field(
         description="Search query - can be token address, token name or token symbol."
     )
-    chains: Optional[List[str]] = Field(
+    chains: list[str] | None = Field(
         description="The chain(s) to query (e.g., 'eth', 'bsc', 'polygon').",
         default=None,
     )
-    limit: Optional[int] = Field(
+    limit: int | None = Field(
         description="The desired page size of the result.",
         default=None,
     )
-    is_verified_contract: Optional[bool] = Field(
+    is_verified_contract: bool | None = Field(
         description="Whether the contract is verified.",
         default=None,
     )
@@ -44,16 +44,16 @@ class TokenSearch(TokenBaseTool):
         "Returns token information including price, market cap, and security information. "
         "NOTE: This is a premium endpoint that requires a Moralis Business plan."
     )
-    args_schema: Type[BaseModel] = TokenSearchInput
+    args_schema: type[BaseModel] = TokenSearchInput
 
     async def _arun(
         self,
         query: str,
-        chains: Optional[List[str]] = None,
-        limit: Optional[int] = None,
-        is_verified_contract: Optional[bool] = None,
+        chains: list[str] | None = None,
+        limit: int | None = None,
+        is_verified_contract: bool | None = None,
         **kwargs,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Search for tokens using Moralis.
 
         Args:

intentkit/skills/twitter/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.clients import TwitterClientConfig
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.twitter.base import TwitterBaseTool
@@ -46,7 +45,6 @@ class Config(SkillConfig, TwitterClientConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[TwitterBaseTool]:
     """Get all Twitter skills."""
@@ -62,7 +60,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_twitter_skill(name, store)
+        skill = get_twitter_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -70,76 +68,54 @@ async def get_skills(
 
 def get_twitter_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> TwitterBaseTool:
     """Get a Twitter skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Twitter skill
     """
     if name == "get_mentions":
         if name not in _cache:
-            _cache[name] = TwitterGetMentions(
-                skill_store=store,
-            )
+            _cache[name] = TwitterGetMentions()
         return _cache[name]
     elif name == "post_tweet":
         if name not in _cache:
-            _cache[name] = TwitterPostTweet(
-                skill_store=store,
-            )
+            _cache[name] = TwitterPostTweet()
         return _cache[name]
     elif name == "reply_tweet":
         if name not in _cache:
-            _cache[name] = TwitterReplyTweet(
-                skill_store=store,
-            )
+            _cache[name] = TwitterReplyTweet()
         return _cache[name]
     elif name == "get_timeline":
         if name not in _cache:
-            _cache[name] = TwitterGetTimeline(
-                skill_store=store,
-            )
+            _cache[name] = TwitterGetTimeline()
         return _cache[name]
     elif name == "follow_user":
         if name not in _cache:
-            _cache[name] = TwitterFollowUser(
-                skill_store=store,
-            )
+            _cache[name] = TwitterFollowUser()
         return _cache[name]
     elif name == "like_tweet":
         if name not in _cache:
-            _cache[name] = TwitterLikeTweet(
-                skill_store=store,
-            )
+            _cache[name] = TwitterLikeTweet()
         return _cache[name]
     elif name == "retweet":
         if name not in _cache:
-            _cache[name] = TwitterRetweet(
-                skill_store=store,
-            )
+            _cache[name] = TwitterRetweet()
         return _cache[name]
     elif name == "search_tweets":
         if name not in _cache:
-            _cache[name] = TwitterSearchTweets(
-                skill_store=store,
-            )
+            _cache[name] = TwitterSearchTweets()
         return _cache[name]
     elif name == "get_user_by_username":
         if name not in _cache:
-            _cache[name] = TwitterGetUserByUsername(
-                skill_store=store,
-            )
+            _cache[name] = TwitterGetUserByUsername()
         return _cache[name]
     elif name == "get_user_tweets":
         if name not in _cache:
-            _cache[name] = TwitterGetUserTweets(
-                skill_store=store,
-            )
+            _cache[name] = TwitterGetUserTweets()
         return _cache[name]
     else:
         logger.warning(f"Unknown Twitter skill: {name}")

intentkit/skills/twitter/base.py

@@ -1,10 +1,9 @@
-from datetime import datetime, timedelta, timezone
-from typing import Type
+from datetime import UTC, datetime, timedelta
 
-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.config.config import config
 from intentkit.skills.base import IntentKitSkill
 from intentkit.utils.error import RateLimitExceeded
 
@@ -14,10 +13,7 @@ class TwitterBaseTool(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]
 
     def get_api_key(self) -> dict:
         context = self.get_context()
@@ -25,20 +21,21 @@ class TwitterBaseTool(IntentKitSkill):
         api_key_provider = skill_config.get("api_key_provider")
         if api_key_provider == "platform":
             # Return platform keys (these need to be added to config.py)
-            return {
-                "consumer_key": self.skill_store.get_system_config(
-                    "twitter_consumer_key"
-                ),
-                "consumer_secret": self.skill_store.get_system_config(
-                    "twitter_consumer_secret"
-                ),
-                "access_token": self.skill_store.get_system_config(
-                    "twitter_access_token"
-                ),
-                "access_token_secret": self.skill_store.get_system_config(
-                    "twitter_access_token_secret"
+            platform_keys = {
+                "consumer_key": getattr(config, "twitter_consumer_key", None),
+                "consumer_secret": getattr(config, "twitter_consumer_secret", None),
+                "access_token": getattr(config, "twitter_access_token", None),
+                "access_token_secret": getattr(
+                    config, "twitter_access_token_secret", None
                 ),
             }
+            missing = [key for key, value in platform_keys.items() if not value]
+            if missing:
+                raise ToolException(
+                    "Twitter platform API keys are not configured: "
+                    + ", ".join(missing)
+                )
+            return platform_keys
         # for backward compatibility or agent_owner provider
         elif api_key_provider == "agent_owner":
             required_keys = [
@@ -63,24 +60,19 @@ class TwitterBaseTool(IntentKitSkill):
     def category(self) -> str:
         return "twitter"
 
-    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
@@ -92,9 +84,7 @@ class TwitterBaseTool(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
 
@@ -103,7 +93,5 @@ class TwitterBaseTool(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

intentkit/skills/twitter/follow_user.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
@@ -34,7 +33,7 @@ class TwitterFollowUser(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterFollowUserInput
+    args_schema: type[BaseModel] = TwitterFollowUserInput
 
     async def _arun(self, user_id: str, **kwargs) -> bool:
         context = self.get_context()
@@ -42,16 +41,13 @@ class TwitterFollowUser(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=5, interval=15
-                )
+                await self.check_rate_limit(max_requests=5, interval=15)
 
             # Follow the user using tweepy client
             response = await client.follow_user(

intentkit/skills/twitter/get_mentions.py

@@ -1,6 +1,5 @@
 import logging
-from datetime import datetime, timedelta, timezone
-from typing import Type
+from datetime import UTC, datetime, timedelta
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel
@@ -38,7 +37,7 @@ class TwitterGetMentions(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterGetMentionsInput
+    args_schema: type[BaseModel] = TwitterGetMentionsInput
 
     async def _arun(self, **kwargs) -> list[Tweet]:
         context = self.get_context()
@@ -46,7 +45,6 @@ class TwitterGetMentions(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
@@ -56,15 +54,12 @@ class TwitterGetMentions(TwitterBaseTool):
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
                 await self.check_rate_limit(
-                    context.agent_id,
                     max_requests=1,
                     interval=15,
                 )
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, "last"
-            )
+            last = await self.get_agent_skill_data("last")
             last = last or {}
             max_results = 10
             since_id = last.get("since_id")
@@ -72,7 +67,7 @@ class TwitterGetMentions(TwitterBaseTool):
                 max_results = 30
 
             # Always get mentions for the last day
-            start_time = datetime.now(tz=timezone.utc) - timedelta(days=1)
+            start_time = datetime.now(tz=UTC) - timedelta(days=1)
 
             user_id = twitter.self_id
             if not user_id:
@@ -113,9 +108,7 @@ class TwitterGetMentions(TwitterBaseTool):
             # Update since_id in store
             if mentions.get("meta") and mentions["meta"].get("newest_id"):
                 last["since_id"] = mentions["meta"].get("newest_id")
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, "last", last
-                )
+                await self.save_agent_skill_data("last", last)
 
             return mentions
 

intentkit/skills/twitter/get_timeline.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from pydantic import BaseModel
 
@@ -34,7 +33,7 @@ class TwitterGetTimeline(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterGetTimelineInput
+    args_schema: type[BaseModel] = TwitterGetTimelineInput
 
     async def _arun(self, **kwargs):
         context = self.get_context()
@@ -45,21 +44,16 @@ class TwitterGetTimeline(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=1, interval=15
-                )
+                await self.check_rate_limit(max_requests=1, interval=15)
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, "last"
-            )
+            last = await self.get_agent_skill_data("last")
             last = last or {}
             since_id = last.get("since_id")
 
@@ -101,9 +95,7 @@ class TwitterGetTimeline(TwitterBaseTool):
             # Update the since_id in store for the next request
             if timeline.get("meta") and timeline["meta"].get("newest_id"):
                 last["since_id"] = timeline["meta"]["newest_id"]
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, "last", last
-                )
+                await self.save_agent_skill_data("last", last)
 
             return timeline
 

intentkit/skills/twitter/get_user_by_username.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from pydantic import BaseModel, Field
 
@@ -35,7 +34,7 @@ class TwitterGetUserByUsername(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterGetUserByUsernameInput
+    args_schema: type[BaseModel] = TwitterGetUserByUsernameInput
 
     async def _arun(self, username: str, **kwargs):
         context = self.get_context()
@@ -43,16 +42,13 @@ class TwitterGetUserByUsername(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=5, interval=60 * 24
-                )
+                await self.check_rate_limit(max_requests=5, interval=60 * 24)
 
             user_data = await client.get_user(
                 username=username,

intentkit/skills/twitter/get_user_tweets.py

@@ -1,5 +1,4 @@
 import logging
-from typing import List, Optional, Type
 
 from pydantic import BaseModel, Field
 
@@ -21,7 +20,7 @@ class TwitterGetUserTweetsInput(BaseModel):
     """Input for TwitterGetUserTweets tool."""
 
     user_id: str = Field(description="The Twitter user ID to fetch tweets from")
-    exclude: Optional[List[str]] = Field(
+    exclude: list[str] | None = Field(
         default=["replies", "retweets"],
         description="Types of tweets to exclude (e.g., 'replies', 'retweets')",
     )
@@ -41,7 +40,7 @@ class TwitterGetUserTweets(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterGetUserTweetsInput
+    args_schema: type[BaseModel] = TwitterGetUserTweetsInput
 
     async def _arun(self, **kwargs):
         context = self.get_context()
@@ -59,21 +58,16 @@ class TwitterGetUserTweets(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=1, interval=15
-                )
+                await self.check_rate_limit(max_requests=1, interval=15)
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, user_id
-            )
+            last = await self.get_agent_skill_data(user_id)
             last = last or {}
             since_id = last.get("since_id")
 
@@ -112,9 +106,7 @@ class TwitterGetUserTweets(TwitterBaseTool):
             # Update the since_id in store for the next request
             if tweets.get("meta") and tweets["meta"].get("newest_id"):
                 last["since_id"] = tweets["meta"]["newest_id"]
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, user_id, last
-                )
+                await self.save_agent_skill_data(user_id, last)
 
             return tweets
 

intentkit/skills/twitter/like_tweet.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
@@ -32,7 +31,7 @@ class TwitterLikeTweet(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterLikeTweetInput
+    args_schema: type[BaseModel] = TwitterLikeTweetInput
 
     async def _arun(self, tweet_id: str, **kwargs):
         context = self.get_context()
@@ -40,16 +39,13 @@ class TwitterLikeTweet(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=100, interval=1440
-                )
+                await self.check_rate_limit(max_requests=100, interval=1440)
 
             # Like the tweet using tweepy client
             response = await client.like(tweet_id=tweet_id, user_auth=twitter.use_key)

intentkit/skills/twitter/post_tweet.py

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.clients import get_twitter_client
+from intentkit.config.config import config
 from intentkit.skills.twitter.base import TwitterBaseTool
 
 NAME = "twitter_post_tweet"
@@ -23,7 +23,7 @@ class TwitterPostTweetInput(BaseModel):
         description="Tweet text (280 chars for regular users, 25,000 bytes for verified)",
         max_length=25000,
     )
-    image: Optional[str] = Field(
+    image: str | None = Field(
         default=None, description="Optional URL of an image to attach to the tweet"
     )
 
@@ -41,12 +41,12 @@ class TwitterPostTweet(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterPostTweetInput
+    args_schema: type[BaseModel] = TwitterPostTweetInput
 
     async def _arun(
         self,
         text: str,
-        image: Optional[str] = None,
+        image: str | None = None,
         **kwargs,
     ):
         context = self.get_context()
@@ -54,16 +54,13 @@ class TwitterPostTweet(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=24, interval=1440
-                )
+                await self.check_rate_limit(max_requests=24, interval=1440)
 
             media_ids = []
             image_warning = ""
@@ -71,7 +68,7 @@ class TwitterPostTweet(TwitterBaseTool):
             # Handle image upload if provided
             if image:
                 # Validate image URL - must be from system's S3 CDN
-                aws_s3_cdn_url = self.skill_store.get_system_config("aws_s3_cdn_url")
+                aws_s3_cdn_url = config.aws_s3_cdn_url
                 if aws_s3_cdn_url and image.startswith(aws_s3_cdn_url):
                     # Use the TwitterClient method to upload the image
                     media_ids = await twitter.upload_media(context.agent_id, image)

intentkit/skills/twitter/reply_tweet.py

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.clients import get_twitter_client
+from intentkit.config.config import config
 from intentkit.skills.twitter.base import TwitterBaseTool
 
 NAME = "twitter_reply_tweet"
@@ -24,7 +24,7 @@ class TwitterReplyTweetInput(BaseModel):
         description="Tweet text (280 chars for regular users, 25,000 bytes for verified)",
         max_length=25000,
     )
-    image: Optional[str] = Field(
+    image: str | None = Field(
         default=None, description="Optional URL of an image to attach to the reply"
     )
 
@@ -42,13 +42,13 @@ class TwitterReplyTweet(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterReplyTweetInput
+    args_schema: type[BaseModel] = TwitterReplyTweetInput
 
     async def _arun(
         self,
         tweet_id: str,
         text: str,
-        image: Optional[str] = None,
+        image: str | None = None,
         **kwargs,
     ):
         context = self.get_context()
@@ -56,16 +56,13 @@ class TwitterReplyTweet(TwitterBaseTool):
             skill_config = context.agent.skill_config(self.category)
             twitter = get_twitter_client(
                 agent_id=context.agent_id,
-                skill_store=self.skill_store,
                 config=skill_config,
             )
             client = await twitter.get_client()
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=48, interval=1440
-                )
+                await self.check_rate_limit(max_requests=48, interval=1440)
 
             media_ids = []
             image_warning = ""
@@ -73,7 +70,7 @@ class TwitterReplyTweet(TwitterBaseTool):
             # Handle image upload if provided
             if image:
                 # Validate image URL - must be from system's S3 CDN
-                aws_s3_cdn_url = self.skill_store.get_system_config("aws_s3_cdn_url")
+                aws_s3_cdn_url = config.aws_s3_cdn_url
                 if aws_s3_cdn_url and image.startswith(aws_s3_cdn_url):
                     # Use the TwitterClient method to upload the image
                     media_ids = await twitter.upload_media(context.agent_id, image)