intentkit 0.8.6.dev2__py3-none-any.whl → 0.8.17__py3-none-any.whl

intentkit/core/credit.py

@@ -1,7 +1,6 @@
 import logging
 from datetime import datetime
 from decimal import ROUND_HALF_UP, Decimal
-from typing import List, Optional, Tuple
 
 from epyxid import XID
 from pydantic import BaseModel
@@ -50,7 +49,7 @@ FOURPLACES = Decimal("0.0001")
 async def update_credit_event_note(
     session: AsyncSession,
     event_id: str,
-    note: Optional[str] = None,
+    note: str | None = None,
 ) -> CreditEvent:
     """
     Update the note of a credit event.
@@ -89,7 +88,7 @@ async def recharge(
     user_id: str,
     amount: Decimal,
     upstream_tx_id: str,
-    note: Optional[str] = None,
+    note: str | None = None,
 ) -> CreditAccount:
     """
     Recharge credits to a user account.
@@ -220,7 +219,7 @@ async def withdraw(
     agent_id: str,
     amount: Decimal,
     upstream_tx_id: str,
-    note: Optional[str] = None,
+    note: str | None = None,
 ) -> CreditAccount:
     """
     Withdraw credits from an agent account to platform account.
@@ -385,8 +384,8 @@ async def reward(
     user_id: str,
     amount: Decimal,
     upstream_tx_id: str,
-    note: Optional[str] = None,
-    reward_type: Optional[RewardType] = RewardType.REWARD,
+    note: str | None = None,
+    reward_type: RewardType | None = RewardType.REWARD,
 ) -> CreditAccount:
     """
     Reward a user account with reward credits.
@@ -679,8 +678,8 @@ async def adjustment(
 async def update_daily_quota(
     session: AsyncSession,
     user_id: str,
-    free_quota: Optional[Decimal] = None,
-    refill_amount: Optional[Decimal] = None,
+    free_quota: Decimal | None = None,
+    refill_amount: Decimal | None = None,
     upstream_tx_id: str = "",
     note: str = "",
 ) -> CreditAccount:
@@ -706,11 +705,11 @@ async def update_daily_quota(
 async def list_credit_events_by_user(
     session: AsyncSession,
     user_id: str,
-    direction: Optional[Direction] = None,
-    cursor: Optional[str] = None,
+    direction: Direction | None = None,
+    cursor: str | None = None,
     limit: int = 20,
-    event_type: Optional[EventType] = None,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+    event_type: EventType | None = None,
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List credit events for a user account with cursor pagination.
 
@@ -771,13 +770,13 @@ async def list_credit_events_by_user(
 
 async def list_credit_events(
     session: AsyncSession,
-    direction: Optional[Direction] = Direction.EXPENSE,
-    cursor: Optional[str] = None,
+    direction: Direction | None = Direction.EXPENSE,
+    cursor: str | None = None,
     limit: int = 20,
-    event_type: Optional[EventType] = None,
-    start_at: Optional[datetime] = None,
-    end_at: Optional[datetime] = None,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+    event_type: EventType | None = None,
+    start_at: datetime | None = None,
+    end_at: datetime | None = None,
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List all credit events with cursor pagination.
 
@@ -841,9 +840,9 @@ async def list_credit_events(
 async def list_fee_events_by_agent(
     session: AsyncSession,
     agent_id: str,
-    cursor: Optional[str] = None,
+    cursor: str | None = None,
     limit: int = 20,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List fee events for an agent with cursor pagination.
     These events represent income for the agent from users' expenses.

intentkit/core/engine.py

@@ -17,7 +17,6 @@ import textwrap
 import time
 import traceback
 from datetime import datetime
-from typing import Optional, Tuple
 
 import sqlalchemy
 from epyxid import XID
@@ -36,7 +35,6 @@ from sqlalchemy.exc import SQLAlchemyError
 
 from intentkit.abstracts.graph import AgentContext, AgentError, AgentState
 from intentkit.config.config import config
-from intentkit.core.agent import agent_store
 from intentkit.core.chat import clear_thread_memory
 from intentkit.core.credit import expense_message, expense_skill
 from intentkit.core.node import PreModelNode, post_model_node
@@ -56,13 +54,12 @@ from intentkit.models.chat import (
 from intentkit.models.credit import CreditAccount, OwnerType
 from intentkit.models.db import get_langgraph_checkpointer, get_session
 from intentkit.models.llm import LLMModelInfo, LLMProvider, create_llm_model
-from intentkit.models.skill import AgentSkillData, ThreadSkillData
+from intentkit.models.skill import AgentSkillData, ChatSkillData, Skill
 from intentkit.models.user import User
 from intentkit.utils.error import IntentKitAPIError
 
 logger = logging.getLogger(__name__)
 
-
 # Global variable to cache all agent executors
 _agents: dict[str, CompiledStateGraph] = {}
 
@@ -70,7 +67,9 @@ _agents: dict[str, CompiledStateGraph] = {}
 _agents_updated: dict[str, datetime] = {}
 
 
-async def build_agent(agent: Agent, agent_data: AgentData) -> CompiledStateGraph:
+async def build_agent(
+    agent: Agent, agent_data: AgentData, custom_skills: list[BaseTool] = []
+) -> CompiledStateGraph:
     """Build an AI agent with specified configuration and tools.
 
     This function:
@@ -82,7 +81,8 @@ async def build_agent(agent: Agent, agent_data: AgentData) -> CompiledStateGraph
     Args:
         agent (Agent): Agent configuration object
         agent_data (AgentData): Agent data object
-        is_private (bool, optional): Flag indicating whether the agent is private. Defaults to False.
+        custom_skills (list[BaseTool], optional): Designed for advanced user who directly
+            call this function to inject custom skills into the agent tool node.
 
     Returns:
         CompiledStateGraph: Initialized LangChain agent
@@ -112,13 +112,13 @@ async def build_agent(agent: Agent, agent_data: AgentData) -> CompiledStateGraph
                 if hasattr(skill_module, "get_skills"):
                     # all
                     skill_tools = await skill_module.get_skills(
-                        v, False, agent_store, agent_id=agent.id, agent=agent
+                        v, False, agent_id=agent.id, agent=agent
                     )
                     if skill_tools and len(skill_tools) > 0:
                         tools.extend(skill_tools)
                     # private
                     skill_private_tools = await skill_module.get_skills(
-                        v, True, agent_store, agent_id=agent.id, agent=agent
+                        v, True, agent_id=agent.id, agent=agent
                     )
                     if skill_private_tools and len(skill_private_tools) > 0:
                         private_tools.extend(skill_private_tools)
@@ -127,6 +127,10 @@ async def build_agent(agent: Agent, agent_data: AgentData) -> CompiledStateGraph
             except ImportError as e:
                 logger.error(f"Could not import skill module: {k} ({e})")
 
+    # add custom skills to private tools
+    if custom_skills and len(custom_skills) > 0:
+        private_tools.extend(custom_skills)
+
     # filter the duplicate tools
     tools = list({tool.name: tool for tool in tools}.values())
     private_tools = list({tool.name: tool for tool in private_tools}.values())
@@ -223,7 +227,7 @@ async def initialize_agent(aid):
         HTTPException: If agent not found (404) or database error (500)
     """
     # get the agent from the database
-    agent: Optional[Agent] = await Agent.get(aid)
+    agent: Agent | None = await Agent.get(aid)
     if not agent:
         raise IntentKitAPIError(
             status_code=404, key="AgentNotFound", message="Agent not found"
@@ -237,7 +241,7 @@ async def initialize_agent(aid):
     _agents_updated[aid] = agent.deployed_at if agent.deployed_at else agent.updated_at
 
 
-async def agent_executor(agent_id: str) -> Tuple[CompiledStateGraph, float]:
+async def agent_executor(agent_id: str) -> tuple[CompiledStateGraph, float]:
     start = time.perf_counter()
     agent = await Agent.get(agent_id)
     if not agent:
@@ -293,6 +297,12 @@ async def stream_agent_raw(
     # save input message first
     user_message = await message.save()
 
+    # temporary debug logging for telegram messages
+    if user_message.author_type == AuthorType.TELEGRAM:
+        logger.info(
+            f"[TELEGRAM DEBUG] Agent: {user_message.agent_id} | Chat: {user_message.chat_id} | Message: {user_message.message}"
+        )
+
     if re.search(
         r"(@clear|/clear)(?!\w)",
         user_message.message.strip(),
@@ -320,6 +330,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:
@@ -690,6 +702,9 @@ async def stream_agent_raw(
                         for skill_call in skill_calls:
                             if not skill_call["success"]:
                                 continue
+                            skill = await Skill.get(skill_call["name"])
+                            if not skill:
+                                continue
                             payment_event = await expense_skill(
                                 session,
                                 payer,
@@ -883,7 +898,7 @@ async def clean_agent_memory(
 
         if clean_skill:
             await AgentSkillData.clean_data(agent_id)
-            await ThreadSkillData.clean_data(agent_id, chat_id)
+            await ChatSkillData.clean_data(agent_id, chat_id)
 
         async with get_session() as db:
             if clean_agent:

intentkit/core/node.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from langchain_core.language_models import LanguageModelLike
 from langchain_core.messages import (

intentkit/core/prompt.py

@@ -1,5 +1,5 @@
 import re
-from typing import Callable, Optional
+from collections.abc import Callable
 
 from eth_utils import is_address
 from langchain_core.messages import BaseMessage
@@ -12,6 +12,7 @@ from intentkit.models.agent import Agent
 from intentkit.models.agent_data import AgentData
 from intentkit.models.chat import AuthorType
 from intentkit.models.skill import Skill
+from intentkit.models.user import User
 
 # ============================================================================
 # CONSTANTS AND CONFIGURATION
@@ -34,7 +35,6 @@ user confirmation before broadcasting any approval transactions for security rea
 
 """
 
-
 # ============================================================================
 # CORE PROMPT BUILDING FUNCTIONS
 # ============================================================================
@@ -110,28 +110,66 @@ def _build_wallet_section(agent: Agent, agent_data: AgentData) -> str:
 
     if agent_data.evm_wallet_address and network_id != "solana":
         wallet_parts.append(
-            f"Your wallet address in {network_id} is {agent_data.evm_wallet_address}."
+            f"Your EVM wallet address is {agent_data.evm_wallet_address}."
+            f"You are now in {network_id} network."
         )
     if agent_data.solana_wallet_address and network_id == "solana":
         wallet_parts.append(
-            f"Your wallet address in {network_id} is {agent_data.solana_wallet_address}."
+            f"Your Solana wallet address is {agent_data.solana_wallet_address}."
+            f"You are now in {network_id} network."
         )
 
+    # Add CDP skills prompt if CDP skills are enabled
+    if agent.skills and "cdp" in agent.skills:
+        cdp_config = agent.skills["cdp"]
+        if cdp_config and cdp_config.get("enabled") is True:
+            # Check if any CDP skills are in public or private state (not disabled)
+            states = cdp_config.get("states", {})
+            has_enabled_cdp_skills = any(
+                state in ["public", "private"] for state in states.values()
+            )
+            if has_enabled_cdp_skills:
+                wallet_parts.append(
+                    "If a skill input parameter requires a token address but you only have the user-provided token symbol, "
+                    "and the address cannot be found in the nearby context, you must use the `token_search` skill to query "
+                    f"the address of that symbol on the current chain ({network_id}) and confirm this address with the user."
+                    "If the `token_search` skill is not found, remind the user to enable it."
+                )
+
     return "\n".join(wallet_parts) + ("\n" if wallet_parts else "")
 
 
-def _build_user_info_section(context: AgentContext) -> str:
+async def _build_user_info_section(context: AgentContext) -> str:
     """Build user information section when user_id is a valid EVM wallet address."""
     if not context.user_id:
         return ""
 
-    # Check if user_id is a valid EVM wallet address
-    try:
-        if is_address(context.user_id):
-            return f"## User Info\n\nThe person you are talking to has wallet address: {context.user_id}\n\n"
-    except Exception:
-        # If validation fails, don't include the section
-        pass
+    user = await User.get(context.user_id)
+
+    prompt_array = []
+
+    evm_wallet_address = ""
+    if user and user.evm_wallet_address:
+        evm_wallet_address = user.evm_wallet_address
+    elif is_address(context.user_id):
+        evm_wallet_address = context.user_id
+
+    if evm_wallet_address:
+        prompt_array.append(
+            f"The user you are talking to has EVM wallet address: {evm_wallet_address}\n"
+        )
+
+    if user:
+        if user.email:
+            prompt_array.append(f"User Email: {user.email}\n")
+        if user.x_username:
+            prompt_array.append(f"User X Username: {user.x_username}\n")
+        if user.telegram_username:
+            prompt_array.append(f"User Telegram Username: {user.telegram_username}\n")
+
+    if prompt_array:
+        prompt_array.append("\n")
+        return "## User Info\n\n" + "".join(prompt_array)
 
     return ""
 
@@ -289,7 +327,7 @@ def _build_autonomous_task_prompt(agent: Agent, context: AgentContext) -> str:
     return f"{task_info}. "
 
 
-async def build_entrypoint_prompt(agent: Agent, context: AgentContext) -> Optional[str]:
+async def build_entrypoint_prompt(agent: Agent, context: AgentContext) -> str | None:
     """
     Build entrypoint-specific prompt based on context.
 
@@ -302,7 +340,7 @@ async def build_entrypoint_prompt(agent: Agent, context: AgentContext) -> Option
         context: The agent context containing entrypoint information
 
     Returns:
-        Optional[str]: The entrypoint-specific prompt, or None if no entrypoint
+        str | None: The entrypoint-specific prompt, or None if no entrypoint
     """
     if not context.entrypoint:
         return None
@@ -397,7 +435,7 @@ def create_formatted_prompt_function(agent: Agent, agent_data: AgentData) -> Cal
             )
 
         # Add user info if user_id is a valid EVM wallet address
-        user_info = _build_user_info_section(context)
+        user_info = await _build_user_info_section(context)
         if user_info:
             final_system_prompt = f"{final_system_prompt}{user_info}"
 

intentkit/core/scheduler.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Mapping, MutableMapping
+from collections.abc import Mapping, MutableMapping
 
 from apscheduler.jobstores.base import BaseJobStore
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -11,7 +11,6 @@ from apscheduler.triggers.cron import CronTrigger
 from intentkit.core.agent import (
     update_agent_action_cost,
     update_agents_account_snapshot,
-    update_agents_assets,
     update_agents_statistics,
 )
 from intentkit.core.credit import refill_all_free_credits
@@ -63,13 +62,14 @@ def create_scheduler(
     )
 
     # Update agent assets daily at UTC midnight
-    scheduler.add_job(
-        update_agents_assets,
-        trigger=CronTrigger(hour=0, minute=0, timezone="UTC"),
-        id="update_agent_assets",
-        name="Update agent assets",
-        replace_existing=True,
-    )
+    # This is too expensive to run daily, so it will only be triggered when detail page is visited
+    # scheduler.add_job(
+    #     update_agents_assets,
+    #     trigger=CronTrigger(hour=0, minute=0, timezone="UTC"),
+    #     id="update_agent_assets",
+    #     name="Update agent assets",
+    #     replace_existing=True,
+    # )
 
     # Update agent action costs hourly at minute 40
     scheduler.add_job(

intentkit/core/statistics.py

@@ -2,9 +2,8 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
-from typing import Optional
 
 from pydantic import BaseModel, Field
 from sqlalchemy import func, select
@@ -46,8 +45,8 @@ class AgentStatistics(BaseModel):
 async def get_agent_statistics(
     agent_id: str,
     *,
-    end_time: Optional[datetime] = None,
-    session: Optional[AsyncSession] = None,
+    end_time: datetime | None = None,
+    session: AsyncSession | None = None,
 ) -> AgentStatistics:
     """Calculate statistics for an agent credit account.
 
@@ -64,11 +63,11 @@ async def get_agent_statistics(
 
     managed_session = session is None
     if end_time is None:
-        end_time = datetime.now(timezone.utc)
+        end_time = datetime.now(UTC)
     elif end_time.tzinfo is None:
-        end_time = end_time.replace(tzinfo=timezone.utc)
+        end_time = end_time.replace(tzinfo=UTC)
     else:
-        end_time = end_time.astimezone(timezone.utc)
+        end_time = end_time.astimezone(UTC)
 
     async def _compute(session: AsyncSession) -> AgentStatistics:
         account = await CreditAccount.get_or_create_in_session(