intentkit 0.6.17.dev3__py3-none-any.whl → 0.6.19__py3-none-any.whl

intentkit/__init__.py

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

intentkit/clients/cdp.py

@@ -144,6 +144,17 @@ class CdpClient:
             wallet_secret=wallet_secret,
         )
         self._wallet_provider = CdpEvmServerWalletProvider(self._wallet_provider_config)
+        # hack for cdp bug
+        if network_id == "base-mainnet":
+            self._wallet_provider._network.network_id = "base"
+        elif network_id == "arbitrum-mainnet":
+            self._wallet_provider._network.network_id = "arbitrum"
+        elif network_id == "optimism-mainnet":
+            self._wallet_provider._network.network_id = "optimism"
+        elif network_id == "polygon-mainnet":
+            self._wallet_provider._network.network_id = "polygon"
+        elif network_id == "ethereum-mainnet":
+            self._wallet_provider._network.network_id = "ethereum"
         return self._wallet_provider
 
     async def get_account(self) -> EvmServerAccount:

intentkit/core/credit.py

@@ -117,8 +117,9 @@ async def recharge(
         session=session,
         owner_type=OwnerType.USER,
         owner_id=user_id,
-        amount=amount,
-        credit_type=CreditType.PERMANENT,  # Recharge adds to permanent credits
+        amount_details={
+            CreditType.PERMANENT: amount
+        },  # Recharge adds to permanent credits
         event_id=event_id,
     )
 
@@ -149,6 +150,9 @@ async def recharge(
         + user_account.reward_credits,
         base_amount=amount,
         base_original_amount=amount,
+        base_free_amount=Decimal("0"),  # No free credits involved in base amount
+        base_reward_amount=Decimal("0"),  # No reward credits involved in base amount
+        base_permanent_amount=amount,  # All base amount is permanent for recharge
         permanent_amount=amount,  # Set permanent_amount since this is a permanent credit
         free_amount=Decimal("0"),  # No free credits involved
         reward_amount=Decimal("0"),  # No reward credits involved
@@ -168,6 +172,9 @@ async def recharge(
         credit_debit=CreditDebit.CREDIT,
         change_amount=amount,
         credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
     )
     session.add(user_tx)
 
@@ -180,6 +187,9 @@ async def recharge(
         credit_debit=CreditDebit.DEBIT,
         change_amount=amount,
         credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
     )
     session.add(platform_tx)
 
@@ -239,8 +249,7 @@ async def reward(
         session=session,
         owner_type=OwnerType.USER,
         owner_id=user_id,
-        amount=amount,
-        credit_type=CreditType.REWARD,  # Reward adds to reward credits
+        amount_details={CreditType.REWARD: amount},  # Reward adds to reward credits
         event_id=event_id,
     )
 
@@ -271,6 +280,11 @@ async def reward(
         + user_account.reward_credits,
         base_amount=amount,
         base_original_amount=amount,
+        base_free_amount=Decimal("0"),  # No free credits involved in base amount
+        base_reward_amount=amount,  # All base amount is reward for reward events
+        base_permanent_amount=Decimal(
+            "0"
+        ),  # No permanent credits involved in base amount
         reward_amount=amount,  # Set reward_amount since this is a reward credit
         free_amount=Decimal("0"),  # No free credits involved
         permanent_amount=Decimal("0"),  # No permanent credits involved
@@ -290,6 +304,9 @@ async def reward(
         credit_debit=CreditDebit.CREDIT,
         change_amount=amount,
         credit_type=CreditType.REWARD,
+        free_amount=Decimal("0"),
+        reward_amount=amount,
+        permanent_amount=Decimal("0"),
     )
     session.add(user_tx)
 
@@ -302,6 +319,9 @@ async def reward(
         credit_debit=CreditDebit.DEBIT,
         change_amount=amount,
         credit_type=CreditType.REWARD,
+        free_amount=Decimal("0"),
+        reward_amount=amount,
+        permanent_amount=Decimal("0"),
     )
     session.add(platform_tx)
 
@@ -375,8 +395,7 @@ async def adjustment(
             session=session,
             owner_type=OwnerType.USER,
             owner_id=user_id,
-            amount=abs_amount,
-            credit_type=credit_type,
+            amount_details={credit_type: abs_amount},
             event_id=event_id,
         )
     else:
@@ -407,8 +426,7 @@ async def adjustment(
             session=session,
             owner_type=OwnerType.PLATFORM,
             owner_id=DEFAULT_PLATFORM_ACCOUNT_ADJUSTMENT,
-            amount=abs_amount,
-            credit_type=credit_type,
+            amount_details={credit_type: abs_amount},
             event_id=event_id,
         )
 
@@ -441,6 +459,9 @@ async def adjustment(
         + user_account.reward_credits,
         base_amount=abs_amount,
         base_original_amount=abs_amount,
+        base_free_amount=free_amount,
+        base_reward_amount=reward_amount,
+        base_permanent_amount=permanent_amount,
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
@@ -460,6 +481,9 @@ async def adjustment(
         credit_debit=credit_debit_user,
         change_amount=abs_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -472,6 +496,9 @@ async def adjustment(
         credit_debit=credit_debit_platform,
         change_amount=abs_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(platform_tx)
 
@@ -842,34 +869,7 @@ async def expense_message(
             session=session, id=agent.id, amount=details.get(CreditType.FREE)
         )
 
-    # 3. Update fee account - add credits
-    message_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_MESSAGE,
-        credit_type=CreditType.PERMANENT,
-        amount=base_amount,
-        event_id=event_id,
-    )
-    platform_fee_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=fee_platform_amount,
-        event_id=event_id,
-    )
-    if fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate detailed amounts for fees based on user payment details
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
@@ -925,6 +925,52 @@ async def expense_message(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    # This ensures that: permanent_amount = base_permanent_amount + fee_platform_permanent_amount + fee_agent_permanent_amount
+    base_free_amount = free_amount - fee_platform_free_amount - fee_agent_free_amount
+    base_reward_amount = (
+        reward_amount - fee_platform_reward_amount - fee_agent_reward_amount
+    )
+    base_permanent_amount = (
+        permanent_amount - fee_platform_permanent_amount - fee_agent_permanent_amount
+    )
+
+    # 4. Update fee account - add credits with detailed amounts
+    message_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_MESSAGE,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_fee_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -949,6 +995,9 @@ async def expense_message(
         + user_account.reward_credits,
         base_amount=base_amount,
         base_original_amount=base_original_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         base_llm_amount=base_llm_amount,
         fee_platform_amount=fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
@@ -977,6 +1026,9 @@ async def expense_message(
         credit_debit=CreditDebit.DEBIT,
         change_amount=total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -989,6 +1041,9 @@ async def expense_message(
         credit_debit=CreditDebit.CREDIT,
         change_amount=base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(message_tx)
 
@@ -1001,6 +1056,9 @@ async def expense_message(
         credit_debit=CreditDebit.CREDIT,
         change_amount=fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1014,6 +1072,9 @@ async def expense_message(
             credit_debit=CreditDebit.CREDIT,
             change_amount=fee_agent_amount,
             credit_type=credit_type,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)
 
@@ -1170,43 +1231,7 @@ async def expense_skill(
             session=session, id=agent.id, amount=details[CreditType.FREE]
         )
 
-    # 3. Update fee account - add credits
-    skill_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_SKILL,
-        credit_type=CreditType.PERMANENT,
-        amount=skill_cost_info.base_amount,
-        event_id=event_id,
-    )
-    platform_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=skill_cost_info.fee_platform_amount,
-        event_id=event_id,
-    )
-    if skill_cost_info.fee_dev_amount > 0:
-        dev_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=skill_cost_info.fee_dev_user_type,
-            owner_id=skill_cost_info.fee_dev_user,
-            credit_type=CreditType.REWARD,  # put dev fee in reward
-            amount=skill_cost_info.fee_dev_amount,
-            event_id=event_id,
-        )
-    if skill_cost_info.fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=skill_cost_info.fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate detailed amounts for fees
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
@@ -1306,6 +1331,78 @@ async def expense_skill(
             skill_cost_info.fee_dev_amount - fee_dev_free_amount - fee_dev_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    base_free_amount = (
+        free_amount
+        - fee_platform_free_amount
+        - fee_agent_free_amount
+        - fee_dev_free_amount
+    )
+
+    base_reward_amount = (
+        reward_amount
+        - fee_platform_reward_amount
+        - fee_agent_reward_amount
+        - fee_dev_reward_amount
+    )
+
+    base_permanent_amount = (
+        permanent_amount
+        - fee_platform_permanent_amount
+        - fee_agent_permanent_amount
+        - fee_dev_permanent_amount
+    )
+
+    # 4. Update fee account - add credits
+    skill_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_SKILL,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if skill_cost_info.fee_dev_amount > 0:
+        dev_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=skill_cost_info.fee_dev_user_type,
+            owner_id=skill_cost_info.fee_dev_user,
+            amount_details={
+                CreditType.FREE: fee_dev_free_amount,
+                CreditType.REWARD: fee_dev_reward_amount,
+                CreditType.PERMANENT: fee_dev_permanent_amount,
+            },
+            event_id=event_id,
+        )
+    if skill_cost_info.fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
+    # 5. Create credit event record
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -1332,6 +1429,9 @@ async def expense_skill(
         base_amount=skill_cost_info.base_amount,
         base_original_amount=skill_cost_info.base_original_amount,
         base_skill_amount=skill_cost_info.base_skill_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         fee_platform_amount=skill_cost_info.fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
         fee_platform_reward_amount=fee_platform_reward_amount,
@@ -1366,6 +1466,9 @@ async def expense_skill(
         credit_debit=CreditDebit.DEBIT,
         change_amount=skill_cost_info.total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -1378,6 +1481,9 @@ async def expense_skill(
         credit_debit=CreditDebit.CREDIT,
         change_amount=skill_cost_info.base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(skill_tx)
 
@@ -1390,6 +1496,9 @@ async def expense_skill(
         credit_debit=CreditDebit.CREDIT,
         change_amount=skill_cost_info.fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1403,6 +1512,9 @@ async def expense_skill(
             credit_debit=CreditDebit.CREDIT,
             change_amount=skill_cost_info.fee_dev_amount,
             credit_type=CreditType.REWARD,
+            free_amount=fee_dev_free_amount,
+            reward_amount=fee_dev_reward_amount,
+            permanent_amount=fee_dev_permanent_amount,
         )
         session.add(dev_tx)
 
@@ -1416,6 +1528,9 @@ async def expense_skill(
             credit_debit=CreditDebit.CREDIT,
             change_amount=skill_cost_info.fee_agent_amount,
             credit_type=credit_type,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)
 
@@ -1460,8 +1575,7 @@ async def refill_free_credits_for_account(
         session=session,
         owner_type=account.owner_type,
         owner_id=account.owner_id,
-        amount=amount_to_add,
-        credit_type=CreditType.FREE,
+        amount_details={CreditType.FREE: amount_to_add},
         event_id=event_id,
     )
 
@@ -1492,6 +1606,9 @@ async def refill_free_credits_for_account(
         + updated_account.reward_credits,
         base_amount=amount_to_add,
         base_original_amount=amount_to_add,
+        base_free_amount=amount_to_add,
+        base_reward_amount=Decimal("0"),
+        base_permanent_amount=Decimal("0"),
         free_amount=amount_to_add,  # Set free_amount since this is a free credit refill
         reward_amount=Decimal("0"),  # No reward credits involved
         permanent_amount=Decimal("0"),  # No permanent credits involved
@@ -1636,38 +1753,12 @@ async def expense_summarize(
             session=session, id=agent.id, amount=details.get(CreditType.FREE)
         )
 
-    # 3. Update fee account - add credits
-    memory_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_MEMORY,
-        credit_type=CreditType.PERMANENT,
-        amount=base_amount,
-        event_id=event_id,
-    )
-    platform_fee_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=fee_platform_amount,
-        event_id=event_id,
-    )
-    if fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate fee amounts by credit type before income_in_session calls
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
     permanent_amount = details.get(CreditType.PERMANENT, Decimal("0"))
+
     if CreditType.PERMANENT in details:
         credit_type = CreditType.PERMANENT
     elif CreditType.REWARD in details:
@@ -1719,6 +1810,55 @@ async def expense_summarize(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    base_free_amount = free_amount - fee_platform_free_amount - fee_agent_free_amount
+
+    base_reward_amount = (
+        reward_amount - fee_platform_reward_amount - fee_agent_reward_amount
+    )
+
+    base_permanent_amount = (
+        permanent_amount - fee_platform_permanent_amount - fee_agent_permanent_amount
+    )
+
+    # 4. Update fee account - add credits
+    memory_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_MEMORY,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_fee_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
+    # 5. Create credit event record
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -1744,6 +1884,9 @@ async def expense_summarize(
         base_amount=base_amount,
         base_original_amount=base_original_amount,
         base_llm_amount=base_llm_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         fee_platform_amount=fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
         fee_platform_reward_amount=fee_platform_reward_amount,
@@ -1769,6 +1912,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.DEBIT,
         change_amount=total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -1781,6 +1927,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.CREDIT,
         change_amount=base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(memory_tx)
 
@@ -1793,6 +1942,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.CREDIT,
         change_amount=fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1806,6 +1958,9 @@ async def expense_summarize(
             credit_debit=CreditDebit.CREDIT,
             change_amount=fee_agent_amount,
             credit_type=CreditType.REWARD,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)
 

intentkit/models/agent_schema.json

@@ -685,7 +685,7 @@
     "network_id": {
       "title": "Default Network",
       "type": "string",
-      "description": "Default Network",
+      "description": "Default Network, please note that some CDP Wallet native skills like swap only support the base network.",
       "default": "base-mainnet",
       "enum": [
         "ethereum-mainnet",
@@ -697,8 +697,7 @@
         "arbitrum-mainnet",
         "arbitrum-sepolia",
         "optimism-mainnet",
-        "optimism-sepolia",
-        "solana"
+        "optimism-sepolia"
       ],
       "x-group": "onchain"
     }
@@ -715,7 +714,7 @@
       "readonly_wallet_address": {
         "title": "Readonly Wallet Address",
         "type": "string",
-        "description": "Wallet address for readonly wallet provider",
+        "description": "Set the wallet address as agent wallet, then it can only be analyzed by the agent.",
         "maxLength": 100,
         "x-group": "onchain"
       }

intentkit/models/chat.py

@@ -503,18 +503,17 @@ class ChatMessage(ChatMessageCreate):
     def sanitize_privacy(self) -> "ChatMessage":
         """Remove sensitive information from the chat message.
 
-        This method clears the message content and removes parameters and response
+        This method clears the skill parameters and response
         from skill calls while preserving the structure and metadata.
 
         Returns:
             ChatMessage: A new ChatMessage instance with sensitive data removed
         """
+        if self.author_type != AuthorType.SKILL:
+            return self
         # Create a copy of the current message
         sanitized_data = self.model_dump()
 
-        # Clear the message content
-        sanitized_data["message"] = ""
-
         # Clear sensitive data from skill calls
         if sanitized_data.get("skill_calls"):
             for skill_call in sanitized_data["skill_calls"]:

intentkit/models/credit.py

@@ -404,20 +404,25 @@ class CreditAccount(BaseModel):
         session: AsyncSession,
         owner_type: OwnerType,
         owner_id: str,
-        amount: Decimal,
-        credit_type: CreditType,
+        amount_details: Dict[CreditType, Decimal],
         event_id: Optional[str] = None,
     ) -> "CreditAccount":
         # check first, create if not exists
         await cls.get_or_create_in_session(session, owner_type, owner_id)
         # income
         values_dict = {
-            credit_type.value: getattr(CreditAccountTable, credit_type.value) + amount,
             "income_at": datetime.now(timezone.utc),
         }
         if event_id:
             values_dict["last_event_id"] = event_id
 
+        # Add credit type values based on amount_details
+        for credit_type, amount in amount_details.items():
+            if amount > 0:
+                values_dict[credit_type.value] = (
+                    getattr(CreditAccountTable, credit_type.value) + amount
+                )
+
         stmt = (
             update(CreditAccountTable)
             .where(
@@ -515,6 +520,7 @@ class CreditAccount(BaseModel):
                 balance_after=free_quota,
                 base_amount=free_quota,
                 base_original_amount=free_quota,
+                base_free_amount=free_quota,
                 free_amount=free_quota,  # Set free_amount since this is a free credit refill
                 reward_amount=Decimal("0"),  # No reward credits involved
                 permanent_amount=Decimal("0"),  # No permanent credits involved
@@ -534,6 +540,9 @@ class CreditAccount(BaseModel):
                 credit_debit=CreditDebit.CREDIT,
                 change_amount=free_quota,
                 credit_type=CreditType.FREE,
+                free_amount=free_quota,
+                reward_amount=Decimal("0"),
+                permanent_amount=Decimal("0"),
             )
             session.add(user_tx)
 
@@ -546,6 +555,9 @@ class CreditAccount(BaseModel):
                 credit_debit=CreditDebit.DEBIT,
                 change_amount=free_quota,
                 credit_type=CreditType.FREE,
+                free_amount=free_quota,
+                reward_amount=Decimal("0"),
+                permanent_amount=Decimal("0"),
             )
             session.add(platform_tx)
 
@@ -794,6 +806,21 @@ class CreditEventTable(Base):
         default=0,
         nullable=True,
     )
+    base_free_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=True,
+    )
+    base_reward_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=True,
+    )
+    base_permanent_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=True,
+    )
     fee_platform_amount = Column(
         Numeric(22, 4),
         default=0,
@@ -968,6 +995,18 @@ class CreditEvent(BaseModel):
         Optional[Decimal],
         Field(default=Decimal("0"), description="Base skill cost amount"),
     ]
+    base_free_amount: Annotated[
+        Optional[Decimal],
+        Field(default=Decimal("0"), description="Base free credit amount"),
+    ]
+    base_reward_amount: Annotated[
+        Optional[Decimal],
+        Field(default=Decimal("0"), description="Base reward credit amount"),
+    ]
+    base_permanent_amount: Annotated[
+        Optional[Decimal],
+        Field(default=Decimal("0"), description="Base permanent credit amount"),
+    ]
     fee_platform_amount: Annotated[
         Optional[Decimal],
         Field(default=Decimal("0"), description="Platform fee amount"),
@@ -1062,6 +1101,9 @@ class CreditEvent(BaseModel):
         "base_original_amount",
         "base_llm_amount",
         "base_skill_amount",
+        "base_free_amount",
+        "base_reward_amount",
+        "base_permanent_amount",
         "fee_platform_amount",
         "fee_platform_free_amount",
         "fee_platform_reward_amount",
@@ -1183,6 +1225,21 @@ class CreditTransactionTable(Base):
         default=0,
         nullable=False,
     )
+    free_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    reward_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
+    permanent_amount = Column(
+        Numeric(22, 4),
+        default=0,
+        nullable=False,
+    )
     credit_type = Column(
         String,
         nullable=False,
@@ -1223,8 +1280,22 @@ class CreditTransaction(BaseModel):
     change_amount: Annotated[
         Decimal, Field(default=Decimal("0"), description="Amount of credits changed")
     ]
+    free_amount: Annotated[
+        Decimal,
+        Field(default=Decimal("0"), description="Amount of free credits changed"),
+    ]
+    reward_amount: Annotated[
+        Decimal,
+        Field(default=Decimal("0"), description="Amount of reward credits changed"),
+    ]
+    permanent_amount: Annotated[
+        Decimal,
+        Field(default=Decimal("0"), description="Amount of permanent credits changed"),
+    ]
 
-    @field_validator("change_amount")
+    @field_validator(
+        "change_amount", "free_amount", "reward_amount", "permanent_amount"
+    )
     @classmethod
     def round_decimal(cls, v: Any) -> Decimal:
         """Round decimal values to 4 decimal places."""

{intentkit-0.6.17.dev3.dist-info → intentkit-0.6.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.6.17.dev3
+Version: 0.6.19
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestal-network/intentkit
 Project-URL: Repository, https://github.com/crestal-network/intentkit

{intentkit-0.6.17.dev3.dist-info → intentkit-0.6.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-intentkit/__init__.py,sha256=mo5gZhps1kgTwEtZ20hqppzAMxo9N5ASnV1C-SrBFnI,384
+intentkit/__init__.py,sha256=FmDOou4eKFWVVffgyC8ibQV_z8X3ych6jsxuIL43U3k,379
 intentkit/abstracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/abstracts/agent.py,sha256=108gb5W8Q1Sy4G55F2_ZFv2-_CnY76qrBtpIr0Oxxqk,1489
 intentkit/abstracts/api.py,sha256=ZUc24vaQvQVbbjznx7bV0lbbQxdQPfEV8ZxM2R6wZWo,166
@@ -7,7 +7,7 @@ intentkit/abstracts/graph.py,sha256=sX5hVemXsODvwIYLHufaf-zSXmW97bXRoZuyxYqaEV4,
 intentkit/abstracts/skill.py,sha256=cIJ6BkASD31U1IEkE8rdAawq99w_xsg0lt3oalqa1ZA,5071
 intentkit/abstracts/twitter.py,sha256=cEtP7ygR_b-pHdc9i8kBuyooz1cPoGUGwsBHDpowJyY,1262
 intentkit/clients/__init__.py,sha256=sQ_6_bRC2MPWLPH-skQ3qsEe8ce-dUGL7i8VJOautHg,298
-intentkit/clients/cdp.py,sha256=VaIFzgfqpq5H4bHbFBe8UPabhkwe8s5pge_P5FssGqU,6453
+intentkit/clients/cdp.py,sha256=_A0QRRi6uPYr_AL26arW-Yofez0JcrEQdfxGCVgC7kM,7038
 intentkit/clients/twitter.py,sha256=Lfa7srHOFnY96SXcElW0jfg7XKS_WliWnXjPZEe6SQc,18976
 intentkit/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/config/config.py,sha256=jhPr7FzZZHUsLIdyiOcaKeAsZQ8FdEo6yUaiIcvmryo,8879
@@ -15,19 +15,19 @@ intentkit/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/core/agent.py,sha256=GIKDn1dTenIHWMRxe-ud7hd1cQaHzbTDdypy5IAgPfU,16658
 intentkit/core/api.py,sha256=WfoaHNquujYJIpNPuTR1dSaaxog0S3X2W4lG9Ehmkm4,3284
 intentkit/core/client.py,sha256=J5K7f08-ucszBKAbn9K3QNOFKIC__7amTbKYii1jFkI,3056
-intentkit/core/credit.py,sha256=Y5cjShFFqGBhz7Uc_ziqejyW-2FP58TYxsSNc4N_6hI,63039
+intentkit/core/credit.py,sha256=1aKT3hNLCvcQYjNckMxBsUpdtc4RH_KZQPAfzpOs-DU,69552
 intentkit/core/engine.py,sha256=H4ew1jhn2coMYJ3zR9isM1Y-XbnXNMg91SeDoeXdQ4U,36562
 intentkit/core/node.py,sha256=7h9zgDSd928bzUi3m3EZnKkhbwqlbRAQUr_uz7gKB5Y,8880
 intentkit/core/prompt.py,sha256=a6nogIGZuDt2u2EuDd29DAv73OjCBOn-bZnuqYRvY7A,15804
 intentkit/core/skill.py,sha256=vPK37sDRT9kzkMBymPwqZ5uEdxTTRtb_DfREIeyz-Xw,5788
 intentkit/models/agent.py,sha256=uC5AErdVucaEajKCXAcF6C3VwYRVIhXTIfOBp-n-Xhg,66310
 intentkit/models/agent_data.py,sha256=mVsiK8TziYa1W1ujU1KwI9osIVIeSM7XJEogGRL1WVU,28263
-intentkit/models/agent_schema.json,sha256=vhW6k9sPAU7Wx0VQjhNc-v9-pu0q6JsRK0z3Mgo5W6w,20999
+intentkit/models/agent_schema.json,sha256=psrYONIzAbiuZB4zzYQFmANP1pw31TV_900TagSYT7o,21109
 intentkit/models/app_setting.py,sha256=iYbW63QD91bt4oEYV3wOXHuRFav2b4VXLwb_StgUQtQ,8230
 intentkit/models/base.py,sha256=o-zRjVrak-f5Jokdvj8BjLm8gcC3yYiYMCTLegwT2lA,185
-intentkit/models/chat.py,sha256=4z5y0Q77XsVABeGMRXnxlY2Ol6gnivTxeMrlO04IB-Q,20494
+intentkit/models/chat.py,sha256=cDccEHU8nd7Y5uhrHDCuZGwqrRwhqCaeztMiZcemiug,20469
 intentkit/models/conversation.py,sha256=nrbDIw-3GK5BYi_xkI15FLdx4a6SNrFK8wfAGLCsrqk,9032
-intentkit/models/credit.py,sha256=bcasHyrCwforLGrH8ZWEvN6y6ml7NeAFrGl8cfqvqbI,42956
+intentkit/models/credit.py,sha256=BHX_Ty1u-TlPCDMjnMbogoUtlbcff0tHHVVZLzkrnGY,45090
 intentkit/models/db.py,sha256=nuDX6NEtnfD5YLr2iVpAAXsgHbSpG5diqfLC-PkHsA4,4406
 intentkit/models/db_mig.py,sha256=vT6Tanm-BHC2T7dTztuB1UG494EFBAlHADKsNzR6xaQ,3577
 intentkit/models/generator.py,sha256=lyZu9U9rZUGkqd_QT5SAhay9DY358JJY8EhDSpN8I1M,10298
@@ -411,7 +411,7 @@ intentkit/utils/random.py,sha256=DymMxu9g0kuQLgJUqalvgksnIeLdS-v0aRk5nQU0mLI,452
 intentkit/utils/s3.py,sha256=9trQNkKQ5VgxWsewVsV8Y0q_pXzGRvsCYP8xauyUYkg,8549
 intentkit/utils/slack_alert.py,sha256=s7UpRgyzLW7Pbmt8cKzTJgMA9bm4EP-1rQ5KXayHu6E,2264
 intentkit/utils/tx.py,sha256=2yLLGuhvfBEY5n_GJ8wmIWLCzn0FsYKv5kRNzw_sLUI,1454
-intentkit-0.6.17.dev3.dist-info/METADATA,sha256=m_OSvSNaYwGPZG1BIkjYKNQDKl8JBU6GuS_J8nuDSpQ,6414
-intentkit-0.6.17.dev3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-intentkit-0.6.17.dev3.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
-intentkit-0.6.17.dev3.dist-info/RECORD,,
+intentkit-0.6.19.dist-info/METADATA,sha256=0Z-h-KZ0LRjUEPTxR9_H7-Le0pnXe7jcZpet-2AFiBE,6409
+intentkit-0.6.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+intentkit-0.6.19.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
+intentkit-0.6.19.dist-info/RECORD,,