intentkit 0.6.9.dev2__py3-none-any.whl → 0.6.10__py3-none-any.whl

intentkit/skills/acolyt/ask.py

@@ -2,7 +2,6 @@ import logging
 from typing import Dict, Literal, Type
 
 import httpx
-from langchain_core.runnables import RunnableConfig
 from pydantic import BaseModel, Field
 
 from intentkit.skills.acolyt.base import AcolytBaseTool
@@ -67,12 +66,11 @@ class AcolytAskGpt(AcolytBaseTool):
         """
     args_schema: Type[BaseModel] = AcolytAskGptInput
 
-    async def _arun(self, question: str, config: RunnableConfig, **kwargs) -> Dict:
+    async def _arun(self, question: str, **kwargs) -> Dict:
         """Run the tool to get answer from Acolyt GPT.
 
         Args:
             question (str): The question body from user.
-            config (RunnableConfig): The configuration for the runnable, containing agent context.
 
         Returns:
             Dict: The response from the API with message content.
@@ -80,8 +78,7 @@ class AcolytAskGpt(AcolytBaseTool):
         Raises:
             Exception: If there's an error accessing the Acolyt API.
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
         if not api_key:
             raise ValueError("Acolyt API key not found")
 

intentkit/skills/acolyt/base.py

@@ -1,9 +1,10 @@
-from typing import Optional, Type
+from typing import Type
 
+from langchain.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext
+from intentkit.skills.base import IntentKitSkill
 
 base_url = "https://acolyt-oracle-poc.vercel.app"
 
@@ -18,10 +19,19 @@ class AcolytBaseTool(IntentKitSkill):
         description="The skill store for persisting data"
     )
 
-    def get_api_key(self, context: SkillContext) -> Optional[str]:
-        if "api_key" in context.config and context.config["api_key"]:
-            return context.config["api_key"]
-        return self.skill_store.get_system_config("acolyt_api_key")
+    def get_api_key(self) -> str:
+        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 == "platform":
+            return self.skill_store.get_system_config("acolyt_api_key")
+        # for backward compatibility, may only have api_key in skill_config
+        elif skill_config.get("api_key"):
+            return skill_config.get("api_key")
+        else:
+            raise ToolException(
+                f"Invalid API key provider: {api_key_provider}, or no api_key in config"
+            )
 
     @property
     def category(self) -> str:

intentkit/skills/aixbt/__init__.py

@@ -48,7 +48,6 @@ async def get_skills(
         get_aixbt_skill(
             name=name,
             store=store,
-            api_key=config.get("api_key", ""),
         )
         for name in available_skills
     ]
@@ -57,17 +56,14 @@ async def get_skills(
 def get_aixbt_skill(
     name: str,
     store: SkillStoreABC,
-    api_key: str = "",
 ) -> AIXBTBaseTool:
     """Get an AIXBT API skill by name."""
-    cache_key = f"{name}:{api_key}"
 
     if name == "aixbt_projects":
-        if cache_key not in _cache:
-            _cache[cache_key] = AIXBTProjects(
+        if name not in _cache:
+            _cache[name] = AIXBTProjects(
                 skill_store=store,
-                api_key=api_key,
             )
-        return _cache[cache_key]
+        return _cache[name]
     else:
         raise ValueError(f"Unknown AIXBT skill: {name}")

intentkit/skills/aixbt/projects.py

@@ -1,9 +1,8 @@
 import logging
-import os
 from typing import Any, Dict, Optional, Type
 
 import httpx
-from langchain_core.runnables import RunnableConfig
+from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.aixbt.base import AIXBTBaseTool
@@ -55,11 +54,9 @@ class AIXBTProjects(AIXBTBaseTool):
         "for accessing AIXBT's specific dataset for crypto research."
     )
     args_schema: Type[BaseModel] = ProjectsInput
-    api_key: str = ""
 
     async def _arun(
         self,
-        config: RunnableConfig,
         limit: int = 10,
         name: Optional[str] = None,
         ticker: Optional[str] = None,
@@ -83,34 +80,27 @@ class AIXBTProjects(AIXBTBaseTool):
             JSON response with project data
         """
         # Get context from the config
-        context = self.context_from_config(config)
+        context = self.get_context()
+        skill_config = context.agent.skill_config(self.category)
         logger.debug(f"aixbt_projects.py: Running search with context {context}")
 
         # Check for rate limiting if configured
-        if context.config.get("rate_limit_number") and context.config.get(
+        if skill_config.get("rate_limit_number") and skill_config.get(
             "rate_limit_minutes"
         ):
             await self.user_rate_limit_by_category(
                 context.user_id,
-                context.config["rate_limit_number"],
-                context.config["rate_limit_minutes"],
+                skill_config["rate_limit_number"],
+                skill_config["rate_limit_minutes"],
             )
 
         # Get the API key from the agent's configuration
-        api_key = context.config.get("api_key")
+        api_key = skill_config.get("api_key")
 
-        # If not available in config, try the instance attribute (for backward compatibility)
         if not api_key:
-            api_key = self.api_key
-
-        # If still not available, try environment variable as last resort
-        if not api_key:
-            api_key = os.environ.get("AIXBT_API_KEY")
-
-        if not api_key:
-            return {
-                "error": "AIXBT API key is not available. Please provide it in the agent configuration."
-            }
+            raise ToolException(
+                "AIXBT API key is not available. Please provide it in the agent configuration."
+            )
 
         base_url = "https://api.aixbt.tech/v1/projects"
 
@@ -134,20 +124,6 @@ class AIXBTProjects(AIXBTBaseTool):
                 response = await client.get(base_url, params=params, headers=headers)
                 response.raise_for_status()
                 return response.json()
-        except httpx.HTTPStatusError as e:
-            logger.error(
-                f"aixbt_projects.py: HTTP error occurred: {e.response.status_code} - {e.response.text}"
-            )
-            return {
-                "error": f"HTTP error occurred: {e.response.status_code}",
-                "details": e.response.text,
-            }
-        except httpx.RequestError as e:
-            logger.error(f"aixbt_projects.py: Request error occurred: {str(e)}")
-            return {"error": f"Request error occurred: {str(e)}"}
         except Exception as e:
-            logger.error(
-                f"aixbt_projects.py: An unexpected error occurred: {str(e)}",
-                exc_info=True,
-            )
-            return {"error": f"An unexpected error occurred: {str(e)}"}
+            logger.error(f"Error getting projects: {str(e)}")
+            raise type(e)(f"[agent:{context.agent_id}]: {e}") from e

intentkit/skills/allora/base.py

@@ -1,9 +1,10 @@
-from typing import Optional, Type
+from typing import Type
 
+from langchain.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext
+from intentkit.skills.base import IntentKitSkill
 
 base_url = "https://api.upshot.xyz/v2/allora"
 
@@ -18,10 +19,19 @@ class AlloraBaseTool(IntentKitSkill):
         description="The skill store for persisting data"
     )
 
-    def get_api_key(self, context: SkillContext) -> Optional[str]:
-        if "api_key" in context.config and context.config["api_key"]:
-            return context.config["api_key"]
-        return self.skill_store.get_system_config("allora_api_key")
+    def get_api_key(self) -> str:
+        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 == "platform":
+            return self.skill_store.get_system_config("allora_api_key")
+        # for backward compatibility, may only have api_key in skill_config
+        elif skill_config.get("api_key"):
+            return skill_config.get("api_key")
+        else:
+            raise ToolException(
+                f"Invalid API key provider: {api_key_provider}, or no api_key in config"
+            )
 
     @property
     def category(self) -> str:

intentkit/skills/allora/price.py

@@ -2,7 +2,6 @@ from typing import Literal, Type
 
 import httpx
 from langchain.tools.base import ToolException
-from langchain_core.runnables import RunnableConfig
 from pydantic import BaseModel, Field
 
 from intentkit.skills.allora.base import AlloraBaseTool
@@ -84,7 +83,7 @@ class AlloraGetPrice(AlloraBaseTool):
         raise NotImplementedError("Use _arun instead")
 
     async def _arun(
-        self, token: str, time_frame: str, config: RunnableConfig, **kwargs
+        self, token: str, time_frame: str, **kwargs
     ) -> AlloraGetPriceOutput:
         """Run the tool to get the token price prediction from Allora API.
         Args:
@@ -98,8 +97,7 @@ class AlloraGetPrice(AlloraBaseTool):
         Raises:
             Exception: If there's an error accessing the Allora API.
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
         if not api_key:
             raise ValueError("Allora API key not found")
 

intentkit/skills/base.py

@@ -5,6 +5,7 @@ from typing import Any, Callable, Dict, Literal, NotRequired, Optional, TypedDic
 from langchain_core.runnables import RunnableConfig
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import ToolException
+from langgraph.runtime import get_runtime
 from pydantic import (
     BaseModel,
     ValidationError,
@@ -13,12 +14,14 @@ from pydantic.v1 import ValidationError as ValidationErrorV1
 from redis.exceptions import RedisError
 
 from intentkit.abstracts.exception import RateLimitExceeded
+from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.models.agent import Agent
 from intentkit.models.redis import get_redis
 
 SkillState = Literal["disabled", "public", "private"]
 SkillOwnerState = Literal["disabled", "private"]
+APIKeyProviderValue = Literal["platform", "agent_owner"]
 
 
 class SkillConfig(TypedDict):
@@ -26,7 +29,7 @@ class SkillConfig(TypedDict):
 
     enabled: bool
     states: Dict[str, SkillState | SkillOwnerState]
-    api_key_provider: NotRequired[str]
+    api_key_provider: NotRequired[APIKeyProviderValue]
     __extra__: NotRequired[Dict[str, Any]]
 
 
@@ -192,3 +195,7 @@ class IntentKitSkill(BaseTool):
             entrypoint=configurable.get("entrypoint"),
             is_private=configurable.get("is_private"),
         )
+
+    def get_context(self) -> AgentContext:
+        runtime = get_runtime(AgentContext)
+        return runtime.context

intentkit/skills/carv/base.py

@@ -2,10 +2,11 @@ import logging
 from typing import Any, Dict, Optional, Tuple, Type
 
 import httpx  # Ensure httpx is installed: pip install httpx
+from langchain.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext, ToolException
+from intentkit.skills.base import IntentKitSkill
 
 logger = logging.getLogger(__name__)
 
@@ -24,7 +25,7 @@ class CarvBaseTool(IntentKitSkill):
     def category(self) -> str:
         return "carv"
 
-    def get_api_key(self, context: SkillContext) -> str:
+    def get_api_key(self) -> str:
         """
         Retrieves the CARV API key based on the api_key_provider setting.
 
@@ -35,10 +36,11 @@ class CarvBaseTool(IntentKitSkill):
             ToolException: If the API key is not found or provider is invalid.
         """
         try:
-            skillConfig = context.config
-            api_key_provider = skillConfig.get("api_key_provider")
+            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: Optional[str] = context.config.get("api_key")
+                agent_api_key: Optional[str] = skill_config.get("api_key")
                 if agent_api_key:
                     logger.debug(
                         f"Using agent-specific CARV API key for skill {self.name} in category {self.category}"
@@ -70,15 +72,15 @@ class CarvBaseTool(IntentKitSkill):
                 raise
             raise ToolException(f"Failed to retrieve CARV API key: {str(e)}") from e
 
-    async def apply_rate_limit(self, context: SkillContext) -> None:
+    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.config
-        user_id = context.user_id
+        skill_config = context.agent.skill_config(self.category)
+        user_id = context.agent.id
 
         limit_num = skill_config.get("rate_limit_number")
         limit_min = skill_config.get("rate_limit_minutes")
@@ -98,7 +100,7 @@ class CarvBaseTool(IntentKitSkill):
 
     async def _call_carv_api(
         self,
-        context: SkillContext,
+        context,
         endpoint: str,
         method: str = "GET",
         params: Optional[Dict[str, Any]] = None,
@@ -122,7 +124,7 @@ class CarvBaseTool(IntentKitSkill):
         url = f"{CARV_API_BASE_URL}{endpoint}"
 
         try:
-            api_key = self.get_api_key(context)
+            api_key = self.get_api_key()
 
             headers = {
                 "Authorization": api_key,

intentkit/skills/carv/fetch_news.py

@@ -1,92 +1,90 @@
-import logging
-from typing import Any, Dict, Type
-
-from langchain_core.runnables import RunnableConfig
-from pydantic import BaseModel
-
-from intentkit.skills.carv.base import CarvBaseTool
-
-logger = logging.getLogger(__name__)
-
-
-class CarvNewsInput(BaseModel):
-    """
-    Input schema for CARV News API.
-    This API endpoint does not require any specific parameters from the user.
-    """
-
-    pass
-
-
-class FetchNewsTool(CarvBaseTool):
-    """
-    Tool for fetching the latest news articles from the CARV API.
-    This tool retrieves a list of recent news items, each including a title, URL, and a short description (card_text).
-    It's useful for getting up-to-date information on various topics covered by CARV's news aggregation.
-    """
-
-    name: str = "carv_fetch_news"
-    description: str = (
-        "Fetches the latest news articles from the CARV API. "
-        "Returns a list of news items, each with a title, URL, and a short summary (card_text)."
-    )
-    args_schema: Type[BaseModel] = CarvNewsInput
-
-    async def _arun(
-        self,
-        config: RunnableConfig = None,  # type: ignore
-        **kwargs: Any,
-    ) -> Dict[str, Any]:
-        """
-        Fetches news from the CARV API and returns the response.
-        The expected successful response structure is a dictionary containing an "infos" key,
-        which holds a list of news articles.
-        Example: {"infos": [{"title": "...", "url": "...", "card_text": "..."}, ...]}
-        """
-        context = self.context_from_config(config)
-
-        try:
-            await self.apply_rate_limit(context)
-
-            result, error = await self._call_carv_api(
-                context=context,
-                endpoint="/ai-agent-backend/news",
-                method="GET",
-            )
-
-            if error is not None or result is None:
-                logger.error(f"Error returned from CARV API (News): {error}")
-                return {
-                    "error": True,
-                    "error_type": "APIError",
-                    "message": "Failed to fetch news from CARV API.",
-                    "details": error,  # error is the detailed error dict from _call_carv_api
-                }
-
-            # _call_carv_api returns response_json.get("data", response_json) on success.
-            # For this endpoint, the "data" field should be {"infos": [...]}.
-            # So, 'result' should be {"infos": [...]}.
-            if "infos" not in result or not isinstance(result.get("infos"), list):
-                logger.warning(
-                    f"CARV API (News) response did not contain 'infos' list as expected: {result}"
-                )
-                return {
-                    "error": True,
-                    "error_type": "UnexpectedResponseFormat",
-                    "message": "News data from CARV API is missing the 'infos' list or has incorrect format.",
-                    "details": result,
-                }
-
-            # Successfully fetched and validated news data
-            return result  # This will be {"infos": [...]}
-
-        except Exception as e:
-            logger.error(
-                f"An unexpected error occurred while fetching news: {e}", exc_info=True
-            )
-            return {
-                "error": True,
-                "error_type": type(e).__name__,
-                "message": "An unexpected error occurred while processing the news request.",
-                "details": str(e),
-            }
+import logging
+from typing import Any, Dict, Type
+
+from pydantic import BaseModel
+
+from intentkit.skills.carv.base import CarvBaseTool
+
+logger = logging.getLogger(__name__)
+
+
+class CarvNewsInput(BaseModel):
+    """
+    Input schema for CARV News API.
+    This API endpoint does not require any specific parameters from the user.
+    """
+
+    pass
+
+
+class FetchNewsTool(CarvBaseTool):
+    """
+    Tool for fetching the latest news articles from the CARV API.
+    This tool retrieves a list of recent news items, each including a title, URL, and a short description (card_text).
+    It's useful for getting up-to-date information on various topics covered by CARV's news aggregation.
+    """
+
+    name: str = "carv_fetch_news"
+    description: str = (
+        "Fetches the latest news articles from the CARV API. "
+        "Returns a list of news items, each with a title, URL, and a short summary (card_text)."
+    )
+    args_schema: Type[BaseModel] = CarvNewsInput
+
+    async def _arun(
+        self,  # type: ignore
+        **kwargs: Any,
+    ) -> Dict[str, Any]:
+        """
+        Fetches news from the CARV API and returns the response.
+        The expected successful response structure is a dictionary containing an "infos" key,
+        which holds a list of news articles.
+        Example: {"infos": [{"title": "...", "url": "...", "card_text": "..."}, ...]}
+        """
+        context = self.get_context()
+
+        try:
+            await self.apply_rate_limit(context)
+
+            result, error = await self._call_carv_api(
+                context=context,
+                endpoint="/ai-agent-backend/news",
+                method="GET",
+            )
+
+            if error is not None or result is None:
+                logger.error(f"Error returned from CARV API (News): {error}")
+                return {
+                    "error": True,
+                    "error_type": "APIError",
+                    "message": "Failed to fetch news from CARV API.",
+                    "details": error,  # error is the detailed error dict from _call_carv_api
+                }
+
+            # _call_carv_api returns response_json.get("data", response_json) on success.
+            # For this endpoint, the "data" field should be {"infos": [...]}.
+            # So, 'result' should be {"infos": [...]}.
+            if "infos" not in result or not isinstance(result.get("infos"), list):
+                logger.warning(
+                    f"CARV API (News) response did not contain 'infos' list as expected: {result}"
+                )
+                return {
+                    "error": True,
+                    "error_type": "UnexpectedResponseFormat",
+                    "message": "News data from CARV API is missing the 'infos' list or has incorrect format.",
+                    "details": result,
+                }
+
+            # Successfully fetched and validated news data
+            return result  # This will be {"infos": [...]}
+
+        except Exception as e:
+            logger.error(
+                f"An unexpected error occurred while fetching news: {e}", exc_info=True
+            )
+            return {
+                "error": True,
+                "error_type": type(e).__name__,
+                "message": "An unexpected error occurred while processing the news request.",
+                "details": str(e),
+            }