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

intentkit/skills/twitter/get_user_by_username.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from pydantic import BaseModel, Field
 
@@ -35,24 +34,21 @@ 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()
         try:
-            context = self.get_context()
             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,9 +40,10 @@ 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()
         try:
             user_id = kwargs.get("user_id")
             if not user_id:
@@ -55,25 +55,19 @@ class TwitterGetUserTweets(TwitterBaseTool):
             # Get exclude parameter with default
             exclude = kwargs.get("exclude", ["replies", "retweets"])
 
-            context = self.get_context()
             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,24 +31,21 @@ 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()
         try:
-            context = self.get_context()
             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,36 +41,43 @@ 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()
         try:
-            context = self.get_context()
             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 = ""
 
             # Handle image upload if provided
             if image:
-                # Use the TwitterClient method to upload the image
-                media_ids = await twitter.upload_media(context.agent_id, image)
+                # Validate image URL - must be from system's S3 CDN
+                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)
+                else:
+                    # Image is not from system's S3 CDN, skip upload but warn
+                    image_warning = "Warning: The provided image URL is not from the system's S3 CDN and has been ignored. "
+                    logger.warning(
+                        f"Image URL validation failed for agent {context.agent_id}: {image}"
+                    )
 
             # Post tweet using tweepy client
             tweet_params = {"text": text, "user_auth": twitter.use_key}
@@ -79,7 +86,11 @@ class TwitterPostTweet(TwitterBaseTool):
 
             response = await client.create_tweet(**tweet_params)
             if "data" in response and "id" in response["data"]:
-                return response
+                # Return response with warning if image was ignored
+                result = (
+                    f"{image_warning}Tweet posted successfully. Response: {response}"
+                )
+                return result
             else:
                 logger.error(f"Error posting tweet: {str(response)}")
                 raise ToolException("Failed to post tweet.")

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,37 +42,44 @@ 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()
         try:
-            context = self.get_context()
             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 = ""
 
             # Handle image upload if provided
             if image:
-                # Use the TwitterClient method to upload the image
-                media_ids = await twitter.upload_media(context.agent_id, image)
+                # Validate image URL - must be from system's S3 CDN
+                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)
+                else:
+                    # Image is not from system's S3 CDN, skip upload but warn
+                    image_warning = "Warning: The provided image URL is not from the system's S3 CDN and has been ignored. "
+                    logger.warning(
+                        f"Image URL validation failed for agent {context.agent_id}: {image}"
+                    )
 
             # Post reply tweet using tweepy client
             tweet_params = {
@@ -87,7 +94,9 @@ class TwitterReplyTweet(TwitterBaseTool):
             response = await client.create_tweet(**tweet_params)
 
             if "data" in response and "id" in response["data"]:
-                return response
+                # Return response with warning if image was ignored
+                result = f"{image_warning}Reply tweet posted successfully. Response: {response}"
+                return result
             else:
                 logger.error(f"Error replying to tweet: {str(response)}")
                 raise ToolException("Failed to post reply tweet.")

intentkit/skills/twitter/retweet.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
@@ -32,24 +31,21 @@ class TwitterRetweet(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterRetweetInput
+    args_schema: type[BaseModel] = TwitterRetweetInput
 
     async def _arun(self, tweet_id: str, **kwargs):
+        context = self.get_context()
         try:
-            context = self.get_context()
             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)
 
             # Get authenticated user's ID
             user_id = twitter.self_id

intentkit/skills/twitter/schema.json

@@ -5,6 +5,7 @@
   "description": "Integration with X API enabling social media interactions including retrieving posts, mentions, user information, and posting content with media support",
   "x-icon": "https://ai.service.crestal.dev/skills/twitter/twitter.png",
   "x-tags": [
+    "Communication",
     "Social"
   ],
   "properties": {

intentkit/skills/twitter/search_tweets.py

@@ -1,6 +1,5 @@
 import datetime
 import logging
-from typing import Type
 
 from pydantic import BaseModel, Field
 
@@ -33,30 +32,25 @@ class TwitterSearchTweets(TwitterBaseTool):
 
     name: str = NAME
     description: str = PROMPT
-    args_schema: Type[BaseModel] = TwitterSearchTweetsInput
+    args_schema: type[BaseModel] = TwitterSearchTweetsInput
 
     async def _arun(self, query: str, **kwargs):
+        context = self.get_context()
         max_results = 10
         try:
-            context = self.get_context()
             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 to avoid duplicate results
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, query
-            )
+            last = await self.get_agent_skill_data(query)
             last = last or {}
             since_id = last.get("since_id")
 
@@ -104,9 +98,7 @@ class TwitterSearchTweets(TwitterBaseTool):
             if tweets.get("meta") and tweets.get("meta").get("newest_id"):
                 last["since_id"] = tweets["meta"]["newest_id"]
                 last["timestamp"] = datetime.datetime.now().isoformat()
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, query, last
-                )
+                await self.save_agent_skill_data(query, last)
 
             return tweets
 

intentkit/skills/unrealspeech/__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.unrealspeech.base import UnrealSpeechBaseTool
 from intentkit.skills.unrealspeech.text_to_speech import TextToSpeech
@@ -23,7 +22,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[UnrealSpeechBaseTool]:
     """Get all UnrealSpeech tools."""
@@ -37,19 +35,16 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Get each skill using the cached getter
-    return [get_unrealspeech_skill(name, store) for name in available_skills]
+    return [get_unrealspeech_skill(name) for name in available_skills]
 
 
 def get_unrealspeech_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> UnrealSpeechBaseTool:
     """Get an UnrealSpeech skill by name."""
     if name == "text_to_speech":
         if name not in _cache:
-            _cache[name] = TextToSpeech(
-                skill_store=store,
-            )
+            _cache[name] = TextToSpeech()
         return _cache[name]
     else:
         raise ValueError(f"Unknown UnrealSpeech skill: {name}")

intentkit/skills/unrealspeech/base.py

@@ -1,9 +1,6 @@
-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
 
 
@@ -12,10 +9,7 @@ class UnrealSpeechBaseTool(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) -> str:
         context = self.get_context()

intentkit/skills/unrealspeech/schema.json

@@ -5,10 +5,7 @@
   "description": "Convert text to natural-sounding speech with various voices and customization options",
   "x-icon": "https://ai.service.crestal.dev/skills/unrealspeech/unrealspeech.jpg",
   "x-tags": [
-    "Audio",
-    "Speech",
-    "Text-to-Speech",
-    "Voice"
+    "Audio"
   ],
   "properties": {
     "enabled": {
@@ -97,4 +94,4 @@
     }
   },
   "additionalProperties": true
-}
+}

intentkit/skills/unrealspeech/text_to_speech.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from typing import Any, Dict, Literal, Optional, Type
+from typing import Any, Literal
 
 import httpx
 from langchain_core.callbacks.manager import CallbackManagerForToolRun
@@ -31,7 +31,7 @@ class TextToSpeechInput(BaseModel):
         default=0.0,
     )
 
-    timestamp_type: Optional[Literal["word", "sentence"]] = Field(
+    timestamp_type: Literal["word", "sentence"] | None = Field(
         description="The type of timestamps to include in the response. 'word' for word-level timestamps, 'sentence' for sentence-level, or None for no timestamps.",
         default="word",
     )
@@ -52,9 +52,9 @@ class TextToSpeech(UnrealSpeechBaseTool):
         "Returns URLs to the generated audio file and word-level timestamps.\n"
         "Provides various voice options and speech customization parameters."
     )
-    args_schema: Type[BaseModel] = TextToSpeechInput
+    args_schema: type[BaseModel] = TextToSpeechInput
 
-    def get_env_var(self, env_var_name: str) -> Optional[str]:
+    def get_env_var(self, env_var_name: str) -> str | None:
         """Helper method to get environment variables."""
         return os.environ.get(env_var_name)
 
@@ -64,11 +64,11 @@ class TextToSpeech(UnrealSpeechBaseTool):
         voice_id: str = "af_sarah",
         bitrate: str = "192k",
         speed: float = 0.0,
-        timestamp_type: Optional[Literal["word", "sentence"]] = "word",
-        config: Optional[Any] = None,
-        run_manager: Optional[CallbackManagerForToolRun] = None,
+        timestamp_type: Literal["word", "sentence"] | None = "word",
+        config: Any | None = None,
+        run_manager: CallbackManagerForToolRun | None = None,
         **kwargs,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Run the tool to convert text to speech."""
 
         # Get the API key from context config if available