intentkit 0.8.6.dev2__py3-none-any.whl → 0.8.17__py3-none-any.whl

intentkit/models/skill.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import csv
 import json
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 from pathlib import Path
-from typing import Annotated, Any, Dict, Optional
+from typing import Annotated, Any
 
 from intentkit.models.base import Base
 from intentkit.models.db import get_session
@@ -46,7 +48,7 @@ class AgentSkillDataTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -58,7 +60,7 @@ class AgentSkillDataCreate(BaseModel):
     agent_id: Annotated[str, Field(description="ID of the agent this data belongs to")]
     skill: Annotated[str, Field(description="Name of the skill this data is for")]
     key: Annotated[str, Field(description="Key for this specific piece of data")]
-    data: Annotated[Dict[str, Any], Field(description="JSON data stored for this key")]
+    data: Annotated[dict[str, Any], Field(description="JSON data stored for this key")]
 
     async def save(self) -> "AgentSkillData":
         """Save or update skill data.
@@ -157,7 +159,7 @@ class AgentSkillData(AgentSkillDataCreate):
             return result or 0
 
     @classmethod
-    async def get(cls, agent_id: str, skill: str, key: str) -> Optional[dict]:
+    async def get(cls, agent_id: str, skill: str, key: str) -> dict | None:
         """Get skill data for an agent.
 
         Args:
@@ -213,12 +215,12 @@ class AgentSkillData(AgentSkillDataCreate):
             await db.commit()
 
 
-class ThreadSkillDataTable(Base):
-    """Database table model for storing skill-specific data for threads."""
+class ChatSkillDataTable(Base):
+    """Database table model for storing skill-specific data for chats."""
 
-    __tablename__ = "thread_skill_data"
+    __tablename__ = "chat_skill_data"
 
-    thread_id = Column(String, primary_key=True)
+    chat_id = Column(String, primary_key=True)
     skill = Column(String, primary_key=True)
     key = Column(String, primary_key=True)
     agent_id = Column(String, nullable=False)
@@ -232,35 +234,33 @@ class ThreadSkillDataTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
-class ThreadSkillDataCreate(BaseModel):
-    """Base model for creating thread skill data records."""
+class ChatSkillDataCreate(BaseModel):
+    """Base model for creating chat skill data records."""
 
     model_config = ConfigDict(from_attributes=True)
 
-    thread_id: Annotated[
-        str, Field(description="ID of the thread this data belongs to")
-    ]
+    chat_id: Annotated[str, Field(description="ID of the chat this data belongs to")]
     skill: Annotated[str, Field(description="Name of the skill this data is for")]
     key: Annotated[str, Field(description="Key for this specific piece of data")]
-    agent_id: Annotated[str, Field(description="ID of the agent that owns this thread")]
-    data: Annotated[Dict[str, Any], Field(description="JSON data stored for this key")]
+    agent_id: Annotated[str, Field(description="ID of the agent that owns this chat")]
+    data: Annotated[dict[str, Any], Field(description="JSON data stored for this key")]
 
-    async def save(self) -> "ThreadSkillData":
+    async def save(self) -> "ChatSkillData":
         """Save or update skill data.
 
         Returns:
-            ThreadSkillData: The saved thread skill data instance
+            ChatSkillData: The saved chat skill data instance
         """
         async with get_session() as db:
             record = await db.scalar(
-                select(ThreadSkillDataTable).where(
-                    ThreadSkillDataTable.thread_id == self.thread_id,
-                    ThreadSkillDataTable.skill == self.skill,
-                    ThreadSkillDataTable.key == self.key,
+                select(ChatSkillDataTable).where(
+                    ChatSkillDataTable.chat_id == self.chat_id,
+                    ChatSkillDataTable.skill == self.skill,
+                    ChatSkillDataTable.key == self.key,
                 )
             )
 
@@ -270,18 +270,18 @@ class ThreadSkillDataCreate(BaseModel):
                 record.agent_id = self.agent_id
             else:
                 # Create new record
-                record = ThreadSkillDataTable(**self.model_dump())
+                record = ChatSkillDataTable(**self.model_dump())
             db.add(record)
             await db.commit()
             await db.refresh(record)
-            return ThreadSkillData.model_validate(record)
+            return ChatSkillData.model_validate(record)
 
 
-class ThreadSkillData(ThreadSkillDataCreate):
-    """Model for storing skill-specific data for threads.
+class ChatSkillData(ChatSkillDataCreate):
+    """Model for storing skill-specific data for chats.
 
-    This model uses a composite primary key of (thread_id, skill, key) to store
-    skill-specific data for threads in a flexible way. It also includes agent_id
+    This model uses a composite primary key of (chat_id, skill, key) to store
+    skill-specific data for chats in a flexible way. It also includes agent_id
     as a required field for tracking ownership.
     """
 
@@ -298,11 +298,11 @@ class ThreadSkillData(ThreadSkillDataCreate):
     ]
 
     @classmethod
-    async def get(cls, thread_id: str, skill: str, key: str) -> Optional[dict]:
-        """Get skill data for a thread.
+    async def get(cls, chat_id: str, skill: str, key: str) -> dict | None:
+        """Get skill data for a chat.
 
         Args:
-            thread_id: ID of the thread
+            chat_id: ID of the chat
             skill: Name of the skill
             key: Data key
 
@@ -311,10 +311,10 @@ class ThreadSkillData(ThreadSkillDataCreate):
         """
         async with get_session() as db:
             record = await db.scalar(
-                select(ThreadSkillDataTable).where(
-                    ThreadSkillDataTable.thread_id == thread_id,
-                    ThreadSkillDataTable.skill == skill,
-                    ThreadSkillDataTable.key == key,
+                select(ChatSkillDataTable).where(
+                    ChatSkillDataTable.chat_id == chat_id,
+                    ChatSkillDataTable.skill == skill,
+                    ChatSkillDataTable.key == key,
                 )
             )
         return record.data if record else None
@@ -323,52 +323,52 @@ class ThreadSkillData(ThreadSkillDataCreate):
     async def clean_data(
         cls,
         agent_id: str,
-        thread_id: Annotated[
+        chat_id: Annotated[
             str,
             Field(
                 default="",
-                description="Optional ID of the thread. If provided, only cleans data for that thread.",
+                description="Optional ID of the chat. If provided, only cleans data for that chat.",
             ),
         ],
     ):
-        """Clean all skill data for a thread or agent.
+        """Clean all skill data for a chat or agent.
 
         Args:
             agent_id: ID of the agent
-            thread_id: Optional ID of the thread. If provided, only cleans data for that thread.
-                      If empty, cleans all data for the agent.
+            chat_id: Optional ID of the chat. If provided, only cleans data for that chat.
+                     If empty, cleans all data for the agent.
         """
         async with get_session() as db:
-            if thread_id and thread_id != "":
+            if chat_id and chat_id != "":
                 await db.execute(
-                    delete(ThreadSkillDataTable).where(
-                        ThreadSkillDataTable.agent_id == agent_id,
-                        ThreadSkillDataTable.thread_id == thread_id,
+                    delete(ChatSkillDataTable).where(
+                        ChatSkillDataTable.agent_id == agent_id,
+                        ChatSkillDataTable.chat_id == chat_id,
                     )
                 )
             else:
                 await db.execute(
-                    delete(ThreadSkillDataTable).where(
-                        ThreadSkillDataTable.agent_id == agent_id
+                    delete(ChatSkillDataTable).where(
+                        ChatSkillDataTable.agent_id == agent_id
                     )
                 )
             await db.commit()
 
 
-def _skill_parse_bool(value: Optional[str]) -> bool:
+def _skill_parse_bool(value: str | None) -> bool:
     if value is None:
         return False
     return value.strip().lower() in {"true", "1", "yes"}
 
 
-def _skill_parse_optional_int(value: Optional[str]) -> Optional[int]:
+def _skill_parse_optional_int(value: str | None) -> int | None:
     if value is None:
         return None
     value = value.strip()
     return int(value) if value else None
 
 
-def _skill_parse_decimal(value: Optional[str], default: str = "0") -> Decimal:
+def _skill_parse_decimal(value: str | None, default: str = "0") -> Decimal:
     value = (value or "").strip()
     if not value:
         value = default
@@ -383,14 +383,14 @@ def _load_default_skills() -> tuple[dict[str, "Skill"], dict[tuple[str, str], "S
         logger.warning("Default skills CSV not found at %s", path)
         return {}, {}
 
-    by_name: dict[str, "Skill"] = {}
-    by_category_config: dict[tuple[str, str], "Skill"] = {}
+    by_name: dict[str, Skill] = {}
+    by_category_config: dict[tuple[str, str], Skill] = {}
 
     with path.open(newline="", encoding="utf-8") as csvfile:
         reader = csv.DictReader(csvfile)
         for row in reader:
             try:
-                timestamp = datetime.now(timezone.utc)
+                timestamp = datetime.now(UTC)
                 price_default = row.get("price") or "1"
                 skill = Skill(
                     name=row["name"],
@@ -449,7 +449,7 @@ class SkillTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -466,10 +466,8 @@ class Skill(BaseModel):
     name: Annotated[str, Field(description="Name of the skill")]
     enabled: Annotated[bool, Field(description="Is this skill enabled?")]
     category: Annotated[str, Field(description="Category of the skill")]
-    config_name: Annotated[Optional[str], Field(description="Config name of the skill")]
-    price_level: Annotated[
-        Optional[int], Field(description="Price level for this skill")
-    ]
+    config_name: Annotated[str | None, Field(description="Config name of the skill")]
+    price_level: Annotated[int | None, Field(description="Price level for this skill")]
     price: Annotated[
         Decimal, Field(description="Price for this skill", default=Decimal("1"))
     ]
@@ -477,11 +475,9 @@ class Skill(BaseModel):
         Decimal,
         Field(description="Price for this skill with self key", default=Decimal("1")),
     ]
-    rate_limit_count: Annotated[Optional[int], Field(description="Rate limit count")]
-    rate_limit_minutes: Annotated[
-        Optional[int], Field(description="Rate limit minutes")
-    ]
-    author: Annotated[Optional[str], Field(description="Author of the skill")]
+    rate_limit_count: Annotated[int | None, Field(description="Rate limit count")]
+    rate_limit_minutes: Annotated[int | None, Field(description="Rate limit minutes")]
+    author: Annotated[str | None, Field(description="Author of the skill")]
     created_at: Annotated[
         datetime, Field(description="Timestamp when this record was created")
     ]
@@ -490,7 +486,7 @@ class Skill(BaseModel):
     ]
 
     @staticmethod
-    async def get(name: str) -> Optional["Skill"]:
+    async def get(name: str) -> Skill | None:
         """Get a skill by name with Redis caching.
 
         The skill is cached in Redis for 3 minutes.
@@ -539,7 +535,7 @@ class Skill(BaseModel):
         return None
 
     @staticmethod
-    async def get_by_config_name(category: str, config_name: str) -> Optional["Skill"]:
+    async def get_by_config_name(category: str, config_name: str) -> "Skill" | None:
         """Get a skill by category and config_name.
 
         Args:
@@ -575,7 +571,7 @@ class Skill(BaseModel):
             async with get_session() as db:
                 return await cls.get_all(session=db)
 
-        skills: dict[str, "Skill"] = {
+        skills: dict[str, Skill] = {
             name: skill.model_copy(deep=True)
             for name, skill in DEFAULT_SKILLS_BY_NAME.items()
         }

intentkit/models/skills.csv

@@ -2,29 +2,29 @@ category,config_name,name,enabled,price_level,price,price_self_key,rate_limit_co
 acolyt,ask_gpt,acolyt_ask_gpt,FALSE,1,1,1,,,0x2Bd32A312280bF5A01140e68ca630fB76cE8A3De
 aixbt,aixbt_projects,aixbt_projects,TRUE,3,100,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
 allora,get_price_prediction,allora_get_price_prediction,TRUE,4,230,5,,,0x2Bd32A312280bF5A01140e68ca630fB76cE8A3De
-basename,BasenameActionProvider_register_basename,BasenameActionProvider_register_basename,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpApiActionProvider_request_faucet_funds,CdpApiActionProvider_request_faucet_funds,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpEvmWalletActionProvider_get_swap_price,CdpEvmWalletActionProvider_get_swap_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpEvmWalletActionProvider_swap,CdpEvmWalletActionProvider_swap,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WalletActionProvider_get_balance,WalletActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WalletActionProvider_get_wallet_details,WalletActionProvider_get_wallet_details,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WalletActionProvider_native_transfer,WalletActionProvider_native_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-erc20,ERC20ActionProvider_get_balance,ERC20ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-erc20,ERC20ActionProvider_transfer,ERC20ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-erc721,Erc721ActionProvider_get_balance,Erc721ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-erc721,Erc721ActionProvider_mint,Erc721ActionProvider_mint,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-erc721,Erc721ActionProvider_transfer,Erc721ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-morpho,MorphoActionProvider_deposit,MorphoActionProvider_deposit,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-morpho,MorphoActionProvider_withdraw,MorphoActionProvider_withdraw,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-pyth,PythActionProvider_fetch_price,PythActionProvider_fetch_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-pyth,PythActionProvider_fetch_price_feed,PythActionProvider_fetch_price_feed,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-superfluid,SuperfluidActionProvider_create_flow,SuperfluidActionProvider_create_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-superfluid,SuperfluidActionProvider_delete_flow,SuperfluidActionProvider_delete_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-superfluid,SuperfluidActionProvider_update_flow,SuperfluidActionProvider_update_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-weth,WethActionProvider_wrap_eth,WethActionProvider_wrap_eth,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-wow,WowActionProvider_buy_token,WowActionProvider_buy_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-wow,WowActionProvider_create_token,WowActionProvider_create_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-wow,WowActionProvider_sell_token,WowActionProvider_sell_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+basename,BasenameActionProvider_register_basename,BasenameActionProvider_register_basename,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,CdpApiActionProvider_request_faucet_funds,CdpApiActionProvider_request_faucet_funds,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,CdpEvmWalletActionProvider_get_swap_price,CdpEvmWalletActionProvider_get_swap_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,CdpEvmWalletActionProvider_swap,CdpEvmWalletActionProvider_swap,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,WalletActionProvider_get_balance,WalletActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,WalletActionProvider_get_wallet_details,WalletActionProvider_get_wallet_details,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+cdp,WalletActionProvider_native_transfer,WalletActionProvider_native_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+erc20,ERC20ActionProvider_get_balance,ERC20ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+erc20,ERC20ActionProvider_transfer,ERC20ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+erc721,Erc721ActionProvider_get_balance,Erc721ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+erc721,Erc721ActionProvider_mint,Erc721ActionProvider_mint,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+erc721,Erc721ActionProvider_transfer,Erc721ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+morpho,MorphoActionProvider_deposit,MorphoActionProvider_deposit,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+morpho,MorphoActionProvider_withdraw,MorphoActionProvider_withdraw,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+pyth,PythActionProvider_fetch_price,PythActionProvider_fetch_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+pyth,PythActionProvider_fetch_price_feed,PythActionProvider_fetch_price_feed,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+superfluid,SuperfluidActionProvider_create_flow,SuperfluidActionProvider_create_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+superfluid,SuperfluidActionProvider_delete_flow,SuperfluidActionProvider_delete_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+superfluid,SuperfluidActionProvider_update_flow,SuperfluidActionProvider_update_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+weth,WethActionProvider_wrap_eth,WethActionProvider_wrap_eth,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+wow,WowActionProvider_buy_token,WowActionProvider_buy_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+wow,WowActionProvider_create_token,WowActionProvider_create_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+wow,WowActionProvider_sell_token,WowActionProvider_sell_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 chainlist,chain_lookup,chain-lookup,TRUE,1,5,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
 common,current_time,common_current_time,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 cookiefun,get_account_details,cookiefun_get_account_details,TRUE,2,70,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
@@ -97,9 +97,11 @@ moralis,fetch_nft_portfolio,moralis_fetch_nft_portfolio,TRUE,1,5,5,,,0xd1a8Dd23e
 moralis,fetch_solana_portfolio,moralis_fetch_solana_portfolio,TRUE,1,5,5,,,0xd1a8Dd23e356B9fAE27dF5DeF9ea025A602EC81e
 moralis,fetch_wallet_portfolio,moralis_fetch_wallet_portfolio,TRUE,1,5,5,,,0xd1a8Dd23e356B9fAE27dF5DeF9ea025A602EC81e
 nation,nft_check,nft_check,FALSE,1,5,5,,,0x275960ad41DbE218bBf72cDF612F88b5C6f40648
-openai,dalle_image_generation,dalle_image_generation,TRUE,4,200,15,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-openai,gpt_image_generation,gpt_image_generation,TRUE,5,400,15,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-openai,gpt_image_to_image,gpt_image_to_image,TRUE,5,400,15,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+openai,dalle_image_generation,dalle_image_generation,TRUE,4,200,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+openai,gpt_image_generation,gpt_image_generation,TRUE,5,400,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+openai,gpt_image_mini_generator,gpt_image_mini_generator,TRUE,3,100,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+openai,gpt_avatar_generator,gpt_avatar_generator,TRUE,2,50,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+openai,gpt_image_to_image,gpt_image_to_image,TRUE,5,400,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 openai,image_to_text,image_to_text,TRUE,4,200,15,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 portfolio,token_balances,portfolio_token_balances,TRUE,1,5,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
 portfolio,wallet_approvals,portfolio_wallet_approvals,TRUE,1,5,5,,,0x3cdd051eeC909f94965F9c1c657f5b70a172B2C0
@@ -165,6 +167,8 @@ firecrawl,firecrawl_clear_indexed_content,firecrawl_clear_indexed_content,TRUE,1
 xmtp,xmtp_transfer,xmtp_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 xmtp,xmtp_swap,xmtp_swap,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 xmtp,xmtp_get_swap_price,xmtp_get_swap_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+x402,x402_ask_agent,x402_ask_agent,TRUE,1,1,1,,,0x445750026A4a1906b61302442E085f9cbAfe206a
+x402,x402_http_request,x402_http_request,TRUE,1,1,1,,,0x445750026A4a1906b61302442E085f9cbAfe206a
 casino,deck_shuffle,casino_deck_shuffle,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0
 casino,deck_draw,casino_deck_draw,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0
 casino,dice_roll,casino_dice_roll,true,1,5,5,,,0x3cdd051eec909f94965f9c1c657f5b70a172b2c0

intentkit/models/user.py

@@ -1,7 +1,7 @@
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from decimal import ROUND_HALF_UP, Decimal
-from typing import Annotated, Optional, Type, TypeVar
+from typing import Annotated, TypeVar
 
 from intentkit.models.base import Base
 from intentkit.models.credit import CreditAccount
@@ -13,7 +13,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 logger = logging.getLogger(__name__)
 
-
 # TypeVar for User model constraint
 UserModelType = TypeVar("UserModelType", bound="User")
 UserTableType = TypeVar("UserTableType", bound="UserTable")
@@ -23,10 +22,10 @@ class UserRegistry:
     """Registry for extended model classes."""
 
     def __init__(self):
-        self._user_table_class: Optional[Type[UserTableType]] = None
-        self._user_model_class: Optional[Type[UserModelType]] = None
+        self._user_table_class: type[UserTableType] | None = None
+        self._user_model_class: type[UserModelType] | None = None
 
-    def register_user_table(self, user_table_class: Type[UserTableType]) -> None:
+    def register_user_table(self, user_table_class: type[UserTableType]) -> None:
         """Register extended UserTable class.
 
         Args:
@@ -34,11 +33,11 @@ class UserRegistry:
         """
         self._user_table_class = user_table_class
 
-    def get_user_table_class(self) -> Type[UserTableType]:
+    def get_user_table_class(self) -> type[UserTableType]:
         """Get registered UserTable class or default."""
         return self._user_table_class or UserTable
 
-    def register_user_model(self, user_model_class: Type[UserModelType]) -> None:
+    def register_user_model(self, user_model_class: type[UserModelType]) -> None:
         """Register extended UserModel class.
 
         Args:
@@ -46,7 +45,7 @@ class UserRegistry:
         """
         self._user_model_class = user_model_class
 
-    def get_user_model_class(self) -> Type[UserModelType]:
+    def get_user_model_class(self) -> type[UserModelType]:
         """Get registered UserModel class or default."""
         return self._user_model_class or User
 
@@ -114,7 +113,7 @@ class UserTable(Base):
         DateTime(timezone=True),
         nullable=False,
         server_default=func.now(),
-        onupdate=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -131,27 +130,27 @@ class UserUpdate(BaseModel):
     nft_count: Annotated[
         int, Field(default=0, description="Number of NFTs owned by the user")
     ]
-    email: Annotated[Optional[str], Field(None, description="User's email address")]
+    email: Annotated[str | None, Field(None, description="User's email address")]
     x_username: Annotated[
-        Optional[str], Field(None, description="User's X (Twitter) username")
+        str | None, Field(None, description="User's X (Twitter) username")
     ]
     github_username: Annotated[
-        Optional[str], Field(None, description="User's GitHub username")
+        str | None, Field(None, description="User's GitHub username")
     ]
     telegram_username: Annotated[
-        Optional[str], Field(None, description="User's Telegram username")
+        str | None, Field(None, description="User's Telegram username")
     ]
     extra: Annotated[
-        Optional[dict], Field(None, description="Additional user information")
+        dict | None, Field(None, description="Additional user information")
     ]
     evm_wallet_address: Annotated[
-        Optional[str], Field(None, description="User's EVM wallet address")
+        str | None, Field(None, description="User's EVM wallet address")
     ]
     solana_wallet_address: Annotated[
-        Optional[str], Field(None, description="User's Solana wallet address")
+        str | None, Field(None, description="User's Solana wallet address")
     ]
     linked_accounts: Annotated[
-        Optional[dict], Field(None, description="User's linked accounts information")
+        dict | None, Field(None, description="User's linked accounts information")
     ]
 
     async def _update_quota_for_nft_count(
@@ -165,7 +164,7 @@ class UserUpdate(BaseModel):
             new_nft_count: Current NFT count
         """
         # Generate upstream_tx_id
-        timestamp = datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")
+        timestamp = datetime.now(UTC).strftime("%Y%m%d%H%M%S")
         upstream_tx_id = f"nft_{id}_{timestamp}"
 
         # Calculate new quota values based on nft_count
@@ -286,7 +285,7 @@ class User(UserUpdate):
     ]
 
     @classmethod
-    async def get(cls, user_id: str) -> Optional[UserModelType]:
+    async def get(cls, user_id: str) -> UserModelType | None:
         """Get a user by ID.
 
         Args:
@@ -301,7 +300,7 @@ class User(UserUpdate):
     @classmethod
     async def get_in_session(
         cls, session: AsyncSession, user_id: str
-    ) -> Optional[UserModelType]:
+    ) -> UserModelType | None:
         """Get a user by ID using the provided session.
 
         Args:
@@ -322,3 +321,29 @@ class User(UserUpdate):
         if user is None:
             return None
         return user_model_class.model_validate(user)
+
+    @classmethod
+    async def get_by_tg(cls, telegram_username: str) -> UserModelType | None:
+        """Get a user by telegram username.
+
+        Args:
+            telegram_username: Telegram username of the user to get
+
+        Returns:
+            User model or None if not found
+        """
+        user_model_class = user_model_registry.get_user_model_class()
+        assert issubclass(user_model_class, User)
+        user_table_class = user_model_registry.get_user_table_class()
+        assert issubclass(user_table_class, UserTable)
+
+        async with get_session() as session:
+            result = await session.execute(
+                select(user_table_class).where(
+                    user_table_class.telegram_username == telegram_username
+                )
+            )
+            user = result.scalars().first()
+            if user is None:
+                return None
+            return user_model_class.model_validate(user)

intentkit/skills/acolyt/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.acolyt.ask import AcolytAskGpt
 from intentkit.skills.acolyt.base import AcolytBaseTool
 from intentkit.skills.base import SkillConfig, SkillState
@@ -28,7 +27,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[AcolytBaseTool]:
     """Get all Acolyt skills.
@@ -36,7 +34,6 @@ async def get_skills(
     Args:
         config: The configuration for Acolyt skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Acolyt skills.
@@ -53,7 +50,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_acolyt_skill(name, store)
+        skill = get_acolyt_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -61,22 +58,18 @@ async def get_skills(
 
 def get_acolyt_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> AcolytBaseTool | None:
     """Get an Acolyt skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Acolyt skill
     """
     if name == "ask_gpt":
         if name not in _cache:
-            _cache[name] = AcolytAskGpt(
-                skill_store=store,
-            )
+            _cache[name] = AcolytAskGpt()
         return _cache[name]
     else:
         logger.warning(f"Unknown Acolyt skill: {name}")

intentkit/skills/acolyt/ask.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, Literal, Type
+from typing import Literal
 
 import httpx
 from pydantic import BaseModel, Field
@@ -48,7 +48,6 @@ class AcolytAskGpt(AcolytBaseTool):
     - DEX & Trading: Get the 24-hour trading volume for tokens, Identify which DEX has the highest liquidity for tokens, Obtain the buy/sell ratio for tokens over specific time periods. Compare price changes across different timeframes for tokens. List trading pairs with over a value in liquidity for tokens.
     - Overall Metrics: Identify projects with the highest smart engagement relative to their market cap, Determine which agents have the best mindshare relative to their market cap. Compare the percentage of smart followers across the top n AI agents by market cap
 
-
     Attributes:
         name (str): Name of the tool, specifically "acolyt_ask_gpt".
         description (str): Comprehensive description of the tool's purpose and functionality.
@@ -64,9 +63,9 @@ class AcolytAskGpt(AcolytBaseTool):
         DEX & Trading: 24h volume, top DEX liquidity, buy/sell ratio, price change comparison, high liquidity pairs.
         Overall: Smart engagement/market cap ratio, mindshare/market cap ratio, smart follower percentage comparison across top AI agents.
         """
-    args_schema: Type[BaseModel] = AcolytAskGptInput
+    args_schema: type[BaseModel] = AcolytAskGptInput
 
-    async def _arun(self, question: str, **kwargs) -> Dict:
+    async def _arun(self, question: str, **kwargs) -> dict:
         """Run the tool to get answer from Acolyt GPT.
 
         Args:

intentkit/skills/acolyt/base.py

@@ -1,9 +1,7 @@
-from typing import Type
-
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 
 base_url = "https://acolyt-oracle-poc.vercel.app"
@@ -14,17 +12,14 @@ class AcolytBaseTool(IntentKitSkill):
 
     name: str = Field(description="The name of the tool")
     description: str = Field(description="A description of what the tool does")
-    args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
+    args_schema: type[BaseModel]
 
     def get_api_key(self) -> str:
         context = self.get_context()
         skill_config = context.agent.skill_config(self.category)
         api_key_provider = skill_config.get("api_key_provider")
         if api_key_provider == "platform":
-            return self.skill_store.get_system_config("acolyt_api_key")
+            return config.acolyt_api_key
         # for backward compatibility, may only have api_key in skill_config
         elif skill_config.get("api_key"):
             return skill_config.get("api_key")