intentkit 0.6.2.dev1__py3-none-any.whl → 0.6.2.dev2__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.2-dev1"
+__version__ = "0.6.2-dev2"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

intentkit/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/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/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/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/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
 

{intentkit-0.6.2.dev1.dist-info → intentkit-0.6.2.dev2.dist-info}/METADATA

@@ -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.dist-info → intentkit-0.6.2.dev2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-intentkit/__init__.py,sha256=HBNDaJ4-iLgVtxsc42X7svB_Cpb5ZvDz_6CDzQuVI5Y,383
+intentkit/__init__.py,sha256=E1dn4BImBle0LKPwKBz0OvEYCyAHMnLGo6m4GxSLwM0,383
 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
@@ -9,14 +9,14 @@ intentkit/abstracts/skill.py,sha256=WS8G_XP0Ukw1eUB-dhbx6FrJUbvV4tqzRnkWa2dt9ck,
 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=_CkvnBkzdq7-sFMGct4lz85FpaOoHxOGstWubhClzrA,5921
-intentkit/clients/twitter.py,sha256=JAc-skIhZZjAFcwzLSTiOPOonteGjrl_JwXoA8IVBmI,16934
+intentkit/clients/twitter.py,sha256=gT7lXYAeRACZGYrTOPjoGoVNWAC1-qn9gkASVTeDL4M,19106
 intentkit/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/config/config.py,sha256=6RreVvQH1xuHVOnIJ3AcaRYzdMw1RLo0vYYtvPKvTds,7453
 intentkit/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/core/agent.py,sha256=PTHsFV_EbsfPUcTI0ErkebWurjxVykP9ISbNUsqV44Q,7764
 intentkit/core/api.py,sha256=3GIMJpwduLUSbVPNW6mQVxZncYHH3OlLwdiqFtYtEAE,1208
 intentkit/core/client.py,sha256=rIwtJVVm-7piXtFNDbeykt9vWdNTecgjW0aA3N-lHnM,1495
-intentkit/core/credit.py,sha256=fpRe8BRNGGaumAvJFgce1T2zkclExSFWQdoUVnl6k5g,60789
+intentkit/core/credit.py,sha256=vLT47NlLrGyvSU1OP8dkVXV5_VHqRNSeAK5t1FqSSYs,61742
 intentkit/core/engine.py,sha256=ZoMk8fBUg1fqbELT8Pi8vB667ytFqAT4mQfUNt5g_H0,41192
 intentkit/core/node.py,sha256=RqAdcR1Fcpgw4k7q9l1Sry8LgcuZWdNxSjOHDcoavCI,9108
 intentkit/core/prompt.py,sha256=RfLhlUktkB2kCr3wfldqq6ZP2l8heZIMc8jVp31KIyQ,3631
@@ -28,7 +28,7 @@ intentkit/models/app_setting.py,sha256=WgW-9t0EbiVemRLrVaC6evdfRU5QFSDK0elsnUU5n
 intentkit/models/base.py,sha256=o-zRjVrak-f5Jokdvj8BjLm8gcC3yYiYMCTLegwT2lA,185
 intentkit/models/chat.py,sha256=2P9dPWEti9f7XbO6L6Kp89lcYuyymSwqzxhL4GfBmBc,18019
 intentkit/models/conversation.py,sha256=nrbDIw-3GK5BYi_xkI15FLdx4a6SNrFK8wfAGLCsrqk,9032
-intentkit/models/credit.py,sha256=tHydPpGk8c8p9TLyIb7kvII4vo2WiXvI_i6xzv9PwaQ,42091
+intentkit/models/credit.py,sha256=95buGlZwIuoSPasZcqYEKvdrnUiUe2RzJCR3a2rvQvU,42397
 intentkit/models/db.py,sha256=2OpdTjQWUM9FkDP8Ni0mGLeVJ5q9ah3bGlGe9-IzDp0,3999
 intentkit/models/db_mig.py,sha256=vT6Tanm-BHC2T7dTztuB1UG494EFBAlHADKsNzR6xaQ,3577
 intentkit/models/generator.py,sha256=lyZu9U9rZUGkqd_QT5SAhay9DY358JJY8EhDSpN8I1M,10298
@@ -292,8 +292,8 @@ intentkit/skills/supabase/update_data.py,sha256=Hbwsoa52GZNTPIhWdR9vj9VlcPRUn_vC
 intentkit/skills/supabase/upsert_data.py,sha256=JgKLFPcQkUwnQhqTZojT4Ae53hYULeGEkQ1gxZJEe-c,2538
 intentkit/skills/system/__init__.py,sha256=y5sBakdOL1vtXV8DNn-g_MN11CrJ8QrOceoJjD5MzXs,2402
 intentkit/skills/system/base.py,sha256=Sm4lSNgbxwGK5YimnBfwi3Hc8E1EwSMZIXsCJbIPiLM,700
-intentkit/skills/system/read_agent_api_key.py,sha256=r7IfD9LCtYocqZsgSpSp7jt-fF00NuvoUwdAhZU-3Fs,3528
-intentkit/skills/system/regenerate_agent_api_key.py,sha256=55Jz5A6TnbSXc2FG3e7wkIxzkIIfDX0hWOENBTNkFi4,3188
+intentkit/skills/system/read_agent_api_key.py,sha256=PmTi4dJ1yDsowPHk4iT0bR-g9Il_UOg895a8aWvCrUQ,3517
+intentkit/skills/system/regenerate_agent_api_key.py,sha256=BaF9l3zDyzJNLoVT8ZAaZTmpXaDwumLW8VO8RLVjLyI,3177
 intentkit/skills/system/schema.json,sha256=4lv144DEDz9m1NYQdTgke3nDyCrVsGm82QiIoLbIRww,1462
 intentkit/skills/system/system.svg,sha256=PVbC6r6rOhvht0lB1fcxDNTcbMUa7haHAkJ8rxp7gm0,3740
 intentkit/skills/tavily/README.md,sha256=VagMkuHrS_ge2Sir9M9CoeqmWc_rysKhTO9-LGICQsA,2840
@@ -389,7 +389,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.2.dev1.dist-info/METADATA,sha256=e6r6BKXz70Dh3FRE0JWsACI7_gAP7Rx5C43HmwOMFhI,7285
-intentkit-0.6.2.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-intentkit-0.6.2.dev1.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
-intentkit-0.6.2.dev1.dist-info/RECORD,,
+intentkit-0.6.2.dev2.dist-info/METADATA,sha256=-Gjx0m4aqm8UNe8yd_V-udLAowAwgNrp7Qb8aMgL11c,7285
+intentkit-0.6.2.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+intentkit-0.6.2.dev2.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
+intentkit-0.6.2.dev2.dist-info/RECORD,,