feat: Update OpenAI runners to implement Runner protocol returning RunnerResult #149
+144
−100
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| import json | ||
| from typing import Any, Dict, List, Optional | ||
|
|
||
| from ldai import LDMessage, log | ||
| from ldai.providers.runner import Runner | ||
| from ldai.providers.types import LDAIMetrics, RunnerResult | ||
| from openai import AsyncOpenAI | ||
|
|
||
| from ldai_openai.openai_helper import ( | ||
|
|
@@ -12,12 +12,15 @@ | |
| ) | ||
|
|
||
|
|
||
| class OpenAIModelRunner(Runner): | ||
| """ | ||
| Runner implementation for OpenAI chat completions. | ||
|
|
||
| Holds a fully-configured AsyncOpenAI client, model name, and parameters. | ||
| Returned by ``OpenAIRunnerFactory.create_model(config)``. | ||
|
|
||
| Implements the unified :class:`~ldai.providers.runner.Runner` protocol via | ||
| :meth:`run`. | ||
| """ | ||
|
|
||
| def __init__( | ||
|
|
@@ -30,13 +33,38 @@ def __init__( | |
| self._model_name = model_name | ||
| self._parameters = parameters | ||
|
|
||
|
There was a problem hiding this comment. Missing deprecated adapters breaks backward compatibility with callersMedium Severity The PR description states "Legacy   Reviewed by Cursor Bugbot for commit efeea93. Configure here. |
||
| async def run( | ||
| self, | ||
| input: Any, | ||
| output_type: Optional[Dict[str, Any]] = None, | ||
| ) -> RunnerResult: | ||
| """ | ||
| Run the OpenAI model with the given input. | ||
|
|
||
| :param input: A string prompt or a list of :class:`LDMessage` objects | ||
| :param output_type: Optional JSON schema dict requesting structured output. | ||
| When provided, ``parsed`` on the returned :class:`RunnerResult` is | ||
| populated with the parsed JSON document. | ||
| :return: :class:`RunnerResult` containing ``content``, ``metrics``, | ||
| ``raw`` and (when ``output_type`` is set) ``parsed``. | ||
| """ | ||
| messages = self._coerce_input(input) | ||
|
|
||
| if output_type is not None: | ||
| return await self._run_structured(messages, output_type) | ||
| return await self._run_completion(messages) | ||
|
|
||
| @staticmethod | ||
| def _coerce_input(input: Any) -> List[LDMessage]: | ||
| if isinstance(input, str): | ||
| return [LDMessage(role='user', content=input)] | ||
| if isinstance(input, list): | ||
| return input | ||
| raise TypeError( | ||
| f"Unsupported input type for OpenAIModelRunner.run: {type(input).__name__}" | ||
| ) | ||
|
|
||
| async def _run_completion(self, messages: List[LDMessage]) -> RunnerResult: | ||
| try: | ||
| response = await self._client.chat.completions.create( | ||
| model=self._model_name, | ||
|
|
@@ -45,40 +73,29 @@ async def invoke_model(self, messages: List[LDMessage]) -> ModelResponse: | |
| ) | ||
|
|
||
| metrics = get_ai_metrics_from_response(response) | ||
| content = self._extract_content(response) | ||
|
|
||
| if not content: | ||
| log.warning('OpenAI response has no content available') | ||
| return RunnerResult( | ||
| content='', | ||
| metrics=LDAIMetrics(success=False, usage=metrics.usage), | ||
| raw=response, | ||
| ) | ||
|
|
||
| return RunnerResult(content=content, metrics=metrics, raw=response) | ||
| except Exception as error: | ||
| log.warning(f'OpenAI model invocation failed: {error}') | ||
| return RunnerResult( | ||
| content='', | ||
| metrics=LDAIMetrics(success=False, usage=None), | ||
| ) | ||
|
|
||
| async def _run_structured( | ||
| self, | ||
| messages: List[LDMessage], | ||
| output_type: Dict[str, Any], | ||
| ) -> RunnerResult: | ||
| try: | ||
| response = await self._client.chat.completions.create( | ||
| model=self._model_name, | ||
|
|
@@ -87,43 +104,50 @@ async def invoke_structured_model( | |
| 'type': 'json_schema', | ||
| 'json_schema': { | ||
| 'name': 'structured_output', | ||
| 'schema': output_type, | ||
| 'strict': True, | ||
| }, | ||
| }, | ||
| **self._parameters, | ||
| ) | ||
|
|
||
| metrics = get_ai_metrics_from_response(response) | ||
| content = self._extract_content(response) | ||
|
|
||
| if not content: | ||
| log.warning('OpenAI structured response has no content available') | ||
| return RunnerResult( | ||
| content='', | ||
| metrics=LDAIMetrics(success=False, usage=metrics.usage), | ||
| raw=response, | ||
| ) | ||
|
|
||
| try: | ||
| parsed = json.loads(content) | ||
| return RunnerResult( | ||
| content=content, | ||
| metrics=metrics, | ||
| raw=response, | ||
| parsed=parsed, | ||
| ) | ||
| except json.JSONDecodeError as parse_error: | ||
| log.warning(f'OpenAI structured response contains invalid JSON: {parse_error}') | ||
| return RunnerResult( | ||
| content=content, | ||
| metrics=LDAIMetrics(success=False, usage=metrics.usage), | ||
| raw=response, | ||
| ) | ||
| except Exception as error: | ||
| log.warning(f'OpenAI structured model invocation failed: {error}') | ||
| return RunnerResult( | ||
| content='', | ||
| metrics=LDAIMetrics(success=False, usage=None), | ||
| ) | ||
|
|
||
| @staticmethod | ||
| def _extract_content(response: Any) -> str: | ||
| if response.choices and len(response.choices) > 0: | ||
| message = response.choices[0].message | ||
| if message and message.content: | ||
| return message.content | ||
| return '' | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agent runner reports function names instead of config keys
Medium Severity
The
tool_callslist inLDAIMetricsis populated with raw runtime names fromget_tool_calls_from_run_items(which returns Python__name__values for custom function tools), rather than the LD config key names. The graph runner correctly builds a_tool_name_map(mappingfn.__name__→ config key) and uses it when tracking tool calls. The agent runner lacks this mapping, so it reports e.g.my_weather_functioninstead of the config nameget-weather. This is inconsistent with the graph runner and with the tracker's documented semantics ("List of tool keys that were invoked").Reviewed by Cursor Bugbot for commit 2878bda. Configure here.