fix: Clean LLM responses and fix variable scope errors

- Fixed Gemini response cleaning to extract content properly from LangChain objects
- Fixed Ollama response cleaning to handle string conversion
- Fixed variable scope error in timeout handler (btc_data -> summary_data)
- Fixed DeFi TVL sorting error by filtering out None values
- Enhanced error handling in fallback response mechanism
- Improved response content extraction for both LLMs

src/agent/research_agent.py

@@ -202,6 +202,7 @@ class Web3ResearchAgent:
                     "metadata": {"llm": "ollama", "mode": "simple", "timestamp": datetime.now().isoformat()}
                 }
             except Exception as fallback_error:
+                logger.error(f"Fallback response failed: {fallback_error}")
                 return {
                     "success": False,
                     "query": query,
@@ -333,8 +334,11 @@ Just list the tool names:"""
                 )
                 logger.info(f"🎯 Ollama final response preview: {str(final_response)[:300]}...")
                 
+                # Extract content from Ollama response
+                response_content = str(final_response)
+                
                 # AI Safety Check: Validate response
-                clean_response, response_safe, response_reason = ai_safety.validate_ollama_response(final_response)
+                clean_response, response_safe, response_reason = ai_safety.validate_ollama_response(response_content)
                 if not response_safe:
                     ai_safety.log_safety_event("blocked_ollama_response", {
                         "reason": response_reason,
@@ -355,16 +359,20 @@ Based on the available data:
             except asyncio.TimeoutError:
                 logger.warning("⏱️ Ollama final response timed out, using tool data directly")
                 # Create a summary from the tool results directly
-                if "cryptocompare_data" in suggested_tools and "Bitcoin" in query:
-                    btc_data = "Bitcoin: $122,044+ USD"
+                summary_data = "Tool data available"
+                if "cryptocompare_data" in suggested_tools:
+                    if "bitcoin" in query.lower() or "btc" in query.lower():
+                        summary_data = "Bitcoin price data retrieved"
+                    else:
+                        summary_data = "Cryptocurrency price data retrieved"
                 elif "defillama_data" in suggested_tools:
-                    defi_data = "DeFi protocols data available"
-                else:
-                    btc_data = "Tool data available"
+                    summary_data = "DeFi protocols data available"
+                elif "etherscan_data" in suggested_tools:
+                    summary_data = "Ethereum blockchain data available"
                 
                 final_response = f"""## {query.split()[0]} Analysis
 
-**Quick Summary**: {btc_data}
+**Quick Summary**: {summary_data}
 
 The system successfully gathered data from {len(suggested_tools)} tools:
 {', '.join(suggested_tools)}
@@ -502,8 +510,14 @@ Respond with only the tool names, comma-separated (no explanations)."""
                 )
                 logger.info(f"🎯 Gemini final response preview: {str(final_response)[:300]}...")
                 
+                # Extract content from Gemini response object
+                if hasattr(final_response, 'content'):
+                    response_content = final_response.content
+                else:
+                    response_content = str(final_response)
+                
                 # AI Safety Check: Validate response
-                clean_response, response_safe, response_reason = ai_safety.validate_gemini_response(str(final_response))
+                clean_response, response_safe, response_reason = ai_safety.validate_gemini_response(response_content)
                 if not response_safe:
                     ai_safety.log_safety_event("blocked_gemini_response", {
                         "reason": response_reason,

src/tools/chart_data_tool.py

@@ -271,9 +271,9 @@ class ChartDataTool(BaseTool):
                             break
                 protocols_data = filtered_protocols[:8]  # Limit to 8
             else:
-                # Get top protocols by TVL
-                protocols_data = sorted([p for p in data if p.get("tvl", 0) > 0], 
-                                      key=lambda x: x.get("tvl", 0), reverse=True)[:8]
+                # Get top protocols by TVL (filter out None values)
+                valid_protocols = [p for p in data if p.get("tvl") is not None and p.get("tvl", 0) > 0]
+                protocols_data = sorted(valid_protocols, key=lambda x: x.get("tvl", 0), reverse=True)[:8]
             
             if not protocols_data:
                 return await self._get_mock_defi_data(protocols)

test_tool_selection.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test the updated tool selection to ensure we use CryptoCompare/Etherscan instead of CoinGecko
-"""
-
-import asyncio
-import sys
-import os
-
-# Add src to path
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))
-
-from src.agent.research_agent import Web3ResearchAgent
-
-async def test_tool_selection():
-    """Test that the system prioritizes CryptoCompare and Etherscan over CoinGecko"""
-    print("🧪 Testing tool selection...")
-    
-    agent = Web3ResearchAgent()
-    
-    if not agent.enabled:
-        print("❌ Agent not enabled")
-        return False
-    
-    # Check which tools are initialized
-    tool_names = [tool.name for tool in agent.tools]
-    print(f"🛠️ Available tools: {tool_names}")
-    
-    # Verify CoinGecko is not in tools (since no API key)
-    if 'coingecko_data' in tool_names:
-        print("⚠️ CoinGecko tool is still initialized - this may cause API failures")
-    else:
-        print("✅ CoinGecko tool properly skipped (no API key)")
-    
-    # Verify we have the working tools
-    expected_tools = ['cryptocompare_data', 'etherscan_data', 'defillama_data', 'chart_data_provider']
-    working_tools = [tool for tool in expected_tools if tool in tool_names]
-    print(f"✅ Working tools available: {working_tools}")
-    
-    # Test a simple query
-    try:
-        print("\n📊 Testing Bitcoin price query...")
-        result = await agent.research_query("Analyze Bitcoin price trends", use_gemini=True)
-        
-        if result['success']:
-            print("✅ Query successful!")
-            print(f"📈 Result preview: {result['result'][:200]}...")
-            print(f"🔧 Tools used: {result.get('metadata', {}).get('tools_used', 'N/A')}")
-            return True
-        else:
-            print(f"❌ Query failed: {result.get('error', 'Unknown error')}")
-            return False
-            
-    except Exception as e:
-        print(f"❌ Test failed with exception: {e}")
-        return False
-
-async def main():
-    success = await test_tool_selection()
-    if success:
-        print("\n🎉 Tool selection test passed!")
-        return 0
-    else:
-        print("\n❌ Tool selection test failed!")
-        return 1
-
-if __name__ == "__main__":
-    exit_code = asyncio.run(main())
-    sys.exit(exit_code)