intentkit 0.7.5.dev15__py3-none-any.whl → 0.7.5.dev17__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.7.5-dev15"
+__version__ = "0.7.5-dev17"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

intentkit/models/agent.py

@@ -142,7 +142,7 @@ class AgentExample(BaseModel):
             description="Name of the example",
             max_length=50,
             json_schema_extra={
-                "x-group": "examples",
+                "x-placeholder": "Add a name for the example",
             },
         ),
     ]
@@ -152,7 +152,7 @@ class AgentExample(BaseModel):
             description="Description of the example",
             max_length=200,
             json_schema_extra={
-                "x-group": "examples",
+                "x-placeholder": "Add a short description for the example",
             },
         ),
     ]
@@ -162,7 +162,7 @@ class AgentExample(BaseModel):
             description="Example prompt",
             max_length=2000,
             json_schema_extra={
-                "x-group": "examples",
+                "x-placeholder": "The prompt will be sent to the agent",
             },
         ),
     ]
@@ -394,6 +394,21 @@ class AgentTable(Base, AgentUserInputColumns):
         nullable=True,
         comment="List of example interactions for the agent",
     )
+    public_extra = Column(
+        JSON().with_variant(JSONB(), "postgresql"),
+        nullable=True,
+        comment="Public extra data of the agent",
+    )
+    deployed_at = Column(
+        DateTime(timezone=True),
+        nullable=True,
+        comment="Timestamp when the agent was deployed",
+    )
+    public_info_updated_at = Column(
+        DateTime(timezone=True),
+        nullable=True,
+        comment="Timestamp when the agent public info was last updated",
+    )
 
     # auto timestamp
     created_at = Column(
@@ -881,6 +896,8 @@ class AgentUpdate(AgentUserInput):
             # update
             for key, value in self.model_dump(exclude_unset=True).items():
                 setattr(db_agent, key, value)
+            db_agent.version = self.hash()
+            db_agent.deployed_at = func.now()
             await db.commit()
             await db.refresh(db_agent)
             return Agent.model_validate(db_agent)
@@ -903,6 +920,7 @@ class AgentUpdate(AgentUserInput):
                 setattr(db_agent, key, value)
             # version
             db_agent.version = self.hash()
+            db_agent.deployed_at = func.now()
             await db.commit()
             await db.refresh(db_agent)
             return Agent.model_validate(db_agent)
@@ -964,6 +982,7 @@ class AgentCreate(AgentUpdate):
             try:
                 db_agent = AgentTable(**self.model_dump())
                 db_agent.version = self.hash()
+                db_agent.deployed_at = func.now()
                 db.add(db_agent)
                 await db.commit()
                 await db.refresh(db_agent)
@@ -991,7 +1010,6 @@ class AgentPublicInfo(BaseModel):
             default=None,
             description="Description of the agent, for public view, not contained in prompt",
             json_schema_extra={
-                "x-group": "basic",
                 "x-placeholder": "Introduce your agent",
             },
         ),
@@ -1002,7 +1020,6 @@ class AgentPublicInfo(BaseModel):
             default=None,
             description="Link of external website of the agent, if you have one",
             json_schema_extra={
-                "x-group": "basic",
                 "x-placeholder": "Enter agent external website url",
                 "format": "uri",
             },
@@ -1016,7 +1033,6 @@ class AgentPublicInfo(BaseModel):
             max_length=10,
             min_length=1,
             json_schema_extra={
-                "x-group": "basic",
                 "x-placeholder": "If one day, your agent has it's own token, what will it be?",
             },
         ),
@@ -1028,8 +1044,7 @@ class AgentPublicInfo(BaseModel):
             description="Token address of the agent",
             max_length=42,
             json_schema_extra={
-                "x-group": "internal",
-                "readOnly": True,
+                "x-placeholder": "The contract address of the agent token",
             },
         ),
     ]
@@ -1040,8 +1055,7 @@ class AgentPublicInfo(BaseModel):
             description="Pool of the agent token",
             max_length=42,
             json_schema_extra={
-                "x-group": "internal",
-                "readOnly": True,
+                "x-placeholder": "The contract address of the agent token pool",
             },
         ),
     ]
@@ -1052,7 +1066,7 @@ class AgentPublicInfo(BaseModel):
             description="Fee percentage of the agent",
             ge=Decimal("0.0"),
             json_schema_extra={
-                "x-group": "basic",
+                "x-placeholder": "Agent will charge service fee according to this ratio.",
             },
         ),
     ]
@@ -1063,7 +1077,7 @@ class AgentPublicInfo(BaseModel):
             description="Introduction of the example",
             max_length=2000,
             json_schema_extra={
-                "x-group": "examples",
+                "x-placeholder": "Add a short introduction in new chat",
             },
         ),
     ]
@@ -1074,11 +1088,51 @@ class AgentPublicInfo(BaseModel):
             description="List of example prompts for the agent",
             max_length=6,
             json_schema_extra={
-                "x-group": "examples",
                 "x-inline": True,
             },
         ),
     ]
+    public_extra: Annotated[
+        Optional[Dict[str, Any]],
+        PydanticField(
+            default=None,
+            description="Public extra data of the agent",
+        ),
+    ]
+
+    async def override(self, agent_id: str) -> "Agent":
+        """Override agent public info with all fields from this instance.
+
+        Args:
+            agent_id: The ID of the agent to override
+
+        Returns:
+            The updated Agent instance
+        """
+        async with get_session() as session:
+            # Get the agent from database
+            result = await session.execute(
+                select(AgentTable).where(AgentTable.id == agent_id)
+            )
+            db_agent = result.scalar_one_or_none()
+
+            if not db_agent:
+                raise IntentKitAPIError(404, "NotFound", f"Agent {agent_id} not found")
+
+            # Update public info fields
+            update_data = self.model_dump()
+            for key, value in update_data.items():
+                if hasattr(db_agent, key):
+                    setattr(db_agent, key, value)
+
+            # Update public_info_updated_at timestamp
+            db_agent.public_info_updated_at = func.now()
+
+            # Commit changes
+            await session.commit()
+            await session.refresh(db_agent)
+
+            return Agent.model_validate(db_agent)
 
 
 class Agent(AgentCreate, AgentPublicInfo):
@@ -1124,6 +1178,21 @@ class Agent(AgentCreate, AgentPublicInfo):
             description="Other helper data fields for query, come from agent and agent data"
         ),
     ]
+    deployed_at: Annotated[
+        Optional[datetime],
+        PydanticField(
+            default=None,
+            description="Timestamp when the agent was deployed",
+        ),
+    ]
+    public_info_updated_at: Annotated[
+        Optional[datetime],
+        PydanticField(
+            default=None,
+            description="Timestamp when the agent public info was last updated",
+        ),
+    ]
+
     # auto timestamp
     created_at: Annotated[
         datetime,

intentkit/models/skills.csv

@@ -2,34 +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
-cdp,BasenameActionProvider_register_basename,BasenameActionProvider_register_basename,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpApiActionProvider_address_reputation,CdpApiActionProvider_address_reputation,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpApiActionProvider_request_faucet_funds,CdpApiActionProvider_request_faucet_funds,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpWalletActionProvider_deploy_contract,CdpWalletActionProvider_deploy_contract,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpWalletActionProvider_deploy_nft,CdpWalletActionProvider_deploy_nft,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpWalletActionProvider_deploy_token,CdpWalletActionProvider_deploy_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,CdpWalletActionProvider_trade,CdpWalletActionProvider_trade,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,ERC20ActionProvider_get_balance,ERC20ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,ERC20ActionProvider_transfer,ERC20ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,Erc721ActionProvider_get_balance,Erc721ActionProvider_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,Erc721ActionProvider_mint,Erc721ActionProvider_mint,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,Erc721ActionProvider_transfer,Erc721ActionProvider_transfer,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,MorphoActionProvider_deposit,MorphoActionProvider_deposit,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,MorphoActionProvider_withdraw,MorphoActionProvider_withdraw,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,PythActionProvider_fetch_price,PythActionProvider_fetch_price,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,PythActionProvider_fetch_price_feed_id,PythActionProvider_fetch_price_feed_id,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,SuperfluidActionProvider_create_flow,SuperfluidActionProvider_create_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,SuperfluidActionProvider_delete_flow,SuperfluidActionProvider_delete_flow,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,SuperfluidActionProvider_update_flow,SuperfluidActionProvider_update_flow,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
-cdp,WethActionProvider_wrap_eth,WethActionProvider_wrap_eth,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WowActionProvider_buy_token,WowActionProvider_buy_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WowActionProvider_create_token,WowActionProvider_create_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,WowActionProvider_sell_token,WowActionProvider_sell_token,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,get_balance,cdp_get_balance,TRUE,1,5,5,,,0x445750026A4a1906b61302442E085f9cbAfe206a
-cdp,swap,cdp_swap,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

intentkit/skills/base.py

@@ -1,6 +1,14 @@
 import logging
+from collections.abc import Sequence
 from typing import Any, Callable, Dict, Literal, NotRequired, Optional, TypedDict, Union
 
+from coinbase_agentkit import (
+    Action,
+    AgentKit,
+    AgentKitConfig,
+    CdpEvmWalletProvider,
+)
+from langchain.tools import StructuredTool
 from langchain_core.tools import BaseTool
 from langchain_core.tools.base import ToolException
 from langgraph.runtime import get_runtime
@@ -13,6 +21,7 @@ from web3 import Web3
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.clients import CdpClient, get_cdp_client
 from intentkit.clients.web3 import get_web3_client
 from intentkit.models.redis import get_redis
 from intentkit.utils.error import RateLimitExceeded
@@ -162,3 +171,39 @@ class IntentKitSkill(BaseTool):
         network_id = agent.network_id
 
         return get_web3_client(network_id, self.skill_store)
+
+
+async def get_agentkit_actions(
+    agent_id: str,
+    store: SkillStoreABC,
+    provider_factories: Sequence[Callable[[], object]],
+) -> list[Action]:
+    """Build an AgentKit instance and return its actions."""
+
+    cdp_client: CdpClient = await get_cdp_client(agent_id, store)
+    wallet_provider: CdpEvmWalletProvider = await cdp_client.get_wallet_provider()
+
+    agent_kit = AgentKit(
+        AgentKitConfig(
+            wallet_provider=wallet_provider,
+            action_providers=[factory() for factory in provider_factories],
+        )
+    )
+    return agent_kit.get_actions()
+
+
+def action_to_structured_tool(action: Action) -> StructuredTool:
+    """Convert an AgentKit action to a LangChain StructuredTool."""
+
+    def _tool_fn(**kwargs: object) -> str:
+        return action.invoke(kwargs)
+
+    tool = StructuredTool(
+        name=action.name,
+        description=action.description,
+        func=_tool_fn,
+        args_schema=action.args_schema,
+    )
+    tool.handle_tool_error = lambda e: f"tool error: {e}"
+    tool.handle_validation_error = lambda e: f"validation error: {e}"
+    return tool

intentkit/skills/basename/__init__.py

@@ -0,0 +1,49 @@
+"""Basename AgentKit skills."""
+
+from typing import TypedDict
+
+from coinbase_agentkit import basename_action_provider
+
+from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.skills.base import (
+    SkillConfig,
+    SkillState,
+    action_to_structured_tool,
+    get_agentkit_actions,
+)
+from intentkit.skills.basename.base import BasenameBaseTool
+
+
+class SkillStates(TypedDict):
+    BasenameActionProvider_register_basename: SkillState
+
+
+class Config(SkillConfig):
+    """Configuration for Basename skills."""
+
+    states: SkillStates
+
+
+async def get_skills(
+    config: "Config",
+    is_private: bool,
+    store: SkillStoreABC,
+    agent_id: str,
+    **_,
+) -> list[BasenameBaseTool]:
+    """Get all Basename skills."""
+
+    available_skills: list[str] = []
+    for skill_name, state in config["states"].items():
+        if state == "disabled":
+            continue
+        if state == "public" or (state == "private" and is_private):
+            available_skills.append(skill_name)
+
+    actions = await get_agentkit_actions(agent_id, store, [basename_action_provider])
+    tools: list[BasenameBaseTool] = []
+    for skill in available_skills:
+        for action in actions:
+            if action.name.endswith(skill):
+                tools.append(action_to_structured_tool(action))
+    return tools

intentkit/skills/basename/base.py

@@ -0,0 +1,11 @@
+"""Basename AgentKit skills base class."""
+
+from intentkit.skills.cdp.base import CDPBaseTool
+
+
+class BasenameBaseTool(CDPBaseTool):
+    """Base class for Basename tools."""
+
+    @property
+    def category(self) -> str:
+        return "basename"

intentkit/skills/basename/basename.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <defs>
+    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#4c7dff" />
+      <stop offset="100%" stop-color="#0b2f80" />
+    </linearGradient>
+  </defs>
+  <rect width="128" height="128" fill="url(#bg)" rx="16" />
+  <text x="50%" y="52%" font-family="Arial,Helvetica,sans-serif" font-size="60" fill="#ffffff" font-weight="700" text-anchor="middle">B</text>
+  <text x="50%" y="86%" font-family="Arial,Helvetica,sans-serif" font-size="20" fill="#dbe4ff" text-anchor="middle">Base</text>
+</svg>

intentkit/skills/basename/schema.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "Basename",
+  "description": "Basename ENS-style name registration via Coinbase AgentKit",
+  "x-icon": "https://ai.service.crestal.dev/skills/basename/basename.svg",
+  "x-tags": [
+    "Blockchain"
+  ],
+  "properties": {
+    "enabled": {
+      "type": "boolean",
+      "title": "Enabled",
+      "description": "Whether this skill is enabled",
+      "default": true
+    },
+    "states": {
+      "type": "object",
+      "properties": {
+        "BasenameActionProvider_register_basename": {
+          "type": "string",
+          "title": "Register Basename",
+          "enum": [
+            "disabled",
+            "public",
+            "private"
+          ],
+          "x-enum-title": [
+            "Disabled",
+            "Agent Owner + All Users",
+            "Agent Owner Only"
+          ],
+          "description": "State for BasenameActionProvider_register_basename",
+          "default": "disabled"
+        }
+      },
+      "description": "States for each Basename skill (disabled, public, or private)"
+    },
+    "api_key_provider": {
+      "type": "string",
+      "title": "API Key Provider",
+      "description": "Who provides the API key",
+      "enum": [
+        "platform"
+      ],
+      "x-enum-title": [
+        "Nation Hosted"
+      ],
+      "default": "platform"
+    }
+  },
+  "required": [
+    "states",
+    "enabled"
+  ],
+  "additionalProperties": true
+}

intentkit/skills/cdp/__init__.py

@@ -3,70 +3,28 @@
 from typing import TypedDict
 
 from coinbase_agentkit import (
-    Action,
-    AgentKit,
-    AgentKitConfig,
-    CdpEvmWalletProvider,
-    basename_action_provider,
     cdp_api_action_provider,
-    erc20_action_provider,
-    morpho_action_provider,
-    pyth_action_provider,
-    superfluid_action_provider,
+    cdp_evm_wallet_action_provider,
     wallet_action_provider,
-    weth_action_provider,
-    wow_action_provider,
 )
-from coinbase_agentkit.action_providers.erc721 import erc721_action_provider
-from langchain.tools import StructuredTool
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.clients import CdpClient, get_cdp_client
-from intentkit.skills.base import SkillConfig, SkillState
+from intentkit.skills.base import (
+    SkillConfig,
+    SkillState,
+    action_to_structured_tool,
+    get_agentkit_actions,
+)
 from intentkit.skills.cdp.base import CDPBaseTool
-from intentkit.skills.cdp.get_balance import GetBalance
-from intentkit.skills.cdp.swap import Swap
-
-
-def _action_to_structured_tool(action: Action) -> StructuredTool:
-    """Convert an AgentKit action to a LangChain StructuredTool."""
-
-    def _tool_fn(**kwargs: object) -> str:
-        return action.invoke(kwargs)
-
-    return StructuredTool(
-        name=action.name,
-        description=action.description,
-        func=_tool_fn,
-        args_schema=action.args_schema,
-    )
 
 
 class SkillStates(TypedDict):
-    get_balance: SkillState
-    swap: SkillState
     WalletActionProvider_get_balance: SkillState
     WalletActionProvider_get_wallet_details: SkillState
     WalletActionProvider_native_transfer: SkillState
-    CdpApiActionProvider_address_reputation: SkillState
     CdpApiActionProvider_request_faucet_funds: SkillState
-    PythActionProvider_fetch_price: SkillState
-    PythActionProvider_fetch_price_feed_id: SkillState
-    BasenameActionProvider_register_basename: SkillState
-    ERC20ActionProvider_get_balance: SkillState
-    ERC20ActionProvider_transfer: SkillState
-    Erc721ActionProvider_get_balance: SkillState
-    Erc721ActionProvider_mint: SkillState
-    Erc721ActionProvider_transfer: SkillState
-    WethActionProvider_wrap_eth: SkillState
-    MorphoActionProvider_deposit: SkillState
-    MorphoActionProvider_withdraw: SkillState
-    SuperfluidActionProvider_create_flow: SkillState
-    SuperfluidActionProvider_delete_flow: SkillState
-    SuperfluidActionProvider_update_flow: SkillState
-    WowActionProvider_buy_token: SkillState
-    WowActionProvider_create_token: SkillState
-    WowActionProvider_sell_token: SkillState
+    CdpEvmWalletActionProvider_get_swap_price: SkillState
+    CdpEvmWalletActionProvider_swap: SkillState
 
 
 class Config(SkillConfig):
@@ -105,50 +63,18 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Initialize CDP client
-    cdp_client: CdpClient = await get_cdp_client(agent_id, store)
-    cdp_wallet_provider: CdpEvmWalletProvider = await cdp_client.get_wallet_provider()
-    agent_kit = AgentKit(
-        AgentKitConfig(
-            wallet_provider=cdp_wallet_provider,
-            action_providers=[
-                wallet_action_provider(),
-                cdp_api_action_provider(),
-                pyth_action_provider(),
-                basename_action_provider(),
-                erc20_action_provider(),
-                erc721_action_provider(),
-                weth_action_provider(),
-                morpho_action_provider(),
-                superfluid_action_provider(),
-                wow_action_provider(),
-            ],
-        )
+    actions = await get_agentkit_actions(
+        agent_id,
+        store,
+        [
+            wallet_action_provider,
+            cdp_api_action_provider,
+            cdp_evm_wallet_action_provider,
+        ],
     )
-    actions = agent_kit.get_actions()
     tools = []
     for skill in available_skills:
-        if skill == "get_balance":
-            # Get the account object for the custom GetBalance skill
-            tools.append(
-                GetBalance(
-                    agent_id=agent_id,
-                    skill_store=store,
-                )
-            )
-            continue
-        elif skill == "swap" or skill.endswith("_trade"):
-            # Add the custom Swap skill, "trade" is backword compatible
-            tools.append(
-                Swap(
-                    agent_id=agent_id,
-                    skill_store=store,
-                )
-            )
-            continue
         for action in actions:
             if action.name.endswith(skill):
-                tool = _action_to_structured_tool(action)
-                tool.handle_tool_error = lambda e: f"tool error: {e}"
-                tool.handle_validation_error = lambda e: f"validation error: {e}"
-                tools.append(tool)
+                tools.append(action_to_structured_tool(action))
     return tools