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

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 (
@@ -24,7 +25,6 @@ from langmem.short_term.summarization import (
 
 from intentkit.abstracts.graph import AgentContext, AgentError, AgentState
 from intentkit.core.credit import skill_cost
-from intentkit.models.agent import Agent
 from intentkit.models.credit import CreditAccount, OwnerType
 from intentkit.models.skill import Skill
 
@@ -66,7 +66,7 @@ class PreModelNode(RunnableCallable):
         model: LanguageModelLike,
         short_term_memory_strategy: str,
         max_tokens: int,
-        max_summary_tokens: int = 1024,
+        max_summary_tokens: int = 2048,
     ) -> None:
         super().__init__(self._func, self._afunc, name="pre_model_node", trace=False)
         self.model = model
@@ -81,10 +81,10 @@ class PreModelNode(RunnableCallable):
         self.func_accepts_config = True
 
     def _parse_input(
-        self, input: AgentState
+        self, state: AgentState
     ) -> tuple[list[AnyMessage], dict[str, Any]]:
-        messages = input.get("messages")
-        context = input.get("context", {})
+        messages = state.get("messages")
+        context = state.get("context", {})
         if messages is None or not isinstance(messages, list) or len(messages) == 0:
             raise ValueError("Missing required field `messages` in the input.")
         return messages, context
@@ -107,13 +107,13 @@ class PreModelNode(RunnableCallable):
     def _func(self, AgentState) -> dict[str, Any]:
         raise NotImplementedError("Not implemented yet")
 
-    async def _afunc(self, input: AgentState) -> dict[str, Any]:
-        messages, context = self._parse_input(input)
+    async def _afunc(self, state: AgentState) -> dict[str, Any]:
+        messages, context = self._parse_input(state)
         try:
             _validate_chat_history(messages)
         except ValueError as e:
             logger.error(f"Invalid chat history: {e}")
-            logger.info(input)
+            logger.info(state)
             # delete all messages
             return {"messages": [RemoveMessage(REMOVE_ALL_MESSAGES)]}
         if self.short_term_memory_strategy == "trim":
@@ -162,7 +162,7 @@ class PreModelNode(RunnableCallable):
                 return self._prepare_state_update(context, summarization_result)
             except ValueError as e:
                 logger.error(f"Invalid chat history: {e}")
-                logger.info(input)
+                logger.info(state)
                 # delete all messages
                 return {"messages": [RemoveMessage(REMOVE_ALL_MESSAGES)]}
         raise ValueError(
@@ -175,15 +175,15 @@ class PostModelNode(RunnableCallable):
         super().__init__(self._func, self._afunc, name="post_model_node", trace=False)
         self.func_accepts_config = True
 
-    def _func(self, input: AgentState) -> dict[str, Any]:
+    def _func(self, state: AgentState) -> dict[str, Any]:
         raise NotImplementedError("Not implemented yet")
 
-    async def _afunc(self, input: AgentState) -> dict[str, Any]:
+    async def _afunc(self, state: AgentState) -> dict[str, Any]:
         runtime = get_runtime(AgentContext)
         context = runtime.context
-        logger.debug(f"Running PostModelNode, input: {input}, context: {context}")
+        logger.debug(f"Running PostModelNode, input: {state}, context: {context}")
         state_update = {}
-        messages = input.get("messages")
+        messages = state.get("messages")
         if messages is None or not isinstance(messages, list) or len(messages) == 0:
             raise ValueError("Missing required field `messages` in the input.")
         payer = context.payer
@@ -191,8 +191,7 @@ class PostModelNode(RunnableCallable):
             return state_update
         logger.debug(f"last: {messages[-1]}")
         msg = messages[-1]
-        agent_id = context.agent_id
-        agent = await Agent.get(agent_id)
+        agent = context.agent
         account = await CreditAccount.get_or_create(OwnerType.USER, payer)
         if hasattr(msg, "tool_calls") and msg.tool_calls:
             for tool_call in msg.tool_calls:

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,13 +12,14 @@ 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
 # ============================================================================
 
 # Base system prompt components
-BASE_SYSTEM_PROMPT = """You are an AI agent built using IntentKit.
+INTENTKIT_PROMPT = """You are an AI agent built using IntentKit.
 Your tools are called 'skills'.
 If your skill fails to execute due to a technical error ask the user to try again later, don't retry by yourself. If someone asks you to do something you can't do with your currently available skills, you must say so, recommend them to submit their feedback to the IntentKit team at https://github.com/crestalnetwork/intentkit. Be concise and helpful with your responses."""
 
@@ -34,7 +35,6 @@ user confirmation before broadcasting any approval transactions for security rea
 
 """
 
-
 # ============================================================================
 # CORE PROMPT BUILDING FUNCTIONS
 # ============================================================================
@@ -45,7 +45,10 @@ def _build_system_header() -> str:
     prompt = "# SYSTEM PROMPT\n\n"
     if config.system_prompt:
         prompt += config.system_prompt + "\n\n"
-    prompt += BASE_SYSTEM_PROMPT + "\n"
+    if config.intentkit_prompt:
+        prompt += config.intentkit_prompt + "\n\n"
+    else:
+        prompt += INTENTKIT_PROMPT + "\n\n"
     return prompt
 
 
@@ -103,32 +106,70 @@ def _build_wallet_section(agent: Agent, agent_data: AgentData) -> str:
         return ""
 
     wallet_parts = []
-    network_id = agent.network_id or agent.cdp_network_id
+    network_id = agent.network_id
 
     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 ""
 
@@ -201,7 +242,6 @@ def agent_prompt(agent: Agent, agent_data: AgentData) -> str:
 async def explain_prompt(message: str) -> str:
     """
     Process message to replace @skill:*:* patterns with (call skill xxxxx) format.
-    This function is used when admin_llm_skill_control is enabled.
 
     Args:
         message (str): The input message to process
@@ -287,12 +327,11 @@ 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.
 
     Supports different entrypoint types:
-    - Twitter: Uses agent.twitter_entrypoint_prompt
     - Telegram: Uses agent.telegram_entrypoint_prompt
     - Autonomous tasks: Builds task-specific prompt with scheduling info
 
@@ -301,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
@@ -323,8 +362,7 @@ async def build_entrypoint_prompt(agent: Agent, context: AgentContext) -> Option
     elif entrypoint == AuthorType.TRIGGER.value:
         entrypoint_prompt = "\n\n" + _build_autonomous_task_prompt(agent, context)
 
-    # Process with admin LLM skill control if enabled
-    if entrypoint_prompt and config.admin_llm_skill_control:
+    if entrypoint_prompt:
         entrypoint_prompt = await explain_prompt(entrypoint_prompt)
 
     return entrypoint_prompt
@@ -365,11 +403,8 @@ def create_formatted_prompt_function(agent: Agent, agent_data: AgentData) -> Cal
     prompt = build_agent_prompt(agent, agent_data)
     escaped_prompt = escape_prompt(prompt)
 
-    # Process with admin LLM skill control if enabled
     async def get_base_prompt():
-        if config.admin_llm_skill_control:
-            return await explain_prompt(escaped_prompt)
-        return escaped_prompt
+        return await explain_prompt(escaped_prompt)
 
     # Build prompt array
     prompt_array = [
@@ -400,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}"
 
@@ -408,8 +443,7 @@ def create_formatted_prompt_function(agent: Agent, agent_data: AgentData) -> Cal
         internal_info = build_internal_info_prompt(context)
         final_system_prompt = f"{final_system_prompt}{internal_info}"
 
-        # Process prompt_append with admin LLM skill control if needed
-        if agent.prompt_append and config.admin_llm_skill_control:
+        if agent.prompt_append:
             # Find the system message in prompt_array and process it
             for i, (role, content) in enumerate(prompt_array):
                 if role == "system":

intentkit/core/scheduler.py

@@ -0,0 +1,92 @@
+"""Core scheduler utilities."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping, MutableMapping
+
+from apscheduler.jobstores.base import BaseJobStore
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.cron import CronTrigger
+
+from intentkit.core.agent import (
+    update_agent_action_cost,
+    update_agents_account_snapshot,
+    update_agents_statistics,
+)
+from intentkit.core.credit import refill_all_free_credits
+from intentkit.models.agent_data import AgentQuota
+
+
+def create_scheduler(
+    jobstores: Mapping[str, BaseJobStore]
+    | MutableMapping[str, BaseJobStore]
+    | None = None,
+) -> AsyncIOScheduler:
+    """Create and configure the APScheduler with all periodic tasks."""
+    scheduler = AsyncIOScheduler(jobstores=dict(jobstores or {}))
+
+    # Reset daily quotas at UTC 00:00
+    scheduler.add_job(
+        AgentQuota.reset_daily_quotas,
+        trigger=CronTrigger(hour=0, minute=0, timezone="UTC"),
+        id="reset_daily_quotas",
+        name="Reset daily quotas",
+        replace_existing=True,
+    )
+
+    # Reset monthly quotas at UTC 00:00 on the first day of each month
+    scheduler.add_job(
+        AgentQuota.reset_monthly_quotas,
+        trigger=CronTrigger(day=1, hour=0, minute=0, timezone="UTC"),
+        id="reset_monthly_quotas",
+        name="Reset monthly quotas",
+        replace_existing=True,
+    )
+
+    # Refill free credits every hour at minute 20
+    scheduler.add_job(
+        refill_all_free_credits,
+        trigger=CronTrigger(minute="20", timezone="UTC"),
+        id="refill_free_credits",
+        name="Refill free credits",
+        replace_existing=True,
+    )
+
+    # Update agent account snapshots hourly
+    scheduler.add_job(
+        update_agents_account_snapshot,
+        trigger=CronTrigger(minute=0, timezone="UTC"),
+        id="update_agent_account_snapshot",
+        name="Update agent account snapshots",
+        replace_existing=True,
+    )
+
+    # Update agent assets daily at UTC midnight
+    # 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(
+        update_agent_action_cost,
+        trigger=CronTrigger(minute="40", timezone="UTC"),
+        id="update_agent_action_cost",
+        name="Update agent action costs",
+        replace_existing=True,
+    )
+
+    # Update agent statistics daily at UTC 00:01
+    scheduler.add_job(
+        update_agents_statistics,
+        trigger=CronTrigger(hour=0, minute=1, timezone="UTC"),
+        id="update_agent_statistics",
+        name="Update agent statistics",
+        replace_existing=True,
+    )
+
+    return scheduler

intentkit/core/statistics.py

@@ -0,0 +1,168 @@
+"""Agent statistics utilities."""
+
+from __future__ import annotations
+
+from datetime import UTC, datetime, timedelta
+from decimal import Decimal
+
+from pydantic import BaseModel, Field
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from intentkit.models.agent_data import AgentQuota, AgentQuotaTable
+from intentkit.models.credit import CreditAccount, CreditEventTable, OwnerType
+from intentkit.models.db import get_session
+
+
+class AgentStatistics(BaseModel):
+    """Aggregated statistics for an agent credit account."""
+
+    agent_id: str = Field(description="ID of the agent")
+    account_id: str = Field(description="ID of the associated credit account")
+    balance: Decimal = Field(description="Current credit account balance")
+    total_income: Decimal = Field(description="Total income across all events")
+    net_income: Decimal = Field(description="Net income from fee allocations")
+    permanent_income: Decimal = Field(
+        description="Total permanent income across all events"
+    )
+    permanent_profit: Decimal = Field(
+        description="Permanent profit allocated to the agent"
+    )
+    last_24h_income: Decimal = Field(
+        description="Income generated during the last 24 hours"
+    )
+    last_24h_permanent_income: Decimal = Field(
+        description="Permanent income generated during the last 24 hours"
+    )
+    avg_action_cost: Decimal = Field(description="Average action cost")
+    min_action_cost: Decimal = Field(description="Minimum action cost")
+    max_action_cost: Decimal = Field(description="Maximum action cost")
+    low_action_cost: Decimal = Field(description="20th percentile action cost")
+    medium_action_cost: Decimal = Field(description="60th percentile action cost")
+    high_action_cost: Decimal = Field(description="80th percentile action cost")
+
+
+async def get_agent_statistics(
+    agent_id: str,
+    *,
+    end_time: datetime | None = None,
+    session: AsyncSession | None = None,
+) -> AgentStatistics:
+    """Calculate statistics for an agent credit account.
+
+    Args:
+        agent_id: ID of the agent.
+        end_time: Optional end time used as the inclusive boundary for
+            time-windowed aggregations. Defaults to the current UTC time.
+        session: Optional database session to reuse. When omitted, a
+            standalone session will be created and committed automatically.
+
+    Returns:
+        Aggregated statistics for the agent.
+    """
+
+    managed_session = session is None
+    if end_time is None:
+        end_time = datetime.now(UTC)
+    elif end_time.tzinfo is None:
+        end_time = end_time.replace(tzinfo=UTC)
+    else:
+        end_time = end_time.astimezone(UTC)
+
+    async def _compute(session: AsyncSession) -> AgentStatistics:
+        account = await CreditAccount.get_or_create_in_session(
+            session, OwnerType.AGENT, agent_id
+        )
+        balance = account.free_credits + account.reward_credits + account.credits
+
+        totals_stmt = select(
+            func.sum(CreditEventTable.total_amount).label("total_income"),
+            func.sum(CreditEventTable.fee_agent_amount).label("net_income"),
+            func.sum(CreditEventTable.permanent_amount).label("permanent_income"),
+            func.sum(CreditEventTable.fee_agent_permanent_amount).label(
+                "permanent_profit"
+            ),
+        ).where(CreditEventTable.agent_id == agent_id)
+        totals_result = await session.execute(totals_stmt)
+        totals_row = totals_result.first()
+
+        total_income = (
+            totals_row.total_income
+            if totals_row and totals_row.total_income
+            else Decimal("0")
+        )
+        net_income = (
+            totals_row.net_income
+            if totals_row and totals_row.net_income
+            else Decimal("0")
+        )
+        permanent_income = (
+            totals_row.permanent_income
+            if totals_row and totals_row.permanent_income
+            else Decimal("0")
+        )
+        permanent_profit = (
+            totals_row.permanent_profit
+            if totals_row and totals_row.permanent_profit
+            else Decimal("0")
+        )
+
+        window_start = end_time - timedelta(hours=24)
+        window_stmt = select(
+            func.sum(CreditEventTable.total_amount).label("last_24h_income"),
+            func.sum(CreditEventTable.permanent_amount).label(
+                "last_24h_permanent_income"
+            ),
+        ).where(
+            CreditEventTable.agent_id == agent_id,
+            CreditEventTable.created_at >= window_start,
+            CreditEventTable.created_at <= end_time,
+        )
+        window_result = await session.execute(window_stmt)
+        window_row = window_result.first()
+
+        last_24h_income = (
+            window_row.last_24h_income
+            if window_row and window_row.last_24h_income
+            else Decimal("0")
+        )
+        last_24h_permanent_income = (
+            window_row.last_24h_permanent_income
+            if window_row and window_row.last_24h_permanent_income
+            else Decimal("0")
+        )
+
+        quota_row = await session.get(AgentQuotaTable, agent_id)
+        quota = (
+            AgentQuota.model_validate(quota_row)
+            if quota_row
+            else AgentQuota(id=agent_id)
+        )
+
+        return AgentStatistics(
+            agent_id=agent_id,
+            account_id=account.id,
+            balance=balance,
+            total_income=total_income,
+            net_income=net_income,
+            permanent_income=permanent_income,
+            permanent_profit=permanent_profit,
+            last_24h_income=last_24h_income,
+            last_24h_permanent_income=last_24h_permanent_income,
+            avg_action_cost=quota.avg_action_cost,
+            min_action_cost=quota.min_action_cost,
+            max_action_cost=quota.max_action_cost,
+            low_action_cost=quota.low_action_cost,
+            medium_action_cost=quota.medium_action_cost,
+            high_action_cost=quota.high_action_cost,
+        )
+
+    if managed_session:
+        async with get_session() as managed:
+            statistics = await _compute(managed)
+            await managed.commit()
+            return statistics
+    return await _compute(session)
+
+
+__all__ = ["AgentStatistics", "get_agent_statistics"]