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

intentkit/skills/system/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillOwnerState
 from intentkit.skills.system.add_autonomous_task import AddAutonomousTask
 from intentkit.skills.system.base import SystemBaseTool
@@ -37,7 +36,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[SystemBaseTool]:
     """Get all system skills.
@@ -45,7 +43,6 @@ async def get_skills(
     Args:
         config: The configuration for system skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of system skills.
@@ -62,7 +59,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_system_skill(name, store)
+        skill = get_system_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -70,52 +67,38 @@ async def get_skills(
 
 def get_system_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> SystemBaseTool:
     """Get a system skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested system skill
     """
     if name == "read_agent_api_key":
         if name not in _cache:
-            _cache[name] = ReadAgentApiKey(
-                skill_store=store,
-            )
+            _cache[name] = ReadAgentApiKey()
         return _cache[name]
     elif name == "regenerate_agent_api_key":
         if name not in _cache:
-            _cache[name] = RegenerateAgentApiKey(
-                skill_store=store,
-            )
+            _cache[name] = RegenerateAgentApiKey()
         return _cache[name]
     elif name == "list_autonomous_tasks":
         if name not in _cache:
-            _cache[name] = ListAutonomousTasks(
-                skill_store=store,
-            )
+            _cache[name] = ListAutonomousTasks()
         return _cache[name]
     elif name == "add_autonomous_task":
         if name not in _cache:
-            _cache[name] = AddAutonomousTask(
-                skill_store=store,
-            )
+            _cache[name] = AddAutonomousTask()
         return _cache[name]
     elif name == "delete_autonomous_task":
         if name not in _cache:
-            _cache[name] = DeleteAutonomousTask(
-                skill_store=store,
-            )
+            _cache[name] = DeleteAutonomousTask()
         return _cache[name]
     elif name == "edit_autonomous_task":
         if name not in _cache:
-            _cache[name] = EditAutonomousTask(
-                skill_store=store,
-            )
+            _cache[name] = EditAutonomousTask()
         return _cache[name]
     else:
         logger.warning(f"Unknown system skill: {name}")

intentkit/skills/system/add_autonomous_task.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 from intentkit.models.agent import AgentAutonomous
@@ -9,21 +7,21 @@ from intentkit.skills.system.base import SystemBaseTool
 class AddAutonomousTaskInput(BaseModel):
     """Input model for add_autonomous_task skill."""
 
-    name: Optional[str] = Field(
+    name: str | None = Field(
         default=None,
         description="Display name of the autonomous task configuration",
         max_length=50,
     )
-    description: Optional[str] = Field(
+    description: str | None = Field(
         default=None,
         description="Description of the autonomous task configuration",
         max_length=200,
     )
-    minutes: Optional[int] = Field(
+    minutes: int | None = Field(
         default=None,
         description="Interval in minutes between operations, mutually exclusive with cron",
     )
-    cron: Optional[str] = Field(
+    cron: str | None = Field(
         default=None,
         description="Cron expression for scheduling operations, mutually exclusive with minutes",
     )
@@ -54,10 +52,10 @@ class AddAutonomousTask(SystemBaseTool):
 
     async def _arun(
         self,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        minutes: Optional[int] = None,
-        cron: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
+        minutes: int | None = None,
+        cron: str | None = None,
         prompt: str = "",
         **kwargs,
     ) -> AddAutonomousTaskOutput:
@@ -75,7 +73,7 @@ class AddAutonomousTask(SystemBaseTool):
             AddAutonomousTaskOutput: The created task
         """
         context = self.get_context()
-        agent_id = context.agent_id
+        agent = context.agent
 
         task = AgentAutonomous(
             name=name,
@@ -86,6 +84,6 @@ class AddAutonomousTask(SystemBaseTool):
             enabled=True,
         )
 
-        created_task = await self.skill_store.add_autonomous_task(agent_id, task)
+        created_task = await agent.add_autonomous_task(task)
 
         return AddAutonomousTaskOutput(task=created_task)

intentkit/skills/system/delete_autonomous_task.py

@@ -45,9 +45,9 @@ class DeleteAutonomousTask(SystemBaseTool):
             DeleteAutonomousTaskOutput: Confirmation of deletion
         """
         context = self.get_context()
-        agent_id = context.agent_id
+        agent = context.agent
 
-        await self.skill_store.delete_autonomous_task(agent_id, task_id)
+        await agent.delete_autonomous_task(task_id)
 
         return DeleteAutonomousTaskOutput(
             success=True, message=f"Successfully deleted autonomous task {task_id}"

intentkit/skills/system/edit_autonomous_task.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 from intentkit.models.agent import AgentAutonomous
@@ -12,28 +10,28 @@ class EditAutonomousTaskInput(BaseModel):
     task_id: str = Field(
         description="The unique identifier of the autonomous task to edit"
     )
-    name: Optional[str] = Field(
+    name: str | None = Field(
         default=None,
         description="Display name of the autonomous task configuration",
         max_length=50,
     )
-    description: Optional[str] = Field(
+    description: str | None = Field(
         default=None,
         description="Description of the autonomous task configuration",
         max_length=200,
     )
-    minutes: Optional[int] = Field(
+    minutes: int | None = Field(
         default=None,
         description="Interval in minutes between operations, mutually exclusive with cron",
     )
-    cron: Optional[str] = Field(
+    cron: str | None = Field(
         default=None,
         description="Cron expression for scheduling operations, mutually exclusive with minutes",
     )
-    prompt: Optional[str] = Field(
+    prompt: str | None = Field(
         default=None, description="Special prompt used during autonomous operation"
     )
-    enabled: Optional[bool] = Field(
+    enabled: bool | None = Field(
         default=None, description="Whether the autonomous task is enabled"
     )
 
@@ -61,12 +59,12 @@ class EditAutonomousTask(SystemBaseTool):
     async def _arun(
         self,
         task_id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        minutes: Optional[int] = None,
-        cron: Optional[str] = None,
-        prompt: Optional[str] = None,
-        enabled: Optional[bool] = None,
+        name: str | None = None,
+        description: str | None = None,
+        minutes: int | None = None,
+        cron: str | None = None,
+        prompt: str | None = None,
+        enabled: bool | None = None,
         **kwargs,
     ) -> EditAutonomousTaskOutput:
         """Edit an autonomous task for the agent.
@@ -85,7 +83,7 @@ class EditAutonomousTask(SystemBaseTool):
             EditAutonomousTaskOutput: The updated task
         """
         context = self.get_context()
-        agent_id = context.agent_id
+        agent = context.agent
 
         if minutes is not None and cron is not None:
             raise ValueError("minutes and cron are mutually exclusive")
@@ -107,8 +105,6 @@ class EditAutonomousTask(SystemBaseTool):
         if enabled is not None:
             task_updates["enabled"] = enabled
 
-        updated_task = await self.skill_store.update_autonomous_task(
-            agent_id, task_id, task_updates
-        )
+        updated_task = await agent.update_autonomous_task(task_id, task_updates)
 
         return EditAutonomousTaskOutput(task=updated_task)

intentkit/skills/system/list_autonomous_tasks.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from pydantic import BaseModel, Field
 
 from intentkit.models.agent import AgentAutonomous
@@ -15,7 +13,7 @@ class ListAutonomousTasksInput(BaseModel):
 class ListAutonomousTasksOutput(BaseModel):
     """Output model for list_autonomous_tasks skill."""
 
-    tasks: List[AgentAutonomous] = Field(
+    tasks: list[AgentAutonomous] = Field(
         description="List of autonomous task configurations for the agent"
     )
 
@@ -43,8 +41,8 @@ class ListAutonomousTasks(SystemBaseTool):
             ListAutonomousTasksOutput: List of autonomous tasks
         """
         context = self.get_context()
-        agent_id = context.agent_id
+        agent = context.agent
 
-        tasks = await self.skill_store.list_autonomous_tasks(agent_id)
+        tasks = await agent.list_autonomous_tasks()
 
         return ListAutonomousTasksOutput(tasks=tasks)

intentkit/skills/system/read_agent_api_key.py

@@ -1,5 +1,7 @@
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
+from intentkit.models.agent_data import AgentData
 from intentkit.skills.system.base import SystemBaseTool
 
 
@@ -41,11 +43,11 @@ class ReadAgentApiKey(SystemBaseTool):
         context = self.get_context()
         agent_id = context.agent_id
 
-        # Get agent data from skill store
-        agent_data = await self.skill_store.get_agent_data(agent_id)
+        # Get agent data from the database
+        agent_data = await AgentData.get(agent_id)
 
         # Get API base URL from system config
-        open_api_base_url = self.skill_store.get_system_config("open_api_base_url")
+        open_api_base_url = config.open_api_base_url
         api_endpoint = f"{open_api_base_url}/v1/chat/completions"
 
         # Check if API keys exist
@@ -72,7 +74,7 @@ class ReadAgentApiKey(SystemBaseTool):
             update_data["api_key_public"] = new_public_api_key
 
         if update_data:
-            await self.skill_store.set_agent_data(agent_id, update_data)
+            await AgentData.patch(agent_id, update_data)
 
         return ReadAgentApiKeyOutput(
             api_key=new_api_key,

intentkit/skills/system/regenerate_agent_api_key.py

@@ -1,5 +1,7 @@
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
+from intentkit.models.agent_data import AgentData
 from intentkit.skills.system.base import SystemBaseTool
 
 
@@ -43,11 +45,11 @@ class RegenerateAgentApiKey(SystemBaseTool):
         context = self.get_context()
         agent_id = context.agent_id
 
-        # Get agent data from skill store
-        agent_data = await self.skill_store.get_agent_data(agent_id)
+        # Get agent data directly from the model
+        agent_data = await AgentData.get(agent_id)
 
         # Get API base URL from system config
-        open_api_base_url = self.skill_store.get_system_config("open_api_base_url")
+        open_api_base_url = config.open_api_base_url
         api_endpoint = f"{open_api_base_url}/v1/chat/completions"
 
         # Check if previous API keys existed
@@ -58,7 +60,7 @@ class RegenerateAgentApiKey(SystemBaseTool):
         new_public_api_key = self._generate_public_api_key()
 
         # Save the new API keys to agent data (overwrites existing)
-        await self.skill_store.set_agent_data(
+        await AgentData.patch(
             agent_id, {"api_key": new_api_key, "api_key_public": new_public_api_key}
         )
 

intentkit/skills/tavily/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.tavily.base import TavilyBaseTool
 from intentkit.skills.tavily.tavily_extract import TavilyExtract
@@ -30,7 +29,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[TavilyBaseTool]:
     """Get all Tavily search skills.
@@ -38,7 +36,6 @@ async def get_skills(
     Args:
         config: The configuration for Tavily search skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Tavily search skills.
@@ -55,7 +52,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_tavily_skill(name, store)
+        skill = get_tavily_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -63,28 +60,22 @@ async def get_skills(
 
 def get_tavily_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> TavilyBaseTool:
     """Get a Tavily search skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Tavily search skill
     """
     if name == "tavily_search":
         if name not in _cache:
-            _cache[name] = TavilySearch(
-                skill_store=store,
-            )
+            _cache[name] = TavilySearch()
         return _cache[name]
     elif name == "tavily_extract":
         if name not in _cache:
-            _cache[name] = TavilyExtract(
-                skill_store=store,
-            )
+            _cache[name] = TavilyExtract()
         return _cache[name]
     else:
         logger.warning(f"Unknown Tavily skill: {name}")

intentkit/skills/tavily/base.py

@@ -1,9 +1,7 @@
-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.config.config import config
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -12,17 +10,14 @@ class TavilyBaseTool(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()
         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("tavily_api_key")
+            return config.tavily_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")

intentkit/skills/tavily/tavily_extract.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 import httpx
 from pydantic import BaseModel, Field
@@ -42,7 +41,7 @@ class TavilyExtract(TavilyBaseTool):
         "This tool is useful when you need to get the full text content from a webpage. "
         "You must call this tool whenever the user asks to extract or scrape content from a specific URL."
     )
-    args_schema: Type[BaseModel] = TavilyExtractInput
+    args_schema: type[BaseModel] = TavilyExtractInput
 
     async def _arun(
         self,
@@ -73,9 +72,8 @@ class TavilyExtract(TavilyBaseTool):
                 "rate_limit_minutes"
             ):
                 await self.user_rate_limit_by_category(
-                    context.user_id,
                     skill_config["rate_limit_number"],
-                    skill_config["rate_limit_minutes"],
+                    skill_config["rate_limit_minutes"] * 60,
                 )
 
         # Get the API key from the agent's configuration

intentkit/skills/tavily/tavily_search.py

@@ -1,9 +1,9 @@
 import logging
-from typing import Type
 
 import httpx
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.tavily.base import TavilyBaseTool
 
 logger = logging.getLogger(__name__)
@@ -49,7 +49,7 @@ class TavilySearch(TavilyBaseTool):
         "You must call this tool whenever the user asks for information that may not be in your training data,"
         " requires current data, or when you're unsure about facts."
     )
-    args_schema: Type[BaseModel] = TavilySearchInput
+    args_schema: type[BaseModel] = TavilySearchInput
 
     async def _arun(
         self,
@@ -67,7 +67,6 @@ class TavilySearch(TavilyBaseTool):
             include_images: Whether to include image URLs in the results.
             include_raw_content: Whether to include raw HTML content in the results.
 
-
         Returns:
             str: Formatted search results with titles, snippets, and URLs.
         """
@@ -80,16 +79,15 @@ class TavilySearch(TavilyBaseTool):
                 "rate_limit_minutes"
             ):
                 await self.user_rate_limit_by_category(
-                    context.user_id,
                     skill_config["rate_limit_number"],
-                    skill_config["rate_limit_minutes"],
+                    skill_config["rate_limit_minutes"] * 60,
                 )
 
         # Get the API key from the agent's configuration
         if skill_config.get("api_key_provider") == "agent_owner":
             api_key = skill_config.get("api_key")
         else:
-            api_key = self.skill_store.get_system_config("tavily_api_key")
+            api_key = config.tavily_api_key
         if not api_key:
             return "Error: No Tavily API key provided in the configuration."
 

intentkit/skills/token/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.token.base import TokenBaseTool
 from intentkit.skills.token.erc20_transfers import ERC20Transfers
@@ -36,7 +35,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[TokenBaseTool]:
     """Get all Token blockchain analysis skills.
@@ -44,7 +42,6 @@ async def get_skills(
     Args:
         config: The configuration for Token skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Token blockchain analysis skills.
@@ -65,7 +62,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_token_skill(name, store)
+        skill = get_token_skill(name)
         if skill:
             result.append(skill)
 
@@ -74,13 +71,11 @@ async def get_skills(
 
 def get_token_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> TokenBaseTool:
     """Get a Token blockchain analysis skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Token blockchain analysis skill
@@ -90,13 +85,13 @@ def get_token_skill(
 
     skill = None
     if name == "token_price":
-        skill = TokenPrice(skill_store=store)
+        skill = TokenPrice()
     elif name == "token_erc20_transfers":
-        skill = ERC20Transfers(skill_store=store)
+        skill = ERC20Transfers()
     elif name == "token_search":
-        skill = TokenSearch(skill_store=store)
+        skill = TokenSearch()
     elif name == "token_analytics":
-        skill = TokenAnalytics(skill_store=store)
+        skill = TokenAnalytics()
     else:
         logger.warning(f"Unknown Token skill: {name}")
         return None

intentkit/skills/token/base.py

@@ -1,11 +1,11 @@
 """Base class for token-related skills."""
 
 import logging
-from typing import Any, Dict
+from typing import Any
 
 import aiohttp
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 from intentkit.skills.token.constants import MORALIS_API_BASE_URL
 
@@ -19,10 +19,6 @@ class TokenBaseTool(IntentKitSkill):
     including making HTTP requests to the Moralis API.
     """
 
-    def __init__(self, skill_store: SkillStoreABC = None):
-        """Initialize the token tool with a skill store."""
-        super().__init__(skill_store=skill_store)
-
     @property
     def category(self) -> str:
         return "token"
@@ -37,9 +33,9 @@ class TokenBaseTool(IntentKitSkill):
         skill_config = context.agent.skill_config(self.category)
         if skill_config.get("api_key_provider") == "agent_owner":
             return skill_config.get("api_key")
-        return self.skill_store.get_system_config("moralis_api_key")
+        return config.moralis_api_key
 
-    def _prepare_params(self, params: Dict[str, Any]) -> Dict[str, Any]:
+    def _prepare_params(self, params: dict[str, Any]) -> dict[str, Any]:
         """Convert boolean values to lowercase strings for API compatibility.
 
         Args:
@@ -64,9 +60,9 @@ class TokenBaseTool(IntentKitSkill):
         method: str,
         endpoint: str,
         api_key: str,
-        params: Dict[str, Any] = None,
-        data: Dict[str, Any] = None,
-    ) -> Dict[str, Any]:
+        params: dict[str, Any] = None,
+        data: dict[str, Any] = None,
+    ) -> dict[str, Any]:
         """Make a request to the Moralis API.
 
         Args: