intentkit 0.8.12.dev1__py3-none-any.whl → 0.8.12.dev3__py3-none-any.whl

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

@@ -4,7 +4,7 @@ from typing import Type
 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
 
@@ -15,9 +15,6 @@ 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"
-    )
 
     def get_api_key(self) -> dict:
         context = self.get_context()
@@ -25,20 +22,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 = [

intentkit/skills/twitter/follow_user.py

@@ -42,7 +42,6 @@ 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()

intentkit/skills/twitter/get_mentions.py

@@ -46,7 +46,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()

intentkit/skills/twitter/get_timeline.py

@@ -45,7 +45,6 @@ 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()

intentkit/skills/twitter/get_user_by_username.py

@@ -43,7 +43,6 @@ 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()

intentkit/skills/twitter/get_user_tweets.py

@@ -59,7 +59,6 @@ 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()

intentkit/skills/twitter/like_tweet.py

@@ -40,7 +40,6 @@ 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()

intentkit/skills/twitter/post_tweet.py

@@ -5,6 +5,7 @@ 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"
@@ -54,7 +55,6 @@ 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()
@@ -69,7 +69,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

@@ -5,6 +5,7 @@ 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"
@@ -56,7 +57,6 @@ 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()
@@ -71,7 +71,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)

intentkit/skills/twitter/retweet.py

@@ -40,7 +40,6 @@ class TwitterRetweet(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()

intentkit/skills/twitter/search_tweets.py

@@ -42,7 +42,6 @@ class TwitterSearchTweets(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()

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

@@ -3,7 +3,6 @@ from typing import Type
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -13,9 +12,6 @@ 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"
-    )
 
     def get_api_key(self) -> str:
         context = self.get_context()

intentkit/skills/venice_audio/__init__.py

@@ -1,106 +1,99 @@
-import logging
-from typing import List, Literal, Optional, TypedDict
-
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import SkillConfig, SkillState
-from intentkit.skills.venice_audio.base import VeniceAudioBaseTool
-from intentkit.skills.venice_audio.venice_audio import VeniceAudioTool
-
-logger = logging.getLogger(__name__)
-
-
-_cache: dict[str, VeniceAudioBaseTool] = {}
-
-_SKILL_NAME_TO_CLASS_MAP = {
-    "text_to_speech": VeniceAudioTool,
-    # Add new mappings here: "skill_name": SkillClassName
-}
-
-
-class SkillStates(TypedDict):
-    text_to_speech: SkillState
-
-
-class Config(SkillConfig):
-    enabled: bool
-    voice_model: Literal["af_heart", "bm_lewis", "custom"]
-    states: SkillStates  # type: ignore
-    api_key_provider: Optional[Literal["agent_owner"]]
-
-    # conditionally required
-    api_key: Optional[str]
-    voice_model_custom: Optional[list[str]]
-
-    # optional
-    rate_limit_number: Optional[int]
-    rate_limit_minutes: Optional[int]
-
-
-async def get_skills(
-    config: "Config",
-    is_private: bool,
-    store: SkillStoreABC,
-    **_,  # Allow for extra arguments if the loader passes them
-) -> list[VeniceAudioBaseTool]:
-    """
-    Factory function to create and return Venice Audio skill tools.
-
-    Args:
-        config: The configuration dictionary for the Venice Audio skill.
-        skill_store: The skill store instance.
-        agent_id: The ID of the agent requesting the skills.
-
-    Returns:
-        A list of VeniceAudioBaseTool instances for the Venice Audio skill.
-    """
-    # Check if the entire category is disabled first
-    if not config.get("enabled", False):
-        return []
-
-    available_skills: List[VeniceAudioBaseTool] = []
-    skill_states = config.get("states", {})
-
-    # Iterate through all known skills defined in the map
-    for skill_name in _SKILL_NAME_TO_CLASS_MAP:
-        state = skill_states.get(
-            skill_name, "disabled"
-        )  # Default to disabled if not in config
-
-        if state == "disabled":
-            continue
-        elif state == "public" or (state == "private" and is_private):
-            # If enabled, get the skill instance using the factory function
-            skill_instance = get_venice_audio_skill(skill_name, store)
-            if skill_instance:
-                available_skills.append(skill_instance)
-            else:
-                # This case should ideally not happen if the map is correct
-                logger.warning(f"Could not instantiate known skill: {skill_name}")
-
-    return available_skills
-
-
-def get_venice_audio_skill(
-    name: str,
-    store: SkillStoreABC,
-) -> Optional[VeniceAudioBaseTool]:
-    """
-    Factory function to get a cached Venice Audio skill instance by name.
-
-    Args:
-        name: The name of voice model.
-        store: The skill store, passed to the skill constructor.
-
-    Returns:
-        The requested Venice Audio skill instance, or None if the name is unknown.
-    """
-
-    # Return from cache immediately if already exists
-    if name in _cache:
-        return _cache[name]
-
-    # Cache and return the newly created instance
-    _cache[name] = VeniceAudioTool(
-        skill_store=store,
-    )
-    return _cache[name]
+import logging
+from typing import List, Literal, Optional, TypedDict
+
+from intentkit.skills.base import SkillConfig, SkillState
+from intentkit.skills.venice_audio.base import VeniceAudioBaseTool
+from intentkit.skills.venice_audio.venice_audio import VeniceAudioTool
+
+logger = logging.getLogger(__name__)
+
+
+_cache: dict[str, VeniceAudioBaseTool] = {}
+
+_SKILL_NAME_TO_CLASS_MAP = {
+    "text_to_speech": VeniceAudioTool,
+    # Add new mappings here: "skill_name": SkillClassName
+}
+
+
+class SkillStates(TypedDict):
+    text_to_speech: SkillState
+
+
+class Config(SkillConfig):
+    enabled: bool
+    voice_model: Literal["af_heart", "bm_lewis", "custom"]
+    states: SkillStates  # type: ignore
+    api_key_provider: Optional[Literal["agent_owner"]]
+
+    # conditionally required
+    api_key: Optional[str]
+    voice_model_custom: Optional[list[str]]
+
+    # optional
+    rate_limit_number: Optional[int]
+    rate_limit_minutes: Optional[int]
+
+
+async def get_skills(
+    config: "Config",
+    is_private: bool,
+    **_,  # Allow for extra arguments if the loader passes them
+) -> list[VeniceAudioBaseTool]:
+    """
+    Factory function to create and return Venice Audio skill tools.
+
+    Args:
+        config: The configuration dictionary for the Venice Audio skill.
+        agent_id: The ID of the agent requesting the skills.
+
+    Returns:
+        A list of VeniceAudioBaseTool instances for the Venice Audio skill.
+    """
+    # Check if the entire category is disabled first
+    if not config.get("enabled", False):
+        return []
+
+    available_skills: List[VeniceAudioBaseTool] = []
+    skill_states = config.get("states", {})
+
+    # Iterate through all known skills defined in the map
+    for skill_name in _SKILL_NAME_TO_CLASS_MAP:
+        state = skill_states.get(
+            skill_name, "disabled"
+        )  # Default to disabled if not in config
+
+        if state == "disabled":
+            continue
+        elif state == "public" or (state == "private" and is_private):
+            # If enabled, get the skill instance using the factory function
+            skill_instance = get_venice_audio_skill(skill_name)
+            if skill_instance:
+                available_skills.append(skill_instance)
+            else:
+                # This case should ideally not happen if the map is correct
+                logger.warning(f"Could not instantiate known skill: {skill_name}")
+
+    return available_skills
+
+
+def get_venice_audio_skill(
+    name: str,
+) -> Optional[VeniceAudioBaseTool]:
+    """
+    Factory function to get a cached Venice Audio skill instance by name.
+
+    Args:
+        name: The name of voice model.
+
+    Returns:
+        The requested Venice Audio skill instance, or None if the name is unknown.
+    """
+
+    # Return from cache immediately if already exists
+    if name in _cache:
+        return _cache[name]
+
+    # Cache and return the newly created instance
+    _cache[name] = VeniceAudioTool()
+    return _cache[name]