intentkit 0.8.4.dev3__tar.gz → 0.8.17__tar.gz

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.8.4.dev3
+Version: 0.8.17
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestalnetwork/intentkit
 Project-URL: Repository, https://github.com/crestalnetwork/intentkit
@@ -34,15 +34,14 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.12
+Requires-Python: ==3.13.*
 Requires-Dist: aiohttp>=3.11.16
 Requires-Dist: aiosqlite>=0.21.0
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: aws-secretsmanager-caching>=1.1.3
-Requires-Dist: bip32>=2.0.0
 Requires-Dist: boto3<2.0.0,>=1.37.23
 Requires-Dist: botocore>=1.35.97
 Requires-Dist: cdp-sdk>=1.31.1

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/__init__.py

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

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/abstracts/agent.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import Dict, Optional
 
 from intentkit.models.agent import Agent
 from intentkit.models.agent_data import AgentData, AgentQuota
@@ -24,7 +23,7 @@ class AgentStoreABC(ABC):
         self.agent_id = agent_id
 
     @abstractmethod
-    async def get_config(self) -> Optional[Agent]:
+    async def get_config(self) -> Agent | None:
         """Get agent configuration.
 
         Returns:
@@ -33,7 +32,7 @@ class AgentStoreABC(ABC):
         pass
 
     @abstractmethod
-    async def get_data(self) -> Optional[AgentData]:
+    async def get_data(self) -> AgentData | None:
         """Get additional agent data.
 
         Returns:
@@ -42,7 +41,7 @@ class AgentStoreABC(ABC):
         pass
 
     @abstractmethod
-    async def set_data(self, data: Dict) -> None:
+    async def set_data(self, data: dict) -> None:
         """Update agent data.
 
         Args:
@@ -51,7 +50,7 @@ class AgentStoreABC(ABC):
         pass
 
     @abstractmethod
-    async def get_quota(self) -> Optional[AgentQuota]:
+    async def get_quota(self) -> AgentQuota | None:
         """Get agent quota information.
 
         Returns:

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/abstracts/engine.py

@@ -1,4 +1,4 @@
-from typing import Callable, List
+from collections.abc import Callable
 
 from pydantic import BaseModel
 
@@ -12,19 +12,19 @@ class AgentMessageInput(BaseModel):
 
     Attributes:
         text (str): The main text content of the message or query
-        images (List[str]): List of image references/URLs to be processed by the agent.
+        images (list[str]): List of image references/URLs to be processed by the agent.
                            Empty list if no images are provided.
     """
 
     text: str  # required
     """The main text content or query to be processed by the agent"""
 
-    images: List[str] = []  # optional, defaults to empty list
+    images: list[str] = []  # optional, defaults to empty list
     """List of image references or URLs for multimodal processing"""
 
 
 # Define a type hint for the callback that takes three strings and returns a list of strings
-AgentExecutionCallback = Callable[[str, AgentMessageInput, str], List[str]]
+AgentExecutionCallback = Callable[[str, AgentMessageInput, str], list[str]]
 """Callback function type for agent execution.
 
 Args:
@@ -33,6 +33,6 @@ Args:
     thread_id (str): The thread ID for tracking the conversation context
 
 Returns:
-    List[str]: A list of formatted response lines from the agent execution. Each line
+    list[str]: A list of formatted response lines from the agent execution. Each line
         typically contains input/output markers, agent responses, and timing information.
 """

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/abstracts/graph.py

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from enum import Enum
-from typing import Any, Callable, Dict, NotRequired, Optional
+from typing import Any, NotRequired
 
 from langgraph.prebuilt.chat_agent_executor import AgentState as BaseAgentState
 from pydantic import BaseModel
@@ -23,21 +24,25 @@ class AgentState(BaseAgentState):
 
     context: dict[str, Any]
     error: NotRequired[AgentError]
-    __extra__: NotRequired[Dict[str, Any]]
+    __extra__: NotRequired[dict[str, Any]]
 
 
 class AgentContext(BaseModel):
     agent_id: str
     get_agent: Callable[[], Agent]
     chat_id: str
-    user_id: Optional[str] = None
-    app_id: Optional[str] = None
+    user_id: str | None = None
+    app_id: str | None = None
     entrypoint: AuthorType
     is_private: bool
     search: bool = False
     thinking: bool = False
-    payer: Optional[str] = None
+    payer: str | None = None
 
     @property
     def agent(self) -> Agent:
         return self.get_agent()
+
+    @property
+    def thread_id(self) -> str:
+        return f"{self.agent_id}-{self.chat_id}"

intentkit-0.8.17/abstracts/skill.py

@@ -0,0 +1,60 @@
+from abc import ABC, abstractmethod
+from typing import Any
+
+from intentkit.models.agent import Agent
+from intentkit.models.agent_data import AgentData, AgentQuota
+
+
+class SkillStoreABC(ABC):
+    """Abstract base class for skill data storage operations.
+
+    This class defines the interface for interacting with skill-related data
+    for both agents and threads.
+    """
+
+    @staticmethod
+    @abstractmethod
+    def get_system_config(key: str) -> Any:
+        """Get system configuration value by key."""
+        pass
+
+    @staticmethod
+    @abstractmethod
+    async def get_agent_config(agent_id: str) -> Agent | None:
+        """Get agent configuration.
+
+        Returns:
+            Agent configuration if found, None otherwise
+        """
+        pass
+
+    @staticmethod
+    @abstractmethod
+    async def get_agent_data(agent_id: str) -> AgentData | None:
+        """Get additional agent data.
+
+        Returns:
+            Agent data if found, None otherwise
+        """
+        pass
+
+    @staticmethod
+    @abstractmethod
+    async def set_agent_data(agent_id: str, data: dict) -> None:
+        """Update agent data.
+
+        Args:
+            agent_id: ID of the agent
+            data: Dictionary containing fields to update
+        """
+        pass
+
+    @staticmethod
+    @abstractmethod
+    async def get_agent_quota(agent_id: str) -> AgentQuota | None:
+        """Get agent quota information.
+
+        Returns:
+            Agent quota if found, None otherwise
+        """
+        pass

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/abstracts/twitter.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from tweepy.asynchronous import AsyncClient
 
@@ -15,7 +14,7 @@ class TwitterABC(ABC):
     use_key = False
 
     @abstractmethod
-    async def get_client(self) -> Optional[AsyncClient]:
+    async def get_client(self) -> AsyncClient | None:
         """Get a configured Tweepy client.
 
         Returns:
@@ -25,7 +24,7 @@ class TwitterABC(ABC):
 
     @property
     @abstractmethod
-    def self_id(self) -> Optional[str]:
+    def self_id(self) -> str | None:
         """Get the Twitter user ID.
 
         Returns:
@@ -35,7 +34,7 @@ class TwitterABC(ABC):
 
     @property
     @abstractmethod
-    def self_username(self) -> Optional[str]:
+    def self_username(self) -> str | None:
         """Get the Twitter username.
 
         Returns:
@@ -45,7 +44,7 @@ class TwitterABC(ABC):
 
     @property
     @abstractmethod
-    def self_name(self) -> Optional[str]:
+    def self_name(self) -> str | None:
         """Get the Twitter display name.
 
         Returns:

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/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-0.8.17/clients/cdp.py

@@ -0,0 +1,128 @@
+import asyncio
+import logging
+
+from cdp import CdpClient, EvmServerAccount  # noqa: E402
+from coinbase_agentkit import (  # noqa: E402
+    CdpEvmWalletProvider,
+    CdpEvmWalletProviderConfig,
+)
+
+from intentkit.config.config import config
+from intentkit.models.agent import Agent, AgentTable  # noqa: E402
+from intentkit.models.agent_data import AgentData
+from intentkit.models.db import get_session
+from intentkit.utils.error import IntentKitAPIError  # noqa: E402
+
+_wallet_providers: dict[str, tuple[str, str, CdpEvmWalletProvider]] = {}
+_cdp_client: CdpClient | None = None
+
+logger = logging.getLogger(__name__)
+
+
+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
+
+    _cdp_client = CdpClient(
+        api_key_id=api_key_id,
+        api_key_secret=api_key_secret,
+        wallet_secret=wallet_secret,
+    )
+    return _cdp_client
+
+
+def _assert_cdp_wallet_provider(agent: Agent) -> None:
+    if agent.wallet_provider != "cdp":
+        raise IntentKitAPIError(
+            400,
+            "BadWalletProvider",
+            "Your agent wallet provider is not cdp but you selected a skill that requires a cdp wallet.",
+        )
+
+
+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: EvmServerAccount | None = None
+
+    if not address:
+        logger.info("Creating new wallet...")
+        account = await cdp_client.evm.create_account(
+            name=agent.id,
+        )
+        address = account.address
+        logger.info("Created new wallet: %s", address)
+
+    agent_data.evm_wallet_address = address
+    await agent_data.save()
+    if not agent.slug:
+        async with get_session() as db:
+            db_agent = await db.get(AgentTable, agent.id)
+            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,
+        network_id=network_id,
+        address=address,
+        wallet_secret=wallet_secret,
+    )
+    wallet_provider = await asyncio.to_thread(
+        CdpEvmWalletProvider, wallet_provider_config
+    )
+    _wallet_providers[agent.id] = (network_id, address, wallet_provider)
+    return wallet_provider

{intentkit-0.8.4.dev3 → intentkit-0.8.17}/clients/twitter.py

@@ -1,8 +1,8 @@
 import logging
 import os
 import tempfile
-from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, List, NotRequired, Optional, TypedDict
+from datetime import UTC, datetime, timedelta
+from typing import Any, NotRequired, TypedDict
 from urllib.parse import urlencode
 
 import httpx
@@ -11,15 +11,14 @@ from requests.auth import HTTPBasicAuth
 from requests_oauthlib import OAuth2Session
 from tweepy.asynchronous import AsyncClient
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.abstracts.twitter import TwitterABC
 from intentkit.models.agent_data import AgentData
 from intentkit.models.redis import get_redis
 
 logger = logging.getLogger(__name__)
 
-_clients_linked: Dict[str, "TwitterClient"] = {}
-_clients_self_key: Dict[str, "TwitterClient"] = {}
+_clients_linked: dict[str, "TwitterClient"] = {}
+_clients_self_key: dict[str, "TwitterClient"] = {}
 
 _VERIFIER_KEY = "intentkit:twitter:code_verifier"
 _CHALLENGE_KEY = "intentkit:twitter:code_challenge"
@@ -30,7 +29,7 @@ class TwitterMedia(BaseModel):
 
     media_key: str
     type: str
-    url: Optional[str] = None
+    url: str | None = None
 
 
 class TwitterUser(BaseModel):
@@ -59,10 +58,10 @@ class Tweet(BaseModel):
     id: str
     text: str
     author_id: str
-    author: Optional[TwitterUser] = None
+    author: TwitterUser | None = None
     created_at: datetime
-    referenced_tweets: Optional[List["Tweet"]] = None
-    attachments: Optional[List[TwitterMedia]] = None
+    referenced_tweets: list["Tweet"] | None = None
+    attachments: list[TwitterMedia] | None = None
 
 
 class TwitterClientConfig(TypedDict):
@@ -80,33 +79,44 @@ class TwitterClient(TwitterABC):
 
     Args:
         agent_id: The ID of the agent
-        skill_store: The skill store for retrieving data
         config: Configuration dictionary that may contain API keys
     """
 
-    def __init__(self, agent_id: str, skill_store: SkillStoreABC, config: Dict) -> None:
+    def __init__(self, agent_id: str, config: dict) -> None:
         """Initialize the Twitter client.
 
         Args:
             agent_id: The ID of the agent
-            skill_store: The skill store for retrieving data
             config: Configuration dictionary that may contain API keys
         """
         self.agent_id = agent_id
-        self._client: Optional[AsyncClient] = None
-        self._skill_store = skill_store
-        self._agent_data: Optional[AgentData] = None
+        self._client: AsyncClient | None = None
+        self._agent_data: AgentData | None = None
         self.use_key = _is_self_key(config)
         self._config = config
 
+    async def _get_agent_data(self) -> AgentData:
+        """Retrieve cached agent data, loading from the database if needed."""
+
+        if not self._agent_data:
+            self._agent_data = await AgentData.get(self.agent_id)
+        return self._agent_data
+
+    async def _refresh_agent_data(self) -> AgentData:
+        """Reload agent data from the database."""
+
+        self._agent_data = await AgentData.get(self.agent_id)
+        return self._agent_data
+
     async def get_client(self) -> AsyncClient:
         """Get the initialized Twitter client.
 
         Returns:
             AsyncClient: The Twitter client if initialized
         """
-        if not self._agent_data:
-            self._agent_data = await self._skill_store.get_agent_data(self.agent_id)
+
+        agent_data = await self._get_agent_data()
+
         if not self._client:
             # Check if we have API keys in config
             if self.use_key:
@@ -118,30 +128,26 @@ class TwitterClient(TwitterABC):
                     return_type=dict,
                 )
                 # refresh userinfo if needed
-                if not self._agent_data.twitter_self_key_refreshed_at or (
-                    self._agent_data.twitter_self_key_refreshed_at
-                    < datetime.now(tz=timezone.utc) - timedelta(days=1)
+                if not agent_data.twitter_self_key_refreshed_at or (
+                    agent_data.twitter_self_key_refreshed_at
+                    < datetime.now(tz=UTC) - timedelta(days=1)
                 ):
                     me = await self._client.get_me(
                         user_auth=self.use_key,
                         user_fields="id,username,name,verified",
                     )
                     if me and "data" in me and "id" in me["data"]:
-                        await self._skill_store.set_agent_data(
+                        await AgentData.patch(
                             self.agent_id,
                             {
                                 "twitter_id": me["data"]["id"],
                                 "twitter_username": me["data"]["username"],
                                 "twitter_name": me["data"]["name"],
                                 "twitter_is_verified": me["data"]["verified"],
-                                "twitter_self_key_refreshed_at": datetime.now(
-                                    tz=timezone.utc
-                                ),
+                                "twitter_self_key_refreshed_at": datetime.now(tz=UTC),
                             },
                         )
-                    self._agent_data = await self._skill_store.get_agent_data(
-                        self.agent_id
-                    )
+                    agent_data = await self._refresh_agent_data()
                 logger.info(
                     f"Twitter self key client initialized. "
                     f"Use API key: {self.use_key}, "
@@ -152,43 +158,38 @@ class TwitterClient(TwitterABC):
                 )
                 return self._client
             # Otherwise try to get OAuth2 tokens from agent data
-            if not self._agent_data.twitter_access_token:
+            if not agent_data.twitter_access_token:
                 raise Exception(f"[{self.agent_id}] Twitter access token not found")
-            if not self._agent_data.twitter_access_token_expires_at:
+            if not agent_data.twitter_access_token_expires_at:
                 raise Exception(
                     f"[{self.agent_id}] Twitter access token expiration not found"
                 )
-            if self._agent_data.twitter_access_token_expires_at <= datetime.now(
-                tz=timezone.utc
-            ):
+            if agent_data.twitter_access_token_expires_at <= datetime.now(tz=UTC):
                 raise Exception(f"[{self.agent_id}] Twitter access token has expired")
             self._client = AsyncClient(
-                bearer_token=self._agent_data.twitter_access_token,
+                bearer_token=agent_data.twitter_access_token,
                 return_type=dict,
             )
             return self._client
+
         if not self.use_key:
             # check if access token has expired
-            if self._agent_data.twitter_access_token_expires_at <= datetime.now(
-                tz=timezone.utc
-            ):
-                self._agent_data = await self._skill_store.get_agent_data(self.agent_id)
-                # check again
-                if self._agent_data.twitter_access_token_expires_at <= datetime.now(
-                    tz=timezone.utc
-                ):
+            if agent_data.twitter_access_token_expires_at <= datetime.now(tz=UTC):
+                agent_data = await self._refresh_agent_data()
+                if agent_data.twitter_access_token_expires_at <= datetime.now(tz=UTC):
                     raise Exception(
                         f"[{self.agent_id}] Twitter access token has expired"
                     )
                 self._client = AsyncClient(
-                    bearer_token=self._agent_data.twitter_access_token,
+                    bearer_token=agent_data.twitter_access_token,
                     return_type=dict,
                 )
                 return self._client
+
         return self._client
 
     @property
-    def self_id(self) -> Optional[str]:
+    def self_id(self) -> str | None:
         """Get the Twitter user ID.
 
         Returns:
@@ -201,7 +202,7 @@ class TwitterClient(TwitterABC):
         return self._agent_data.twitter_id
 
     @property
-    def self_username(self) -> Optional[str]:
+    def self_username(self) -> str | None:
         """Get the Twitter username.
 
         Returns:
@@ -214,7 +215,7 @@ class TwitterClient(TwitterABC):
         return self._agent_data.twitter_username
 
     @property
-    def self_name(self) -> Optional[str]:
+    def self_name(self) -> str | None:
         """Get the Twitter display name.
 
         Returns:
@@ -227,7 +228,7 @@ class TwitterClient(TwitterABC):
         return self._agent_data.twitter_name
 
     @property
-    def self_is_verified(self) -> Optional[bool]:
+    def self_is_verified(self) -> bool | None:
         """Get the Twitter account verification status.
 
         Returns:
@@ -239,14 +240,14 @@ class TwitterClient(TwitterABC):
             return None
         return self._agent_data.twitter_is_verified
 
-    def process_tweets_response(self, response: Dict[str, Any]) -> List[Tweet]:
+    def process_tweets_response(self, response: dict[str, Any]) -> list[Tweet]:
         """Process Twitter API response and convert it to a list of Tweet objects.
 
         Args:
             response: Raw Twitter API response containing tweets data and includes.
 
         Returns:
-            List[Tweet]: List of processed Tweet objects.
+            list[Tweet]: List of processed Tweet objects.
         """
         result = []
         if not response.get("data"):
@@ -338,7 +339,7 @@ class TwitterClient(TwitterABC):
 
         return result
 
-    async def upload_media(self, agent_id: str, image_url: str) -> List[str]:
+    async def upload_media(self, agent_id: str, image_url: str) -> list[str]:
         """Upload media to Twitter and return the media IDs.
 
         Args:
@@ -346,13 +347,13 @@ class TwitterClient(TwitterABC):
             image_url: The URL of the image to upload.
 
         Returns:
-            List[str]: A list of media IDs for the uploaded media.
+            list[str]: A list of media IDs for the uploaded media.
 
         Raises:
             ValueError: If there's an error uploading the media.
         """
         # Get agent data to access the token
-        agent_data = await self._skill_store.get_agent_data(agent_id)
+        agent_data = await AgentData.get(agent_id)
         if not agent_data.twitter_access_token:
             raise ValueError("Only linked X account can post media")
 
@@ -419,19 +420,17 @@ class TwitterClient(TwitterABC):
         return media_ids
 
 
-def _is_self_key(config: Dict) -> bool:
+def _is_self_key(config: dict) -> bool:
     return config.get("api_key_provider") == "agent_owner"
 
 
-def get_twitter_client(
-    agent_id: str, skill_store: SkillStoreABC, config: Dict
-) -> "TwitterClient":
+def get_twitter_client(agent_id: str, config: dict) -> "TwitterClient":
     if _is_self_key(config):
         if agent_id not in _clients_self_key:
-            _clients_self_key[agent_id] = TwitterClient(agent_id, skill_store, config)
+            _clients_self_key[agent_id] = TwitterClient(agent_id, config)
         return _clients_self_key[agent_id]
     if agent_id not in _clients_linked:
-        _clients_linked[agent_id] = TwitterClient(agent_id, skill_store, config)
+        _clients_linked[agent_id] = TwitterClient(agent_id, config)
     return _clients_linked[agent_id]