intentkit 0.6.0.dev15__tar.gz → 0.6.0.dev17__tar.gz

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.6.0.dev15
+Version: 0.6.0.dev17
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestal-network/intentkit
 Project-URL: Repository, https://github.com/crestal-network/intentkit

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/__init__.py

@@ -3,7 +3,7 @@
 A powerful platform for building AI agents with blockchain and cryptocurrency capabilities.
 """
 
-__version__ = "0.6.0-dev.15"
+__version__ = "0.6.0-dev.17"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

intentkit-0.6.0.dev17/clients/cdp.py

@@ -0,0 +1,151 @@
+import json
+import logging
+from typing import Dict, Optional
+
+from bip32 import BIP32
+from cdp import CdpClient as OriginCdpClient
+from cdp import EvmServerAccount
+from coinbase_agentkit import (
+    CdpEvmServerWalletProvider,
+    CdpEvmServerWalletProviderConfig,
+)
+from eth_keys.datatypes import PrivateKey
+from eth_utils import to_checksum_address
+
+from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.models.agent import Agent
+from intentkit.models.agent_data import AgentData
+
+_clients: Dict[str, "CdpClient"] = {}
+
+logger = logging.getLogger(__name__)
+
+
+def bip39_seed_to_eth_keys(seed_hex: str) -> Dict[str, str]:
+    """
+    Converts a BIP39 seed to an Ethereum private key, public key, and address.
+
+    Args:
+        seed_hex: The BIP39 seed in hexadecimal format
+
+    Returns:
+        Dict containing private_key, public_key, and address
+    """
+    # Convert the hex seed to bytes
+    seed_bytes = bytes.fromhex(seed_hex)
+
+    # Derive the master key from the seed
+    bip32 = BIP32.from_seed(seed_bytes)
+
+    # Derive the Ethereum address using the standard derivation path
+    private_key_bytes = bip32.get_privkey_from_path("m/44'/60'/0'/0/0")
+
+    # Create a private key object
+    private_key = PrivateKey(private_key_bytes)
+
+    # Get the public key
+    public_key = private_key.public_key
+
+    # Get the Ethereum address
+    address = public_key.to_address()
+
+    return {
+        "private_key": private_key.to_hex(),
+        "public_key": public_key.to_hex(),
+        "address": to_checksum_address(address),
+    }
+
+
+class CdpClient:
+    def __init__(self, agent_id: str, skill_store: SkillStoreABC) -> None:
+        self._agent_id = agent_id
+        self._skill_store = skill_store
+        self._wallet_provider: Optional[CdpEvmServerWalletProvider] = None
+        self._wallet_provider_config: Optional[CdpEvmServerWalletProviderConfig] = None
+
+    async def get_wallet_provider(self) -> CdpEvmServerWalletProvider:
+        if self._wallet_provider:
+            return self._wallet_provider
+        agent: Agent = await self._skill_store.get_agent_config(self._agent_id)
+        agent_data: AgentData = await self._skill_store.get_agent_data(self._agent_id)
+        network_id = agent.network_id or agent.cdp_network_id
+
+        # Get credentials from skill store system config
+        api_key_id = self._skill_store.get_system_config("cdp_api_key_id")
+        api_key_secret = self._skill_store.get_system_config("cdp_api_key_secret")
+        wallet_secret = self._skill_store.get_system_config("cdp_wallet_secret")
+
+        # already have address
+        address = agent_data.evm_wallet_address
+
+        # new agent or address not migrated yet
+        if not address:
+            # create cdp client for later use
+            cdp_client = OriginCdpClient(
+                api_key_id=api_key_id,
+                api_key_secret=api_key_secret,
+                wallet_secret=wallet_secret,
+            )
+            # 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(
+                        name=agent.id,
+                        private_key=keys["private_key"],
+                    )
+                    address = keys["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(
+                    name=agent.id,
+                )
+                address = new_account.address
+                logger.info("Created new wallet: %s", address)
+            # now it should be created or migrated, store it
+            agent_data.evm_wallet_address = address
+            await agent_data.save()
+
+        # it must have v2 account now, load agentkit wallet provider
+        self._wallet_provider_config = CdpEvmServerWalletProviderConfig(
+            api_key_id=api_key_id,
+            api_key_secret=api_key_secret,
+            network_id=network_id,
+            address=address,
+            wallet_secret=wallet_secret,
+        )
+        self._wallet_provider = CdpEvmServerWalletProvider(self._wallet_provider_config)
+        return self._wallet_provider
+
+    async def get_account(self) -> EvmServerAccount:
+        """Get the account object from the wallet provider.
+
+        Returns:
+            EvmServerAccount: The account object that can be used for balance checks, transfers, etc.
+        """
+        wallet_provider = await self.get_wallet_provider()
+        # Access the internal account object
+        return wallet_provider._account
+
+    async def get_provider_config(self) -> CdpEvmServerWalletProviderConfig:
+        if not self._wallet_provider_config:
+            await self.get_wallet_provider()
+        return self._wallet_provider_config
+
+
+async def get_cdp_client(agent_id: str, skill_store: SkillStoreABC) -> "CdpClient":
+    if agent_id not in _clients:
+        _clients[agent_id] = CdpClient(agent_id, skill_store)
+    return _clients[agent_id]

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/core/prompt.py

@@ -1,5 +1,3 @@
-import json
-
 from intentkit.config.config import config
 from intentkit.models.agent import Agent
 from intentkit.models.agent_data import AgentData
@@ -34,10 +32,11 @@ def agent_prompt(agent: Agent, agent_data: AgentData) -> str:
         if agent_data.telegram_name:
             prompt += f"Your telegram bot name is {agent_data.telegram_name}.\n"
         # CDP
-        if agent_data.cdp_wallet_data:
-            network_id = agent.network_id or agent.cdp_network_id
-            wallet_data = json.loads(agent_data.cdp_wallet_data)
-            prompt += f"Your wallet address in {network_id} is {wallet_data['default_address_id']} .\n"
+        network_id = agent.network_id or agent.cdp_network_id
+        if agent_data.evm_wallet_address and network_id != "solana":
+            prompt += f"Your wallet address in {network_id} is {agent_data.evm_wallet_address} .\n"
+        if agent_data.solana_wallet_address and network_id == "solana":
+            prompt += f"Your wallet address in {network_id} is {agent_data.solana_wallet_address} .\n"
     prompt += "\n"
     if agent.purpose:
         prompt += f"## Purpose\n\n{agent.purpose}\n\n"

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/models/agent.py

@@ -1564,7 +1564,6 @@ class AgentResponse(BaseModel):
             str: ETag value for the agent
         """
         import hashlib
-        import json
 
         # Generate hash from the entire object data using json mode to handle datetime objects
         # Sort keys to ensure consistent ordering of dictionary keys
@@ -1622,13 +1621,7 @@ class AgentResponse(BaseModel):
             data["skills"] = filtered_skills
 
         # Process CDP wallet address
-        cdp_wallet_address = None
-        if agent_data and agent_data.cdp_wallet_data:
-            try:
-                wallet_data = json.loads(agent_data.cdp_wallet_data)
-                cdp_wallet_address = wallet_data.get("default_address_id")
-            except (json.JSONDecodeError, AttributeError):
-                pass
+        cdp_wallet_address = agent_data.evm_wallet_address if agent_data else None
 
         # Process Twitter linked status
         has_twitter_linked = False

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/models/agent_data.py

@@ -29,6 +29,10 @@ class AgentDataTable(Base):
     __tablename__ = "agent_data"
 
     id = Column(String, primary_key=True, comment="Same as Agent.id")
+    evm_wallet_address = Column(String, nullable=True, comment="EVM wallet address")
+    solana_wallet_address = Column(
+        String, nullable=True, comment="Solana wallet address"
+    )
     cdp_wallet_data = Column(String, nullable=True, comment="CDP wallet data")
     crossmint_wallet_data = Column(
         JSON().with_variant(JSONB(), "postgresql"),
@@ -94,6 +98,20 @@ class AgentData(BaseModel):
             description="Same as Agent.id",
         ),
     ]
+    evm_wallet_address: Annotated[
+        Optional[str],
+        PydanticField(
+            default=None,
+            description="EVM wallet address",
+        ),
+    ]
+    solana_wallet_address: Annotated[
+        Optional[str],
+        PydanticField(
+            default=None,
+            description="Solana wallet address",
+        ),
+    ]
     cdp_wallet_data: Annotated[
         Optional[str],
         PydanticField(

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "intentkit"
-version = "0.6.0-dev.15"
+version = "0.6.0-dev.17"
 description = "Intent-based AI Agent Platform - Core Package"
 authors = [{ name = "hyacinthus", email = "hyacinthus@gmail.com" }]
 requires-python = ">=3.12"

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/skills/cdp/__init__.py

@@ -25,9 +25,6 @@ from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.cdp.base import CDPBaseTool
 from intentkit.skills.cdp.get_balance import GetBalance
 
-# Cache skills at the system level, because they are stateless
-_cache: dict[str, CDPBaseTool] = {}
-
 
 class SkillStates(TypedDict):
     get_balance: SkillState

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/skills/http/schema.json

@@ -3,7 +3,7 @@
   "type": "object",
   "title": "HTTP Client",
   "description": "HTTP client skills for making web requests",
-  "x-icon": "https://ai.service.crestal.dev/skills/http/http.jpg",
+  "x-icon": "https://ai.service.crestal.dev/skills/http/http.svg",
   "x-tags": [
     "HTTP",
     "Web",
@@ -15,7 +15,7 @@
       "type": "boolean",
       "title": "Enabled",
       "description": "Whether this skill is enabled",
-      "default": true
+      "default": false
     },
     "states": {
       "type": "object",
@@ -70,18 +70,6 @@
         }
       },
       "description": "States for each HTTP client skill (disabled, public, or private)"
-    },
-    "api_key_provider": {
-      "type": "string",
-      "title": "API Key Provider",
-      "description": "Who provides the API key",
-      "enum": [
-        "platform"
-      ],
-      "x-enum-title": [
-        "Nation Hosted"
-      ],
-      "default": "platform"
     }
   },
   "required": [

{intentkit-0.6.0.dev15 → intentkit-0.6.0.dev17}/skills/supabase/schema.json

@@ -3,7 +3,7 @@
   "type": "object",
   "title": "Supabase",
   "description": "Integration with Supabase backend-as-a-service platform enabling database operations and Edge Function invocations",
-  "x-icon": "https://ai.service.crestal.dev/skills/supabase/supabase.png",
+  "x-icon": "https://ai.service.crestal.dev/skills/supabase/supabase.svg",
   "x-tags": [
     "Database",
     "Backend"
@@ -132,19 +132,21 @@
     "supabase_url": {
       "type": "string",
       "title": "Supabase URL",
-      "description": "Your Supabase project URL (e.g., https://your-project.supabase.co)",
+      "description": "Your Supabase project URL (e.g., https://your-project.supabase.co). You can find it in Project Settings -> Data API",
+      "x-link": "https://supabase.com/",
       "format": "uri"
     },
     "supabase_key": {
       "type": "string",
-      "title": "Supabase Anon Key",
-      "description": "Your Supabase project's anon/public key",
+      "title": "Supabase API Key",
+      "description": "Your Supabase project's API key. You can find it in Project Settings -> API Keys",
+      "x-sensitive": true,
       "format": "password"
     },
     "public_write_tables": {
       "type": "string",
       "title": "Public Write Tables",
-      "description": "Add tables split by comma, when insert,update,upsert,delete enabled in public use, they can only use tables from this list. When skills in owner mode, this list will not limit skills.",
+      "description": "Add tables separated by commas. When insert, update, upsert, or delete operations are enabled for public use, only tables from this list can be used. This list does not restrict the skills executed by the owner or in autonomous chat.",
       "default": ""
     }
   },

intentkit-0.6.0.dev15/clients/cdp.py

@@ -1,92 +0,0 @@
-import json
-import logging
-from typing import Dict, Optional
-
-from cdp import EvmServerAccount
-from coinbase_agentkit import (
-    CdpEvmServerWalletProvider,
-    CdpEvmServerWalletProviderConfig,
-)
-
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.models.agent import Agent
-from intentkit.models.agent_data import AgentData
-
-_clients: Dict[str, "CdpClient"] = {}
-
-
-class CdpClient:
-    def __init__(self, agent_id: str, skill_store: SkillStoreABC) -> None:
-        self._agent_id = agent_id
-        self._skill_store = skill_store
-        self._wallet_provider: Optional[CdpEvmServerWalletProvider] = None
-        self._wallet_provider_config: Optional[CdpEvmServerWalletProviderConfig] = None
-
-    async def get_wallet_provider(self) -> CdpEvmServerWalletProvider:
-        if self._wallet_provider:
-            return self._wallet_provider
-        agent: Agent = await self._skill_store.get_agent_config(self._agent_id)
-        agent_data: AgentData = await self._skill_store.get_agent_data(self._agent_id)
-        network_id = agent.network_id or agent.cdp_network_id
-
-        logger = logging.getLogger(__name__)
-
-        # Get credentials from skill store system config
-        api_key_id = self._skill_store.get_system_config("cdp_api_key_id")
-        api_key_secret = self._skill_store.get_system_config("cdp_api_key_secret")
-        wallet_secret = self._skill_store.get_system_config("cdp_wallet_secret")
-
-        address = None
-
-        # Attempt to override with any wallet-specific secret stored in wallet_data
-        if agent_data.cdp_wallet_data:
-            try:
-                wallet_data = json.loads(agent_data.cdp_wallet_data)
-                # Try to get address from the new format or fallback to old format
-                if "default_address_id" in wallet_data:
-                    address = wallet_data["default_address_id"]
-
-                # Prefer wallet_secret stored alongside the wallet data if present
-                if "wallet_secret" in wallet_data:
-                    wallet_secret = wallet_data["wallet_secret"]
-                elif "account_data" in wallet_data and wallet_data["account_data"]:
-                    # Some versions may nest the secret inside account_data
-                    wallet_secret = (
-                        wallet_data["account_data"].get("wallet_secret")
-                        or wallet_secret
-                    )
-            except json.JSONDecodeError:
-                logger.warning(
-                    "Invalid JSON in cdp_wallet_data for agent %s", self._agent_id
-                )
-
-        self._wallet_provider_config = CdpEvmServerWalletProviderConfig(
-            api_key_id=api_key_id,
-            api_key_secret=api_key_secret,
-            network_id=network_id,
-            address=address,
-            wallet_secret=wallet_secret,
-        )
-        self._wallet_provider = CdpEvmServerWalletProvider(self._wallet_provider_config)
-        return self._wallet_provider
-
-    async def get_account(self) -> EvmServerAccount:
-        """Get the account object from the wallet provider.
-
-        Returns:
-            EvmServerAccount: The account object that can be used for balance checks, transfers, etc.
-        """
-        wallet_provider = await self.get_wallet_provider()
-        # Access the internal account object
-        return wallet_provider._account
-
-    async def get_provider_config(self) -> CdpEvmServerWalletProviderConfig:
-        if not self._wallet_provider_config:
-            await self.get_wallet_provider()
-        return self._wallet_provider_config
-
-
-async def get_cdp_client(agent_id: str, skill_store: SkillStoreABC) -> "CdpClient":
-    if agent_id not in _clients:
-        _clients[agent_id] = CdpClient(agent_id, skill_store)
-    return _clients[agent_id]