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

intentkit/core/agent.py

@@ -1,22 +1,20 @@
 import logging
 import time
-from datetime import datetime, timedelta, timezone
+from collections.abc import AsyncGenerator
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
-from typing import Any, AsyncGenerator, Dict, List, Optional, Tuple
 
 from sqlalchemy import func, select, text, update
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.clients.cdp import get_wallet_provider
 from intentkit.config.config import config
 from intentkit.models.agent import (
     Agent,
-    AgentAutonomous,
     AgentCreate,
     AgentTable,
     AgentUpdate,
 )
-from intentkit.models.agent_data import AgentData, AgentQuota, AgentQuotaTable
+from intentkit.models.agent_data import AgentData, AgentQuotaTable
 from intentkit.models.credit import (
     CreditAccount,
     CreditEventTable,
@@ -25,12 +23,6 @@ from intentkit.models.credit import (
     UpstreamType,
 )
 from intentkit.models.db import get_session
-from intentkit.models.skill import (
-    AgentSkillData,
-    AgentSkillDataCreate,
-    ThreadSkillData,
-    ThreadSkillDataCreate,
-)
 from intentkit.utils.error import IntentKitAPIError
 from intentkit.utils.slack_alert import send_slack_message
 
@@ -201,8 +193,8 @@ def send_agent_notification(agent: Agent, agent_data: AgentData, message: str) -
 
 
 async def override_agent(
-    agent_id: str, agent: AgentUpdate, owner: Optional[str] = None
-) -> Tuple[Agent, AgentData]:
+    agent_id: str, agent: AgentUpdate, owner: str | None = None
+) -> tuple[Agent, AgentData]:
     """Override an existing agent with new configuration.
 
     This function updates an existing agent with the provided configuration.
@@ -242,7 +234,7 @@ async def override_agent(
     return latest_agent, agent_data
 
 
-async def create_agent(agent: AgentCreate) -> Tuple[Agent, AgentData]:
+async def create_agent(agent: AgentCreate) -> tuple[Agent, AgentData]:
     """Create a new agent with the provided configuration.
 
     This function creates a new agent instance with the given configuration,
@@ -279,8 +271,8 @@ async def create_agent(agent: AgentCreate) -> Tuple[Agent, AgentData]:
 
 
 async def deploy_agent(
-    agent_id: str, agent: AgentUpdate, owner: Optional[str] = None
-) -> Tuple[Agent, AgentData]:
+    agent_id: str, agent: AgentUpdate, owner: str | None = None
+) -> tuple[Agent, AgentData]:
     """Deploy an agent by first attempting to override, then creating if not found.
 
     This function first tries to override an existing agent. If the agent is not found
@@ -315,7 +307,7 @@ async def deploy_agent(
             raise
 
 
-async def agent_action_cost(agent_id: str) -> Dict[str, Decimal]:
+async def agent_action_cost(agent_id: str) -> dict[str, Decimal]:
     """
     Calculate various action cost metrics for an agent based on past three days of credit events.
 
@@ -331,7 +323,7 @@ async def agent_action_cost(agent_id: str) -> Dict[str, Decimal]:
         agent_id: ID of the agent
 
     Returns:
-        Dict[str, Decimal]: Dictionary containing all calculated cost metrics
+        dict[str, Decimal]: Dictionary containing all calculated cost metrics
     """
     start_time = time.time()
     default_value = Decimal("0")
@@ -344,7 +336,7 @@ async def agent_action_cost(agent_id: str) -> Dict[str, Decimal]:
 
     async with get_session() as session:
         # Calculate the date 3 days ago from now
-        three_days_ago = datetime.now(timezone.utc) - timedelta(days=3)
+        three_days_ago = datetime.now(UTC) - timedelta(days=3)
 
         # First, count the number of distinct start_message_ids to determine if we have enough data
         count_query = select(
@@ -492,188 +484,12 @@ async def agent_action_cost(agent_id: str) -> Dict[str, Decimal]:
         return result
 
 
-class AgentStore(SkillStoreABC):
-    """Implementation of skill data storage operations.
-
-    This class provides concrete implementations for storing and retrieving
-    skill-related data for both agents and threads.
-    """
-
-    @staticmethod
-    def get_system_config(key: str) -> Any:
-        # TODO: maybe need a whitelist here
-        if hasattr(config, key):
-            return getattr(config, key)
-        return None
-
-    @staticmethod
-    async def get_agent_config(agent_id: str) -> Optional[Agent]:
-        return await Agent.get(agent_id)
-
-    @staticmethod
-    async def get_agent_data(agent_id: str) -> AgentData:
-        return await AgentData.get(agent_id)
-
-    @staticmethod
-    async def set_agent_data(agent_id: str, data: Dict) -> AgentData:
-        return await AgentData.patch(agent_id, data)
-
-    @staticmethod
-    async def get_agent_quota(agent_id: str) -> AgentQuota:
-        return await AgentQuota.get(agent_id)
-
-    @staticmethod
-    async def get_agent_skill_data(
-        agent_id: str, skill: str, key: str
-    ) -> Optional[Dict[str, Any]]:
-        """Get skill data for an agent.
-
-        Args:
-            agent_id: ID of the agent
-            skill: Name of the skill
-            key: Data key
-
-        Returns:
-            Dictionary containing the skill data if found, None otherwise
-        """
-        return await AgentSkillData.get(agent_id, skill, key)
-
-    @staticmethod
-    async def save_agent_skill_data(
-        agent_id: str, skill: str, key: str, data: Dict[str, Any]
-    ) -> None:
-        """Save or update skill data for an agent.
-
-        Args:
-            agent_id: ID of the agent
-            skill: Name of the skill
-            key: Data key
-            data: JSON data to store
-        """
-        skill_data = AgentSkillDataCreate(
-            agent_id=agent_id,
-            skill=skill,
-            key=key,
-            data=data,
-        )
-        await skill_data.save()
-
-    @staticmethod
-    async def delete_agent_skill_data(agent_id: str, skill: str, key: str) -> None:
-        """Delete skill data for an agent.
-
-        Args:
-            agent_id: ID of the agent
-            skill: Name of the skill
-            key: Data key
-        """
-        await AgentSkillData.delete(agent_id, skill, key)
-
-    @staticmethod
-    async def get_thread_skill_data(
-        thread_id: str, skill: str, key: str
-    ) -> Optional[Dict[str, Any]]:
-        """Get skill data for a thread.
-
-        Args:
-            thread_id: ID of the thread
-            skill: Name of the skill
-            key: Data key
-
-        Returns:
-            Dictionary containing the skill data if found, None otherwise
-        """
-        return await ThreadSkillData.get(thread_id, skill, key)
-
-    @staticmethod
-    async def save_thread_skill_data(
-        thread_id: str,
-        agent_id: str,
-        skill: str,
-        key: str,
-        data: Dict[str, Any],
-    ) -> None:
-        """Save or update skill data for a thread.
-
-        Args:
-            thread_id: ID of the thread
-            agent_id: ID of the agent that owns this thread
-            skill: Name of the skill
-            key: Data key
-            data: JSON data to store
-        """
-        skill_data = ThreadSkillDataCreate(
-            thread_id=thread_id,
-            agent_id=agent_id,
-            skill=skill,
-            key=key,
-            data=data,
-        )
-        await skill_data.save()
-
-    @staticmethod
-    async def list_autonomous_tasks(agent_id: str) -> List[AgentAutonomous]:
-        """List all autonomous tasks for an agent.
-
-        Args:
-            agent_id: ID of the agent
-
-        Returns:
-            List[AgentAutonomous]: List of autonomous task configurations
-        """
-        return await list_autonomous_tasks(agent_id)
-
-    @staticmethod
-    async def add_autonomous_task(
-        agent_id: str, task: AgentAutonomous
-    ) -> AgentAutonomous:
-        """Add a new autonomous task to an agent.
-
-        Args:
-            agent_id: ID of the agent
-            task: Autonomous task configuration
-
-        Returns:
-            AgentAutonomous: The created task
-        """
-        return await add_autonomous_task(agent_id, task)
-
-    @staticmethod
-    async def delete_autonomous_task(agent_id: str, task_id: str) -> None:
-        """Delete an autonomous task from an agent.
-
-        Args:
-            agent_id: ID of the agent
-            task_id: ID of the task to delete
-        """
-        await delete_autonomous_task(agent_id, task_id)
-
-    @staticmethod
-    async def update_autonomous_task(
-        agent_id: str, task_id: str, task_updates: dict
-    ) -> AgentAutonomous:
-        """Update an autonomous task for an agent.
-
-        Args:
-            agent_id: ID of the agent
-            task_id: ID of the task to update
-            task_updates: Dictionary containing fields to update
-
-        Returns:
-            AgentAutonomous: The updated task
-        """
-        return await update_autonomous_task(agent_id, task_id, task_updates)
-
-
-agent_store = AgentStore()
-
-
 async def _iterate_agent_id_batches(
     batch_size: int = 100,
 ) -> AsyncGenerator[list[str], None]:
     """Yield agent IDs in ascending batches to limit memory usage."""
 
-    last_id: Optional[str] = None
+    last_id: str | None = None
     while True:
         async with get_session() as session:
             query = select(AgentTable.id).order_by(AgentTable.id)
@@ -863,18 +679,18 @@ async def update_agents_assets(batch_size: int = 100) -> None:
 
 
 async def update_agents_statistics(
-    *, end_time: Optional[datetime] = None, batch_size: int = 100
+    *, end_time: datetime | None = None, batch_size: int = 100
 ) -> None:
     """Refresh cached statistics for every agent."""
 
     from intentkit.core.statistics import get_agent_statistics
 
     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)
 
     logger.info("Starting update of agent statistics using end_time %s", end_time)
     start_time = time.time()
@@ -923,191 +739,3 @@ async def update_agents_statistics(
         total_updated,
         total_time,
     )
-
-
-async def list_autonomous_tasks(agent_id: str) -> List[AgentAutonomous]:
-    """
-    List all autonomous tasks for an agent.
-
-    Args:
-        agent_id: ID of the agent
-
-    Returns:
-        List[AgentAutonomous]: List of autonomous task configurations
-
-    Raises:
-        IntentKitAPIError: If agent is not found
-    """
-    agent = await Agent.get(agent_id)
-    if not agent:
-        raise IntentKitAPIError(
-            400, "AgentNotFound", f"Agent with ID {agent_id} does not exist."
-        )
-
-    if not agent.autonomous:
-        return []
-
-    return agent.autonomous
-
-
-async def add_autonomous_task(agent_id: str, task: AgentAutonomous) -> AgentAutonomous:
-    """
-    Add a new autonomous task to an agent.
-
-    Args:
-        agent_id: ID of the agent
-        task: Autonomous task configuration (id will be generated if not provided)
-
-    Returns:
-        AgentAutonomous: The created task with generated ID
-
-    Raises:
-        IntentKitAPIError: If agent is not found
-    """
-    agent = await Agent.get(agent_id)
-    if not agent:
-        raise IntentKitAPIError(
-            400, "AgentNotFound", f"Agent with ID {agent_id} does not exist."
-        )
-
-    # Get current autonomous tasks
-    current_tasks = agent.autonomous or []
-    if not isinstance(current_tasks, list):
-        current_tasks = []
-
-    # Add the new task
-    current_tasks.append(task)
-
-    # Convert all AgentAutonomous objects to dictionaries for JSON serialization
-    serializable_tasks = [task_item.model_dump() for task_item in current_tasks]
-
-    # Update the agent in the database
-    async with get_session() as session:
-        update_stmt = (
-            update(AgentTable)
-            .where(AgentTable.id == agent_id)
-            .values(autonomous=serializable_tasks)
-        )
-        await session.execute(update_stmt)
-        await session.commit()
-
-    logger.info(f"Added autonomous task {task.id} to agent {agent_id}")
-    return task
-
-
-async def delete_autonomous_task(agent_id: str, task_id: str) -> None:
-    """
-    Delete an autonomous task from an agent.
-
-    Args:
-        agent_id: ID of the agent
-        task_id: ID of the task to delete
-
-    Raises:
-        IntentKitAPIError: If agent is not found or task is not found
-    """
-    agent = await Agent.get(agent_id)
-    if not agent:
-        raise IntentKitAPIError(
-            400, "AgentNotFound", f"Agent with ID {agent_id} does not exist."
-        )
-
-    # Get current autonomous tasks
-    current_tasks = agent.autonomous or []
-    if not isinstance(current_tasks, list):
-        current_tasks = []
-
-    # Find and remove the task
-    task_found = False
-    updated_tasks = []
-    for task_data in current_tasks:
-        if task_data.id == task_id:
-            task_found = True
-            continue
-        updated_tasks.append(task_data)
-
-    if not task_found:
-        raise IntentKitAPIError(
-            404, "TaskNotFound", f"Autonomous task with ID {task_id} not found."
-        )
-
-    # Convert remaining AgentAutonomous objects to dictionaries for JSON serialization
-    serializable_tasks = [task_item.model_dump() for task_item in updated_tasks]
-
-    # Update the agent in the database
-    async with get_session() as session:
-        update_stmt = (
-            update(AgentTable)
-            .where(AgentTable.id == agent_id)
-            .values(autonomous=serializable_tasks)
-        )
-        await session.execute(update_stmt)
-        await session.commit()
-
-    logger.info(f"Deleted autonomous task {task_id} from agent {agent_id}")
-
-
-async def update_autonomous_task(
-    agent_id: str, task_id: str, task_updates: dict
-) -> AgentAutonomous:
-    """
-    Update an autonomous task for an agent.
-
-    Args:
-        agent_id: ID of the agent
-        task_id: ID of the task to update
-        task_updates: Dictionary containing fields to update
-
-    Returns:
-        AgentAutonomous: The updated task
-
-    Raises:
-        IntentKitAPIError: If agent is not found or task is not found
-    """
-    agent = await Agent.get(agent_id)
-    if not agent:
-        raise IntentKitAPIError(
-            400, "AgentNotFound", f"Agent with ID {agent_id} does not exist."
-        )
-
-    # Get current autonomous tasks
-    current_tasks: List[AgentAutonomous] = agent.autonomous or []
-
-    # Find and update the task
-    task_found = False
-    updated_tasks: List[AgentAutonomous] = []
-    updated_task = None
-
-    for task_data in current_tasks:
-        if task_data.id == task_id:
-            task_found = True
-            # Create a dictionary with current task data
-            task_dict = task_data.model_dump()
-            # Update with provided fields
-            task_dict.update(task_updates)
-            # Create new AgentAutonomous instance
-            updated_task = AgentAutonomous.model_validate(task_dict)
-            updated_tasks.append(updated_task)
-        else:
-            updated_tasks.append(task_data)
-
-    if not task_found:
-        raise IntentKitAPIError(
-            404, "TaskNotFound", f"Autonomous task with ID {task_id} not found."
-        )
-
-    # Convert all AgentAutonomous objects to dictionaries for JSON serialization
-    serializable_tasks = [task_item.model_dump() for task_item in updated_tasks]
-
-    # Update the agent in the database
-    async with get_session() as session:
-        update_stmt = (
-            update(AgentTable)
-            .where(AgentTable.id == agent_id)
-            .values(autonomous=serializable_tasks)
-        )
-        await session.execute(update_stmt)
-        await session.commit()
-
-    logger.info(f"Updated autonomous task {task_id} for agent {agent_id}")
-    return updated_task

intentkit/core/asset.py

@@ -2,18 +2,21 @@
 
 from __future__ import annotations
 
+import json
 import logging
 from decimal import Decimal
-from typing import Optional
 
 import httpx
 from pydantic import BaseModel, Field
+from sqlalchemy import update
 from web3 import Web3
 
 from intentkit.clients.web3 import get_web3_client
 from intentkit.config.config import config
-from intentkit.models.agent import Agent
+from intentkit.models.agent import Agent, AgentTable
 from intentkit.models.agent_data import AgentData
+from intentkit.models.db import get_session
+from intentkit.models.redis import get_redis
 from intentkit.utils.error import IntentKitAPIError
 
 logger = logging.getLogger(__name__)
@@ -135,7 +138,7 @@ async def _build_assets_list(
         return assets
 
     wallet_address = agent_data.evm_wallet_address
-    network_id: Optional[str] = agent.network_id
+    network_id: str | None = agent.network_id
 
     # ETH is always included
     eth_balance = await _get_eth_balance(web3_client, wallet_address)
@@ -171,29 +174,72 @@ async def _build_assets_list(
 
 async def agent_asset(agent_id: str) -> AgentAssets:
     """Fetch wallet net worth and token balances for an agent."""
+
+    cache_key = f"intentkit:agent_assets:{agent_id}"
+    redis_client = None
+
+    try:
+        redis_client = get_redis()
+    except Exception as exc:  # pragma: no cover - best effort fallback
+        logger.debug("Redis unavailable for agent assets: %s", exc)
+
     agent = await Agent.get(agent_id)
     if not agent:
         raise IntentKitAPIError(404, "AgentNotFound", "Agent not found")
 
+    if redis_client:
+        try:
+            cached_raw = await redis_client.get(cache_key)
+            if cached_raw:
+                cached_data = json.loads(cached_raw)
+                cached_assets = AgentAssets.model_validate(cached_data)
+                return cached_assets
+        except Exception as exc:  # pragma: no cover - cache read path only
+            logger.debug("Failed to read agent asset cache for %s: %s", agent_id, exc)
+
     agent_data = await AgentData.get(agent_id)
     if not agent_data or not agent_data.evm_wallet_address:
-        return AgentAssets(net_worth="0", tokens=[])
-
-    if not agent.network_id:
-        return AgentAssets(net_worth="0", tokens=[])
+        assets_result = AgentAssets(net_worth="0", tokens=[])
+    elif not agent.network_id:
+        assets_result = AgentAssets(net_worth="0", tokens=[])
+    else:
+        try:
+            web3_client = get_web3_client(str(agent.network_id))
+            tokens = await _build_assets_list(agent, agent_data, web3_client)
+            net_worth = await _get_wallet_net_worth(agent_data.evm_wallet_address)
+            assets_result = AgentAssets(net_worth=net_worth, tokens=tokens)
+        except IntentKitAPIError:
+            raise
+        except Exception as exc:
+            logger.error("Error getting agent assets for %s: %s", agent_id, exc)
+            raise IntentKitAPIError(
+                500, "AgentAssetError", "Failed to retrieve agent assets"
+            ) from exc
+
+    assets_payload = assets_result.model_dump(mode="json")
+
+    if redis_client:
+        try:
+            await redis_client.set(
+                cache_key,
+                json.dumps(assets_payload),
+                ex=3600,
+            )
+        except Exception as exc:  # pragma: no cover - cache write path only
+            logger.debug("Failed to write agent asset cache for %s: %s", agent_id, exc)
 
     try:
-        web3_client = get_web3_client(str(agent.network_id))
-        tokens = await _build_assets_list(agent, agent_data, web3_client)
-        net_worth = await _get_wallet_net_worth(agent_data.evm_wallet_address)
-        return AgentAssets(net_worth=net_worth, tokens=tokens)
-    except IntentKitAPIError:
-        raise
-    except Exception as exc:
-        logger.error("Error getting agent assets for %s: %s", agent_id, exc)
-        raise IntentKitAPIError(
-            500, "AgentAssetError", "Failed to retrieve agent assets"
-        ) from exc
+        async with get_session() as session:
+            await session.execute(
+                update(AgentTable)
+                .where(AgentTable.id == agent_id)
+                .values(assets=assets_payload)
+            )
+            await session.commit()
+    except Exception as exc:  # pragma: no cover - db persistence path only
+        logger.error("Error updating agent assets cache for %s: %s", agent_id, exc)
+
+    return assets_result
 
 
 __all__ = [

intentkit/core/client.py

@@ -3,7 +3,7 @@
 This module provides client functions for core API endpoints with environment-aware routing.
 """
 
-from typing import AsyncIterator
+from collections.abc import AsyncIterator
 
 import httpx