fix: add deprecated invoke_model shims and translate tool names to LD config keys in OpenAIAgentRunner

Author: jsonbailey

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

@@ -8,6 +8,7 @@
 from ldai_openai.openai_helper import (
     get_ai_usage_from_response,
     get_tool_calls_from_run_items,
+    is_agent_tool_instance,
     registry_value_to_agent_tool,
 )
 
@@ -42,6 +43,7 @@ def __init__(
         self._instructions = instructions
         self._tool_definitions = tool_definitions
         self._tools = tools
+        self._tool_name_map: Dict[str, str] = {}
 
     async def run(
         self,
@@ -87,8 +89,10 @@ async def run(
             result = await Runner.run(agent, str(input), max_turns=25)
 
             tool_calls = [
-                tool_name
-                for _agent_name, tool_name in get_tool_calls_from_run_items(result.new_items)
+                ld_name
+                for _agent_name, tool_fn_name in get_tool_calls_from_run_items(result.new_items)
+                for ld_name in [self._tool_name_map.get(tool_fn_name)]
+                if ld_name is not None
             ]
 
             return RunnerResult(
@@ -108,8 +112,14 @@ async def run(
             )
 
     def _build_agent_tools(self) -> List[Any]:
-        """Build tool instances from LD tool definitions and registry."""
+        """Build tool instances from LD tool definitions and registry.
+
+        Also populates ``self._tool_name_map`` so observed tool-call names
+        from the runtime can be translated back to their LD config keys for
+        metric reporting.
+        """
         tools = []
+        self._tool_name_map = {}
         for td in self._tool_definitions:
             if not isinstance(td, dict):
                 continue
@@ -119,6 +129,12 @@ def _build_agent_tools(self) -> List[Any]:
 
             tool_fn = self._tools.get(name)
             if tool_fn:
+                # Map runtime tool name → LD config key for metrics (function __name__
+                # for callables; identity for native tool instances — see get_tool_calls_from_run_items).
+                if is_agent_tool_instance(tool_fn):
+                    self._tool_name_map[tool_fn.name] = name
+                else:
+                    self._tool_name_map[tool_fn.__name__] = name
                 tools.append(registry_value_to_agent_tool(tool_fn))
                 continue
 

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

@@ -151,3 +151,44 @@ def _extract_content(response: Any) -> str:
             if message and message.content:
                 return message.content
         return ''
+
+    async def invoke_model(self, messages: List[LDMessage]) -> 'ModelResponse':
+        """
+        .. deprecated::
+            Use :meth:`run` instead.
+        """
+        import warnings
+
+        from ldai.providers.types import ModelResponse
+        warnings.warn(
+            "invoke_model is deprecated; use run() instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        result = await self.run(messages)
+        return ModelResponse(
+            message=LDMessage(role='assistant', content=result.content),
+            metrics=result.metrics,
+        )
+
+    async def invoke_structured_model(
+        self, messages: List[LDMessage], schema: Any
+    ) -> 'StructuredResponse':
+        """
+        .. deprecated::
+            Use :meth:`run` with ``output_type`` instead.
+        """
+        import warnings
+
+        from ldai.providers.types import StructuredResponse
+        warnings.warn(
+            "invoke_structured_model is deprecated; use run(output_type=...) instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        result = await self.run(messages, output_type=schema)
+        return StructuredResponse(
+            data=result.parsed or {},
+            raw_response=result.content,
+            metrics=result.metrics,
+        )