removed old tools

Author: cemde

examples/5_a_day_benchmark/five_a_day_benchmark.py

@@ -232,23 +232,21 @@ def create_tools(self) -> list:
         return tools_list
 
     def _convert_tool(self, base_tool):
-        """Convert BaseTool to framework-specific tool type.
+        """Convert BaseTool to framework-specific tool adapter.
 
         Args:
             base_tool: BaseTool instance
 
         Returns:
-            Framework-specific tool object with tracing preserved
+            Tool adapter with gather_traces() for tracing support.
+            For smolagents: SmolagentsToolAdapter (has .tool attribute for raw Tool)
+            For langgraph: LangGraphToolAdapter (has .tool attribute for StructuredTool)
+            For llamaindex: LlamaIndexToolAdapter (has .tool attribute for FunctionTool)
         """
         if self.framework == "smolagents":
-            adapter = base_tool.to_smolagents()
-            # Return the actual tool, not the adapter
-            # The adapter has a .tool attribute with the smolagents Tool instance
-            return adapter.tool if hasattr(adapter, "tool") else adapter
+            return base_tool.to_smolagents()
         elif self.framework == "langgraph":
-            adapter = base_tool.to_langgraph()
-            # LangGraph adapter already returns the StructuredTool directly
-            return adapter
+            return base_tool.to_langgraph()
         elif self.framework == "llamaindex":
             return base_tool.to_llamaindex()
         else:
@@ -339,7 +337,7 @@ def _setup_single_agent(
         temperature: float,
     ) -> tuple[List[AgentAdapter], Dict[str, AgentAdapter]]:
         """Setup a single agent with all tools."""
-        tools = environment.get_tools()
+        tool_adapters = environment.get_tools()
         agent_spec = agent_data["agent"]
 
         # Sanitize agent name to be a valid Python identifier for smolagents
@@ -351,6 +349,9 @@ def _setup_single_agent(
             # Create smolagents model
             model = get_model(model_id, framework, temperature)
 
+            # Extract raw smolagents Tool objects from adapters
+            tools = [adapter.tool for adapter in tool_adapters]
+
             # Create agent
             agent = ToolCallingAgent(
                 model=model,
@@ -375,6 +376,9 @@ def _setup_single_agent(
             # Create LangChain model
             model = get_model(model_id, framework, temperature)
 
+            # Extract raw LangChain StructuredTool objects from adapters
+            tools = [adapter.tool for adapter in tool_adapters]
+
             # Create agent graph
             class AgentState(TypedDict):
                 messages: Annotated[List[Any], add_messages]
@@ -412,6 +416,9 @@ def call_model(state: AgentState):
             # Create LlamaIndex LiteLLM model (supports Gemini via 'gemini/' prefix)
             model = get_model(model_id, framework, temperature)
 
+            # Extract raw LlamaIndex FunctionTool objects from adapters
+            tools = [adapter.tool for adapter in tool_adapters]
+
             # Create ReActAgent with tools
             agent = ReActAgent.from_tools(
                 tools=tools,
@@ -463,7 +470,8 @@ def _setup_multi_agent(
 
             # Create specialist agents
             specialist_agents = []
-            all_tools = environment.get_tools()
+            all_tool_adapters = environment.get_tools()
+            all_tools = [adapter.tool for adapter in all_tool_adapters]
 
             for agent_spec in specialist_specs:
                 # Get tools for this specialist
@@ -521,7 +529,8 @@ class MultiAgentState(TypedDict):
                 messages: Annotated[List[Any], add_messages]
                 next_agent: str
 
-            all_tools = environment.get_tools()
+            all_tool_adapters = environment.get_tools()
+            all_tools = [adapter.tool for adapter in all_tool_adapters]
 
             # Create specialist agent nodes
             specialist_nodes = {}
@@ -628,7 +637,8 @@ def route_to_specialist(state: MultiAgentState) -> Literal["orchestrator", "__en
             # Create LlamaIndex LiteLLM model (supports Gemini via 'gemini/' prefix)
             model = get_model(model_id, framework, temperature)
 
-            all_tools = environment.get_tools()
+            all_tool_adapters = environment.get_tools()
+            all_tools = [adapter.tool for adapter in all_tool_adapters]
 
             # Create specialist agents
             specialist_agents_dict = {}

examples/5_a_day_benchmark/tools/__init__.py

@@ -10,7 +10,6 @@
 from .calendar import CalendarToolCollection
 from .fitness import RunningAppToolCollection, GymTrackerToolCollection
 from .hotel_search import HotelSearchToolCollection
-from .factory import ToolFactory
 from .mcp_calendar import MCPCalendarToolCollection
 
 __all__ = [
@@ -27,6 +26,5 @@
     "RunningAppToolCollection",
     "GymTrackerToolCollection",
     "HotelSearchToolCollection",
-    "ToolFactory",
     "MCPCalendarToolCollection",
 ]

examples/5_a_day_benchmark/tools/banking_old.py

@@ -197,7 +197,7 @@ def to_langgraph(self) -> Any:
         except ImportError as e:
             raise ImportError("langchain is not installed. Install it with: pip install maseval[langgraph]") from e
 
-        return LangGraphToolAdapter(self).tool
+        return LangGraphToolAdapter(self)
 
     def to_llamaindex(self) -> Any:
         """Convert to LlamaIndex FunctionTool."""
@@ -206,7 +206,7 @@ def to_llamaindex(self) -> Any:
         except ImportError as e:
             raise ImportError("llamaindex is not installed. Install it with: pip install llama-index-core") from e
 
-        return LlamaIndexToolAdapter(self).tool
+        return LlamaIndexToolAdapter(self)
 
 
 class SmolagentsToolAdapter(TraceableMixin, ConfigurableMixin):
@@ -224,9 +224,13 @@ def __init__(self, base_tool: BaseTool):
 
         self.base_tool = base_tool
 
+        # Sanitize tool name to be a valid Python identifier for smolagents
+        # Replace dots with underscores (email.get_inbox -> email_get_inbox)
+        sanitized_tool_name = base_tool.name.replace(".", "_").replace("-", "_")
+
         # Create a dynamic smolagents Tool class
         class DynamicSmolagentsTool(SmolagentsTool):
-            name = base_tool.name
+            name = sanitized_tool_name
             description = base_tool.description
             # Use specific tool arguments (excluding 'action' which is smolagents internal)
             inputs = base_tool.tool_args