intentkit 0.7.5.dev9__tar.gz → 0.7.5.dev11__tar.gz

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.7.5.dev9
+Version: 0.7.5.dev11
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestalnetwork/intentkit
 Project-URL: Repository, https://github.com/crestalnetwork/intentkit

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/__init__.py

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

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/core/agent.py

@@ -2,7 +2,7 @@ import logging
 import time
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 from sqlalchemy import func, select, text, update
 
@@ -193,53 +193,35 @@ def send_agent_notification(agent: Agent, agent_data: AgentData, message: str) -
     )
 
 
-async def deploy_agent(
+async def override_agent(
     agent_id: str, agent: AgentUpdate, owner: Optional[str] = None
-) -> Agent:
-    """Override an existing agent.
+) -> Tuple[Agent, AgentData]:
+    """Override an existing agent with new configuration.
 
-    Use input to override agent configuration. If some fields are not provided, they will be reset to default values.
+    This function updates an existing agent with the provided configuration.
+    If some fields are not provided, they will be reset to default values.
 
     Args:
-        agent_id: ID of the agent to update
-        agent: Agent update configuration
-        owner: Optional owner for the agent
+        agent_id: ID of the agent to override
+        agent: Agent update configuration containing the new settings
+        owner: Optional owner for permission validation
 
     Returns:
         tuple[Agent, AgentData]: Updated agent configuration and processed agent data
 
     Raises:
-        HTTPException:
-            - 400: Invalid agent ID format
+        IntentKitAPIError:
             - 404: Agent not found
             - 403: Permission denied (if owner mismatch)
-            - 500: Database error
+            - 400: Invalid configuration or wallet provider change
     """
     existing_agent = await Agent.get(agent_id)
-
     if not existing_agent:
-        new_agent = AgentCreate.model_validate(agent)
-        new_agent.id = agent_id
-        if owner:
-            new_agent.owner = owner
-        else:
-            new_agent.owner = "system"
-        # Check for existing agent by upstream_id, forward compatibility, raise error after 3.0
-        existing = await new_agent.get_by_upstream_id()
-        if existing:
-            raise IntentKitAPIError(
-                status_code=400,
-                key="BadRequest",
-                message="Agent with this upstream ID already exists",
-            )
-
-        # Create new agent
-        latest_agent = await new_agent.create()
-        agent_data = await process_agent_wallet(latest_agent)
-        send_agent_notification(latest_agent, agent_data, "Agent Deployed")
-
-        return latest_agent, agent_data
-
+        raise IntentKitAPIError(
+            status_code=404,
+            key="AgentNotFound",
+            message=f"Agent with ID '{agent_id}' not found",
+        )
     if owner and owner != existing_agent.owner:
         raise IntentKitAPIError(403, "Forbidden", "forbidden")
 
@@ -253,6 +235,79 @@ async def deploy_agent(
     return latest_agent, agent_data
 
 
+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,
+    initializes its wallet, and sends a notification about the creation.
+
+    Args:
+        agent: Agent creation configuration containing all necessary settings
+
+    Returns:
+        tuple[Agent, AgentData]: Created agent configuration and processed agent data
+
+    Raises:
+        IntentKitAPIError:
+            - 400: Agent with upstream ID already exists or invalid configuration
+            - 500: Database error or wallet initialization failure
+    """
+    if not agent.owner:
+        agent.owner = "system"
+    # Check for existing agent by upstream_id, forward compatibility, raise error after 3.0
+    existing = await agent.get_by_upstream_id()
+    if existing:
+        raise IntentKitAPIError(
+            status_code=400,
+            key="BadRequest",
+            message="Agent with this upstream ID already exists",
+        )
+
+    # Create new agent
+    latest_agent = await agent.create()
+    agent_data = await process_agent_wallet(latest_agent)
+    send_agent_notification(latest_agent, agent_data, "Agent Deployed")
+
+    return latest_agent, agent_data
+
+
+async def deploy_agent(
+    agent_id: str, agent: AgentUpdate, owner: Optional[str] = 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
+    (404 error), it will create a new agent instead.
+
+    Args:
+        agent_id: ID of the agent to deploy
+        agent: Agent configuration data
+        owner: Optional owner for the agent
+
+    Returns:
+        tuple[Agent, AgentData]: Deployed agent configuration and processed agent data
+
+    Raises:
+        IntentKitAPIError:
+            - 400: Invalid agent configuration or upstream ID conflict
+            - 403: Permission denied (if owner mismatch)
+            - 500: Database error
+    """
+    try:
+        # First try to override the existing agent
+        return await override_agent(agent_id, agent, owner)
+    except IntentKitAPIError as e:
+        # If agent not found (404), create a new one
+        if e.status_code == 404:
+            new_agent = AgentCreate.model_validate(agent)
+            new_agent.id = agent_id
+            new_agent.owner = owner
+            return await create_agent(new_agent)
+        else:
+            # Re-raise other errors
+            raise
+
+
 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.

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/core/engine.py

@@ -17,7 +17,7 @@ import textwrap
 import time
 import traceback
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Tuple
 
 import sqlalchemy
 from epyxid import XID
@@ -211,7 +211,7 @@ async def initialize_agent(aid, is_private=False):
 
 async def agent_executor(
     agent_id: str, is_private: bool
-) -> (CompiledStateGraph, float):
+) -> Tuple[CompiledStateGraph, float]:
     start = time.perf_counter()
     agent = await Agent.get(agent_id)
     if not agent:

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/models/agent.py

@@ -34,6 +34,7 @@ from sqlalchemy import (
     select,
 )
 from sqlalchemy.dialects.postgresql import JSON, JSONB
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
 logger = logging.getLogger(__name__)
@@ -960,12 +961,20 @@ class AgentCreate(AgentUpdate):
             self.validate_autonomous_schedule()
 
         async with get_session() as db:
-            db_agent = AgentTable(**self.model_dump())
-            db_agent.version = self.hash()
-            db.add(db_agent)
-            await db.commit()
-            await db.refresh(db_agent)
-            return Agent.model_validate(db_agent)
+            try:
+                db_agent = AgentTable(**self.model_dump())
+                db_agent.version = self.hash()
+                db.add(db_agent)
+                await db.commit()
+                await db.refresh(db_agent)
+                return Agent.model_validate(db_agent)
+            except IntegrityError:
+                await db.rollback()
+                raise IntentKitAPIError(
+                    status_code=400,
+                    key="AgentExists",
+                    message=f"Agent with ID '{self.id}' already exists",
+                )
 
 
 class AgentPublicInfo(BaseModel):
@@ -1509,16 +1518,16 @@ class AgentResponse(Agent):
     )
 
     # Override privacy fields to exclude them from JSON schema
-    purpose: Annotated[Optional[str], SkipJsonSchema] = None
-    personality: Annotated[Optional[str], SkipJsonSchema] = None
-    principles: Annotated[Optional[str], SkipJsonSchema] = None
-    prompt: Annotated[Optional[str], SkipJsonSchema] = None
-    prompt_append: Annotated[Optional[str], SkipJsonSchema] = None
-    temperature: Annotated[Optional[float], SkipJsonSchema] = None
-    frequency_penalty: Annotated[Optional[float], SkipJsonSchema] = None
-    telegram_entrypoint_prompt: Annotated[Optional[str], SkipJsonSchema] = None
-    telegram_config: Annotated[Optional[dict], SkipJsonSchema] = None
-    xmtp_entrypoint_prompt: Annotated[Optional[str], SkipJsonSchema] = None
+    purpose: SkipJsonSchema[Optional[str]] = None
+    personality: SkipJsonSchema[Optional[str]] = None
+    principles: SkipJsonSchema[Optional[str]] = None
+    prompt: SkipJsonSchema[Optional[str]] = None
+    prompt_append: SkipJsonSchema[Optional[str]] = None
+    temperature: SkipJsonSchema[Optional[float]] = None
+    frequency_penalty: SkipJsonSchema[Optional[float]] = None
+    telegram_entrypoint_prompt: SkipJsonSchema[Optional[str]] = None
+    telegram_config: SkipJsonSchema[Optional[dict]] = None
+    xmtp_entrypoint_prompt: SkipJsonSchema[Optional[str]] = None
 
     # Additional fields specific to AgentResponse
     cdp_wallet_address: Annotated[

{intentkit-0.7.5.dev9 → intentkit-0.7.5.dev11}/pyproject.toml

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