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

intentkit/skills/lifi/__init__.py

@@ -1,7 +1,6 @@
 import logging
 from typing import Any, List, Optional, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.token_execute import TokenExecute
@@ -31,7 +30,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_: Any,
 ) -> list[LiFiBaseTool]:
     """Get all LiFi skills."""
@@ -60,7 +58,7 @@ async def get_skills(
     skills: list[LiFiBaseTool] = []
     for name in available_skills:
         try:
-            skill = get_lifi_skill(name, store, config)
+            skill = get_lifi_skill(name, config)
             skills.append(skill)
             logger.info(f"[LiFi_Skills] Successfully loaded skill: {name}")
         except Exception as e:
@@ -73,7 +71,6 @@ async def get_skills(
 
 def get_lifi_skill(
     name: str,
-    store: SkillStoreABC,
     config: Config,
 ) -> LiFiBaseTool:
     """Get a LiFi skill by name."""
@@ -108,7 +105,6 @@ def get_lifi_skill(
                 logger.info(f"[LiFi_Skills] Allowed chains: {allowed_chains}")
 
             _cache[cache_key] = TokenQuote(
-                skill_store=store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
             )
@@ -129,7 +125,6 @@ def get_lifi_skill(
             )
 
             _cache[cache_key] = TokenExecute(
-                skill_store=store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
                 max_execution_time=max_execution_time,

intentkit/skills/lifi/base.py

@@ -2,7 +2,6 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -12,9 +11,6 @@ class LiFiBaseTool(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/lifi/token_execute.py

@@ -6,7 +6,6 @@ from coinbase_agentkit import CdpEvmWalletProvider
 from pydantic import BaseModel, Field
 from web3 import Web3
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.clients import get_wallet_provider as get_agent_wallet_provider
 from intentkit.models.agent import Agent
 from intentkit.skills.lifi.base import LiFiBaseTool
@@ -75,20 +74,18 @@ class TokenExecute(LiFiBaseTool):
 
     def __init__(
         self,
-        skill_store: SkillStoreABC,
         default_slippage: float = 0.03,
         allowed_chains: Optional[List[str]] = None,
         max_execution_time: int = 300,
     ) -> None:
         """Initialize the TokenExecute skill with configuration options."""
-        super().__init__(skill_store=skill_store)
+        super().__init__()
         self.default_slippage = default_slippage
         self.allowed_chains = allowed_chains
         self.max_execution_time = max_execution_time
         # Initialize quote tool if not set
         if not self.quote_tool:
             self.quote_tool = TokenQuote(
-                skill_store=skill_store,
                 default_slippage=default_slippage,
                 allowed_chains=allowed_chains,
             )

intentkit/skills/lifi/token_quote.py

@@ -3,7 +3,6 @@ from typing import Any, Dict, List, Optional, Type
 import httpx
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.lifi.base import LiFiBaseTool
 from intentkit.skills.lifi.utils import (
     LIFI_API_URL,
@@ -62,12 +61,11 @@ class TokenQuote(LiFiBaseTool):
 
     def __init__(
         self,
-        skill_store: SkillStoreABC,
         default_slippage: float = 0.03,
         allowed_chains: Optional[List[str]] = None,
     ) -> None:
         """Initialize the TokenQuote skill with configuration options."""
-        super().__init__(skill_store=skill_store)
+        super().__init__()
         self.default_slippage = default_slippage
         self.allowed_chains = allowed_chains
 

intentkit/skills/moralis/__init__.py

@@ -3,7 +3,7 @@
 import logging
 from typing import Dict, List, NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config as system_config
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.moralis.base import WalletBaseTool
 from intentkit.skills.moralis.fetch_chain_portfolio import FetchChainPortfolio
@@ -34,7 +34,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> List[WalletBaseTool]:
     """Get all Wallet Portfolio skills.
@@ -42,7 +41,6 @@ async def get_skills(
     Args:
         config: Skill configuration
         is_private: Whether the request is from an authenticated user
-        store: Skill store for persistence
         chain_provider: Optional chain provider for blockchain interactions
         **_: Additional arguments
 
@@ -67,12 +65,12 @@ async def get_skills(
     if config.get("api_key_provider") == "agent_owner":
         api_key = config.get("api_key")
     else:
-        api_key = store.get_system_config("moralis_api_key")
+        api_key = system_config.moralis_api_key
 
     # Get each skill using the getter
     result = []
     for name in available_skills:
-        skill = get_wallet_skill(name, api_key, store)
+        skill = get_wallet_skill(name, api_key)
         if skill:
             result.append(skill)
     return result
@@ -81,7 +79,6 @@ async def get_skills(
 def get_wallet_skill(
     name: str,
     api_key: str,
-    store: SkillStoreABC,
 ) -> WalletBaseTool:
     """Get a specific Wallet Portfolio skill by name.
 
@@ -106,5 +103,4 @@ def get_wallet_skill(
 
     return skill_classes[name](
         api_key=api_key,
-        skill_store=store,
     )

intentkit/skills/moralis/base.py

@@ -5,7 +5,7 @@ from typing import List, Optional, 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
 
 # Chain ID to chain name mapping for EVM chains
@@ -30,9 +30,6 @@ class WalletBaseTool(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"
-    )
 
     # Optional fields for blockchain providers
     solana_networks: Optional[List[str]] = Field(
@@ -44,7 +41,7 @@ class WalletBaseTool(IntentKitSkill):
         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("moralis_api_key")
+            return config.moralis_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/morpho/__init__.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import morpho_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,
     **_,
@@ -46,7 +44,7 @@ async def get_skills(
             available_skills.append(skill_name)
 
     actions = await get_agentkit_actions(
-        agent_id, store, [morpho_action_provider], agent=agent
+        agent_id, [morpho_action_provider], agent=agent
     )
     tools: list[MorphoBaseTool] = []
     for skill in available_skills:

intentkit/skills/nation/__init__.py

@@ -1,7 +1,6 @@
 import logging
 from typing import Optional, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.nation.base import NationBaseTool
 from intentkit.skills.nation.nft_check import NftCheck
@@ -25,7 +24,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[NationBaseTool]:
     """Get all nation skills."""
@@ -42,20 +40,17 @@ async def get_skills(
     return [
         skill
         for name in available_skills
-        if (skill := get_nation_skill(name, store)) is not None
+        if (skill := get_nation_skill(name)) is not None
     ]
 
 
 def get_nation_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> Optional[NationBaseTool]:
     """Get a nation skill by name."""
     if name == "nft_check":
         if name not in _cache:
-            _cache[name] = NftCheck(
-                skill_store=store,
-            )
+            _cache[name] = NftCheck()
         return _cache[name]
     else:
         logger.error(f"Unknown Nation skill: {name}")

intentkit/skills/nation/base.py

@@ -2,7 +2,7 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 
 default_nation_api_url = "http://backend-api"
@@ -14,16 +14,13 @@ class NationBaseTool(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:
-        return self.skill_store.get_system_config("nation_api_key")
+        return config.nation_api_key
 
     def get_base_url(self) -> str:
-        if self.skill_store.get_system_config("nation_api_url"):
-            return self.skill_store.get_system_config("nation_api_url")
+        if config.nation_api_url:
+            return config.nation_api_url
         return default_nation_api_url
 
     @property

intentkit/skills/onchain.py

@@ -0,0 +1,27 @@
+from typing import TYPE_CHECKING
+
+from web3 import Web3
+
+from intentkit.clients import get_evm_account as fetch_evm_account
+from intentkit.clients.web3 import get_web3_client
+from intentkit.skills.base import IntentKitSkill
+
+if TYPE_CHECKING:
+    from cdp import EvmServerAccount
+
+
+class IntentKitOnChainSkill(IntentKitSkill):
+    """Shared helpers for on-chain enabled skills."""
+
+    def web3_client(self) -> Web3:
+        """Get a Web3 client for the active agent network."""
+        context = self.get_context()
+        agent = context.agent
+        network_id = agent.network_id
+        return get_web3_client(network_id)
+
+    async def get_evm_account(self) -> "EvmServerAccount":
+        """Fetch the EVM account associated with the active agent."""
+        context = self.get_context()
+        agent = context.agent
+        return await fetch_evm_account(agent)

intentkit/skills/openai/__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.openai.base import OpenAIBaseTool
 from intentkit.skills.openai.dalle_image_generation import DALLEImageGeneration
@@ -34,7 +33,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[OpenAIBaseTool]:
     """Get all OpenAI skills.
@@ -42,7 +40,6 @@ async def get_skills(
     Args:
         config: The configuration for OpenAI skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of OpenAI skills.
@@ -59,7 +56,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_openai_skill(name, store)
+        skill = get_openai_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -67,40 +64,30 @@ async def get_skills(
 
 def get_openai_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> OpenAIBaseTool:
     """Get an OpenAI skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested OpenAI skill
     """
     if name == "image_to_text":
         if name not in _cache:
-            _cache[name] = ImageToText(
-                skill_store=store,
-            )
+            _cache[name] = ImageToText()
         return _cache[name]
     elif name == "dalle_image_generation":
         if name not in _cache:
-            _cache[name] = DALLEImageGeneration(
-                skill_store=store,
-            )
+            _cache[name] = DALLEImageGeneration()
         return _cache[name]
     elif name == "gpt_image_generation":
         if name not in _cache:
-            _cache[name] = GPTImageGeneration(
-                skill_store=store,
-            )
+            _cache[name] = GPTImageGeneration()
         return _cache[name]
     elif name == "gpt_image_to_image":
         if name not in _cache:
-            _cache[name] = GPTImageToImage(
-                skill_store=store,
-            )
+            _cache[name] = GPTImageToImage()
         return _cache[name]
     else:
         logger.warning(f"Unknown OpenAI skill: {name}")

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: