intentkit 0.6.10.dev7__py3-none-any.whl → 0.6.11__py3-none-any.whl

intentkit/__init__.py

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

intentkit/clients/cdp.py

@@ -17,6 +17,7 @@ from intentkit.models.agent import Agent
 from intentkit.models.agent_data import AgentData
 
 _clients: Dict[str, "CdpClient"] = {}
+_origin_cdp_client: Optional[OriginCdpClient] = None
 
 logger = logging.getLogger(__name__)
 
@@ -56,6 +57,24 @@ def bip39_seed_to_eth_keys(seed_hex: str) -> Dict[str, str]:
     }
 
 
+def get_origin_cdp_client(skill_store: SkillStoreABC) -> OriginCdpClient:
+    global _origin_cdp_client
+    if _origin_cdp_client:
+        return _origin_cdp_client
+
+    # Get credentials from skill store system config
+    api_key_id = skill_store.get_system_config("cdp_api_key_id")
+    api_key_secret = skill_store.get_system_config("cdp_api_key_secret")
+    wallet_secret = skill_store.get_system_config("cdp_wallet_secret")
+
+    _origin_cdp_client = OriginCdpClient(
+        api_key_id=api_key_id,
+        api_key_secret=api_key_secret,
+        wallet_secret=wallet_secret,
+    )
+    return _origin_cdp_client
+
+
 class CdpClient:
     def __init__(self, agent_id: str, skill_store: SkillStoreABC) -> None:
         self._agent_id = agent_id
@@ -81,11 +100,7 @@ class CdpClient:
         # new agent or address not migrated yet
         if not address:
             # create cdp client for later use
-            cdp_client = OriginCdpClient(
-                api_key_id=api_key_id,
-                api_key_secret=api_key_secret,
-                wallet_secret=wallet_secret,
-            )
+            cdp_client = get_origin_cdp_client(self._skill_store)
             # try migrating from v1 cdp_wallet_data
             if agent_data.cdp_wallet_data:
                 wallet_data = json.loads(agent_data.cdp_wallet_data)
@@ -115,8 +130,7 @@ class CdpClient:
                 address = new_account.address
                 logger.info("Created new wallet: %s", address)
 
-            # close client
-            await cdp_client.close()
+            # do not close cached global client
             # now it should be created or migrated, store it
             agent_data.evm_wallet_address = address
             await agent_data.save()

intentkit/config/config.py

@@ -51,23 +51,23 @@ class Config:
             }
         else:
             self.db = {
-                "username": self.load("DB_USERNAME"),
-                "password": self.load("DB_PASSWORD"),
-                "host": self.load("DB_HOST"),
-                "port": self.load("DB_PORT"),
-                "dbname": self.load("DB_NAME"),
+                "username": self.load("DB_USERNAME", ""),
+                "password": self.load("DB_PASSWORD", ""),
+                "host": self.load("DB_HOST", ""),
+                "port": self.load("DB_PORT", "5432"),
+                "dbname": self.load("DB_NAME", ""),
             }
         # ==== this part can be load from env or aws secrets manager
         self.db["auto_migrate"] = self.load("DB_AUTO_MIGRATE", "true") == "true"
-        self.db["pool_size"] = int(self.load("DB_POOL_SIZE", "3"))
+        self.db["pool_size"] = self.load_int("DB_POOL_SIZE", 3)
         self.debug = self.load("DEBUG") == "true"
         self.debug_checkpoint = (
             self.load("DEBUG_CHECKPOINT", "false") == "true"
         )  # log with checkpoint
         # Redis
         self.redis_host = self.load("REDIS_HOST")
-        self.redis_port = int(self.load("REDIS_PORT", "6379"))
-        self.redis_db = int(self.load("REDIS_DB", "0"))
+        self.redis_port = self.load_int("REDIS_PORT", 6379)
+        self.redis_db = self.load_int("REDIS_DB", 0)
         # AWS
         self.aws_s3_bucket = self.load("AWS_S3_BUCKET")
         self.aws_s3_cdn_url = self.load("AWS_S3_CDN_URL")
@@ -97,7 +97,7 @@ class Config:
         self.reigent_api_key = self.load("REIGENT_API_KEY")
         self.venice_api_key = self.load("VENICE_API_KEY")
         self.system_prompt = self.load("SYSTEM_PROMPT")
-        self.input_token_limit = int(self.load("INPUT_TOKEN_LIMIT", "60000"))
+        self.input_token_limit = self.load_int("INPUT_TOKEN_LIMIT", 60000)
         # Telegram server settings
         self.tg_base_url = self.load("TG_BASE_URL")
         self.tg_server_host = self.load("TG_SERVER_HOST", "127.0.0.1")
@@ -107,8 +107,8 @@ class Config:
         self.twitter_oauth2_client_id = self.load("TWITTER_OAUTH2_CLIENT_ID")
         self.twitter_oauth2_client_secret = self.load("TWITTER_OAUTH2_CLIENT_SECRET")
         self.twitter_oauth2_redirect_uri = self.load("TWITTER_OAUTH2_REDIRECT_URI")
-        self.twitter_entrypoint_interval = int(
-            self.load("TWITTER_ENTRYPOINT_INTERVAL", "5")
+        self.twitter_entrypoint_interval = self.load_int(
+            "TWITTER_ENTRYPOINT_INTERVAL", 5
         )  # in minutes
         # Slack Alert
         self.slack_alert_token = self.load("SLACK_ALERT_TOKEN")
@@ -126,12 +126,12 @@ class Config:
         self.firecrawl_api_key = self.load("FIRECRAWL_API_KEY")
         # Sentry
         self.sentry_dsn = self.load("SENTRY_DSN")
-        self.sentry_sample_rate = float(self.load("SENTRY_SAMPLE_RATE", "0.1"))
-        self.sentry_traces_sample_rate = float(
-            self.load("SENTRY_TRACES_SAMPLE_RATE", "0.01")
+        self.sentry_sample_rate = self.load_float("SENTRY_SAMPLE_RATE", 0.1)
+        self.sentry_traces_sample_rate = self.load_float(
+            "SENTRY_TRACES_SAMPLE_RATE", 0.01
         )
-        self.sentry_profiles_sample_rate = float(
-            self.load("SENTRY_PROFILES_SAMPLE_RATE", "0.01")
+        self.sentry_profiles_sample_rate = self.load_float(
+            "SENTRY_PROFILES_SAMPLE_RATE", 0.01
         )
         # RPC Providers
         self.quicknode_api_key = self.load("QUICKNODE_API_KEY")
@@ -164,11 +164,38 @@ class Config:
     def load(self, key, default=None):
         """Load a secret from the secrets map or env"""
         value = self.secrets.get(key, os.getenv(key, default))
+
+        # If value is empty string, use default instead
+        if value == "":
+            value = default
+
         if value:
             value = value.replace("\\n", "\n")
         if value and value.startswith("'") and value.endswith("'"):
             value = value[1:-1]
         return value
 
+    def load_int(self, key, default=0):
+        """Load an integer value from env, handling empty strings gracefully"""
+        value = self.load(key, str(default))
+        if value is None or value == "":
+            return default
+        try:
+            return int(value)
+        except (ValueError, TypeError):
+            logger.warning(f"Invalid integer value for {key}, using default: {default}")
+            return default
+
+    def load_float(self, key, default=0.0):
+        """Load a float value from env, handling empty strings gracefully"""
+        value = self.load(key, str(default))
+        if value is None or value == "":
+            return default
+        try:
+            return float(value)
+        except (ValueError, TypeError):
+            logger.warning(f"Invalid float value for {key}, using default: {default}")
+            return default
+
 
 config: Config = Config()

intentkit/core/credit.py

@@ -38,6 +38,7 @@ from intentkit.models.credit import (
 )
 from intentkit.models.db import get_session
 from intentkit.models.skill import Skill
+from intentkit.utils.slack_alert import send_slack_message
 
 logger = logging.getLogger(__name__)
 
@@ -185,6 +186,19 @@ async def recharge(
     # Commit all changes
     await session.commit()
 
+    # Send Slack notification for recharge
+    try:
+        send_slack_message(
+            f"💰 **Credit Recharge**\n"
+            f"• User ID: `{user_id}`\n"
+            f"• Amount: `{amount}` credits\n"
+            f"• Transaction ID: `{upstream_tx_id}`\n"
+            f"• New Balance: `{user_account.credits + user_account.free_credits + user_account.reward_credits}` credits\n"
+            f"• Note: {note or 'N/A'}"
+        )
+    except Exception as e:
+        logger.error(f"Failed to send Slack notification for recharge: {str(e)}")
+
     return user_account
 
 
@@ -294,6 +308,21 @@ async def reward(
     # Commit all changes
     await session.commit()
 
+    # Send Slack notification for reward
+    try:
+        reward_type_name = reward_type.value if reward_type else "REWARD"
+        send_slack_message(
+            f"🎁 **Credit Reward**\n"
+            f"• User ID: `{user_id}`\n"
+            f"• Amount: `{amount}` reward credits\n"
+            f"• Transaction ID: `{upstream_tx_id}`\n"
+            f"• Reward Type: `{reward_type_name}`\n"
+            f"• New Balance: `{user_account.credits + user_account.free_credits + user_account.reward_credits}` credits\n"
+            f"• Note: {note or 'N/A'}"
+        )
+    except Exception as e:
+        logger.error(f"Failed to send Slack notification for reward: {str(e)}")
+
     return user_account
 
 

intentkit/core/engine.py

@@ -26,12 +26,10 @@ from langchain_core.messages import (
     BaseMessage,
     HumanMessage,
 )
-from langchain_core.prompts import ChatPromptTemplate
 from langchain_core.tools import BaseTool
 from langgraph.errors import GraphRecursionError
 from langgraph.graph.state import CompiledStateGraph
 from langgraph.prebuilt import create_react_agent
-from langgraph.runtime import Runtime
 from sqlalchemy import func, update
 from sqlalchemy.exc import SQLAlchemyError
 
@@ -39,7 +37,10 @@ from intentkit.abstracts.graph import AgentContext, AgentError, AgentState
 from intentkit.config.config import config
 from intentkit.core.credit import expense_message, expense_skill
 from intentkit.core.node import PreModelNode, post_model_node
-from intentkit.core.prompt import agent_prompt
+from intentkit.core.prompt import (
+    create_formatted_prompt_function,
+    explain_prompt,
+)
 from intentkit.core.skill import skill_store
 from intentkit.models.agent import Agent, AgentTable
 from intentkit.models.agent_data import AgentData, AgentQuota
@@ -53,51 +54,13 @@ from intentkit.models.chat import (
 from intentkit.models.credit import CreditAccount, OwnerType
 from intentkit.models.db import get_langgraph_checkpointer, get_session
 from intentkit.models.llm import LLMModelInfo, LLMProvider
-from intentkit.models.skill import AgentSkillData, Skill, ThreadSkillData
+from intentkit.models.skill import AgentSkillData, ThreadSkillData
 from intentkit.models.user import User
 from intentkit.utils.error import IntentKitAPIError
 
 logger = logging.getLogger(__name__)
 
 
-async def explain_prompt(message: str) -> str:
-    """
-    Process message to replace @skill:*:* patterns with (call skill xxxxx) format.
-
-    Args:
-        message (str): The input message to process
-
-    Returns:
-        str: The processed message with @skill patterns replaced
-    """
-    # Pattern to match @skill:category:config_name with word boundaries
-    pattern = r"\b@skill:([^:]+):([^\s]+)\b"
-
-    async def replace_skill_pattern(match):
-        category = match.group(1)
-        config_name = match.group(2)
-
-        # Get skill by category and config_name
-        skill = await Skill.get_by_config_name(category, config_name)
-
-        if skill:
-            return f"(call skill {skill.name})"
-        else:
-            # If skill not found, keep original pattern
-            return match.group(0)
-
-    # Find all matches
-    matches = list(re.finditer(pattern, message))
-
-    # Process matches in reverse order to maintain string positions
-    result = message
-    for match in reversed(matches):
-        replacement = await replace_skill_pattern(match)
-        result = result[: match.start()] + replacement + result[match.end() :]
-
-    return result
-
-
 # Global variable to cache all agent executors
 _agents: dict[str, CompiledStateGraph] = {}
 _private_agents: dict[str, CompiledStateGraph] = {}
@@ -176,106 +139,15 @@ async def create_agent(
         has_search
         and llm_model.info.provider == LLMProvider.OPENAI
         and llm_model.info.supports_search
+        and not agent.model.startswith(
+            "gpt-5"
+        )  # tmp disable gpt-5 search since package bugs
     ):
         tools.append({"type": "web_search_preview"})
 
-    # finally, set up the system prompt
-    prompt = agent_prompt(agent, agent_data)
-    # Escape curly braces in the prompt
-    escaped_prompt = prompt.replace("{", "{{").replace("}", "}}")
-    # Process message to handle @skill patterns
-    if config.admin_llm_skill_control:
-        escaped_prompt = await explain_prompt(escaped_prompt)
-    prompt_array = [
-        ("placeholder", "{system_prompt}"),
-        ("placeholder", "{messages}"),
-    ]
-    if agent.prompt_append:
-        # Escape any curly braces in prompt_append
-        escaped_append = agent.prompt_append.replace("{", "{{").replace("}", "}}")
-        # Process message to handle @skill patterns
-        if config.admin_llm_skill_control:
-            escaped_append = await explain_prompt(escaped_append)
-        prompt_array.append(("system", escaped_append))
-
-    prompt_temp = ChatPromptTemplate.from_messages(prompt_array)
-
-    async def formatted_prompt(
-        state: AgentState, runtime: Runtime[AgentContext]
-    ) -> list[BaseMessage]:
-        final_system_prompt = escaped_prompt
-        context = runtime.context
-        logger.debug(f"formatted_prompt, context: {context}")
-        if context.entrypoint:
-            entrypoint = context.entrypoint
-            entrypoint_prompt = None
-            if (
-                agent.twitter_entrypoint_enabled
-                and agent.twitter_entrypoint_prompt
-                and entrypoint == AuthorType.TWITTER.value
-            ):
-                entrypoint_prompt = agent.twitter_entrypoint_prompt
-                logger.debug("twitter entrypoint prompt added")
-            elif (
-                agent.telegram_entrypoint_enabled
-                and agent.telegram_entrypoint_prompt
-                and entrypoint == AuthorType.TELEGRAM.value
-            ):
-                entrypoint_prompt = agent.telegram_entrypoint_prompt
-                logger.debug("telegram entrypoint prompt added")
-            elif entrypoint == AuthorType.TRIGGER.value:
-                task_id = context.chat_id.removeprefix("autonomous-")
-                # Find the autonomous task by task_id
-                autonomous_task = None
-                if agent.autonomous:
-                    for task in agent.autonomous:
-                        if task.id == task_id:
-                            autonomous_task = task
-                            break
-
-                if autonomous_task:
-                    # Build detailed task info - always include task_id
-                    if autonomous_task.name:
-                        task_info = f"You are running an autonomous task '{autonomous_task.name}' (ID: {task_id})"
-                    else:
-                        task_info = (
-                            f"You are running an autonomous task (ID: {task_id})"
-                        )
-
-                    # Add description if available
-                    if autonomous_task.description:
-                        task_info += f": {autonomous_task.description}"
-
-                    # Add cycle info
-                    if autonomous_task.minutes:
-                        task_info += f". This task runs every {autonomous_task.minutes} minute(s)"
-                    elif autonomous_task.cron:
-                        task_info += (
-                            f". This task runs on schedule: {autonomous_task.cron}"
-                        )
+    # Create the formatted_prompt function using the refactored prompt module
+    formatted_prompt = create_formatted_prompt_function(agent, agent_data)
 
-                    entrypoint_prompt = f"{task_info}. "
-                else:
-                    # Fallback if task not found
-                    entrypoint_prompt = f"You are running an autonomous task. The task id is {task_id}. "
-            if entrypoint_prompt:
-                entrypoint_prompt = await explain_prompt(entrypoint_prompt)
-                final_system_prompt = f"{final_system_prompt}## Entrypoint rules\n\n{entrypoint_prompt}\n\n"
-        final_system_prompt = f"{final_system_prompt}## Internal Info\n\n"
-        "These are for your internal use. You can use them when querying or storing data, "
-        "but please do not directly share this information with users.\n\n"
-        final_system_prompt = f"{final_system_prompt}chat_id: {context.chat_id}\n\n"
-        if context.user_id:
-            final_system_prompt = f"{final_system_prompt}user_id: {context.user_id}\n\n"
-        system_prompt = [("system", final_system_prompt)]
-        return prompt_temp.invoke(
-            {"messages": state["messages"], "system_prompt": system_prompt}
-        )
-
-    # log final prompt and all skills
-    logger.debug(
-        f"[{agent.id}{'-private' if is_private else ''}] init prompt: {escaped_prompt}"
-    )
     for tool in tools:
         logger.info(
             f"[{agent.id}{'-private' if is_private else ''}] loaded tool: {tool.name if isinstance(tool, BaseTool) else tool}"