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

intentkit/skills/openai/base.py

@@ -5,7 +5,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
 
 
@@ -18,23 +18,21 @@ class OpenAIBaseTool(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()
         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("openai_api_key")
+            if not config.openai_api_key:
+                raise ToolException("OpenAI API key is not configured")
+            return config.openai_api_key
         # for backward compatibility, may only have api_key in skill_config
-        elif skill_config.get("api_key"):
+        if 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"
-            )
+        raise ToolException(
+            f"Invalid API key provider: {api_key_provider}, or no api_key in config"
+        )
 
     @property
     def category(self) -> str:

intentkit/skills/openai/dalle_image_generation.py

@@ -79,12 +79,9 @@ class DALLEImageGeneration(OpenAIBaseTool):
             Exception: If the image generation fails.
         """
         context = self.get_context()
-        skill_config = context.agent.skill_config(self.category)
 
-        # Get the OpenAI API key from the skill store
-        api_key = skill_config.get("api_key") or self.skill_store.get_system_config(
-            "openai_api_key"
-        )
+        # Get the OpenAI API key from configuration or agent settings
+        api_key = self.get_api_key()
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/openai/gpt_image_generation.py

@@ -80,12 +80,9 @@ class GPTImageGeneration(OpenAIBaseTool):
             Exception: If the image generation fails.
         """
         context = self.get_context()
-        skill_config = context.agent.skill_config(self.category)
 
-        # Get the OpenAI API key from the skill store
-        api_key = skill_config.get("api_key") or self.skill_store.get_system_config(
-            "openai_api_key"
-        )
+        # Get the OpenAI API key from configuration or agent settings
+        api_key = self.get_api_key()
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/openai/gpt_image_to_image.py

@@ -81,12 +81,9 @@ class GPTImageToImage(OpenAIBaseTool):
             Exception: If the image editing fails.
         """
         context = self.get_context()
-        skill_config = context.agent.skill_config(self.category)
 
-        # Get the OpenAI API key from the skill store
-        api_key = skill_config.get("api_key") or self.skill_store.get_system_config(
-            "openai_api_key"
-        )
+        # Get the OpenAI API key from configuration or agent settings
+        api_key = self.get_api_key()
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/openai/image_to_text.py

@@ -58,13 +58,10 @@ class ImageToText(OpenAIBaseTool):
             ImageToTextOutput: Object containing the text description and image dimensions.
         """
         context = self.get_context()
-        skill_config = context.agent.skill_config(self.category)
         logger.debug(f"context: {context}")
 
-        # Get the OpenAI client from the skill store
-        api_key = skill_config.get("api_key") or self.skill_store.get_system_config(
-            "openai_api_key"
-        )
+        # Get the OpenAI client from configuration or agent settings
+        api_key = self.get_api_key()
         client = openai.AsyncOpenAI(api_key=api_key)
 
         try:

intentkit/skills/portfolio/__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.portfolio.base import PortfolioBaseTool
 from intentkit.skills.portfolio.token_balances import TokenBalances
@@ -51,7 +50,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[PortfolioBaseTool]:
     """Get all Portfolio blockchain analysis skills.
@@ -59,7 +57,6 @@ async def get_skills(
     Args:
         config: The configuration for Portfolio skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Portfolio blockchain analysis skills.
@@ -76,7 +73,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_portfolio_skill(name, store)
+        skill = get_portfolio_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -84,68 +81,47 @@ async def get_skills(
 
 def get_portfolio_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> PortfolioBaseTool:
     """Get a portfolio skill by name."""
     if name == "wallet_history":
         if name not in _cache:
-            _cache[name] = WalletHistory(
-                skill_store=store,
-            )
+            _cache[name] = WalletHistory()
         return _cache[name]
     elif name == "token_balances":
         if name not in _cache:
-            _cache[name] = TokenBalances(
-                skill_store=store,
-            )
+            _cache[name] = TokenBalances()
         return _cache[name]
     elif name == "wallet_approvals":
         if name not in _cache:
-            _cache[name] = WalletApprovals(
-                skill_store=store,
-            )
+            _cache[name] = WalletApprovals()
         return _cache[name]
     elif name == "wallet_swaps":
         if name not in _cache:
-            _cache[name] = WalletSwaps(
-                skill_store=store,
-            )
+            _cache[name] = WalletSwaps()
         return _cache[name]
     elif name == "wallet_net_worth":
         if name not in _cache:
-            _cache[name] = WalletNetWorth(
-                skill_store=store,
-            )
+            _cache[name] = WalletNetWorth()
         return _cache[name]
     elif name == "wallet_profitability_summary":
         if name not in _cache:
-            _cache[name] = WalletProfitabilitySummary(
-                skill_store=store,
-            )
+            _cache[name] = WalletProfitabilitySummary()
         return _cache[name]
     elif name == "wallet_profitability":
         if name not in _cache:
-            _cache[name] = WalletProfitability(
-                skill_store=store,
-            )
+            _cache[name] = WalletProfitability()
         return _cache[name]
     elif name == "wallet_stats":
         if name not in _cache:
-            _cache[name] = WalletStats(
-                skill_store=store,
-            )
+            _cache[name] = WalletStats()
         return _cache[name]
     elif name == "wallet_defi_positions":
         if name not in _cache:
-            _cache[name] = WalletDefiPositions(
-                skill_store=store,
-            )
+            _cache[name] = WalletDefiPositions()
         return _cache[name]
     elif name == "wallet_nfts":
         if name not in _cache:
-            _cache[name] = WalletNFTs(
-                skill_store=store,
-            )
+            _cache[name] = WalletNFTs()
         return _cache[name]
     else:
         raise ValueError(f"Unknown portfolio skill: {name}")

intentkit/skills/portfolio/base.py

@@ -9,7 +9,7 @@ import aiohttp
 from langchain_core.tools 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.skills.portfolio.constants import MORALIS_API_BASE_URL
 
@@ -22,9 +22,6 @@ class PortfolioBaseTool(IntentKitSkill, ABC):
     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()
@@ -32,7 +29,7 @@ class PortfolioBaseTool(IntentKitSkill, ABC):
         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("moralis_api_key")
+            api_key = config.moralis_api_key
 
         if not api_key:
             raise ToolException("Moralis API key is not configured.")

intentkit/skills/pyth/__init__.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import pyth_action_provider
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import (
     SkillConfig,
     SkillState,
@@ -31,7 +30,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     agent_id: str,
     agent: Optional["Agent"] = None,
     **_,
@@ -45,9 +43,7 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(
-        agent_id, store, [pyth_action_provider], agent=agent
-    )
+    actions = await get_agentkit_actions(agent_id, [pyth_action_provider], agent=agent)
     tools: list[PythBaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/slack/__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.slack.base import SlackBaseTool
 from intentkit.skills.slack.get_channel import SlackGetChannel
@@ -34,7 +33,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[SlackBaseTool]:
     """Get all Slack skills."""
@@ -50,7 +48,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_slack_skill(name, store)
+        skill = get_slack_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -58,40 +56,30 @@ async def get_skills(
 
 def get_slack_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> SlackBaseTool:
     """Get a Slack skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Slack skill
     """
     if name == "get_channel":
         if name not in _cache:
-            _cache[name] = SlackGetChannel(
-                skill_store=store,
-            )
+            _cache[name] = SlackGetChannel()
         return _cache[name]
     elif name == "get_message":
         if name not in _cache:
-            _cache[name] = SlackGetMessage(
-                skill_store=store,
-            )
+            _cache[name] = SlackGetMessage()
         return _cache[name]
     elif name == "schedule_message":
         if name not in _cache:
-            _cache[name] = SlackScheduleMessage(
-                skill_store=store,
-            )
+            _cache[name] = SlackScheduleMessage()
         return _cache[name]
     elif name == "send_message":
         if name not in _cache:
-            _cache[name] = SlackSendMessage(
-                skill_store=store,
-            )
+            _cache[name] = SlackSendMessage()
         return _cache[name]
     else:
         logger.warning(f"Unknown Slack skill: {name}")

intentkit/skills/slack/base.py

@@ -4,7 +4,6 @@ from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 from slack_sdk import WebClient
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -14,9 +13,6 @@ class SlackBaseTool(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/supabase/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.supabase.base import SupabaseBaseTool
 from intentkit.skills.supabase.delete_data import SupabaseDeleteData
@@ -41,7 +40,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[SupabaseBaseTool]:
     """Get all Supabase skills."""
@@ -57,7 +55,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_supabase_skill(name, store)
+        skill = get_supabase_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -65,52 +63,38 @@ async def get_skills(
 
 def get_supabase_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> SupabaseBaseTool:
     """Get a Supabase skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Supabase skill
     """
     if name == "fetch_data":
         if name not in _cache:
-            _cache[name] = SupabaseFetchData(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseFetchData()
         return _cache[name]
     elif name == "insert_data":
         if name not in _cache:
-            _cache[name] = SupabaseInsertData(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseInsertData()
         return _cache[name]
     elif name == "update_data":
         if name not in _cache:
-            _cache[name] = SupabaseUpdateData(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseUpdateData()
         return _cache[name]
     elif name == "upsert_data":
         if name not in _cache:
-            _cache[name] = SupabaseUpsertData(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseUpsertData()
         return _cache[name]
     elif name == "delete_data":
         if name not in _cache:
-            _cache[name] = SupabaseDeleteData(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseDeleteData()
         return _cache[name]
     elif name == "invoke_function":
         if name not in _cache:
-            _cache[name] = SupabaseInvokeFunction(
-                skill_store=store,
-            )
+            _cache[name] = SupabaseInvokeFunction()
         return _cache[name]
     else:
         logger.warning(f"Unknown Supabase skill: {name}")

intentkit/skills/supabase/base.py

@@ -4,7 +4,6 @@ from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.graph import AgentContext
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -14,9 +13,6 @@ class SupabaseBaseTool(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"
-    )
 
     @property
     def category(self) -> str:

intentkit/skills/superfluid/__init__.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import superfluid_action_provider
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import (
     SkillConfig,
     SkillState,
@@ -32,7 +31,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     agent_id: str,
     agent: Optional["Agent"] = None,
     **_,
@@ -47,7 +45,7 @@ async def get_skills(
             available_skills.append(skill_name)
 
     actions = await get_agentkit_actions(
-        agent_id, store, [superfluid_action_provider], agent=agent
+        agent_id, [superfluid_action_provider], agent=agent
     )
     tools: list[SuperfluidBaseTool] = []
     for skill in available_skills:

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

@@ -75,7 +75,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 +86,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

@@ -85,7 +85,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 +107,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

@@ -43,8 +43,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,