Merge pull request #928 from MervinPraison/claude/issue-926-20250715_112808

refactor: inline Gemini internal tools detection logic

Author: MervinPraison

src/praisonai-agents/praisonaiagents/llm/llm.py

@@ -17,7 +17,6 @@
     ReflectionOutput,
     execute_sync_callback,
 )
-from .model_capabilities import is_gemini_internal_tool
 from rich.console import Console
 from rich.live import Live
 
@@ -651,10 +650,14 @@ def _format_tools_for_litellm(self, tools: Optional[List[Any]]) -> Optional[List
                 if tool_def:
                     formatted_tools.append(tool_def)
             # Handle Gemini internal tools (e.g., {"googleSearch": {}}, {"urlContext": {}}, {"codeExecution": {}})
-            elif is_gemini_internal_tool(tool):
+            elif isinstance(tool, dict) and len(tool) == 1:
                 tool_name = next(iter(tool.keys()))
-                logging.debug(f"Using Gemini internal tool: {tool_name}")
-                formatted_tools.append(tool)
+                gemini_internal_tools = {'googleSearch', 'urlContext', 'codeExecution'}
+                if tool_name in gemini_internal_tools:
+                    logging.debug(f"Using Gemini internal tool: {tool_name}")
+                    formatted_tools.append(tool)
+                else:
+                    logging.debug(f"Skipping unknown tool: {tool_name}")
             else:
                 logging.debug(f"Skipping tool of unsupported type: {type(tool)}")
 

src/praisonai-agents/praisonaiagents/llm/openai_client.py

@@ -18,7 +18,6 @@
 from rich.console import Console
 from rich.live import Live
 import inspect
-from .model_capabilities import is_gemini_internal_tool
 
 # Constants
 LOCAL_SERVER_API_KEY_PLACEHOLDER = "not-needed"
@@ -407,10 +406,14 @@ def format_tools(self, tools: Optional[List[Any]]) -> Optional[List[Dict]]:
                 if tool_def:
                     formatted_tools.append(tool_def)
             # Handle Gemini internal tools (e.g., {"googleSearch": {}}, {"urlContext": {}}, {"codeExecution": {}})
-            elif is_gemini_internal_tool(tool):
+            elif isinstance(tool, dict) and len(tool) == 1:
                 tool_name = next(iter(tool.keys()))
-                logging.debug(f"Using Gemini internal tool: {tool_name}")
-                formatted_tools.append(tool)
+                gemini_internal_tools = {'googleSearch', 'urlContext', 'codeExecution'}
+                if tool_name in gemini_internal_tools:
+                    logging.debug(f"Using Gemini internal tool: {tool_name}")
+                    formatted_tools.append(tool)
+                else:
+                    logging.debug(f"Skipping unknown tool: {tool_name}")
             else:
                 logging.debug(f"Skipping tool of unsupported type: {type(tool)}")
 

test_gemini_tools.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+"""Test script to verify the refactored Gemini tools logic."""
+
+import logging
+import sys
+import os
+
+# Setup logging to see debug messages
+logging.basicConfig(level=logging.DEBUG, format='%(levelname)s: %(message)s')
+
+# Add the src directory to the Python path
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src', 'praisonai-agents'))
+
+try:
+    from praisonaiagents.llm.llm import LLM
+    from praisonaiagents.llm.openai_client import OpenAIClient
+    
+    print("Testing LLM tool formatting...")
+    llm = LLM(model="gpt-4o-mini")
+    tools = [
+        {'googleSearch': {}},  # Valid Gemini tool
+        {'urlContext': {}},    # Valid Gemini tool  
+        {'codeExecution': {}}, # Valid Gemini tool
+        {'unknown': {}}        # Invalid tool - should be skipped
+    ]
+    
+    formatted = llm._format_tools_for_litellm(tools)
+    print(f"LLM formatted tools ({len(formatted)} tools):", formatted)
+    
+    print("\nTesting OpenAI client tool formatting...")
+    client = OpenAIClient(api_key="not-needed")
+    formatted = client.format_tools(tools)
+    print(f"OpenAI client formatted tools ({len(formatted)} tools):", formatted)
+    
+    print("\nTest completed successfully!")
+    
+except Exception as e:
+    import traceback
+    print(f"Error: {e}")
+    traceback.print_exc()