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

intentkit/models/user.py

@@ -1,7 +1,7 @@
 import logging
-from datetime import datetime, timezone
-from decimal import Decimal
-from typing import Annotated, Optional, Type, TypeVar
+from datetime import UTC, datetime
+from decimal import ROUND_HALF_UP, Decimal
+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
 
@@ -93,6 +92,18 @@ class UserTable(Base):
         JSON().with_variant(JSONB(), "postgresql"),
         nullable=True,
     )
+    evm_wallet_address = Column(
+        String,
+        nullable=True,
+    )
+    solana_wallet_address = Column(
+        String,
+        nullable=True,
+    )
+    linked_accounts = Column(
+        JSON().with_variant(JSONB(), "postgresql"),
+        nullable=True,
+    )
     created_at = Column(
         DateTime(timezone=True),
         nullable=False,
@@ -102,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),
     )
 
 
@@ -119,18 +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[
+        str | None, Field(None, description="User's EVM wallet address")
+    ]
+    solana_wallet_address: Annotated[
+        str | None, Field(None, description="User's Solana wallet address")
+    ]
+    linked_accounts: Annotated[
+        dict | None, Field(None, description="User's linked accounts information")
     ]
 
     async def _update_quota_for_nft_count(
@@ -144,12 +164,17 @@ 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
-        free_quota = Decimal(480 + 48 * new_nft_count)
-        refill_amount = Decimal(20 + 2 * new_nft_count)
+        FOURPLACES = Decimal("0.0001")
+        free_quota = Decimal(480 + 48 * new_nft_count).quantize(
+            FOURPLACES, rounding=ROUND_HALF_UP
+        )
+        refill_amount = Decimal(20 + 2 * new_nft_count).quantize(
+            FOURPLACES, rounding=ROUND_HALF_UP
+        )
         note = f"NFT count changed to {new_nft_count}"
 
         # Update daily quota
@@ -165,7 +190,7 @@ class UserUpdate(BaseModel):
             note=note,
         )
 
-    async def patch(self, id: str) -> "User":
+    async def patch(self, id: str) -> UserModelType:
         """Update only the provided fields of a user in the database.
         If the user doesn't exist, create a new one with the provided ID and fields.
         If nft_count changes, update the daily quota accordingly.
@@ -177,7 +202,9 @@ class UserUpdate(BaseModel):
             Updated or newly created User model
         """
         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 db:
             db_user = await db.get(user_table_class, id)
             old_nft_count = 0  # Default for new users
@@ -203,7 +230,7 @@ class UserUpdate(BaseModel):
 
             return user_model_class.model_validate(db_user)
 
-    async def put(self, id: str) -> "User":
+    async def put(self, id: str) -> UserModelType:
         """Replace all fields of a user in the database with the provided values.
         If the user doesn't exist, create a new one with the provided ID and fields.
         If nft_count changes, update the daily quota accordingly.
@@ -215,7 +242,9 @@ class UserUpdate(BaseModel):
             Updated or newly created User model
         """
         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 db:
             db_user = await db.get(user_table_class, id)
             old_nft_count = 0  # Default for new users
@@ -256,7 +285,7 @@ class User(UserUpdate):
     ]
 
     @classmethod
-    async def get(cls, user_id: str) -> Optional["User"]:
+    async def get(cls, user_id: str) -> UserModelType | None:
         """Get a user by ID.
 
         Args:
@@ -271,7 +300,7 @@ class User(UserUpdate):
     @classmethod
     async def get_in_session(
         cls, session: AsyncSession, user_id: str
-    ) -> Optional["User"]:
+    ) -> UserModelType | None:
         """Get a user by ID using the provided session.
 
         Args:
@@ -281,11 +310,40 @@ class User(UserUpdate):
         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)
         result = await session.execute(
             select(user_table_class).where(user_table_class.id == user_id)
         )
         user = result.scalars().first()
         if user is None:
             return None
-        return cls.model_validate(user)
+        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")

intentkit/skills/acolyt/schema.json

@@ -5,8 +5,9 @@
   "description": "Integration with Acolyt Oracle providing blockchain oracle services for accessing and verifying off-chain data with secure API connections",
   "x-icon": "https://ai.service.crestal.dev/skills/acolyt/acolyt.jpg",
   "x-tags": [
-    "Blockchain",
-    "Oracle"
+    "Analytics",
+    "Crypto",
+    "DeFi"
   ],
   "properties": {
     "enabled": {
@@ -86,4 +87,4 @@
     }
   },
   "additionalProperties": true
-}
+}

intentkit/skills/aixbt/__init__.py

@@ -1,6 +1,5 @@
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.aixbt.base import AIXBTBaseTool
 from intentkit.skills.aixbt.projects import AIXBTProjects
 from intentkit.skills.base import SkillConfig, SkillState
@@ -27,7 +26,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[AIXBTBaseTool]:
     """Get all AIXBT API skills."""
@@ -44,26 +42,17 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Get each skill using the cached getter
-    return [
-        get_aixbt_skill(
-            name=name,
-            store=store,
-        )
-        for name in available_skills
-    ]
+    return [get_aixbt_skill(name) for name in available_skills]
 
 
 def get_aixbt_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> AIXBTBaseTool:
     """Get an AIXBT API skill by name."""
 
     if name == "aixbt_projects":
         if name not in _cache:
-            _cache[name] = AIXBTProjects(
-                skill_store=store,
-            )
+            _cache[name] = AIXBTProjects()
         return _cache[name]
     else:
         raise ValueError(f"Unknown AIXBT skill: {name}")

intentkit/skills/aixbt/base.py

@@ -1,8 +1,5 @@
-from typing import Type
-
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -11,10 +8,7 @@ class AIXBTBaseTool(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]
 
     @property
     def category(self) -> str:

intentkit/skills/aixbt/projects.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, Optional, Type
+from typing import Any
 
 import httpx
 from langchain_core.tools import ToolException
@@ -17,23 +17,23 @@ class ProjectsInput(BaseModel):
         default=10,
         description="Number of projects to return (max 50)",
     )
-    name: Optional[str] = Field(
+    name: str | None = Field(
         default=None,
         description="Filter projects by name (case-insensitive regex match)",
     )
-    ticker: Optional[str] = Field(
+    ticker: str | None = Field(
         default=None,
         description="Filter projects by ticker symbol (case-insensitive match)",
     )
-    xHandle: Optional[str] = Field(
+    xHandle: str | None = Field(
         default=None,
         description="Filter projects by X/Twitter handle",
     )
-    minScore: Optional[float] = Field(
+    minScore: float | None = Field(
         default=None,
         description="Minimum score threshold",
     )
-    chain: Optional[str] = Field(
+    chain: str | None = Field(
         default=None,
         description="Filter projects by blockchain",
     )
@@ -53,18 +53,18 @@ class AIXBTProjects(AIXBTBaseTool):
         "detailed information on recent developments. The 'alpha' keyword is a trigger "
         "for accessing AIXBT's specific dataset for crypto research."
     )
-    args_schema: Type[BaseModel] = ProjectsInput
+    args_schema: type[BaseModel] = ProjectsInput
 
     async def _arun(
         self,
         limit: int = 10,
-        name: Optional[str] = None,
-        ticker: Optional[str] = None,
-        xHandle: Optional[str] = None,
-        minScore: Optional[float] = None,
-        chain: Optional[str] = None,
+        name: str | None = None,
+        ticker: str | None = None,
+        xHandle: str | None = None,
+        minScore: float | None = None,
+        chain: str | None = None,
         **kwargs,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """
         Search for cryptocurrency projects using AIXBT API.
 
@@ -89,9 +89,8 @@ class AIXBTProjects(AIXBTBaseTool):
             "rate_limit_minutes"
         ):
             await self.user_rate_limit_by_category(
-                context.user_id,
                 skill_config["rate_limit_number"],
-                skill_config["rate_limit_minutes"],
+                skill_config["rate_limit_minutes"] * 60,
             )
 
         # Get the API key from the agent's configuration

intentkit/skills/aixbt/schema.json

@@ -5,9 +5,9 @@
   "description": "Cryptocurrency project data and analytics through the AIXBT API",
   "x-icon": "https://ai.service.crestal.dev/skills/aixbt/aixbt.jpg",
   "x-tags": [
-    "Cryptocurrency",
-    "Research",
-    "Analytics"
+    "Analytics",
+    "Crypto",
+    "Knowledge Base"
   ],
   "properties": {
     "enabled": {
@@ -96,4 +96,4 @@
     }
   },
   "additionalProperties": true
-}
+}

intentkit/skills/allora/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.allora.base import AlloraBaseTool
 from intentkit.skills.allora.price import AlloraGetPrice
 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[AlloraBaseTool]:
     """Get all Allora skills.
@@ -36,7 +34,6 @@ async def get_skills(
     Args:
         config: The configuration for Allora skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Allora skills.
@@ -53,7 +50,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_allora_skill(name, store)
+        skill = get_allora_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -61,22 +58,18 @@ async def get_skills(
 
 def get_allora_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> AlloraBaseTool:
     """Get an Allora skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Allora skill
     """
     if name == "get_price_prediction":
         if name not in _cache:
-            _cache[name] = AlloraGetPrice(
-                skill_store=store,
-            )
+            _cache[name] = AlloraGetPrice()
         return _cache[name]
     else:
         logger.warning(f"Unknown Allora skill: {name}")

intentkit/skills/allora/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://api.upshot.xyz/v2/allora"
@@ -14,17 +12,14 @@ class AlloraBaseTool(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("allora_api_key")
+            return config.allora_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")

intentkit/skills/allora/price.py

@@ -1,7 +1,7 @@
-from typing import Literal, Type
+from typing import Literal
 
 import httpx
-from langchain.tools.base import ToolException
+from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.allora.base import AlloraBaseTool
@@ -57,7 +57,6 @@ class AlloraGetPrice(AlloraBaseTool):
     The Allora Price Prediction Feed tool fetches the price prediction feed from the Allora API.
     Ethereum (ETH) or Bitcoin (BTC) price predictions (5-minute, 8-hour)
 
-
     Attributes:
         name (str): Name of the tool, specifically "get_price_prediction".
         description (str): Comprehensive description of the tool's purpose and functionality.
@@ -69,7 +68,7 @@ class AlloraGetPrice(AlloraBaseTool):
         The Allora Price Prediction Feed tool fetches the price prediction feed from the Allora API.
         Ethereum (ETH) or Bitcoin (BTC) price predictions (5-minute, 8-hour)
         """
-    args_schema: Type[BaseModel] = AlloraGetPriceInput
+    args_schema: type[BaseModel] = AlloraGetPriceInput
 
     def _run(self, question: str) -> AlloraGetPriceOutput:
         """Run the tool to get the token price prediction from Allora API.

intentkit/skills/allora/schema.json

@@ -5,14 +5,15 @@
   "description": "Integration with Allora API for blockchain-based price predictions and market forecasting services via Upshot's prediction markets",
   "x-icon": "https://ai.service.crestal.dev/skills/allora/allora.jpeg",
   "x-tags": [
-    "Blockchain"
+    "Analytics",
+    "Crypto"
   ],
   "properties": {
     "enabled": {
       "type": "boolean",
       "title": "Enabled",
       "description": "Whether this skill is enabled",
-      "default": true
+      "default": false
     },
     "states": {
       "type": "object",