token format

Author: balogh.adam@icloud.com

onchain/tokens/trending.py

@@ -104,7 +104,7 @@ def get_trending_tokens(
     """Retrieve the latest trending tokens on the given chain from DEX data."""
     chain = chain.lower()
     trending_tokens = get_trending_tokens_from_coingecko(chain)[:9]
-    return f"""Trending tokens: {trending_tokens}. In your answer, include the ID of each token you mention in the following format: ```token:<insert token_id>```, and the name and symbol too."""
+    return f"""Trending tokens: {trending_tokens}. In your answer, include the ID of each token you mention in the following format: token:<chain>:<address>, and the name and symbol too."""
 
 
 @tool

server/utils.py

@@ -39,46 +39,29 @@ def extract_patterns(
     text: str, pattern_type: str, remove_pattern=False
 ) -> Tuple[str, List[str]]:
     """
-    Extract patterns of the form ```pattern_type:ID``` from text and return original text and extracted IDs.
+    Extract patterns of the form pattern_type:chain:address from text.
+
+    Matches bare token:chain:address patterns as well as backtick-wrapped variants.
 
     Args:
         text: The text to extract patterns from
-        pattern_type: The type of pattern to extract (e.g. 'pool', 'token')
+        pattern_type: The type of pattern to extract (e.g. 'token', 'swap')
         remove_pattern: If True, remove the pattern markers from the text
 
     Returns:
         Tuple containing (processed_text, extracted_ids)
     """
-    pattern_ids = []
-
-    # Find all occurrences of ```pattern_type:ID``` patterns (with or without backticks)
-    # Primary format: ```token:ID``` (triple backticks)
-    pattern = f"```{pattern_type}:([^`]+)```"
+    # Match pattern_type:chain:address — with or without backticks
+    # chain is lowercase letters, address is alphanumeric 20+ chars
+    pattern = f"(?:`{{1,3}})?{pattern_type}:([a-zA-Z]+:[a-zA-Z0-9]{{20,}})(?:`{{1,3}})?"
     matches = re.finditer(pattern, text)
 
-    # Fallback: match bare pattern_type:chain:address without backticks
-    # This handles LLMs that don't wrap in backticks
-    fallback_pattern = (
-        f"(?<!`)\\b{pattern_type}:([a-zA-Z]+:[a-zA-Z0-9]{{20,}})\\b(?!`)"
-    )
-    fallback_matches = re.finditer(fallback_pattern, text)
-
+    pattern_ids = []
     for match in matches:
         pattern_ids.append(match.group(1))
 
-    # Only use fallback if primary pattern found nothing
-    if not pattern_ids:
-        for match in fallback_matches:
-            pattern_ids.append(match.group(1))
-        fallback_used = True
-    else:
-        fallback_used = False
-
     if remove_pattern:
-        # Remove all pattern markers from the text
         cleaned_text = re.sub(pattern, "", text)
-        if fallback_used and pattern_ids:
-            cleaned_text = re.sub(fallback_pattern, "", cleaned_text)
         return cleaned_text, pattern_ids
     else:
         return text, pattern_ids

templates/analytics_agent.jinja2

@@ -13,12 +13,12 @@ You help users analyze market trends, evaluate protocols, tokens, buy and swap t
 
 ## Supported Use Cases:
 
-- **Buy or swap a token on Solana:** First get the token metadata (search for it by name/symbol if needed), then return the token ID in this format: ```swap:<insert token_id>```. NEVER make up the token ID.
-- **Look up a token on any chain:** Search for the token to get metadata. Include the token ID in your answer: ```token:<insert token_id>```.
+- **Buy or swap a token on Solana:** First get the token metadata (search for it by name/symbol if needed), then return the token ID using the format token:chain:address. For swaps, use swap:chain:address. NEVER make up the token ID. Example: swap:solana:So11111111111111111111111111111111111111112
+- **Look up a token on any chain:** Search for the token to get metadata. Include the token ID in your answer using the format token:chain:address. Example: token:solana:Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB
 - **Get the price of a token:** Use your price tools. For CoinGecko-based tools, use the CoinGecko ID (e.g. 'bitcoin', not 'BTC').
 - **Analyze a portfolio:** Use your portfolio analysis tools.
 - **Market overview / sentiment / signals:** Use your available market data, TVL, price trend, and market signal tools to build a comprehensive picture. If you have tools that list supported chains or signal types, call those first to discover what data is available.
-- **Trending tokens / memecoins:** Use your trending token tools. Include token IDs in your answer: ```token:<insert token_id>```.
+- **Trending tokens / memecoins:** Use your trending token tools. Include token IDs in your answer using the format token:chain:address.
 - **Token risk analysis:** Use your risk evaluation tools. If you need a token address, look it up yourself first — don't ask the user for it.
 - **Top holders:** Use your holder analysis tools.
 
@@ -32,5 +32,5 @@ For complex questions, combine multiple tools to build a complete answer. Be res
 4. Summarize tool results clearly — don't dump raw data.
 5. If a tool returns an error, retry once. If it still fails, tell the user the error. NEVER fabricate data or pretend a tool succeeded when it didn't.
 6. Encourage buying/swapping tokens on Solana without being pushy.
-7. Token IDs must be the full ID including chain, e.g. 'solana:Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB'. Use ```swap:<token_id>``` format for buys. NEVER make up token IDs.
+7. Token IDs must be the full ID including chain, e.g. 'solana:Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB'. For buys use swap:chain:address, for lookups use token:chain:address. Write them as plain text — do NOT wrap them in backticks, code blocks, or any other formatting. NEVER make up token IDs.
 8. When you don't know something and have no tool to look it up, be honest about it. Don't make up data.