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

intentkit/__init__.py

@@ -3,7 +3,7 @@
 A powerful platform for building AI agents with blockchain and cryptocurrency capabilities.
 """
 
-__version__ = "0.8.12-dev6"
+__version__ = "0.8.13"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

intentkit/clients/__init__.py

@@ -1,4 +1,4 @@
-from intentkit.clients.cdp import get_origin_cdp_client, get_wallet_provider
+from intentkit.clients.cdp import get_cdp_client, get_evm_account, get_wallet_provider
 from intentkit.clients.twitter import (
     TwitterClient,
     TwitterClientConfig,
@@ -10,7 +10,8 @@ __all__ = [
     "TwitterClient",
     "TwitterClientConfig",
     "get_twitter_client",
-    "get_origin_cdp_client",
+    "get_evm_account",
+    "get_cdp_client",
     "get_wallet_provider",
     "get_web3_client",
 ]

intentkit/clients/cdp.py

@@ -4,7 +4,7 @@ import logging
 from typing import Dict, Optional, Tuple
 
 from bip32 import BIP32
-from cdp import CdpClient as OriginCdpClient  # noqa: E402
+from cdp import CdpClient, EvmServerAccount  # noqa: E402
 from coinbase_agentkit import (  # noqa: E402
     CdpEvmWalletProvider,
     CdpEvmWalletProviderConfig,
@@ -19,7 +19,7 @@ from intentkit.models.db import get_session
 from intentkit.utils.error import IntentKitAPIError  # noqa: E402
 
 _wallet_providers: Dict[str, Tuple[str, str, CdpEvmWalletProvider]] = {}
-_origin_cdp_client: Optional[OriginCdpClient] = None
+_cdp_client: Optional[CdpClient] = None
 
 logger = logging.getLogger(__name__)
 
@@ -59,25 +59,25 @@ def bip39_seed_to_eth_keys(seed_hex: str) -> Dict[str, str]:
     }
 
 
-def get_origin_cdp_client() -> OriginCdpClient:
-    global _origin_cdp_client
-    if _origin_cdp_client:
-        return _origin_cdp_client
+def get_cdp_client() -> CdpClient:
+    global _cdp_client
+    if _cdp_client:
+        return _cdp_client
 
     # Get credentials from global configuration
     api_key_id = config.cdp_api_key_id
     api_key_secret = config.cdp_api_key_secret
     wallet_secret = config.cdp_wallet_secret
 
-    _origin_cdp_client = OriginCdpClient(
+    _cdp_client = CdpClient(
         api_key_id=api_key_id,
         api_key_secret=api_key_secret,
         wallet_secret=wallet_secret,
     )
-    return _origin_cdp_client
+    return _cdp_client
 
 
-async def get_wallet_provider(agent: Agent) -> CdpEvmWalletProvider:
+def _assert_cdp_wallet_provider(agent: Agent) -> None:
     if agent.wallet_provider != "cdp":
         raise IntentKitAPIError(
             400,
@@ -85,74 +85,93 @@ async def get_wallet_provider(agent: Agent) -> CdpEvmWalletProvider:
             "Your agent wallet provider is not cdp but you selected a skill that requires a cdp wallet.",
         )
 
-    if not agent.network_id:
-        raise IntentKitAPIError(
-            400,
-            "BadNetworkID",
-            "Your agent network ID is not set. Please set it in the agent config.",
-        )
 
-    agent_data = await AgentData.get(agent.id)
+async def _ensure_evm_account(
+    agent: Agent, agent_data: AgentData | None = None
+) -> Tuple[EvmServerAccount, AgentData]:
+    cdp_client = get_cdp_client()
+    agent_data = agent_data or await AgentData.get(agent.id)
     address = agent_data.evm_wallet_address
+    account: Optional[EvmServerAccount] = None
 
-    cache_entry = _wallet_providers.get(agent.id)
-    if cache_entry:
-        cached_network_id, cached_address, provider = cache_entry
-        if cached_network_id == agent.network_id:
-            if not address:
-                address = cached_address or provider.get_address()
-            if cached_address == address:
-                return provider
-
-    # Get credentials from global config
-    api_key_id = config.cdp_api_key_id
-    api_key_secret = config.cdp_api_key_secret
-    wallet_secret = config.cdp_wallet_secret
-
-    network_id = agent.network_id
-
-    # new agent or address not migrated yet
     if not address:
-        cdp_client = get_origin_cdp_client()
-        # try migrating from v1 cdp_wallet_data
         if agent_data.cdp_wallet_data:
             wallet_data = json.loads(agent_data.cdp_wallet_data)
             if not isinstance(wallet_data, dict):
                 raise ValueError("Invalid wallet data format")
             if wallet_data.get("default_address_id") and wallet_data.get("seed"):
-                # verify seed and convert to pk
                 keys = bip39_seed_to_eth_keys(wallet_data["seed"])
                 if keys["address"] != wallet_data["default_address_id"]:
                     raise ValueError(
                         "Bad wallet data, seed does not match default_address_id"
                     )
-                # try to import wallet to v2
                 logger.info("Migrating wallet data to v2...")
-                await cdp_client.evm.import_account(
+                account = await cdp_client.evm.import_account(
                     name=agent.id,
                     private_key=keys["private_key"],
                 )
-                address = keys["address"]
+                address = account.address
                 logger.info("Migrated wallet data to v2 successfully: %s", address)
-        # still not address
         if not address:
             logger.info("Creating new wallet...")
-            new_account = await cdp_client.evm.create_account(
+            account = await cdp_client.evm.create_account(
                 name=agent.id,
             )
-            address = new_account.address
+            address = account.address
             logger.info("Created new wallet: %s", address)
 
         agent_data.evm_wallet_address = address
         await agent_data.save()
-        # Update agent slug with evm_wallet_address if slug is null or empty
         if not agent.slug:
             async with get_session() as db:
                 db_agent = await db.get(AgentTable, agent.id)
-                if db_agent:
+                if db_agent and not db_agent.slug:
                     db_agent.slug = agent_data.evm_wallet_address
                     await db.commit()
 
+    if account is None:
+        account = await cdp_client.evm.get_account(address=address)
+
+    return account, agent_data
+
+
+async def get_evm_account(agent: Agent) -> EvmServerAccount:
+    _assert_cdp_wallet_provider(agent)
+    account, _ = await _ensure_evm_account(agent)
+    return account
+
+
+async def get_wallet_provider(agent: Agent) -> CdpEvmWalletProvider:
+    _assert_cdp_wallet_provider(agent)
+    if not agent.network_id:
+        raise IntentKitAPIError(
+            400,
+            "BadNetworkID",
+            "Your agent network ID is not set. Please set it in the agent config.",
+        )
+
+    agent_data = await AgentData.get(agent.id)
+    address = agent_data.evm_wallet_address
+
+    cache_entry = _wallet_providers.get(agent.id)
+    if cache_entry:
+        cached_network_id, cached_address, provider = cache_entry
+        if cached_network_id == agent.network_id:
+            if not address:
+                address = cached_address or provider.get_address()
+            if cached_address == address:
+                return provider
+
+    account, agent_data = await _ensure_evm_account(agent, agent_data)
+    address = account.address
+
+    # Get credentials from global config
+    api_key_id = config.cdp_api_key_id
+    api_key_secret = config.cdp_api_key_secret
+    wallet_secret = config.cdp_wallet_secret
+
+    network_id = agent.network_id
+
     wallet_provider_config = CdpEvmWalletProviderConfig(
         api_key_id=api_key_id,
         api_key_secret=api_key_secret,

intentkit/config/config.py

@@ -79,6 +79,7 @@ class Config:
         self.debug_password = self.load("DEBUG_PASSWORD")
         # Payment
         self.payment_enabled = self.load("PAYMENT_ENABLED", "false") == "true"
+        self.x402_fee_address = self.load("X402_FEE_ADDRESS")
         # Open API for agent
         self.open_api_base_url = self.load("OPEN_API_BASE_URL", "http://localhost:8000")
         # CDP - AgentKit 0.7.x Configuration

intentkit/core/engine.py

@@ -332,6 +332,8 @@ async def stream_agent_raw(
     model = await LLMModelInfo.get(agent.model)
 
     payment_enabled = config.payment_enabled
+    if user_message.author_type == AuthorType.X402:
+        payment_enabled = False
 
     # check user balance
     if payment_enabled:

intentkit/models/agent.py

@@ -1288,6 +1288,35 @@ class Agent(AgentCreate, AgentPublicInfo):
                 return None
             return cls.model_validate(item)
 
+    @classmethod
+    async def get_by_id_or_slug(cls, agent_id: str) -> Optional["Agent"]:
+        """Get agent by ID or slug.
+
+        First tries to get by ID if agent_id length <= 20,
+        then falls back to searching by slug if not found.
+
+        Args:
+            agent_id: Agent ID or slug to search for
+
+        Returns:
+            Agent if found, None otherwise
+        """
+        async with get_session() as db:
+            agent = None
+
+            # Try to get by ID if length <= 20
+            if len(agent_id) <= 20:
+                agent = await Agent.get(agent_id)
+
+            # If not found, try to get by slug
+            if agent is None:
+                slug_stmt = select(AgentTable).where(AgentTable.slug == agent_id)
+                agent_row = await db.scalar(slug_stmt)
+                if agent_row is not None:
+                    agent = Agent.model_validate(agent_row)
+
+            return agent
+
     @staticmethod
     def _deserialize_autonomous(
         autonomous_data: Optional[List[Any]],

intentkit/models/chat.py

@@ -47,6 +47,7 @@ class AuthorType(str, Enum):
     SYSTEM = "system"
     API = "api"
     XMTP = "xmtp"
+    X402 = "x402"
 
 
 class ChatMessageAttachment(TypedDict):

intentkit/models/skills.csv

@@ -162,9 +162,10 @@ firecrawl,firecrawl_scrape,firecrawl_scrape,TRUE,3,100,5,,,0x3cdd051eeC909f94965
 firecrawl,firecrawl_crawl,firecrawl_crawl,TRUE,3,100,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
 firecrawl,firecrawl_query_indexed_content,firecrawl_query_indexed_content,TRUE,1,5,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
 firecrawl,firecrawl_clear_indexed_content,firecrawl_clear_indexed_content,TRUE,1,5,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
-xmtp,xmtp_transfer,xmtp_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-xmtp,xmtp_swap,xmtp_swap,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-xmtp,xmtp_get_swap_price,xmtp_get_swap_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-casino,deck_shuffle,casino_deck_shuffle,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0
+xmtp,xmtp_transfer,xmtp_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+xmtp,xmtp_swap,xmtp_swap,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+xmtp,xmtp_get_swap_price,xmtp_get_swap_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+x402,x402_ask_agent,x402_ask_agent,TRUE,1,1,1,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+casino,deck_shuffle,casino_deck_shuffle,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0
 casino,deck_draw,casino_deck_draw,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0
 casino,dice_roll,casino_dice_roll,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0

intentkit/skills/base.py

@@ -26,11 +26,9 @@ from pydantic import (
 )
 from pydantic.v1 import ValidationError as ValidationErrorV1
 from redis.exceptions import RedisError
-from web3 import Web3
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.clients import get_wallet_provider
-from intentkit.clients.web3 import get_web3_client
 from intentkit.models.redis import get_redis
 from intentkit.models.skill import (
     AgentSkillData,
@@ -257,14 +255,6 @@ class IntentKitSkill(BaseTool):
             raise ValueError("No AgentContext found")
         return runtime.context
 
-    def web3_client(self) -> Web3:
-        """Get a Web3 client for the skill."""
-        context = self.get_context()
-        agent = context.agent
-        network_id = agent.network_id
-
-        return get_web3_client(network_id)
-
     async def get_agent_skill_data(
         self,
         key: str,

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/skills.toml

@@ -118,6 +118,10 @@ author_wallet = "0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0"
 author_github = "yornfifty"
 author_wallet = "0xF60D4B6780D5D51827602D7aC319458bc9e921F4"
 
+[x402]
+author_github = "hyacinthus"
+author_wallet = "0x445750026A4a1906b61302442E085f9cbAfe206a"
+
 [portfolio]
 author_github = "bluntbrain"
 author_wallet = "0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0"

intentkit/skills/x402/__init__.py

@@ -0,0 +1,53 @@
+"""x402 skill category."""
+
+import logging
+from typing import TypedDict
+
+from intentkit.skills.base import SkillConfig, SkillState
+from intentkit.skills.x402.ask_agent import X402AskAgent
+from intentkit.skills.x402.base import X402BaseSkill
+
+logger = logging.getLogger(__name__)
+
+_cache: dict[str, X402BaseSkill] = {}
+
+
+class SkillStates(TypedDict):
+    x402_ask_agent: SkillState
+
+
+class Config(SkillConfig):
+    """Configuration for x402 skills."""
+
+    states: SkillStates
+
+
+async def get_skills(
+    config: "Config",
+    is_private: bool,
+    **_,
+) -> list[X402BaseSkill]:
+    """Return enabled x402 skills for the agent."""
+    enabled_skills = []
+    for skill_name, state in config["states"].items():
+        if state == "disabled":
+            continue
+        if state == "public" or (state == "private" and is_private):
+            enabled_skills.append(skill_name)
+
+    result: list[X402BaseSkill] = []
+    for name in enabled_skills:
+        skill = _get_skill(name)
+        if skill:
+            result.append(skill)
+    return result
+
+
+def _get_skill(name: str) -> X402BaseSkill | None:
+    if name == "x402_ask_agent":
+        if name not in _cache:
+            _cache[name] = X402AskAgent()
+        return _cache[name]
+
+    logger.warning("Unknown x402 skill requested: %s", name)
+    return None

intentkit/skills/x402/ask_agent.py

@@ -0,0 +1,141 @@
+import threading
+from typing import Any, Dict, Optional, Type
+
+from coinbase_agentkit.wallet_providers.evm_wallet_provider import (
+    EvmWalletSigner as CoinbaseEvmWalletSigner,
+)
+from langchain_core.tools import ToolException
+from pydantic import BaseModel, Field
+from x402.clients.httpx import x402HttpxClient
+
+from intentkit.clients import get_wallet_provider
+from intentkit.config.config import config
+from intentkit.models.chat import AuthorType
+from intentkit.skills.x402.base import X402BaseSkill
+
+
+class AskAgentInput(BaseModel):
+    """Arguments for the x402 ask agent skill."""
+
+    agent_id: str = Field(description="ID or slug of the agent to query.")
+    message: str = Field(description="Message to send to the target agent.")
+    search_mode: Optional[bool] = Field(
+        default=None, description="Enable search mode when interacting with the agent."
+    )
+    super_mode: Optional[bool] = Field(
+        default=None, description="Enable super mode when interacting with the agent."
+    )
+
+
+class X402AskAgent(X402BaseSkill):
+    """Skill that queries another agent via the x402 API."""
+
+    name: str = "x402_ask_agent"
+    description: str = (
+        "Call another agent through the x402 API and return the final agent message."
+    )
+    args_schema: Type[BaseModel] = AskAgentInput
+
+    async def _arun(
+        self,
+        agent_id: str,
+        message: str,
+        search_mode: Optional[bool] = None,
+        super_mode: Optional[bool] = None,
+    ) -> str:
+        base_url = (config.open_api_base_url or "").rstrip("/")
+        if not base_url:
+            raise ValueError("X402 API base URL is not configured.")
+
+        # Use wallet provider signer to satisfy eth_account.BaseAccount interface requirements
+        context = self.get_context()
+        wallet_provider = await get_wallet_provider(context.agent)
+        account = ThreadSafeEvmWalletSigner(wallet_provider)
+
+        payload: Dict[str, Any] = {
+            "agent_id": agent_id,
+            "message": message,
+            "app_id": "skill",
+        }
+        if search_mode is not None:
+            payload["search_mode"] = search_mode
+        if super_mode is not None:
+            payload["super_mode"] = super_mode
+
+        async with x402HttpxClient(
+            account=account,
+            base_url=base_url,
+            timeout=20.0,
+        ) as client:
+            response = await client.post("/x402", json=payload)
+            response.raise_for_status()
+            messages = response.json()
+        if not isinstance(messages, list) or not messages:
+            raise ValueError("Agent returned an empty response.")
+
+        last_message = messages[-1]
+        if not isinstance(last_message, dict):
+            raise ValueError("Agent response format is invalid.")
+
+        author_type = last_message.get("author_type")
+        content = last_message.get("message")
+
+        if author_type == AuthorType.SYSTEM.value:
+            raise ToolException(content or "Agent returned a system message.")
+
+        if not content:
+            raise ToolException("Agent response did not include message text.")
+
+        return str(content)
+
+
+class ThreadSafeEvmWalletSigner(CoinbaseEvmWalletSigner):
+    """EVM wallet signer that avoids nested event loop errors.
+
+    Coinbase's signer runs async wallet calls in the current thread. When invoked
+    inside an active asyncio loop (as happens in async skills), it trips over the
+    loop already running. We hop work to a background thread so the provider can
+    spin up its own loop safely.
+    """
+
+    def _run_in_thread(self, func: Any, *args: Any, **kwargs: Any) -> Any:
+        result: list[Any] = []
+        error: list[BaseException] = []
+
+        def _target() -> None:
+            try:
+                result.append(func(*args, **kwargs))
+            except BaseException as exc:  # pragma: no cover - bubble up original error
+                error.append(exc)
+
+        thread = threading.Thread(target=_target, daemon=True)
+        thread.start()
+        thread.join()
+
+        if error:
+            raise error[0]
+        return result[0] if result else None
+
+    def unsafe_sign_hash(self, message_hash: Any) -> Any:
+        return self._run_in_thread(super().unsafe_sign_hash, message_hash)
+
+    def sign_message(self, signable_message: Any) -> Any:
+        return self._run_in_thread(super().sign_message, signable_message)
+
+    def sign_transaction(self, transaction_dict: Any) -> Any:
+        return self._run_in_thread(super().sign_transaction, transaction_dict)
+
+    def sign_typed_data(
+        self,
+        domain_data: Optional[Dict[str, Any]] = None,
+        message_types: Optional[Dict[str, Any]] = None,
+        message_data: Optional[Dict[str, Any]] = None,
+        full_message: Optional[Dict[str, Any]] = None,
+    ) -> Any:
+        return self._run_in_thread(
+            super().sign_typed_data,
+            domain_data=domain_data,
+            message_types=message_types,
+            message_data=message_data,
+            full_message=full_message,
+        )

intentkit/skills/x402/base.py

@@ -0,0 +1,9 @@
+from intentkit.skills.onchain import IntentKitOnChainSkill
+
+
+class X402BaseSkill(IntentKitOnChainSkill):
+    """Base class for x402 skills."""
+
+    @property
+    def category(self) -> str:
+        return "x402"

intentkit/skills/x402/schema.json

@@ -0,0 +1,40 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "x402",
+  "description": "Interact with other IntentKit agents through the x402 payment protocol.",
+  "x-icon": "https://ai.service.crestal.dev/skills/x402/x402.png",
+  "x-tags": [
+    "Communication",
+    "Infrastructure"
+  ],
+  "properties": {
+    "enabled": {
+      "type": "boolean",
+      "title": "Enabled",
+      "description": "Whether this skill category is enabled.",
+      "default": false
+    },
+    "states": {
+      "type": "object",
+      "properties": {
+        "x402_ask_agent": {
+          "type": "string",
+          "title": "Ask Agent",
+          "enum": [
+            "disabled",
+            "public",
+            "private"
+          ],
+          "x-enum-title": [
+            "Disabled",
+            "Agent Owner + All Users",
+            "Agent Owner Only"
+          ],
+          "description": "Send a message to another IntentKit agent via the x402 API and return the final agent response.",
+          "default": "disabled"
+        }
+      }
+    }
+  }
+}

intentkit/skills/xmtp/base.py

@@ -1,9 +1,9 @@
 from typing import Dict, Literal
 
-from intentkit.skills.base import IntentKitSkill
+from intentkit.skills.onchain import IntentKitOnChainSkill
 
 
-class XmtpBaseTool(IntentKitSkill):
+class XmtpBaseTool(IntentKitOnChainSkill):
     """Base class for XMTP-related skills."""
 
     # Set response format to content_and_artifact for returning tuple

intentkit/skills/xmtp/price.py

@@ -3,7 +3,7 @@ from typing import Literal, Type
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.clients.cdp import get_origin_cdp_client
+from intentkit.clients.cdp import get_cdp_client
 from intentkit.skills.xmtp.base import XmtpBaseTool
 
 
@@ -50,8 +50,8 @@ class XmtpGetSwapPrice(XmtpBaseTool):
 
         network_for_cdp = self.get_cdp_network(agent.network_id)
 
-        cdp_client = get_origin_cdp_client()
-        # Note: Don't use async with context manager as get_origin_cdp_client returns a managed global client
+        cdp_client = get_cdp_client()
+        # Note: Don't use async with context manager as get_cdp_client returns a managed global client
         price = await cdp_client.evm.get_swap_price(
             from_token=from_token,
             to_token=to_token,

intentkit/skills/xmtp/swap.py

@@ -2,7 +2,7 @@ from typing import List, Tuple, Type
 
 from pydantic import BaseModel, Field
 
-from intentkit.clients.cdp import get_origin_cdp_client
+from intentkit.clients.cdp import get_cdp_client
 from intentkit.models.chat import ChatMessageAttachment, ChatMessageAttachmentType
 from intentkit.skills.xmtp.base import XmtpBaseTool
 
@@ -107,15 +107,15 @@ class XmtpSwap(XmtpBaseTool):
         # https://github.com/coinbase/cdp-sdk/blob/main/examples/python/evm/swaps/create_swap_quote.py
         network_for_cdp = self.get_cdp_network(agent.network_id)
 
-        # Get CDP client from global origin helper (server-side credentials)
-        cdp_client = get_origin_cdp_client()
+        # Get CDP client from the global helper (server-side credentials)
+        cdp_client = get_cdp_client()
 
         # Call CDP to create swap quote and extract call datas
         # Be permissive with response shape across SDK versions
         try:
             # Attempt the canonical method per CDP SDK examples
             # create_swap_quote(from_token, to_token, from_amount, network, taker, slippage_bps, signer_address)
-            # Note: Don't use async with context manager as get_origin_cdp_client returns a managed global client
+            # Note: Don't use async with context manager as get_cdp_client returns a managed global client
             quote = await cdp_client.evm.create_swap_quote(
                 from_token=from_token,
                 to_token=to_token,

intentkit/utils/schema.py

@@ -0,0 +1,100 @@
+"""JSON Schema utilities for IntentKit.
+
+This module provides utilities for working with JSON schemas, including
+resolving $defs references and generating nested schemas.
+"""
+
+import copy
+from typing import Any, Dict
+
+
+def resolve_schema_refs(schema: Dict[str, Any]) -> Dict[str, Any]:
+    """Recursively resolve $defs references in a JSON schema.
+
+    This function takes a JSON schema with $defs references and returns
+    a fully nested schema without any $ref pointers. This is useful for
+    creating schemas that can be easily consumed by external systems
+    that don't support JSON Schema references.
+
+    Args:
+        schema: The JSON schema dictionary that may contain $defs and $ref
+
+    Returns:
+        dict: A new schema with all $ref resolved to nested objects
+
+    Example:
+        >>> schema = {
+        ...     "type": "object",
+        ...     "properties": {
+        ...         "user": {"$ref": "#/$defs/User"}
+        ...     },
+        ...     "$defs": {
+        ...         "User": {
+        ...             "type": "object",
+        ...             "properties": {"name": {"type": "string"}}
+        ...         }
+        ...     }
+        ... }
+        >>> resolved = resolve_schema_refs(schema)
+        >>> # resolved will have the User definition inlined
+    """
+    # Deep copy to avoid modifying the original
+    resolved_schema = copy.deepcopy(schema)
+
+    # Extract $defs if they exist
+    defs = resolved_schema.pop("$defs", {})
+
+    def resolve_refs(obj: Any, defs_dict: Dict[str, Any]) -> Any:
+        """Recursively resolve $ref in an object."""
+        if isinstance(obj, dict):
+            if "$ref" in obj:
+                ref_path = obj["$ref"]
+                if ref_path.startswith("#/$defs/"):
+                    def_name = ref_path.replace("#/$defs/", "")
+                    if def_name in defs_dict:
+                        # Recursively resolve the referenced definition
+                        resolved_def = resolve_refs(defs_dict[def_name], defs_dict)
+                        return resolved_def
+                    else:
+                        # Keep the reference if definition not found
+                        return obj
+                else:
+                    # Keep non-$defs references as is
+                    return obj
+            else:
+                # Recursively process all values in the dictionary
+                return {
+                    key: resolve_refs(value, defs_dict) for key, value in obj.items()
+                }
+        elif isinstance(obj, list):
+            # Recursively process all items in the list
+            return [resolve_refs(item, defs_dict) for item in obj]
+        else:
+            # Return primitive values as is
+            return obj
+
+    # Resolve all references in the schema
+    return resolve_refs(resolved_schema, defs)
+
+
+def create_array_schema(
+    item_schema: Dict[str, Any], resolve_refs: bool = True
+) -> Dict[str, Any]:
+    """Create an array schema with the given item schema.
+
+    Args:
+        item_schema: The schema for array items
+        resolve_refs: Whether to resolve $defs references in the item schema
+
+    Returns:
+        dict: Array schema with resolved item schema
+    """
+    if resolve_refs:
+        resolved_item_schema = resolve_schema_refs(item_schema)
+    else:
+        resolved_item_schema = item_schema
+
+    return {
+        "type": "array",
+        "items": resolved_item_schema,
+    }

{intentkit-0.8.12.dev6.dist-info → intentkit-0.8.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.8.12.dev6
+Version: 0.8.13
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestalnetwork/intentkit
 Project-URL: Repository, https://github.com/crestalnetwork/intentkit

{intentkit-0.8.12.dev6.dist-info → intentkit-0.8.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-intentkit/__init__.py,sha256=-kIFg9MyxWQgHhkHhd-6gez56EOxMztr2j7NbDtnYpw,384
+intentkit/__init__.py,sha256=QWC30Bt7oJyPHu-z50Sqem9fu1yxLVVsN49Yuv2WeOM,379
 intentkit/abstracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/abstracts/agent.py,sha256=108gb5W8Q1Sy4G55F2_ZFv2-_CnY76qrBtpIr0Oxxqk,1489
 intentkit/abstracts/api.py,sha256=ZUc24vaQvQVbbjznx7bV0lbbQxdQPfEV8ZxM2R6wZWo,166
@@ -6,12 +6,12 @@ intentkit/abstracts/engine.py,sha256=C5C9d8vVMePhkKWURKIAbZSDZnmjxj5epL_04E6RpxQ
 intentkit/abstracts/graph.py,sha256=I3AQMPBuFbMUaANpjl0zLKocg3aXTX9gRkhFJqyvGHc,1285
 intentkit/abstracts/skill.py,sha256=lRIM0BKuj639Z9MLoFU5eqmHnuCAkbgmeI5E3B3Z_o8,1524
 intentkit/abstracts/twitter.py,sha256=cEtP7ygR_b-pHdc9i8kBuyooz1cPoGUGwsBHDpowJyY,1262
-intentkit/clients/__init__.py,sha256=YmXSif963E5rUfkfHaI6JdWRFU5yNa_yJwafs2KEIVo,406
-intentkit/clients/cdp.py,sha256=A-cczpek9iPw6dDxKub_BOjCAtpIbUP_MYYP06fYW90,5791
+intentkit/clients/__init__.py,sha256=wCSVM4whe9xBCL8lrT6r-Zx0-ZTnQI51iQmNlC1HcPQ,432
+intentkit/clients/cdp.py,sha256=sE4ZMX5oK8GIobVGpcofRd6BBkYysqdK07HPkbfUNLQ,6219
 intentkit/clients/twitter.py,sha256=dMyskssmnxns31RoCr3c2sJTaR3xm8RkI5-8yYz1pGo,19975
 intentkit/clients/web3.py,sha256=iFjjingL9Aqh3kwUUKN8Tw5N66o2SE_bfo6OhqI-6SU,890
 intentkit/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-intentkit/config/config.py,sha256=kw9F-uLsJd-knCKmYNb-hqR7x7HUXUkNg5FZCgOPH54,8868
+intentkit/config/config.py,sha256=W1WCfk3RrCHG68wuV-eQ6jhvrncLh52x61fxluHedAE,8930
 intentkit/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/core/agent.py,sha256=N90lIy1rJS1uCNWAc-dQiGrx1zF9vN5h56Wq6KlJCZo,27125
 intentkit/core/api.py,sha256=WfoaHNquujYJIpNPuTR1dSaaxog0S3X2W4lG9Ehmkm4,3284
@@ -19,18 +19,18 @@ intentkit/core/asset.py,sha256=8x8FN1B2PgisizPYS4XtihFMf8HAUTrAAjMHogXO2Y4,9140
 intentkit/core/chat.py,sha256=YN20CnDazWLjiOZFOHgV6uHmA2DKkvPCsD5Q5sfNcZg,1685
 intentkit/core/client.py,sha256=J5K7f08-ucszBKAbn9K3QNOFKIC__7amTbKYii1jFkI,3056
 intentkit/core/credit.py,sha256=b4f4T6G6eeBTMe0L_r8awWtXgUnqiog4IUaymDPYym0,75587
-intentkit/core/engine.py,sha256=stFQtRO_hGyb9SMNIZdO8dDAb3NRNUW9kQfoZzV0Y4M,39010
+intentkit/core/engine.py,sha256=mDiUmo1eE3er3vU630v89FYq5MBildNUzRBg4P53o30,39094
 intentkit/core/node.py,sha256=-QVgmQuMnrzo6cF-4AECOIVT3R4gCnWfQ1EjTm2Sz1g,8791
 intentkit/core/prompt.py,sha256=cf33qLpGozRc_aPdbnI_pDFREivSUhvUB9VboOKscXA,17212
 intentkit/core/scheduler.py,sha256=XK-VVGkUk1PSjiFc5va2T134cmzMYHH_eIzInLzjv8c,2929
 intentkit/core/statistics.py,sha256=-IZmxIBzyzZuai7QyfPEY1tx8Q8ydmmcm6eqbSSy_6o,6366
-intentkit/models/agent.py,sha256=CuUPPKSun4VVaiwEMMFpXMw0qkOCGmzcqDs3LBIuguI,69154
+intentkit/models/agent.py,sha256=DRIdPVngXgITObUnRjrJGLr5W_7b7ZRg8eqPFsChyKY,70084
 intentkit/models/agent_data.py,sha256=5zq3EPKnygT2P1OHc2IfEmL8hXkjeBND6sJ0JJsvQJg,28370
 intentkit/models/agent_public.json,sha256=0X8Bd2WOobDJLsok8avWNzmzu4uvKSGEyy6Myn53eT4,2802
 intentkit/models/agent_schema.json,sha256=_-oviPLPCdveQ3H4wTuoxC2PF5tOhFXuG7BUsmhUJG8,11829
 intentkit/models/app_setting.py,sha256=iYbW63QD91bt4oEYV3wOXHuRFav2b4VXLwb_StgUQtQ,8230
 intentkit/models/base.py,sha256=o-zRjVrak-f5Jokdvj8BjLm8gcC3yYiYMCTLegwT2lA,185
-intentkit/models/chat.py,sha256=cDccEHU8nd7Y5uhrHDCuZGwqrRwhqCaeztMiZcemiug,20469
+intentkit/models/chat.py,sha256=K4ufFrZyIjpXImukaX2GnXo1PwXWETrk55Sa9vCzAmk,20487
 intentkit/models/conversation.py,sha256=nrbDIw-3GK5BYi_xkI15FLdx4a6SNrFK8wfAGLCsrqk,9032
 intentkit/models/credit.py,sha256=CM_oOhcpKHkdCVTe86osYsBM9vIo-9N65SWrNKEKy7Y,52614
 intentkit/models/db.py,sha256=1uX1DJZGMx9A3lq6WKSTSwpXhWgWaiki55-iiED8BYM,5082
@@ -40,11 +40,12 @@ intentkit/models/llm.csv,sha256=0NIGyo-6E9sKkPy-iCw4xl3KK8dFO5t45le1gwfg7Vs,3801
 intentkit/models/llm.py,sha256=ZnM6qpk9ouTqFysQzzg8TcAfxXASD-H9f1eHsmVjYv8,22186
 intentkit/models/redis.py,sha256=Vqb9pjeMQ85Az5GvUbqCsQ5stBpFg3n85p94TB40xEw,3727
 intentkit/models/skill.py,sha256=vGJgKpUmjGsThFznEwMLipuZIlqtto_ovVELp1_AjB8,20709
-intentkit/models/skills.csv,sha256=lvQg_1byPvJaHToQbEqRZarfYDuXpP4EXeVJVMc8aDs,19132
+intentkit/models/skills.csv,sha256=4Ni3OlVLLVEv8ipBtFzBJ23pysi59HbJ4CRCMHAMDYQ,19219
 intentkit/models/user.py,sha256=M79XT1dF1Ju5HKdE49RALeV_XXen7mIvmP9Lhsx9NFw,11485
 intentkit/skills/__init__.py,sha256=WkjmKB4xvy36zyXMroPMf_DTPgQloNS3L73nVnBmuQI,303
-intentkit/skills/base.py,sha256=cZmSEc-wHEGA1hgORYOO6xItVfr0WI7DRdz8hAUHWiI,12602
-intentkit/skills/skills.toml,sha256=WQiai9RKIQ2Mqp-eW35_RCn2RW5QLWN3aRgsj7B7OvE,3532
+intentkit/skills/base.py,sha256=WpCrCHJkvg9hi7wbvwMqBdWfPUGQ2NSOHkGziQuoJfc,12297
+intentkit/skills/onchain.py,sha256=U-wggQ-uYpZQAUp1cl7eij6FPvp7kQ84ZxSLZS5fysw,870
+intentkit/skills/skills.toml,sha256=O-s3Y66oswIi9SgwBZY9sva7bUYD3S2nJs9xWUn6SrM,3630
 intentkit/skills/acolyt/__init__.py,sha256=Q5Fx_9wVX1JkcXNzaf30E0BJB2wHAXReeE8WtDFAvbc,1812
 intentkit/skills/acolyt/acolyt.jpg,sha256=CwrrouzXzYvnHi1rprYruvZqPopG06ppMczEZmZ7D2s,11559
 intentkit/skills/acolyt/ask.py,sha256=UuTdjF5961MLDMzDChnD7OGAqi0UYTTFgwGvuAIUDkQ,5871
@@ -435,12 +436,17 @@ intentkit/skills/wow/__init__.py,sha256=m7kbAlh4kQWEixxiEeyVf3v4wUDdzOuFZ79NVsVj
 intentkit/skills/wow/base.py,sha256=nFt8sJtQQsu2_ZlRasXhyG148fSJYRL-20kEt380PaE,226
 intentkit/skills/wow/schema.json,sha256=jGpugebVupGTlOUYNu7fN99p-zL-cfaoOYSX7KW8VQc,2292
 intentkit/skills/wow/wow.svg,sha256=PO0-m6TZjJCql9r1oWohlRV5PyqGc5kIDUEnpP2-5SU,427
+intentkit/skills/x402/__init__.py,sha256=tAO80tBlMluExByWiQ_r2GZlaAYTMsaWxCXDREaqqAg,1315
+intentkit/skills/x402/ask_agent.py,sha256=9zp73uHmYZXnJQtEF7SRxC8N36e41cOwsNqVFo2Q9IQ,5053
+intentkit/skills/x402/base.py,sha256=KhC9CWFEgdfQjWH1QCRJiNSWCnmgypVIe1ap1hb3X5E,211
+intentkit/skills/x402/schema.json,sha256=1mYBzi5t3nSgSBzRv5imAAPG1hEGUWp_-QGJ1vyymoA,1069
+intentkit/skills/x402/x402.png,sha256=0BTtwDFlbdily3dA7ZANZYujEI_2_Ll3_D_091jBDws,68
 intentkit/skills/xmtp/README.md,sha256=7y3ny77l5WUI758Q3xip1akFEgBdbibkwZjeJDu5MwE,2963
 intentkit/skills/xmtp/__init__.py,sha256=2x3roc8BaHT_Mfd7IXPw0UgUdca8TDB8NBFvMRibhD0,2180
-intentkit/skills/xmtp/base.py,sha256=iZHRzl4KJ1XFRKR_QnR7hYojSyEIB89S8MGoBVarLZY,2495
-intentkit/skills/xmtp/price.py,sha256=gwuARYXcAsS5pQVHDqFOCewrHvzHnxVjQxXzDa67fZ8,2871
+intentkit/skills/xmtp/base.py,sha256=hPDcio_mgtD_blsQuMOJcwHQRKiFFaLR022JZZq1HPY,2512
+intentkit/skills/xmtp/price.py,sha256=31M9V-QAmqwNxTimBKtFHti3yYP7e3WGWJg8U31LKYI,2850
 intentkit/skills/xmtp/schema.json,sha256=DDi_vK1WeoON96j10yTVlRPpjc-8stIG7dwdek2LyXU,2463
-intentkit/skills/xmtp/swap.py,sha256=nQ2mqCp_Z2UnIXp81WLZSFOxIm8LSAqTIBDUklTRV3M,8437
+intentkit/skills/xmtp/swap.py,sha256=5OByZPdQEo3XbtR5Fu2t7sVh2Rp8_F_duTOcwCwkbKU,8413
 intentkit/skills/xmtp/transfer.py,sha256=43t1LG9B_8v5cbGH12F68JDsfd90a9_x2KUsJXnSMbE,7916
 intentkit/skills/xmtp/xmtp.png,sha256=vQzT-71zIb8aPodg-GkGSQbBnjGAPczWGm3es2ZkJe8,6681
 intentkit/utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -449,9 +455,10 @@ intentkit/utils/error.py,sha256=fZOZ9CPrU08veSyDBoNf44UjkojpsyFMEr2SxEdlSZA,4898
 intentkit/utils/logging.py,sha256=bhwZi5vscjBTd9kaNp_L6ijrfv9Sl3lsr4ARaUB4Iec,2389
 intentkit/utils/random.py,sha256=DymMxu9g0kuQLgJUqalvgksnIeLdS-v0aRk5nQU0mLI,452
 intentkit/utils/s3.py,sha256=A8Nsx5QJyLsxhj9g7oHNy2-m24tjQUhC9URm8Qb1jFw,10057
+intentkit/utils/schema.py,sha256=ATeTskEO2Y-MLFcOJEm5BoFJvxqc_zqQwiRS3rO4XDQ,3428
 intentkit/utils/slack_alert.py,sha256=s7UpRgyzLW7Pbmt8cKzTJgMA9bm4EP-1rQ5KXayHu6E,2264
 intentkit/utils/tx.py,sha256=2yLLGuhvfBEY5n_GJ8wmIWLCzn0FsYKv5kRNzw_sLUI,1454
-intentkit-0.8.12.dev6.dist-info/METADATA,sha256=nByKZWR9SCEC3HCfyKLk3xVGXSx4vCYaTOKJNsej374,6316
-intentkit-0.8.12.dev6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-intentkit-0.8.12.dev6.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
-intentkit-0.8.12.dev6.dist-info/RECORD,,
+intentkit-0.8.13.dist-info/METADATA,sha256=psi1Mh-lcGa0fOkVhr5F4Y1PiWpMc0sLNk4Ojpk6CMM,6311
+intentkit-0.8.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+intentkit-0.8.13.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
+intentkit-0.8.13.dist-info/RECORD,,