intentkit 0.8.12rc0__py3-none-any.whl → 0.8.13.dev1__py3-none-any.whl

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,

intentkit/skills/venice_image/__init__.py

@@ -1,154 +1,147 @@
-import logging
-from typing import NotRequired, Optional, TypedDict
-
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import (
-    SkillConfig,
-    SkillState,
-)
-
-# Import the base tool and all specific model skill classes
-from intentkit.skills.venice_image.base import VeniceImageBaseTool
-from intentkit.skills.venice_image.image_enhance.image_enhance import ImageEnhance
-from intentkit.skills.venice_image.image_generation.image_generation_fluently_xl import (
-    ImageGenerationFluentlyXL,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_flux_dev import (
-    ImageGenerationFluxDev,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_flux_dev_uncensored import (
-    ImageGenerationFluxDevUncensored,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_lustify_sdxl import (
-    ImageGenerationLustifySDXL,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_pony_realism import (
-    ImageGenerationPonyRealism,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_stable_diffusion_3_5 import (
-    ImageGenerationStableDiffusion35,
-)
-from intentkit.skills.venice_image.image_generation.image_generation_venice_sd35 import (
-    ImageGenerationVeniceSD35,
-)
-from intentkit.skills.venice_image.image_upscale.image_upscale import ImageUpscale
-from intentkit.skills.venice_image.image_vision.image_vision import ImageVision
-
-# Cache skills at the system level, because they are stateless and only depend on the store
-_cache: dict[str, VeniceImageBaseTool] = {}
-
-logger = logging.getLogger(__name__)
-
-
-# Define the expected structure for the 'states' dictionary in the config
-class SkillStates(TypedDict):
-    image_upscale: SkillState
-    image_enhance: SkillState
-    image_vision: SkillState
-    image_generation_flux_dev: SkillState
-    image_generation_flux_dev_uncensored: SkillState
-    image_generation_venice_sd35: SkillState
-    image_generation_fluently_xl: SkillState
-    image_generation_lustify_sdxl: SkillState
-    image_generation_pony_realism: SkillState
-    image_generation_stable_diffusion_3_5: SkillState
-    # Add new skill names here if more models are added
-
-
-# Define the overall configuration structure for the venice_image category
-class Config(SkillConfig):
-    """Configuration for Venice Image skills."""
-
-    enabled: bool  # Keep standard enabled flag
-    states: SkillStates
-    api_key_provider: str = "agent_owner"
-    api_key: NotRequired[Optional[str]]  # Explicitly Optional
-    safe_mode: NotRequired[bool]  # Defaults handled in base or usage
-    hide_watermark: NotRequired[bool]  # Defaults handled in base or usage
-    negative_prompt: NotRequired[str]  # Defaults handled in base or usage
-    rate_limit_number: NotRequired[Optional[int]]  # Explicitly Optional
-    rate_limit_minutes: NotRequired[Optional[int]]  # Explicitly Optional
-
-
-_SKILL_NAME_TO_CLASS_MAP: dict[str, type[VeniceImageBaseTool]] = {
-    "image_upscale": ImageUpscale,
-    "image_enhance": ImageEnhance,
-    "image_vision": ImageVision,
-    "image_generation_flux_dev": ImageGenerationFluxDev,
-    "image_generation_flux_dev_uncensored": ImageGenerationFluxDevUncensored,
-    "image_generation_venice_sd35": ImageGenerationVeniceSD35,
-    "image_generation_fluently_xl": ImageGenerationFluentlyXL,
-    "image_generation_lustify_sdxl": ImageGenerationLustifySDXL,
-    "image_generation_pony_realism": ImageGenerationPonyRealism,
-    "image_generation_stable_diffusion_3_5": ImageGenerationStableDiffusion35,
-}
-
-
-async def get_skills(
-    config: "Config",
-    is_private: bool,
-    store: SkillStoreABC,
-    **_,  # Allow for extra arguments if the loader passes them
-) -> list[VeniceImageBaseTool]:
-    """Get all enabled Venice Image skills based on configuration and privacy level.
-
-    Args:
-        config: The configuration for Venice Image skills.
-        is_private: Whether the context is private (e.g., agent owner).
-        store: The skill store for persisting data and accessing system config.
-
-    Returns:
-        A list of instantiated and enabled Venice Image skill objects.
-    """
-    # Check if the entire category is disabled first
-    if not config.get("enabled", False):
-        return []
-
-    available_skills: list[VeniceImageBaseTool] = []
-
-    # Include skills based on their state
-    for skill_name, state in config["states"].items():
-        if state == "disabled":
-            continue
-        elif state == "public" or (state == "private" and is_private):
-            available_skills.append(skill_name)
-
-    # Get each skill using the cached getter
-    result = []
-    for name in available_skills:
-        skill = get_venice_image_skill(name, store, config)
-        if skill:
-            result.append(skill)
-    return result
-
-
-def get_venice_image_skill(
-    name: str,
-    store: SkillStoreABC,
-    config: "Config",
-) -> Optional[VeniceImageBaseTool]:
-    """
-    Factory function to get a cached Venice Image skill instance by name.
-
-    Args:
-        name: The name of the skill to get (must match keys in _SKILL_NAME_TO_CLASS_MAP).
-        store: The skill store, passed to the skill constructor.
-
-    Returns:
-        The requested Venice Image skill instance, or None if the name is unknown.
-    """
-
-    # Return from cache immediately if already exists
-    if name in _cache:
-        return _cache[name]
-
-    skill_class = _SKILL_NAME_TO_CLASS_MAP.get(name)
-    if not skill_class:
-        logger.warning(f"Unknown Venice skill: {name}")
-        return None
-
-    # Cache and return the newly created instance
-    _cache[name] = skill_class(
-        skill_store=store,
-    )
-    return _cache[name]
+import logging
+from typing import NotRequired, Optional, TypedDict
+
+from intentkit.skills.base import (
+    SkillConfig,
+    SkillState,
+)
+
+# Import the base tool and all specific model skill classes
+from intentkit.skills.venice_image.base import VeniceImageBaseTool
+from intentkit.skills.venice_image.image_enhance.image_enhance import ImageEnhance
+from intentkit.skills.venice_image.image_generation.image_generation_fluently_xl import (
+    ImageGenerationFluentlyXL,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_flux_dev import (
+    ImageGenerationFluxDev,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_flux_dev_uncensored import (
+    ImageGenerationFluxDevUncensored,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_lustify_sdxl import (
+    ImageGenerationLustifySDXL,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_pony_realism import (
+    ImageGenerationPonyRealism,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_stable_diffusion_3_5 import (
+    ImageGenerationStableDiffusion35,
+)
+from intentkit.skills.venice_image.image_generation.image_generation_venice_sd35 import (
+    ImageGenerationVeniceSD35,
+)
+from intentkit.skills.venice_image.image_upscale.image_upscale import ImageUpscale
+from intentkit.skills.venice_image.image_vision.image_vision import ImageVision
+
+# Cache skills at the system level, because they are stateless and only depend on the store
+_cache: dict[str, VeniceImageBaseTool] = {}
+
+logger = logging.getLogger(__name__)
+
+
+# Define the expected structure for the 'states' dictionary in the config
+class SkillStates(TypedDict):
+    image_upscale: SkillState
+    image_enhance: SkillState
+    image_vision: SkillState
+    image_generation_flux_dev: SkillState
+    image_generation_flux_dev_uncensored: SkillState
+    image_generation_venice_sd35: SkillState
+    image_generation_fluently_xl: SkillState
+    image_generation_lustify_sdxl: SkillState
+    image_generation_pony_realism: SkillState
+    image_generation_stable_diffusion_3_5: SkillState
+    # Add new skill names here if more models are added
+
+
+# Define the overall configuration structure for the venice_image category
+class Config(SkillConfig):
+    """Configuration for Venice Image skills."""
+
+    enabled: bool  # Keep standard enabled flag
+    states: SkillStates
+    api_key_provider: str = "agent_owner"
+    api_key: NotRequired[Optional[str]]  # Explicitly Optional
+    safe_mode: NotRequired[bool]  # Defaults handled in base or usage
+    hide_watermark: NotRequired[bool]  # Defaults handled in base or usage
+    negative_prompt: NotRequired[str]  # Defaults handled in base or usage
+    rate_limit_number: NotRequired[Optional[int]]  # Explicitly Optional
+    rate_limit_minutes: NotRequired[Optional[int]]  # Explicitly Optional
+
+
+_SKILL_NAME_TO_CLASS_MAP: dict[str, type[VeniceImageBaseTool]] = {
+    "image_upscale": ImageUpscale,
+    "image_enhance": ImageEnhance,
+    "image_vision": ImageVision,
+    "image_generation_flux_dev": ImageGenerationFluxDev,
+    "image_generation_flux_dev_uncensored": ImageGenerationFluxDevUncensored,
+    "image_generation_venice_sd35": ImageGenerationVeniceSD35,
+    "image_generation_fluently_xl": ImageGenerationFluentlyXL,
+    "image_generation_lustify_sdxl": ImageGenerationLustifySDXL,
+    "image_generation_pony_realism": ImageGenerationPonyRealism,
+    "image_generation_stable_diffusion_3_5": ImageGenerationStableDiffusion35,
+}
+
+
+async def get_skills(
+    config: "Config",
+    is_private: bool,
+    **_,  # Allow for extra arguments if the loader passes them
+) -> list[VeniceImageBaseTool]:
+    """Get all enabled Venice Image skills based on configuration and privacy level.
+
+    Args:
+        config: The configuration for Venice Image skills.
+        is_private: Whether the context is private (e.g., agent owner).
+
+    Returns:
+        A list of instantiated and enabled Venice Image skill objects.
+    """
+    # Check if the entire category is disabled first
+    if not config.get("enabled", False):
+        return []
+
+    available_skills: list[VeniceImageBaseTool] = []
+
+    # Include skills based on their state
+    for skill_name, state in config["states"].items():
+        if state == "disabled":
+            continue
+        elif state == "public" or (state == "private" and is_private):
+            available_skills.append(skill_name)
+
+    # Get each skill using the cached getter
+    result = []
+    for name in available_skills:
+        skill = get_venice_image_skill(name, config)
+        if skill:
+            result.append(skill)
+    return result
+
+
+def get_venice_image_skill(
+    name: str,
+    config: "Config",
+) -> Optional[VeniceImageBaseTool]:
+    """
+    Factory function to get a cached Venice Image skill instance by name.
+
+    Args:
+        name: The name of the skill to get (must match keys in _SKILL_NAME_TO_CLASS_MAP).
+
+    Returns:
+        The requested Venice Image skill instance, or None if the name is unknown.
+    """
+
+    # Return from cache immediately if already exists
+    if name in _cache:
+        return _cache[name]
+
+    skill_class = _SKILL_NAME_TO_CLASS_MAP.get(name)
+    if not skill_class:
+        logger.warning(f"Unknown Venice skill: {name}")
+        return None
+
+    # Cache and return the newly created instance
+    _cache[name] = skill_class()
+    return _cache[name]