intentkit 0.7.5.dev12__tar.gz → 0.7.5.dev14__tar.gz

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/.gitignore

@@ -176,4 +176,3 @@ wallet_data.txt
 # export/import data
 *.response
 scripts/*.yaml
-skills.csv

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.7.5.dev12
+Version: 0.7.5.dev14
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestalnetwork/intentkit
 Project-URL: Repository, https://github.com/crestalnetwork/intentkit
@@ -45,9 +45,8 @@ Requires-Dist: aws-secretsmanager-caching>=1.1.3
 Requires-Dist: bip32>=2.0.0
 Requires-Dist: boto3<2.0.0,>=1.37.23
 Requires-Dist: botocore>=1.35.97
-Requires-Dist: cdp-sdk>=1.22.0
-Requires-Dist: coinbase-agentkit-langchain>=0.5.0
-Requires-Dist: coinbase-agentkit<0.7.0,>=0.6.0
+Requires-Dist: cdp-sdk>=1.31.1
+Requires-Dist: coinbase-agentkit<0.8.0,>=0.7.2
 Requires-Dist: cron-validator<2.0.0,>=1.0.8
 Requires-Dist: epyxid>=0.3.3
 Requires-Dist: eth-keys>=0.4.0

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/__init__.py

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

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/clients/cdp.py

@@ -1,20 +1,21 @@
+import asyncio
 import json
 import logging
 from typing import Dict, Optional
 
 from bip32 import BIP32
-from cdp import CdpClient as OriginCdpClient
-from cdp import EvmServerAccount
-from coinbase_agentkit import (
-    CdpEvmServerWalletProvider,
-    CdpEvmServerWalletProviderConfig,
+from cdp import CdpClient as OriginCdpClient  # noqa: E402
+from cdp import EvmServerAccount  # noqa: E402
+from coinbase_agentkit import (  # noqa: E402
+    CdpEvmWalletProvider,
+    CdpEvmWalletProviderConfig,
 )
 from eth_keys.datatypes import PrivateKey
 from eth_utils import to_checksum_address
 
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.models.agent import Agent
-from intentkit.models.agent_data import AgentData
+from intentkit.abstracts.skill import SkillStoreABC  # noqa: E402
+from intentkit.models.agent import Agent  # noqa: E402
+from intentkit.models.agent_data import AgentData  # noqa: E402
 
 _clients: Dict[str, "CdpClient"] = {}
 _origin_cdp_client: Optional[OriginCdpClient] = None
@@ -79,10 +80,10 @@ class CdpClient:
     def __init__(self, agent_id: str, skill_store: SkillStoreABC) -> None:
         self._agent_id = agent_id
         self._skill_store = skill_store
-        self._wallet_provider: Optional[CdpEvmServerWalletProvider] = None
-        self._wallet_provider_config: Optional[CdpEvmServerWalletProviderConfig] = None
+        self._wallet_provider: Optional[CdpEvmWalletProvider] = None
+        self._wallet_provider_config: Optional[CdpEvmWalletProviderConfig] = None
 
-    async def get_wallet_provider(self) -> CdpEvmServerWalletProvider:
+    async def get_wallet_provider(self) -> CdpEvmWalletProvider:
         if self._wallet_provider:
             return self._wallet_provider
         agent: Agent = await self._skill_store.get_agent_config(self._agent_id)
@@ -136,25 +137,16 @@ class CdpClient:
             await agent_data.save()
 
         # it must have v2 account now, load agentkit wallet provider
-        self._wallet_provider_config = CdpEvmServerWalletProviderConfig(
+        self._wallet_provider_config = CdpEvmWalletProviderConfig(
             api_key_id=api_key_id,
             api_key_secret=api_key_secret,
             network_id=network_id,
             address=address,
             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"
+        self._wallet_provider = await asyncio.to_thread(
+            CdpEvmWalletProvider, self._wallet_provider_config
+        )
         return self._wallet_provider
 
     async def get_account(self) -> EvmServerAccount:
@@ -167,7 +159,7 @@ class CdpClient:
         # Access the internal account object
         return wallet_provider._account
 
-    async def get_provider_config(self) -> CdpEvmServerWalletProviderConfig:
+    async def get_provider_config(self) -> CdpEvmWalletProviderConfig:
         if not self._wallet_provider_config:
             await self.get_wallet_provider()
         return self._wallet_provider_config

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/config/config.py

@@ -3,6 +3,7 @@ import json
 import logging
 import os
 
+import cdp
 from dotenv import load_dotenv
 
 from intentkit.utils.chain import ChainProvider, QuicknodeChainProvider
@@ -78,14 +79,11 @@ class Config:
         self.debug_auth_enabled = self.load("DEBUG_AUTH_ENABLED", "false") == "true"
         self.debug_username = self.load("DEBUG_USERNAME")
         self.debug_password = self.load("DEBUG_PASSWORD")
-        self.admin_llm_skill_control = (
-            self.load("ADMIN_LLM_SKILL_CONTROL", "false") == "true"
-        )
         # Payment
         self.payment_enabled = self.load("PAYMENT_ENABLED", "false") == "true"
         # Open API for agent
         self.open_api_base_url = self.load("OPEN_API_BASE_URL", "http://localhost:8000")
-        # CDP - AgentKit 0.6.0 Configuration
+        # CDP - AgentKit 0.7.x Configuration
         self.cdp_api_key_id = self.load("CDP_API_KEY_ID")
         self.cdp_api_key_secret = self.load("CDP_API_KEY_SECRET")
         self.cdp_wallet_secret = self.load("CDP_WALLET_SECRET")
@@ -207,3 +205,5 @@ class Config:
 
 
 config: Config = Config()
+
+logger.info(f"cdp-sdk version: {cdp.__version__}")

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/core/engine.py

@@ -368,10 +368,7 @@ async def stream_agent(message: ChatMessageCreate):
         ]
 
     # Process input message to handle @skill patterns
-    if config.admin_llm_skill_control:
-        input_message = await explain_prompt(input.message)
-    else:
-        input_message = input.message
+    input_message = await explain_prompt(input.message)
 
     # super mode
     recursion_limit = 30

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/core/prompt.py

@@ -204,7 +204,6 @@ def agent_prompt(agent: Agent, agent_data: AgentData) -> str:
 async def explain_prompt(message: str) -> str:
     """
     Process message to replace @skill:*:* patterns with (call skill xxxxx) format.
-    This function is used when admin_llm_skill_control is enabled.
 
     Args:
         message (str): The input message to process
@@ -325,8 +324,7 @@ async def build_entrypoint_prompt(agent: Agent, context: AgentContext) -> Option
     elif entrypoint == AuthorType.TRIGGER.value:
         entrypoint_prompt = "\n\n" + _build_autonomous_task_prompt(agent, context)
 
-    # Process with admin LLM skill control if enabled
-    if entrypoint_prompt and config.admin_llm_skill_control:
+    if entrypoint_prompt:
         entrypoint_prompt = await explain_prompt(entrypoint_prompt)
 
     return entrypoint_prompt
@@ -367,11 +365,8 @@ def create_formatted_prompt_function(agent: Agent, agent_data: AgentData) -> Cal
     prompt = build_agent_prompt(agent, agent_data)
     escaped_prompt = escape_prompt(prompt)
 
-    # Process with admin LLM skill control if enabled
     async def get_base_prompt():
-        if config.admin_llm_skill_control:
-            return await explain_prompt(escaped_prompt)
-        return escaped_prompt
+        return await explain_prompt(escaped_prompt)
 
     # Build prompt array
     prompt_array = [
@@ -410,8 +405,7 @@ def create_formatted_prompt_function(agent: Agent, agent_data: AgentData) -> Cal
         internal_info = build_internal_info_prompt(context)
         final_system_prompt = f"{final_system_prompt}{internal_info}"
 
-        # Process prompt_append with admin LLM skill control if needed
-        if agent.prompt_append and config.admin_llm_skill_control:
+        if agent.prompt_append:
             # Find the system message in prompt_array and process it
             for i, (role, content) in enumerate(prompt_array):
                 if role == "system":

{intentkit-0.7.5.dev12 → intentkit-0.7.5.dev14}/models/agent.py

@@ -16,8 +16,8 @@ from intentkit.models.agent_data import AgentData
 from intentkit.models.base import Base
 from intentkit.models.credit import CreditAccount
 from intentkit.models.db import get_session
-from intentkit.models.llm import LLMModelInfo, LLMModelInfoTable, LLMProvider
-from intentkit.models.skill import SkillTable
+from intentkit.models.llm import LLMModelInfo, LLMProvider
+from intentkit.models.skill import Skill
 from intentkit.utils.error import IntentKitAPIError
 from pydantic import BaseModel, ConfigDict, field_validator
 from pydantic import Field as PydanticField
@@ -1328,7 +1328,6 @@ class Agent(AgentCreate, AgentPublicInfo):
         cls,
         db: AsyncSession = None,
         filter_owner_api_skills: bool = False,
-        admin_llm_skill_control: bool = True,
     ) -> Dict:
         """Get the JSON schema for Agent model with all $ref references resolved.
 
@@ -1338,7 +1337,6 @@ class Agent(AgentCreate, AgentPublicInfo):
         Args:
             db: Database session (optional, will create if not provided)
             filter_owner_api_skills: Whether to filter out skills that require agent owner API keys
-            admin_llm_skill_control: Whether to enable admin LLM and skill control features
 
         Returns:
             Dict containing the complete JSON schema for the Agent model
@@ -1346,9 +1344,7 @@ class Agent(AgentCreate, AgentPublicInfo):
         # Get database session if not provided
         if db is None:
             async with get_session() as session:
-                return await cls.get_json_schema(
-                    session, filter_owner_api_skills, admin_llm_skill_control
-                )
+                return await cls.get_json_schema(session, filter_owner_api_skills)
 
         # Get the schema file path relative to this file
         current_dir = Path(__file__).parent
@@ -1361,146 +1357,120 @@ class Agent(AgentCreate, AgentPublicInfo):
             # Get the model property from the schema
             model_property = schema.get("properties", {}).get("model", {})
 
-            if admin_llm_skill_control:
-                # Process model property - use LLMModelInfo as primary source
-                if model_property:
-                    # Query all LLM models from the database
-                    stmt = select(LLMModelInfoTable).where(LLMModelInfoTable.enabled)
-                    result = await db.execute(stmt)
-                    models = result.scalars().all()
-
-                    # Create new lists based on LLMModelInfo
-                    new_enum = []
-                    new_enum_title = []
-                    new_enum_category = []
-                    new_enum_support_skill = []
-
-                    # Process each model from database
-                    for model in models:
-                        model_info = LLMModelInfo.model_validate(model)
-
-                        # Add model ID to enum
-                        new_enum.append(model_info.id)
-
-                        # Add model name as title
-                        new_enum_title.append(model_info.name)
-
-                        # Add provider display name as category
-                        provider = (
-                            LLMProvider(model_info.provider)
-                            if isinstance(model_info.provider, str)
-                            else model_info.provider
+            # Process model property using defaults merged with database overrides
+            if model_property:
+                new_enum = []
+                new_enum_title = []
+                new_enum_category = []
+                new_enum_support_skill = []
+
+                for model_info in await LLMModelInfo.get_all(db):
+                    if not model_info.enabled:
+                        continue
+
+                    provider = (
+                        LLMProvider(model_info.provider)
+                        if isinstance(model_info.provider, str)
+                        else model_info.provider
+                    )
+
+                    new_enum.append(model_info.id)
+                    new_enum_title.append(model_info.name)
+                    new_enum_category.append(provider.display_name())
+                    new_enum_support_skill.append(model_info.supports_skill_calls)
+
+                model_property["enum"] = new_enum
+                model_property["x-enum-title"] = new_enum_title
+                model_property["x-enum-category"] = new_enum_category
+                model_property["x-support-skill"] = new_enum_support_skill
+
+                if (
+                    "default" in model_property
+                    and model_property["default"] not in new_enum
+                    and new_enum
+                ):
+                    model_property["default"] = new_enum[0]
+
+            # Process skills property using defaults merged with database overrides
+            skills_property = schema.get("properties", {}).get("skills", {})
+            skills_properties = skills_property.get("properties", {})
+
+            if skills_properties:
+                skill_states_map: dict[str, dict[str, Skill]] = {}
+
+                for skill_model in await Skill.get_all(db):
+                    if not skill_model.config_name:
+                        continue
+                    category_states = skill_states_map.setdefault(
+                        skill_model.category, {}
+                    )
+                    if skill_model.enabled:
+                        category_states[skill_model.config_name] = skill_model
+                    else:
+                        category_states.pop(skill_model.config_name, None)
+
+                enabled_categories = {
+                    category for category, states in skill_states_map.items() if states
+                }
+
+                category_avg_price_levels = {}
+                skills_data = {}
+                for category, states in skill_states_map.items():
+                    if not states:
+                        continue
+                    price_levels = [
+                        state.price_level
+                        for state in states.values()
+                        if state.price_level is not None
+                    ]
+                    if price_levels:
+                        category_avg_price_levels[category] = int(
+                            sum(price_levels) / len(price_levels)
                         )
-                        new_enum_category.append(provider.display_name())
-
-                        # Add skill support information
-                        new_enum_support_skill.append(model_info.supports_skill_calls)
-
-                    # Update the schema with the new lists constructed from LLMModelInfo
-                    model_property["enum"] = new_enum
-                    model_property["x-enum-title"] = new_enum_title
-                    model_property["x-enum-category"] = new_enum_category
-                    model_property["x-support-skill"] = new_enum_support_skill
-
-                    # If the default model is not in the new enum, update it if possible
-                    if (
-                        "default" in model_property
-                        and model_property["default"] not in new_enum
-                        and new_enum
+                    skills_data[category] = {
+                        config_name: state.price_level
+                        for config_name, state in states.items()
+                    }
+
+                skill_keys = list(skills_properties.keys())
+
+                for skill_category in skill_keys:
+                    if skill_category not in enabled_categories:
+                        skills_properties.pop(skill_category, None)
+                    elif filter_owner_api_skills and cls._is_agent_owner_only_skill(
+                        skills_properties[skill_category]
                     ):
-                        model_property["default"] = new_enum[0]
-
-                # Process skills property
-                skills_property = schema.get("properties", {}).get("skills", {})
-                skills_properties = skills_property.get("properties", {})
-
-                if skills_properties:
-                    # Load all skills from the database
-                    # Query all skills grouped by category with enabled status
-                    stmt = select(
-                        SkillTable.category,
-                        func.bool_or(SkillTable.enabled).label("any_enabled"),
-                    ).group_by(SkillTable.category)
-                    result = await db.execute(stmt)
-                    category_status = {row.category: row.any_enabled for row in result}
-
-                    # Query all skills with their price levels for adding x-price-level fields
-                    skills_stmt = select(
-                        SkillTable.category,
-                        SkillTable.config_name,
-                        SkillTable.price_level,
-                        SkillTable.enabled,
-                    ).where(SkillTable.enabled)
-                    skills_result = await db.execute(skills_stmt)
-                    skills_data = {}
-                    category_price_levels = {}
-
-                    for row in skills_result:
-                        if row.category not in skills_data:
-                            skills_data[row.category] = {}
-                            category_price_levels[row.category] = []
-
-                        if row.config_name:
-                            skills_data[row.category][row.config_name] = row.price_level
-
-                        if row.price_level is not None:
-                            category_price_levels[row.category].append(row.price_level)
-
-                    # Calculate average price levels for categories
-                    category_avg_price_levels = {}
-                    for category, price_levels in category_price_levels.items():
-                        if price_levels:
-                            avg_price_level = int(sum(price_levels) / len(price_levels))
-                            category_avg_price_levels[category] = avg_price_level
-
-                    # Create a copy of keys to avoid modifying during iteration
-                    skill_keys = list(skills_properties.keys())
-
-                    # Process each skill in the schema
-                    for skill_category in skill_keys:
-                        if skill_category not in category_status:
-                            # If category not found in database, remove it from schema
-                            skills_properties.pop(skill_category, None)
-                        elif not category_status[skill_category]:
-                            # If category exists but all skills are disabled, remove it
-                            skills_properties.pop(skill_category, None)
-                        elif filter_owner_api_skills and cls._is_agent_owner_only_skill(
-                            skills_properties[skill_category]
-                        ):
-                            # If filtering owner API skills and this skill requires it, remove it
-                            skills_properties.pop(skill_category, None)
-                            logger.info(
-                                f"Filtered out skill '{skill_category}' from auto-generation: requires agent owner API key"
+                        skills_properties.pop(skill_category, None)
+                        logger.info(
+                            f"Filtered out skill '{skill_category}' from auto-generation: requires agent owner API key"
+                        )
+                    else:
+                        if skill_category in category_avg_price_levels:
+                            skills_properties[skill_category]["x-avg-price-level"] = (
+                                category_avg_price_levels[skill_category]
+                            )
+
+                        if skill_category in skills_data:
+                            skill_states = (
+                                skills_properties[skill_category]
+                                .get("properties", {})
+                                .get("states", {})
+                                .get("properties", {})
                             )
-                        else:
-                            # Add x-avg-price-level to category level
-                            if skill_category in category_avg_price_levels:
-                                skills_properties[skill_category][
-                                    "x-avg-price-level"
-                                ] = category_avg_price_levels[skill_category]
-
-                            # Add x-price-level to individual skill states
-                            if skill_category in skills_data:
-                                skill_states = (
-                                    skills_properties[skill_category]
-                                    .get("properties", {})
-                                    .get("states", {})
-                                    .get("properties", {})
-                                )
-                                for state_name, state_config in skill_states.items():
-                                    if (
-                                        state_name in skills_data[skill_category]
-                                        and skills_data[skill_category][state_name]
-                                        is not None
-                                    ):
-                                        state_config["x-price-level"] = skills_data[
-                                            skill_category
-                                        ][state_name]
+                            for state_name, state_config in skill_states.items():
+                                if (
+                                    state_name in skills_data[skill_category]
+                                    and skills_data[skill_category][state_name]
+                                    is not None
+                                ):
+                                    state_config["x-price-level"] = skills_data[
+                                        skill_category
+                                    ][state_name]
 
             # Log the changes for debugging
             logger.debug(
-                f"Schema processed with LLM and skill controls enabled: {admin_llm_skill_control}, "
-                f"filtered owner API skills: {filter_owner_api_skills}"
+                "Schema processed with merged LLM/skill defaults; filtered owner API skills: %s",
+                filter_owner_api_skills,
             )
 
             return schema

intentkit-0.7.5.dev14/models/llm.csv

@@ -0,0 +1,20 @@
+id,name,provider,enabled,input_price,output_price,price_level,context_length,output_length,intelligence,speed,supports_image_input,supports_skill_calls,supports_structured_output,has_reasoning,supports_search,supports_temperature,supports_frequency_penalty,supports_presence_penalty,api_base,timeout
+gpt-4o,GPT-4o,openai,FALSE,2.5,10,4,128000,4096,4,3,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,FALSE,FALSE,,180
+gpt-4o-mini,GPT-4o Mini,openai,FALSE,0.15,0.6,1,128000,4096,3,4,FALSE,TRUE,TRUE,FALSE,TRUE,TRUE,FALSE,FALSE,,180
+gpt-4.1-nano,GPT-4.1 Nano,openai,TRUE,0.1,0.4,1,128000,4096,3,5,FALSE,TRUE,TRUE,FALSE,FALSE,TRUE,FALSE,FALSE,,180
+gpt-4.1-mini,GPT-4.1 Mini,openai,TRUE,0.4,1.6,2,128000,4096,4,4,FALSE,TRUE,TRUE,FALSE,TRUE,TRUE,FALSE,FALSE,,180
+gpt-4.1,GPT-4.1,openai,TRUE,2,8,4,128000,4096,5,3,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,FALSE,FALSE,,180
+gpt-5-nano,GPT-5 Nano,openai,TRUE,0.05,0.4,1,400000,128000,3,5,TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,,180
+gpt-5-mini,GPT-5 Mini,openai,TRUE,0.25,2,2,400000,128000,4,4,TRUE,TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,FALSE,,180
+gpt-5,GPT-5,openai,TRUE,1.25,10,4,400000,128000,5,3,TRUE,TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,FALSE,,180
+o3,OpenAI o3,openai,TRUE,2,8,4,200000,100000,5,1,TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,,180
+o4-mini,OpenAI o4-mini,openai,TRUE,1.1,4.4,3,128000,4096,4,3,FALSE,TRUE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,,180
+deepseek-chat,Deepseek V3.1,deepseek,TRUE,0.56,1.68,2,128000,4096,4,3,FALSE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,https://api.deepseek.com,300
+deepseek-reasoner,DeepSeek V3.1 (Thinking Mode),deepseek,TRUE,0.56,1.68,2,128000,32000,5,1,FALSE,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,TRUE,https://api.deepseek.com,300
+grok-2,Grok 2,xai,TRUE,2,10,4,120000,4096,3,3,FALSE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,,180
+grok-3,Grok 3,xai,TRUE,3,15,4,131072,4096,5,3,FALSE,TRUE,TRUE,FALSE,TRUE,TRUE,TRUE,TRUE,,180
+grok-3-mini,Grok 3 Mini,xai,TRUE,0.3,0.5,2,131072,4096,5,3,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,,180
+eternalai,Eternal AI (Llama-3.3-70B),eternal,FALSE,0.25,0.75,2,64000,4096,4,3,FALSE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,https://api.eternalai.org/v1,300
+reigent,REI Network,reigent,FALSE,0.5,1.5,3,32000,4096,4,3,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,https://api.reisearch.box/v1,300
+venice-uncensored,Venice Uncensored,venice,TRUE,0.5,2,3,32000,4096,4,3,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,https://api.venice.ai/api/v1,300
+venice-llama-4-maverick-17b,Venice Llama 4 Maverick 17B,venice,TRUE,1.5,6,4,32000,4096,4,3,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,https://api.venice.ai/api/v1,300