intentkit 0.7.1.dev1__tar.gz → 0.7.1.dev3__tar.gz

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.7.1.dev1
+Version: 0.7.1.dev3
 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.1.dev1 → intentkit-0.7.1.dev3}/__init__.py

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

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/core/credit.py

@@ -1562,7 +1562,7 @@ async def refill_free_credits_for_account(
     # If adding refill_amount would exceed free_quota, only add what's needed to reach free_quota
     amount_to_add = min(
         account.refill_amount, account.free_quota - account.free_credits
-    )
+    ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
     if amount_to_add <= Decimal("0"):
         return  # Nothing to add

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/models/credit.py

@@ -26,6 +26,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 logger = logging.getLogger(__name__)
 
+# Precision constant for 4 decimal places
+FOURPLACES = Decimal("0.0001")
+
 
 class CreditType(str, Enum):
     """Credit type is used in db column names, do not change it."""
@@ -114,6 +117,47 @@ class CreditAccountTable(Base):
         String,
         nullable=True,
     )
+    # Total statistics fields
+    total_income = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_free_income = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_reward_income = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_permanent_income = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_expense = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_free_expense = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_reward_expense = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    total_permanent_expense = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
     created_at = Column(
         DateTime(timezone=True),
         nullable=False,
@@ -186,6 +230,63 @@ class CreditAccount(BaseModel):
         Optional[str],
         Field(None, description="ID of the last event that modified this account"),
     ]
+    # Total statistics fields
+    total_income: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total income from all credit transactions",
+        ),
+    ]
+    total_free_income: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total income from free credit transactions",
+        ),
+    ]
+    total_reward_income: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total income from reward credit transactions",
+        ),
+    ]
+    total_permanent_income: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total income from permanent credit transactions",
+        ),
+    ]
+    total_expense: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total expense from all credit transactions",
+        ),
+    ]
+    total_free_expense: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total expense from free credit transactions",
+        ),
+    ]
+    total_reward_expense: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total expense from reward credit transactions",
+        ),
+    ]
+    total_permanent_expense: Annotated[
+        Decimal,
+        Field(
+            default=Decimal("0"),
+            description="Total expense from permanent credit transactions",
+        ),
+    ]
     created_at: Annotated[
         datetime, Field(description="Timestamp when this account was created")
     ]
@@ -194,7 +295,19 @@ class CreditAccount(BaseModel):
     ]
 
     @field_validator(
-        "free_quota", "refill_amount", "free_credits", "reward_credits", "credits"
+        "free_quota",
+        "refill_amount",
+        "free_credits",
+        "reward_credits",
+        "credits",
+        "total_income",
+        "total_free_income",
+        "total_reward_income",
+        "total_permanent_income",
+        "total_expense",
+        "total_free_expense",
+        "total_reward_expense",
+        "total_permanent_expense",
     )
     @classmethod
     def round_decimal(cls, v: Any) -> Decimal:
@@ -300,13 +413,32 @@ class CreditAccount(BaseModel):
         # check first, create if not exists
         await cls.get_or_create_in_session(session, owner_type, owner_id)
 
+        # Quantize the amount to ensure proper precision
+        quantized_amount = amount.quantize(FOURPLACES, rounding=ROUND_HALF_UP)
         values_dict = {
-            credit_type.value: getattr(CreditAccountTable, credit_type.value) - amount,
+            credit_type.value: getattr(CreditAccountTable, credit_type.value)
+            - quantized_amount,
             "expense_at": datetime.now(timezone.utc),
+            # Update total expense statistics
+            "total_expense": CreditAccountTable.total_expense + quantized_amount,
         }
         if event_id:
             values_dict["last_event_id"] = event_id
 
+        # Update corresponding statistics fields based on credit type
+        if credit_type == CreditType.FREE:
+            values_dict["total_free_expense"] = (
+                CreditAccountTable.total_free_expense + quantized_amount
+            )
+        elif credit_type == CreditType.REWARD:
+            values_dict["total_reward_expense"] = (
+                CreditAccountTable.total_reward_expense + quantized_amount
+            )
+        elif credit_type == CreditType.PERMANENT:
+            values_dict["total_permanent_expense"] = (
+                CreditAccountTable.total_permanent_expense + quantized_amount
+            )
+
         stmt = (
             update(CreditAccountTable)
             .where(
@@ -348,14 +480,18 @@ class CreditAccount(BaseModel):
         else:
             if account.free_credits > 0:
                 details[CreditType.FREE] = account.free_credits
-                amount_left -= account.free_credits
+                amount_left = (amount_left - account.free_credits).quantize(
+                    FOURPLACES, rounding=ROUND_HALF_UP
+                )
             if amount_left <= account.reward_credits:
                 details[CreditType.REWARD] = amount_left
                 amount_left = Decimal("0")
             else:
                 if account.reward_credits > 0:
                     details[CreditType.REWARD] = account.reward_credits
-                    amount_left -= account.reward_credits
+                    amount_left = (amount_left - account.reward_credits).quantize(
+                        FOURPLACES, rounding=ROUND_HALF_UP
+                    )
                 details[CreditType.PERMANENT] = amount_left
 
         # Create values dict based on what's in details, defaulting to 0 for missing keys
@@ -365,14 +501,41 @@ class CreditAccount(BaseModel):
         if event_id:
             values_dict["last_event_id"] = event_id
 
+        # Calculate total expense for statistics
+        total_expense_amount = Decimal("0")
+
         # Add credit type values only if they exist in details
         for credit_type in [CreditType.FREE, CreditType.REWARD, CreditType.PERMANENT]:
             if credit_type in details:
+                # Quantize the amount to ensure proper precision
+                quantized_amount = details[credit_type].quantize(
+                    FOURPLACES, rounding=ROUND_HALF_UP
+                )
                 values_dict[credit_type.value] = (
-                    getattr(CreditAccountTable, credit_type.value)
-                    - details[credit_type]
+                    getattr(CreditAccountTable, credit_type.value) - quantized_amount
                 )
 
+                # Update corresponding statistics fields
+                total_expense_amount += quantized_amount
+                if credit_type == CreditType.FREE:
+                    values_dict["total_free_expense"] = (
+                        CreditAccountTable.total_free_expense + quantized_amount
+                    )
+                elif credit_type == CreditType.REWARD:
+                    values_dict["total_reward_expense"] = (
+                        CreditAccountTable.total_reward_expense + quantized_amount
+                    )
+                elif credit_type == CreditType.PERMANENT:
+                    values_dict["total_permanent_expense"] = (
+                        CreditAccountTable.total_permanent_expense + quantized_amount
+                    )
+
+        # Update total expense if there was any expense
+        if total_expense_amount > 0:
+            values_dict["total_expense"] = (
+                CreditAccountTable.total_expense + total_expense_amount
+            )
+
         stmt = (
             update(CreditAccountTable)
             .where(
@@ -416,13 +579,39 @@ class CreditAccount(BaseModel):
         if event_id:
             values_dict["last_event_id"] = event_id
 
+        # Calculate total income for statistics
+        total_income_amount = Decimal("0")
+
         # Add credit type values based on amount_details
         for credit_type, amount in amount_details.items():
             if amount > 0:
+                # Quantize the amount to ensure 4 decimal places precision
+                quantized_amount = amount.quantize(FOURPLACES, rounding=ROUND_HALF_UP)
                 values_dict[credit_type.value] = (
-                    getattr(CreditAccountTable, credit_type.value) + amount
+                    getattr(CreditAccountTable, credit_type.value) + quantized_amount
                 )
 
+                # Update corresponding statistics fields
+                total_income_amount += quantized_amount
+                if credit_type == CreditType.FREE:
+                    values_dict["total_free_income"] = (
+                        CreditAccountTable.total_free_income + quantized_amount
+                    )
+                elif credit_type == CreditType.REWARD:
+                    values_dict["total_reward_income"] = (
+                        CreditAccountTable.total_reward_income + quantized_amount
+                    )
+                elif credit_type == CreditType.PERMANENT:
+                    values_dict["total_permanent_income"] = (
+                        CreditAccountTable.total_permanent_income + quantized_amount
+                    )
+
+        # Update total income if there was any income
+        if total_income_amount > 0:
+            values_dict["total_income"] = (
+                CreditAccountTable.total_income + total_income_amount
+            )
+
         stmt = (
             update(CreditAccountTable)
             .where(
@@ -487,6 +676,16 @@ class CreditAccount(BaseModel):
             income_at=datetime.now(timezone.utc),
             expense_at=None,
             last_event_id=event_id if owner_type == OwnerType.USER else None,
+            # Initialize new statistics fields
+            # For USER accounts, initial free_quota counts as income
+            total_income=free_quota,
+            total_free_income=free_quota,
+            total_reward_income=0.0,
+            total_permanent_income=0.0,
+            total_expense=0.0,
+            total_free_expense=0.0,
+            total_reward_expense=0.0,
+            total_permanent_expense=0.0,
         )
         # Platform virtual accounts have fixed IDs, same as owner_id
         if owner_type == OwnerType.PLATFORM:
@@ -621,6 +820,10 @@ class CreditAccount(BaseModel):
         if not note:
             raise ValueError("Quota update requires a note explaining the reason")
 
+        # Quantize values to ensure proper precision (4 decimal places)
+        free_quota = free_quota.quantize(FOURPLACES, rounding=ROUND_HALF_UP)
+        refill_amount = refill_amount.quantize(FOURPLACES, rounding=ROUND_HALF_UP)
+
         # Update the free_quota field
         stmt = (
             update(CreditAccountTable)

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/models/db.py

@@ -6,6 +6,7 @@ from intentkit.models.db_mig import safe_migrate
 from langgraph.checkpoint.memory import InMemorySaver
 from langgraph.checkpoint.postgres.aio import AsyncPostgresSaver
 from langgraph.types import Checkpointer
+from psycopg import OperationalError
 from psycopg_pool import AsyncConnectionPool
 from pydantic import Field
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
@@ -14,6 +15,18 @@ engine = None
 _langgraph_checkpointer: Optional[Checkpointer] = None
 
 
+async def check_connection(conn):
+    """
+    Pre-ping function to validate connection health before returning to application.
+    This helps handle database restarts and failovers gracefully.
+    """
+    try:
+        await conn.execute("SELECT 1")
+    except OperationalError:
+        # Re-raise the exception to let the connection pool know this connection is broken
+        raise
+
+
 async def init_db(
     host: Optional[str],
     username: Optional[str],
@@ -51,6 +64,10 @@ async def init_db(
                 max_size=pool_size * 2,
                 timeout=60,
                 max_idle=30 * 60,
+                # Add health check function to handle database restarts
+                check=check_connection,
+                # Set connection max lifetime to prevent stale connections
+                max_lifetime=3600,  # 1 hour
             )
             _langgraph_checkpointer = AsyncPostgresSaver(pool)
             if auto_migrate:

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/models/llm.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from datetime import datetime, timezone
-from decimal import Decimal
+from decimal import ROUND_HALF_UP, Decimal
 from enum import Enum
 from typing import Annotated, Any, Optional
 
@@ -17,6 +17,7 @@ from sqlalchemy import Boolean, Column, DateTime, Integer, Numeric, String, func
 logger = logging.getLogger(__name__)
 
 _credit_per_usdc = None
+FOURPLACES = Decimal("0.0001")
 
 
 class LLMProvider(str, Enum):
@@ -219,14 +220,14 @@ class LLMModelInfo(BaseModel):
             * Decimal(input_tokens)
             * self.input_price
             / Decimal(1000000)
-        )
+        ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
         output_cost = (
             _credit_per_usdc
             * Decimal(output_tokens)
             * self.output_price
             / Decimal(1000000)
-        )
-        return input_cost + output_cost
+        ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
+        return (input_cost + output_cost).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
 
 # Define all available models

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/models/user.py

@@ -1,6 +1,6 @@
 import logging
 from datetime import datetime, timezone
-from decimal import Decimal
+from decimal import ROUND_HALF_UP, Decimal
 from typing import Annotated, Optional, Type, TypeVar
 
 from intentkit.models.base import Base
@@ -148,8 +148,13 @@ class UserUpdate(BaseModel):
         upstream_tx_id = f"nft_{id}_{timestamp}"
 
         # Calculate new quota values based on nft_count
-        free_quota = Decimal(480 + 48 * new_nft_count)
-        refill_amount = Decimal(20 + 2 * new_nft_count)
+        FOURPLACES = Decimal("0.0001")
+        free_quota = Decimal(480 + 48 * new_nft_count).quantize(
+            FOURPLACES, rounding=ROUND_HALF_UP
+        )
+        refill_amount = Decimal(20 + 2 * new_nft_count).quantize(
+            FOURPLACES, rounding=ROUND_HALF_UP
+        )
         note = f"NFT count changed to {new_nft_count}"
 
         # Update daily quota

{intentkit-0.7.1.dev1 → intentkit-0.7.1.dev3}/pyproject.toml

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