intentkit 0.8.11__py3-none-any.whl → 0.8.12__py3-none-any.whl

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,16 +57,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 +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,16 +40,13 @@ 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()
 
             # 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/search_tweets.py

@@ -42,21 +42,16 @@ 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()
 
             # 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 +99,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

@@ -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]

intentkit/skills/venice_audio/base.py

@@ -1,121 +1,118 @@
-import logging
-from typing import Dict, List, Optional, Tuple, 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
-
-logger = logging.getLogger(__name__)
-
-
-class VeniceAudioBaseTool(IntentKitSkill):
-    """Base class for Venice Audio tools."""
-
-    name: str = Field(default="venice_base_tool", description="The name of the tool")
-    description: str = Field(description="A description of what the tool does")
-    args_schema: Type[BaseModel]  # type: ignore
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
-
-    @property
-    def category(self) -> str:
-        return "venice_audio"
-
-    def validate_voice_model(
-        self, context, voice_model: str
-    ) -> Tuple[bool, Optional[Dict[str, object]]]:
-        config = context.config
-
-        selected_model = config.get("voice_model")
-        custom_models = config.get("voice_model_custom", [])
-
-        allowed_voice_models: List[str] = []
-
-        if selected_model == "custom":
-            allowed_voice_models = custom_models or []
-        else:
-            allowed_voice_models = [selected_model] if selected_model else []
-
-        if voice_model not in allowed_voice_models:
-            return False, {
-                "error": f'"{voice_model}" is not allowed',
-                "allowed": allowed_voice_models,
-                "suggestion": "please try again with allowed voice model",
-            }
-
-        return True, None
-
-    def get_api_key(self) -> str:
-        """
-        Retrieves the Venice AI API key based on the api_key_provider setting.
-
-        Returns:
-            The API key if found.
-
-        Raises:
-            ToolException: If the API key is not found or provider is invalid.
-        """
-        try:
-            context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
-            api_key_provider = skill_config.get("api_key_provider")
-            if api_key_provider == "agent_owner":
-                agent_api_key = skill_config.get("api_key")
-                if agent_api_key:
-                    logger.debug(
-                        f"Using agent-specific Venice API key for skill {self.name} in category {self.category}"
-                    )
-                    return agent_api_key
-                raise ToolException(
-                    f"No agent-owned Venice API key found for skill '{self.name}' in category '{self.category}'."
-                )
-
-            elif api_key_provider == "platform":
-                system_api_key = self.skill_store.get_system_config("venice_api_key")
-                if system_api_key:
-                    logger.debug(
-                        f"Using system Venice API key for skill {self.name} in category {self.category}"
-                    )
-                    return system_api_key
-                raise ToolException(
-                    f"No platform-hosted Venice API key found for skill '{self.name}' in category '{self.category}'."
-                )
-
-            else:
-                raise ToolException(
-                    f"Invalid API key provider '{api_key_provider}' for skill '{self.name}'"
-                )
-
-        except Exception as e:
-            raise ToolException(f"Failed to retrieve Venice API key: {str(e)}") from e
-
-    async def apply_rate_limit(self, context) -> None:
-        """
-        Applies rate limiting ONLY if specified in the agent's config ('skill_config').
-        Checks for 'rate_limit_number' and 'rate_limit_minutes'.
-        If not configured, NO rate limiting is applied.
-        Raises ConnectionAbortedError if the configured limit is exceeded.
-        """
-        skill_config = context.agent.skill_config(self.category)
-        user_id = context.agent.id
-
-        # Get agent-specific limits safely
-        limit_num = skill_config.get("rate_limit_number")
-        limit_min = skill_config.get("rate_limit_minutes")
-
-        # Apply limit ONLY if both values are present and valid (truthy check handles None and 0)
-        if limit_num and limit_min:
-            limit_source = "Agent"
-            logger.debug(
-                f"Applying {limit_source} rate limit ({limit_num}/{limit_min} min) for user {user_id} on {self.name}"
-            )
-            if user_id:
-                await self.user_rate_limit_by_category(user_id, limit_num, limit_min)
-        else:
-            # No valid agent configuration found, so do nothing.
-            logger.debug(
-                f"No agent rate limits configured for category '{self.category}'. Skipping rate limit for user {user_id}."
-            )
+import logging
+from typing import Dict, List, Optional, Tuple, Type
+
+from langchain_core.tools.base import ToolException
+from pydantic import BaseModel, Field
+
+from intentkit.config.config import config
+from intentkit.skills.base import IntentKitSkill
+
+logger = logging.getLogger(__name__)
+
+
+class VeniceAudioBaseTool(IntentKitSkill):
+    """Base class for Venice Audio tools."""
+
+    name: str = Field(default="venice_base_tool", description="The name of the tool")
+    description: str = Field(description="A description of what the tool does")
+    args_schema: Type[BaseModel]  # type: ignore
+
+    @property
+    def category(self) -> str:
+        return "venice_audio"
+
+    def validate_voice_model(
+        self, context, voice_model: str
+    ) -> Tuple[bool, Optional[Dict[str, object]]]:
+        config = context.config
+
+        selected_model = config.get("voice_model")
+        custom_models = config.get("voice_model_custom", [])
+
+        allowed_voice_models: List[str] = []
+
+        if selected_model == "custom":
+            allowed_voice_models = custom_models or []
+        else:
+            allowed_voice_models = [selected_model] if selected_model else []
+
+        if voice_model not in allowed_voice_models:
+            return False, {
+                "error": f'"{voice_model}" is not allowed',
+                "allowed": allowed_voice_models,
+                "suggestion": "please try again with allowed voice model",
+            }
+
+        return True, None
+
+    def get_api_key(self) -> str:
+        """
+        Retrieves the Venice AI API key based on the api_key_provider setting.
+
+        Returns:
+            The API key if found.
+
+        Raises:
+            ToolException: If the API key is not found or provider is invalid.
+        """
+        try:
+            context = self.get_context()
+            skill_config = context.agent.skill_config(self.category)
+            api_key_provider = skill_config.get("api_key_provider")
+            if api_key_provider == "agent_owner":
+                agent_api_key = skill_config.get("api_key")
+                if agent_api_key:
+                    logger.debug(
+                        f"Using agent-specific Venice API key for skill {self.name} in category {self.category}"
+                    )
+                    return agent_api_key
+                raise ToolException(
+                    f"No agent-owned Venice API key found for skill '{self.name}' in category '{self.category}'."
+                )
+
+            elif api_key_provider == "platform":
+                system_api_key = config.venice_api_key
+                if system_api_key:
+                    logger.debug(
+                        f"Using system Venice API key for skill {self.name} in category {self.category}"
+                    )
+                    return system_api_key
+                raise ToolException(
+                    f"No platform-hosted Venice API key found for skill '{self.name}' in category '{self.category}'."
+                )
+
+            else:
+                raise ToolException(
+                    f"Invalid API key provider '{api_key_provider}' for skill '{self.name}'"
+                )
+
+        except Exception as e:
+            raise ToolException(f"Failed to retrieve Venice API key: {str(e)}") from e
+
+    async def apply_rate_limit(self, context) -> None:
+        """
+        Applies rate limiting ONLY if specified in the agent's config ('skill_config').
+        Checks for 'rate_limit_number' and 'rate_limit_minutes'.
+        If not configured, NO rate limiting is applied.
+        Raises ConnectionAbortedError if the configured limit is exceeded.
+        """
+        skill_config = context.agent.skill_config(self.category)
+        user_id = context.agent.id
+
+        # Get agent-specific limits safely
+        limit_num = skill_config.get("rate_limit_number")
+        limit_min = skill_config.get("rate_limit_minutes")
+
+        # Apply limit ONLY if both values are present and valid (truthy check handles None and 0)
+        if limit_num and limit_min:
+            limit_source = "Agent"
+            logger.debug(
+                f"Applying {limit_source} rate limit ({limit_num}/{limit_min} min) for user {user_id} on {self.name}"
+            )
+            if user_id:
+                await self.user_rate_limit_by_category(limit_num, limit_min * 60)
+        else:
+            # No valid agent configuration found, so do nothing.
+            logger.debug(
+                f"No agent rate limits configured for category '{self.category}'. Skipping rate limit for user {user_id}."
+            )

intentkit/skills/venice_audio/venice_audio.py

@@ -4,9 +4,8 @@ import logging
 from typing import Any, Dict, Optional, Type
 
 import httpx
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.venice_audio.base import VeniceAudioBaseTool
 from intentkit.skills.venice_audio.input import AllowedAudioFormat, VeniceAudioInput
 from intentkit.utils.s3 import store_file
@@ -34,9 +33,6 @@ class VeniceAudioTool(VeniceAudioBaseTool):
         "and audio format (mp3, opus, aac, flac, wav, pcm, default mp3)."
     )
     args_schema: Type[BaseModel] = VeniceAudioInput
-    skill_store: SkillStoreABC = Field(
-        description="The skill store instance for accessing system/agent configurations and persisting data."
-    )
 
     async def _arun(
         self,