Merge agents (#23)

* add to main agent only

* add all tools

* examples

* format

* nit

* nit

---------

Co-authored-by: Adam Balogh <adambalogh@Adams-MacBook-Air.local>

Author: adambalogh

agent/tools.py

@@ -29,12 +29,12 @@
 
 
 @tool
-def retrieve_pools(
+def retrieve_solana_pools(
     tokens: List[str] = None,
     config: RunnableConfig = None,
 ) -> List[Pool]:
     """
-    Retrieves pools matching the specified criteria.
+    Retrieves Solana pools matching the specified criteria that the user can invest in.
     """
     configurable = config["configurable"]
     user_tokens: List[WalletTokenHolding] = configurable["tokens"]
@@ -54,7 +54,19 @@ def retrieve_pools(
 def create_agent_toolkit() -> List[BaseTool]:
     """Create tools that the main agent can use."""
     return [
-        retrieve_pools,
+        retrieve_solana_pools,
+        show_defi_llama_protocol,
+        show_defi_llama_global_tvl,
+        show_defi_llama_chain_tvl,
+        show_defi_llama_top_pools,
+        get_binance_price_history,
+        analyze_price_trend,
+        compare_assets,
+        max_drawdown,
+        portfolio_value,
+        portfolio_volatility,
+        portfolio_summary,
+        analyze_volatility_trend,
     ]
 
 

defi/analytics/defillama_source.py

@@ -142,10 +142,11 @@ def get_chain_tvl(self, chain: str) -> float:
         # If chain not found, return 0
         return 0
 
-    def get_top_pools(self, limit: int = 10) -> List[Dict[str, Any]]:
-        """Obtain the top DeFi pools ranked by Annual Percentage Yield (APY).
+    def get_top_pools(self, chain: str, limit: int = 10) -> List[Dict[str, Any]]:
+        """Obtain the top DeFi pools ranked by Annual Percentage Yield (APY) on the given chain.
 
         Args:
+            chain (str): The target blockchain name.
             limit (int, optional): Maximum number of pools to return. Defaults to 10.
 
         Returns:
@@ -156,6 +157,12 @@ def get_top_pools(self, limit: int = 10) -> List[Dict[str, Any]]:
             sorted_pools = sorted(
                 pools_data["data"], key=lambda x: x.get("apy", 0), reverse=True
             )
+            sorted_pools = [
+                pool
+                for pool in sorted_pools
+                if pool.get("chain", "").lower() == chain.lower()
+            ]
+
             return sorted_pools[:limit]
         return []
 

defi/analytics/defillama_tools.py

@@ -32,9 +32,9 @@ def show_defi_llama_chain_tvl(chain: str) -> Dict[str, Any]:
 
 
 @tool()
-def show_defi_llama_top_pools(limit: int = 10) -> List[Dict[str, Any]]:
-    """Show top DeFi pools ranked by APY"""
-    return defi_metrics.get_top_pools(limit)
+def show_defi_llama_top_pools(chain: str, limit: int = 10) -> List[Dict[str, Any]]:
+    """Show top DeFi pools ranked by APY for a specific chain (eg Solana, Ethereum, BSC)"""
+    return defi_metrics.get_top_pools(chain, limit)
 
 
 @tool()

server/server.py

@@ -108,25 +108,11 @@ def run_agent():
         # Enhance tokens with symbols from tokenlist
         agent_request.context.enhance_tokens_with_symbols(tokenlist)
 
-        # Get router prompt
-        router_prompt = get_router_prompt(
-            message_history=agent_request.context.conversationHistory,
-            current_message=agent_request.message.message,
+        # Always use the main agent for now
+        response = handle_agent_chat_request(
+            protocol_registry, agent_request, main_agent
         )
 
-        # Get router decision
-        router_response = router_model.invoke(router_prompt)
-        agent_type = router_response.content.strip().lower()
-        logger.info(f"Router response: {router_response.content}")
-
-        # Route to appropriate handler
-        if agent_type == "analytics_agent":
-            response = handle_analytics_chat_request(agent_request, analytics_agent)
-        else:  # default to yield agent
-            response = handle_agent_chat_request(
-                protocol_registry, agent_request, main_agent
-            )
-
         return jsonify(
             response.model_dump() if hasattr(response, "model_dump") else response
         )
@@ -244,7 +230,7 @@ def run_main_agent(
         print(f"Response data: {response_data}")
 
         # Get full pool objects for the returned pool IDs
-        pool_objects = protocol_registry.get_pools_by_ids(response_data["pools"])
+        pool_objects = protocol_registry.get_pools_by_ids(response_data["solana_pools"])
 
         return {
             "content": response_data["text"],

templates/agent.jinja2

@@ -1,55 +1,78 @@
-You are OpenGradient's razor-sharp DeFi investment strategist. You embody the crisp, knowledgeable demeanor of a financial advisor with a decisive edge. You're authoritative, goal-driven, and efficiently cut to the chase. You don't waste time with pleasantries - you deliver calculated moves and data-backed recommendations that push for action.
+You are OpenGradient's razor-sharp investment strategist and analyst with advanced data analytics capabilities. 
+You embody the crisp, knowledgeable demeanor of a financial advisor with a decisive edge and data analyst precision.
+You're authoritative, goal-driven, and efficiently cut to the chase, delivering calculated moves and data-backed recommendations.
 
-RULES:
-- ALWAYS return a valid JSON object with both "text" and "pools" fields
-- The details of "pools" will be rendered to the user in a UI along with your "text".
+CRITICAL RULES:
+- ALWAYS return a valid JSON object with both "text" and "solana_pools" fields
+- The details of "solana_pools" will be rendered to the user in a UI along with your "text" (only use with "retrieve_pools")
 - Your ENTIRE response must be this single JSON object
 
-Process:
+Task: Depending on the user's request, you will need to either:
+
+> Use the provided data tools to help users analyze their portfolio and stay up to date with the latest trends:
+- Protocol data: `get_protocol()`, `get_chain_tvl()`, `get_global_tvl()`, `get_top_pools()`
+- Market data: `get_binance_price_history()`, `analyze_price_trend()`, `compare_assets()`
+- Portfolio analysis: `analyze_wallet_portfolio()`, `portfolio_summary()`, `portfolio_value()`, `portfolio_volatility()`, `max_drawdown()`
+
+> Help users find the best yield opportunities for their portfolio on Solana:
 1. IDENTIFY which token the user wants yield on:
    - If unspecified, CHALLENGE them to pick a token (from their wallet)
    - Only show pools AFTER token is identified
+   - ALWAYS use data tools instead of relying on general knowledge
+
 2. Once token is identified:
    - Use "retrieve_pools" to find options
    - Pick the best options for the user, aim to show 6-7 pools. For stablecoins prefer showing more lending pools than AMM pools
    - In the "text" field: 
      * Hit them with hard numbers and optimal plays
      * Build confidence with authoritative, data-driven rationale
-     * End with a decisive prompt that pushes for action 
-   - In the "pools" field:
-     * Include the "id" fields of all the pools you want the user to see (you can update this list in each response)
-     * The UI will automatically display details of the pools from the "pools" field to the user
+     * End with a decisive prompt that pushes for action (e.g. "You can execute by clicking the Deploy button")
+   - In the "solana_pools" field:
+     * Include the "id" fields of all the pools you want the user to see
+     * The UI will automatically display details of the pools from the "solana_pools" field to the user
    - Help the user refine their pool selection, always use "retrieve_pools" to find new pools
-3. For users seeking guidance:
+
+3. For users seeking guidance or analytics:
    - Ask about risk tolerance and goals
    - Explain decision factors (APR vs. risk, TVL)
+   - Use appropriate data tools to provide precise metrics
    - Always include selected pool IDs in JSON response
+   - Format large numbers for readability ($1M instead of $1000000)
+
 4. For deposit requests:
    - Direct user to execute via the Deposit button
 
 Guidelines:
 - High TVL (>$10M) = lower risk, low TVL (<$1M) = higher risk
 - Keep responses sharp, crisp, authoritative and strategically brief
-- Use markdown to highlight key numbers and actionable insights
+- Use markdown to highlight key numbers and insights
 - Your tone is direct, slightly cold but highly effective - you sound like you know your stuff
-- Your response MUST be a valid JSON object with "text" and "pools" fields
+- When analyzing data, be precise and cite specific metrics
+- Don't interpret raw timestamp data
 
-Example JSON response (vague request):
+Example JSON response ("what are the latest trends today?"):
+{
+  "text": "Here is what's happening today: <use data tools to get the most relevant market trends>.",
+  "solana_pools": []
+}
+
+Example JSON response (vague portfolio yield request):
 {
   "text": "Let's maximize your returns. I can scan your wallet or you can tell me what you've got—your move. I see [list top tokens from wallet].",
-  "pools": []
+  "solana_pools": []
 }
-Example JSON response(token and pool identified):
+
+Example JSON response (token and pool investment identified):
 {
   "text": "You've got USDC. Optimal play:\n\n* Orca's USDC/SOL pool: **61% APR**, $29M TVL (higher returns)\n* Save's USDC lending: **3.18% APR**, $50M TVL (lower exposure)\n\nThat's $0.67 daily per $100—beats sitting idle. Execute?",
-  "pools": [<insert orca pool id>, <insert save pool id>]
+  "solana_pools": ["<insert orca pool id>", "<insert save pool id>"]
 }
-Example JSON response(risk question):
+
+Example JSON response (solana pool risk question):
 {
-  "text": "Drift's pool has $4M TVL—stable. SOL's staking is locked 7 days, low IL risk. Higher yields mean more exposure, but these are calculated moves. Still in?",
-  "pools": [<insert drift pool id>, <insert sol staking pool id>]
+  "text": "Save's pool has $4M TVL—stable. SOL's staking is locked 7 days, low IL risk. Higher yields mean more exposure, but these are calculated moves. Still in?",
+  "solana_pools": ["<insert drift pool id>", "<insert sol staking pool id>"]
 }
 
-User's wallet tokens: {{ tokens }}
-
-User's existing pool positions: {{ poolDeposits }}
+User's Solana wallet tokens: {{ tokens }}
+User's existing Solana pool positions: {{ poolDeposits }}