intentkit 0.6.2.dev1__tar.gz → 0.6.2.dev2__tar.gz

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/PKG-INFO

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

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

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/clients/twitter.py

@@ -3,9 +3,12 @@ import os
 import tempfile
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List, NotRequired, Optional, TypedDict
+from urllib.parse import urlencode
 
 import httpx
 from pydantic import BaseModel, Field
+from requests.auth import HTTPBasicAuth
+from requests_oauthlib import OAuth2Session
 from tweepy.asynchronous import AsyncClient
 
 from intentkit.abstracts.skill import SkillStoreABC
@@ -443,3 +446,58 @@ async def unlink_twitter(agent_id: str) -> AgentData:
             "twitter_refresh_token": None,
         },
     )
+
+
+# this class is forked from:
+# https://github.com/tweepy/tweepy/blob/main/tweepy/auth.py
+# it is not maintained by the original author, bug need to be fixed
+class OAuth2UserHandler(OAuth2Session):
+    """OAuth 2.0 Authorization Code Flow with PKCE (User Context)
+    authentication handler
+    """
+
+    def __init__(self, *, client_id, redirect_uri, scope, client_secret=None):
+        super().__init__(client_id, redirect_uri=redirect_uri, scope=scope)
+        if client_secret is not None:
+            self.auth = HTTPBasicAuth(client_id, client_secret)
+        else:
+            self.auth = None
+        self.code_challenge = self._client.create_code_challenge(
+            self._client.create_code_verifier(128), "S256"
+        )
+
+    def get_authorization_url(self, agent_id: str, redirect_uri: str):
+        """Get the authorization URL to redirect the user to
+
+        Args:
+            agent_id: ID of the agent to authenticate
+            redirect_uri: URI to redirect to after authorization
+        """
+        state_params = {"agent_id": agent_id, "redirect_uri": redirect_uri}
+        authorization_url, _ = self.authorization_url(
+            "https://x.com/i/oauth2/authorize",
+            state=urlencode(state_params),
+            code_challenge=self.code_challenge,
+            code_challenge_method="S256",
+        )
+        return authorization_url
+
+    def get_token(self, authorization_response):
+        """After user has authorized the app, fetch access token with
+        authorization response URL
+        """
+        return super().fetch_token(
+            "https://api.x.com/2/oauth2/token",
+            authorization_response=authorization_response,
+            auth=self.auth,
+            include_client_id=True,
+            code_verifier=self._client.code_verifier,
+        )
+
+    def refresh(self, refresh_token: str):
+        """Refresh token"""
+        return super().refresh_token(
+            "https://api.x.com/2/oauth2/token",
+            refresh_token=refresh_token,
+            include_client_id=True,
+        )

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/core/credit.py

@@ -10,6 +10,7 @@ from sqlalchemy import desc, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from intentkit.models.agent import Agent
+from intentkit.models.agent_data import AgentData
 from intentkit.models.app_setting import AppSetting
 from intentkit.models.credit import (
     DEFAULT_PLATFORM_ACCOUNT_ADJUSTMENT,
@@ -150,6 +151,7 @@ async def 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
+        agent_wallet_address=None,  # No agent involved in recharge
         note=note,
     )
     session.add(event)
@@ -258,6 +260,7 @@ async def reward(
         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
+        agent_wallet_address=None,  # No agent involved in reward
         note=note,
     )
     session.add(event)
@@ -412,6 +415,7 @@ async def adjustment(
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
+        agent_wallet_address=None,  # No agent involved in adjustment
         note=note,
     )
     session.add(event)
@@ -892,6 +896,10 @@ async def expense_message(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Get agent wallet address
+    agent_data = await AgentData.get(agent.id)
+    agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
+
     event = CreditEventTable(
         id=event_id,
         account_id=user_account.id,
@@ -925,6 +933,7 @@ async def expense_message(
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
+        agent_wallet_address=agent_wallet_address,
     )
     session.add(event)
     await session.flush()
@@ -1268,6 +1277,10 @@ async def expense_skill(
             skill_cost_info.fee_dev_amount - fee_dev_free_amount - fee_dev_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Get agent wallet address
+    agent_data = await AgentData.get(agent.id)
+    agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
+
     event = CreditEventTable(
         id=event_id,
         account_id=user_account.id,
@@ -1309,6 +1322,7 @@ async def expense_skill(
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
+        agent_wallet_address=agent_wallet_address,
     )
     session.add(event)
     await session.flush()
@@ -1452,6 +1466,7 @@ async def refill_free_credits_for_account(
         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
+        agent_wallet_address=None,  # No agent involved in refill
         note=f"Hourly free credits refill of {amount_to_add}",
     )
     session.add(event)
@@ -1675,6 +1690,10 @@ async def expense_summarize(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Get agent wallet address
+    agent_data = await AgentData.get(agent.id)
+    agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
+
     event = CreditEventTable(
         id=event_id,
         account_id=user_account.id,
@@ -1707,6 +1726,7 @@ async def expense_summarize(
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
+        agent_wallet_address=agent_wallet_address,
     )
     session.add(event)
 

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/models/credit.py

@@ -508,6 +508,7 @@ class CreditAccount(BaseModel):
                 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
+                agent_wallet_address=None,  # No agent involved in initial refill
                 note="Initial refill",
             )
             session.add(event)
@@ -712,6 +713,10 @@ class CreditEventTable(Base):
         String,
         nullable=True,
     )
+    agent_wallet_address = Column(
+        String,
+        nullable=True,
+    )
     start_message_id = Column(
         String,
         nullable=True,
@@ -896,6 +901,10 @@ class CreditEvent(BaseModel):
     agent_id: Annotated[
         Optional[str], Field(None, description="ID of the agent if applicable")
     ]
+    agent_wallet_address: Annotated[
+        Optional[str],
+        Field(None, description="Wallet address of the agent if applicable"),
+    ]
     start_message_id: Annotated[
         Optional[str],
         Field(None, description="ID of the starting message if applicable"),

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/pyproject.toml

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

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/skills/system/read_agent_api_key.py

@@ -32,7 +32,7 @@ class ReadAgentApiKey(SystemBaseTool):
         "Make sure to tell the user the base URL and endpoint.  "
         "Tell user in OpenAI sdk or Desktop client like Cherry Studio, input the base URL and API key.  "
         "Always use markdown code block to wrap the API keys, base URL, and endpoint.  "
-        "Tell user to check more doc in https://github.com/crestalnetwork/intentkit/blob/main/docs/skills/agent_api_key.md "
+        "Tell user to check more doc in https://github.com/crestalnetwork/intentkit/blob/main/docs/agent_api.md "
     )
     args_schema = ReadAgentApiKeyInput
 

{intentkit-0.6.2.dev1 → intentkit-0.6.2.dev2}/skills/system/regenerate_agent_api_key.py

@@ -34,7 +34,7 @@ class RegenerateAgentApiKey(SystemBaseTool):
         "Make sure to tell the user the base URL and endpoint.  "
         "Tell user in OpenAI sdk or Desktop client like Cherry Studio, input the base URL and API key.  "
         "Always use markdown code block to wrap the API keys, base URL, and endpoint.  "
-        "Tell user to check more doc in https://github.com/crestalnetwork/intentkit/blob/main/docs/skills/agent_api_key.md "
+        "Tell user to check more doc in https://github.com/crestalnetwork/intentkit/blob/main/docs/agent_api.md "
     )
     args_schema = RegenerateAgentApiKeyInput