fix sending proper tool name in openai

Author: jsonbailey

packages/ai-providers/server-ai-langchain/tests/test_tracking_langgraph.py

@@ -254,12 +254,23 @@ async def test_tracks_tool_calls():
     """A tool_call event fires for each tool name found in the model response."""
     mock_ld_client = MagicMock()
     graph = _make_graph(mock_ld_client, tool_names=['get_weather'])
-    fake_response = _make_fake_response('Calling tool.', tool_call_names=['get_weather'])
 
-    tool_registry = {'get_weather': lambda location='NYC': 'sunny'}
+    # Model returns a tool call on the first invoke, then a final answer.
+    tool_response = _make_fake_response('Calling tool.', tool_call_names=['get_weather'])
+    final_response = _make_fake_response('It is sunny in NYC.')
+
+    mock_model = MagicMock()
+    mock_model.invoke.side_effect = [tool_response, final_response]
+    mock_model.bind_tools.return_value = mock_model
+
+    def get_weather(location: str = 'NYC') -> str:
+        """Return the current weather for a location."""
+        return 'sunny'
+
+    tool_registry = {'get_weather': get_weather}
 
     with patch('ldai_langchain.langgraph_agent_graph_runner.create_langchain_model',
-               return_value=_mock_model(fake_response)):
+               return_value=mock_model):
         runner = LangGraphAgentGraphRunner(graph, tool_registry)
         await runner.run('What is the weather?')
 
@@ -274,12 +285,27 @@ async def test_tracks_multiple_tool_calls():
     """One tool_call event fires per tool name in the response."""
     mock_ld_client = MagicMock()
     graph = _make_graph(mock_ld_client, tool_names=['search', 'summarize'])
-    fake_response = _make_fake_response('Done.', tool_call_names=['search', 'summarize'])
 
-    tool_registry = {'search': lambda q='': q, 'summarize': lambda text='': text}
+    # Both tools called in one response; second invoke returns a final answer.
+    tool_response = _make_fake_response('Done.', tool_call_names=['search', 'summarize'])
+    final_response = _make_fake_response('Here is the summary.')
+
+    mock_model = MagicMock()
+    mock_model.invoke.side_effect = [tool_response, final_response]
+    mock_model.bind_tools.return_value = mock_model
+
+    def search(q: str = '') -> str:
+        """Search for information."""
+        return q
+
+    def summarize(text: str = '') -> str:
+        """Summarize the given text."""
+        return text
+
+    tool_registry = {'search': search, 'summarize': summarize}
 
     with patch('ldai_langchain.langgraph_agent_graph_runner.create_langchain_model',
-               return_value=_mock_model(fake_response)):
+               return_value=mock_model):
         runner = LangGraphAgentGraphRunner(graph, tool_registry)
         await runner.run('Search and summarize.')
 

packages/ai-providers/server-ai-openai/src/ldai_openai/openai_agent_graph_runner.py

@@ -51,6 +51,7 @@ def __init__(self, graph: AgentGraphDefinition, tools: ToolRegistry):
         self._graph = graph
         self._tools = tools
         self._agent_name_map: Dict[str, str] = {}
+        self._tool_name_map: Dict[str, str] = {}
 
     async def run(self, input: Any) -> AgentGraphResult:
         """
@@ -140,6 +141,7 @@ def _build_agents(self, path: List[str], state: _RunState) -> Any:
 
         tracker = self._graph.get_tracker()
         name_map: Dict[str, str] = {}
+        tool_name_map: Dict[str, str] = {}
 
         def build_node(node: AgentGraphNode, ctx: dict) -> Any:
             node_config = node.get_config()
@@ -180,6 +182,8 @@ def build_node(node: AgentGraphNode, ctx: dict) -> Any:
                 if not tool_fn:
                     continue
 
+                # Map fn.__name__ → config key so tracked names match the AI config.
+                tool_name_map[tool_fn.__name__] = tool_name
                 agent_tools.append(function_tool(tool_fn))
 
             return Agent(
@@ -192,6 +196,7 @@ def build_node(node: AgentGraphNode, ctx: dict) -> Any:
 
         root = self._graph.reverse_traverse(fn=build_node)
         self._agent_name_map = name_map
+        self._tool_name_map = tool_name_map
         return root
 
     def _make_on_handoff(
@@ -280,8 +285,9 @@ def _flush_final_segment(
     def _track_tool_calls(self, result: Any, tracker: Any) -> None:
         """Track all tool calls from the run result, attributed to the node that called them."""
         gk = tracker.graph_key if tracker is not None else None
-        for agent_name, tool_name in get_tool_calls_from_run_items(result.new_items):
+        for agent_name, tool_fn_name in get_tool_calls_from_run_items(result.new_items):
             original_key = self._agent_name_map.get(agent_name, agent_name)
+            tool_name = self._tool_name_map.get(tool_fn_name, '')
             node = self._graph.get_node(original_key)
             if node is None:
                 continue