From a95c4d0952ff5eb767206574e687cb029a49a4ab Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Sat, 13 Dec 2025 00:06:47 +0000 Subject: [PATCH 1/3] feat(api): api update --- .stats.yml | 4 +- src/openai/types/eval_create_params.py | 57 +++++++++++++++-- ...create_eval_completions_run_data_source.py | 57 +++++++++++++++-- ..._eval_completions_run_data_source_param.py | 58 +++++++++++++++-- src/openai/types/evals/run_cancel_response.py | 59 ++++++++++++++++-- src/openai/types/evals/run_create_params.py | 59 ++++++++++++++++-- src/openai/types/evals/run_create_response.py | 59 ++++++++++++++++-- src/openai/types/evals/run_list_response.py | 59 ++++++++++++++++-- .../types/evals/run_retrieve_response.py | 59 ++++++++++++++++-- .../types/graders/label_model_grader.py | 62 +++++++++++++++++-- .../types/graders/label_model_grader_param.py | 59 ++++++++++++++++-- .../types/graders/score_model_grader.py | 56 +++++++++++++++-- .../types/graders/score_model_grader_param.py | 54 ++++++++++++++-- src/openai/types/video_model.py | 4 +- 14 files changed, 633 insertions(+), 73 deletions(-) diff --git a/.stats.yml b/.stats.yml index 4e5b38902d..595620b8ac 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 137 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-41f98da99f44ebe6204fce5c1dc9940f85f3472779e797b674c4fdc20306c77d.yml -openapi_spec_hash: c61259027f421f501bdc6b23cf9e430e +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-386042697a8769999956bdc26ff1e70bfc2a56913f724eedc6bfaf82679e9956.yml +openapi_spec_hash: 7072a6a4a43d7ff0bb4098a3e8a6b9a7 config_hash: 141b101c9f13b90e21af74e1686f1f41 diff --git a/src/openai/types/eval_create_params.py b/src/openai/types/eval_create_params.py index 0f2100b718..bfb39568c2 100644 --- a/src/openai/types/eval_create_params.py +++ b/src/openai/types/eval_create_params.py @@ -27,7 +27,10 @@ "TestingCriterionLabelModelInputEvalItem", "TestingCriterionLabelModelInputEvalItemContent", "TestingCriterionLabelModelInputEvalItemContentOutputText", - "TestingCriterionLabelModelInputEvalItemContentInputImage", + "TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage", + "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "TestingCriterionTextSimilarity", "TestingCriterionPython", "TestingCriterionScoreModel", @@ -128,8 +131,8 @@ class TestingCriterionLabelModelInputEvalItemContentOutputText(TypedDict, total= """The type of the output text. Always `output_text`.""" -class TestingCriterionLabelModelInputEvalItemContentInputImage(TypedDict, total=False): - """An image input to the model.""" +class TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" image_url: Required[str] """The URL of the image input.""" @@ -144,13 +147,51 @@ class TestingCriterionLabelModelInputEvalItemContentInputImage(TypedDict, total= """ +class TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + TypedDict, total=False +): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + TypedDict, total=False +): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputTextParam, + TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudioParam, +] + TestingCriterionLabelModelInputEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, TestingCriterionLabelModelInputEvalItemContentOutputText, - TestingCriterionLabelModelInputEvalItemContentInputImage, + TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage, ResponseInputAudioParam, - Iterable[object], + SequenceNotStr[TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -164,7 +205,11 @@ class TestingCriterionLabelModelInputEvalItem(TypedDict, total=False): """ content: Required[TestingCriterionLabelModelInputEvalItemContent] - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Required[Literal["user", "assistant", "system", "developer"]] """The role of the message input. diff --git a/src/openai/types/evals/create_eval_completions_run_data_source.py b/src/openai/types/evals/create_eval_completions_run_data_source.py index cc88450276..34118c0dfb 100644 --- a/src/openai/types/evals/create_eval_completions_run_data_source.py +++ b/src/openai/types/evals/create_eval_completions_run_data_source.py @@ -28,7 +28,10 @@ "InputMessagesTemplateTemplateEvalItem", "InputMessagesTemplateTemplateEvalItemContent", "InputMessagesTemplateTemplateEvalItemContentOutputText", - "InputMessagesTemplateTemplateEvalItemContentInputImage", + "InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "InputMessagesItemReference", "SamplingParams", "SamplingParamsResponseFormat", @@ -101,8 +104,8 @@ class InputMessagesTemplateTemplateEvalItemContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): - """An image input to the model.""" +class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -117,13 +120,51 @@ class InputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """ +class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + BaseModel +): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + BaseModel +): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + InputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, InputMessagesTemplateTemplateEvalItemContentOutputText, - InputMessagesTemplateTemplateEvalItemContentInputImage, + InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudio, - List[object], + List[InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -137,7 +178,11 @@ class InputMessagesTemplateTemplateEvalItem(BaseModel): """ content: InputMessagesTemplateTemplateEvalItemContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/evals/create_eval_completions_run_data_source_param.py b/src/openai/types/evals/create_eval_completions_run_data_source_param.py index bab2658afe..64c4844d43 100644 --- a/src/openai/types/evals/create_eval_completions_run_data_source_param.py +++ b/src/openai/types/evals/create_eval_completions_run_data_source_param.py @@ -5,6 +5,7 @@ from typing import Dict, Union, Iterable, Optional from typing_extensions import Literal, Required, TypeAlias, TypedDict +from ..._types import SequenceNotStr from ..shared_params.metadata import Metadata from ..shared.reasoning_effort import ReasoningEffort from ..responses.easy_input_message_param import EasyInputMessageParam @@ -28,7 +29,10 @@ "InputMessagesTemplateTemplateEvalItem", "InputMessagesTemplateTemplateEvalItemContent", "InputMessagesTemplateTemplateEvalItemContentOutputText", - "InputMessagesTemplateTemplateEvalItemContentInputImage", + "InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "InputMessagesItemReference", "SamplingParams", "SamplingParamsResponseFormat", @@ -99,8 +103,8 @@ class InputMessagesTemplateTemplateEvalItemContentOutputText(TypedDict, total=Fa """The type of the output text. Always `output_text`.""" -class InputMessagesTemplateTemplateEvalItemContentInputImage(TypedDict, total=False): - """An image input to the model.""" +class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" image_url: Required[str] """The URL of the image input.""" @@ -115,13 +119,51 @@ class InputMessagesTemplateTemplateEvalItemContentInputImage(TypedDict, total=Fa """ +class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + TypedDict, total=False +): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + TypedDict, total=False +): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputTextParam, + InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudioParam, +] + InputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, InputMessagesTemplateTemplateEvalItemContentOutputText, - InputMessagesTemplateTemplateEvalItemContentInputImage, + InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudioParam, - Iterable[object], + SequenceNotStr[InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -135,7 +177,11 @@ class InputMessagesTemplateTemplateEvalItem(TypedDict, total=False): """ content: Required[InputMessagesTemplateTemplateEvalItemContent] - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Required[Literal["user", "assistant", "system", "developer"]] """The role of the message input. diff --git a/src/openai/types/evals/run_cancel_response.py b/src/openai/types/evals/run_cancel_response.py index 6ad874b2b3..791b1f0444 100644 --- a/src/openai/types/evals/run_cancel_response.py +++ b/src/openai/types/evals/run_cancel_response.py @@ -33,7 +33,10 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -155,8 +158,8 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): - """An image input to the model.""" +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -171,13 +174,53 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage( """ +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + BaseModel +): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + BaseModel +): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudio, - List[object], + List[ + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio + ], ] @@ -191,7 +234,11 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItem(BaseModel): """ content: DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/evals/run_create_params.py b/src/openai/types/evals/run_create_params.py index fd7d56e39d..0717f2ee20 100644 --- a/src/openai/types/evals/run_create_params.py +++ b/src/openai/types/evals/run_create_params.py @@ -31,7 +31,10 @@ "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItem", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContent", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage", + "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesItemReference", "DataSourceCreateEvalResponsesRunDataSourceSamplingParams", "DataSourceCreateEvalResponsesRunDataSourceSamplingParamsText", @@ -171,10 +174,10 @@ class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEva """The type of the output text. Always `output_text`.""" -class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage( +class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage( TypedDict, total=False ): - """An image input to the model.""" + """An image input block used within EvalItem content arrays.""" image_url: Required[str] """The URL of the image input.""" @@ -189,13 +192,53 @@ class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEva """ +class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + TypedDict, total=False +): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + TypedDict, total=False +): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputTextParam, + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudioParam, +] + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage, + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudioParam, - Iterable[object], + SequenceNotStr[ + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio + ], ] @@ -209,7 +252,11 @@ class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEva """ content: Required[DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContent] - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Required[Literal["user", "assistant", "system", "developer"]] """The role of the message input. diff --git a/src/openai/types/evals/run_create_response.py b/src/openai/types/evals/run_create_response.py index 1651cb5b2f..a860bd178a 100644 --- a/src/openai/types/evals/run_create_response.py +++ b/src/openai/types/evals/run_create_response.py @@ -33,7 +33,10 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -155,8 +158,8 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): - """An image input to the model.""" +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -171,13 +174,53 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage( """ +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + BaseModel +): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + BaseModel +): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudio, - List[object], + List[ + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio + ], ] @@ -191,7 +234,11 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItem(BaseModel): """ content: DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/evals/run_list_response.py b/src/openai/types/evals/run_list_response.py index 9ec84330cf..aee471e2b6 100644 --- a/src/openai/types/evals/run_list_response.py +++ b/src/openai/types/evals/run_list_response.py @@ -33,7 +33,10 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -155,8 +158,8 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): - """An image input to the model.""" +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -171,13 +174,53 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage( """ +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + BaseModel +): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + BaseModel +): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudio, - List[object], + List[ + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio + ], ] @@ -191,7 +234,11 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItem(BaseModel): """ content: DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/evals/run_retrieve_response.py b/src/openai/types/evals/run_retrieve_response.py index 9204635d1e..ff3564de54 100644 --- a/src/openai/types/evals/run_retrieve_response.py +++ b/src/openai/types/evals/run_retrieve_response.py @@ -33,7 +33,10 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -155,8 +158,8 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): - """An image input to the model.""" +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -171,13 +174,53 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage( """ +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( + BaseModel +): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( + BaseModel +): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, ResponseInputAudio, - List[object], + List[ + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio + ], ] @@ -191,7 +234,11 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItem(BaseModel): """ content: DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/graders/label_model_grader.py b/src/openai/types/graders/label_model_grader.py index 141306b510..def3dd7602 100644 --- a/src/openai/types/graders/label_model_grader.py +++ b/src/openai/types/graders/label_model_grader.py @@ -7,7 +7,16 @@ from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio -__all__ = ["LabelModelGrader", "Input", "InputContent", "InputContentOutputText", "InputContentInputImage"] +__all__ = [ + "LabelModelGrader", + "Input", + "InputContent", + "InputContentOutputText", + "InputContentEvalItemInputImage", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", +] class InputContentOutputText(BaseModel): @@ -20,8 +29,34 @@ class InputContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputContentInputImage(BaseModel): - """An image input to the model.""" +class InputContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(BaseModel): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -36,8 +71,21 @@ class InputContentInputImage(BaseModel): """ +InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + InputContent: TypeAlias = Union[ - str, ResponseInputText, InputContentOutputText, InputContentInputImage, ResponseInputAudio, List[object] + str, + ResponseInputText, + InputContentOutputText, + InputContentEvalItemInputImage, + ResponseInputAudio, + List[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -51,7 +99,11 @@ class Input(BaseModel): """ content: InputContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/graders/label_model_grader_param.py b/src/openai/types/graders/label_model_grader_param.py index a23be2a236..6b6faa465d 100644 --- a/src/openai/types/graders/label_model_grader_param.py +++ b/src/openai/types/graders/label_model_grader_param.py @@ -9,7 +9,16 @@ from ..responses.response_input_text_param import ResponseInputTextParam from ..responses.response_input_audio_param import ResponseInputAudioParam -__all__ = ["LabelModelGraderParam", "Input", "InputContent", "InputContentOutputText", "InputContentInputImage"] +__all__ = [ + "LabelModelGraderParam", + "Input", + "InputContent", + "InputContentOutputText", + "InputContentEvalItemInputImage", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", +] class InputContentOutputText(TypedDict, total=False): @@ -22,8 +31,8 @@ class InputContentOutputText(TypedDict, total=False): """The type of the output text. Always `output_text`.""" -class InputContentInputImage(TypedDict, total=False): - """An image input to the model.""" +class InputContentEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" image_url: Required[str] """The URL of the image input.""" @@ -38,13 +47,47 @@ class InputContentInputImage(TypedDict, total=False): """ +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(TypedDict, total=False): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputTextParam, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudioParam, +] + InputContent: TypeAlias = Union[ str, ResponseInputTextParam, InputContentOutputText, - InputContentInputImage, + InputContentEvalItemInputImage, ResponseInputAudioParam, - Iterable[object], + SequenceNotStr[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -58,7 +101,11 @@ class Input(TypedDict, total=False): """ content: Required[InputContent] - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Required[Literal["user", "assistant", "system", "developer"]] """The role of the message input. diff --git a/src/openai/types/graders/score_model_grader.py b/src/openai/types/graders/score_model_grader.py index bceb8b1ad0..7787c82bb6 100644 --- a/src/openai/types/graders/score_model_grader.py +++ b/src/openai/types/graders/score_model_grader.py @@ -13,7 +13,10 @@ "Input", "InputContent", "InputContentOutputText", - "InputContentInputImage", + "InputContentEvalItemInputImage", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "SamplingParams", ] @@ -28,8 +31,8 @@ class InputContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputContentInputImage(BaseModel): - """An image input to the model.""" +class InputContentEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" image_url: str """The URL of the image input.""" @@ -44,8 +47,47 @@ class InputContentInputImage(BaseModel): """ +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(BaseModel): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudio, +] + InputContent: TypeAlias = Union[ - str, ResponseInputText, InputContentOutputText, InputContentInputImage, ResponseInputAudio, List[object] + str, + ResponseInputText, + InputContentOutputText, + InputContentEvalItemInputImage, + ResponseInputAudio, + List[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -59,7 +101,11 @@ class Input(BaseModel): """ content: InputContent - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Literal["user", "assistant", "system", "developer"] """The role of the message input. diff --git a/src/openai/types/graders/score_model_grader_param.py b/src/openai/types/graders/score_model_grader_param.py index bd08645a85..1f9475d885 100644 --- a/src/openai/types/graders/score_model_grader_param.py +++ b/src/openai/types/graders/score_model_grader_param.py @@ -5,6 +5,7 @@ from typing import Union, Iterable, Optional from typing_extensions import Literal, Required, TypeAlias, TypedDict +from ..._types import SequenceNotStr from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text_param import ResponseInputTextParam from ..responses.response_input_audio_param import ResponseInputAudioParam @@ -14,7 +15,10 @@ "Input", "InputContent", "InputContentOutputText", - "InputContentInputImage", + "InputContentEvalItemInputImage", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", + "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", "SamplingParams", ] @@ -29,8 +33,8 @@ class InputContentOutputText(TypedDict, total=False): """The type of the output text. Always `output_text`.""" -class InputContentInputImage(TypedDict, total=False): - """An image input to the model.""" +class InputContentEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" image_url: Required[str] """The URL of the image input.""" @@ -45,13 +49,47 @@ class InputContentInputImage(TypedDict, total=False): """ +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(TypedDict, total=False): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ + str, + ResponseInputTextParam, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, + InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, + ResponseInputAudioParam, +] + InputContent: TypeAlias = Union[ str, ResponseInputTextParam, InputContentOutputText, - InputContentInputImage, + InputContentEvalItemInputImage, ResponseInputAudioParam, - Iterable[object], + SequenceNotStr[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], ] @@ -65,7 +103,11 @@ class Input(TypedDict, total=False): """ content: Required[InputContent] - """Inputs to the model - can contain template strings.""" + """Inputs to the model - can contain template strings. + + Supports text, output text, input images, and input audio, either as a single + item or an array of items. + """ role: Required[Literal["user", "assistant", "system", "developer"]] """The role of the message input. diff --git a/src/openai/types/video_model.py b/src/openai/types/video_model.py index 0b0835fca4..e96e7685f8 100644 --- a/src/openai/types/video_model.py +++ b/src/openai/types/video_model.py @@ -4,4 +4,6 @@ __all__ = ["VideoModel"] -VideoModel: TypeAlias = Literal["sora-2", "sora-2-pro"] +VideoModel: TypeAlias = Literal[ + "sora-2", "sora-2-pro", "sora-2-2025-10-06", "sora-2-pro-2025-10-06", "sora-2-2025-12-08" +] From b2c389bf5c3bde50bac2d9f60cce58f4aef44a41 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Sat, 13 Dec 2025 03:23:48 +0000 Subject: [PATCH 2/3] feat(api): fix grader input list, add dated slugs for sora-2 --- .stats.yml | 6 +- api.md | 1 + src/openai/types/eval_create_params.py | 50 ++--------------- ...create_eval_completions_run_data_source.py | 50 ++--------------- ..._eval_completions_run_data_source_param.py | 51 ++--------------- src/openai/types/evals/run_cancel_response.py | 52 ++---------------- src/openai/types/evals/run_create_params.py | 52 ++---------------- src/openai/types/evals/run_create_response.py | 52 ++---------------- src/openai/types/evals/run_list_response.py | 52 ++---------------- .../types/evals/run_retrieve_response.py | 52 ++---------------- src/openai/types/graders/__init__.py | 2 + src/openai/types/graders/grader_inputs.py | 43 +++++++++++++++ .../types/graders/grader_inputs_param.py | 53 ++++++++++++++++++ .../types/graders/label_model_grader.py | 55 ++----------------- .../types/graders/label_model_grader_param.py | 52 ++---------------- .../types/graders/score_model_grader.py | 49 ++--------------- .../types/graders/score_model_grader_param.py | 47 ++-------------- 17 files changed, 160 insertions(+), 559 deletions(-) create mode 100644 src/openai/types/graders/grader_inputs.py create mode 100644 src/openai/types/graders/grader_inputs_param.py diff --git a/.stats.yml b/.stats.yml index 595620b8ac..2d7e7248c7 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 137 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-386042697a8769999956bdc26ff1e70bfc2a56913f724eedc6bfaf82679e9956.yml -openapi_spec_hash: 7072a6a4a43d7ff0bb4098a3e8a6b9a7 -config_hash: 141b101c9f13b90e21af74e1686f1f41 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-fe8e67bdc351a518b113ab48e775750190e207807903d6b03ab22c438c38a588.yml +openapi_spec_hash: 8af972190647ffb9dcec516e19d8761a +config_hash: 856bee50ee3617e85a9bc9274db01dbb diff --git a/api.md b/api.md index 3807603206..1c054b52fc 100644 --- a/api.md +++ b/api.md @@ -342,6 +342,7 @@ Types: ```python from openai.types.graders import ( + GraderInputs, LabelModelGrader, MultiGrader, PythonGrader, diff --git a/src/openai/types/eval_create_params.py b/src/openai/types/eval_create_params.py index bfb39568c2..a1d5ea5371 100644 --- a/src/openai/types/eval_create_params.py +++ b/src/openai/types/eval_create_params.py @@ -7,6 +7,7 @@ from .._types import SequenceNotStr from .shared_params.metadata import Metadata +from .graders.grader_inputs_param import GraderInputsParam from .graders.python_grader_param import PythonGraderParam from .graders.score_model_grader_param import ScoreModelGraderParam from .graders.string_check_grader_param import StringCheckGraderParam @@ -27,10 +28,7 @@ "TestingCriterionLabelModelInputEvalItem", "TestingCriterionLabelModelInputEvalItemContent", "TestingCriterionLabelModelInputEvalItemContentOutputText", - "TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage", - "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "TestingCriterionLabelModelInputEvalItemContentInputImage", "TestingCriterionTextSimilarity", "TestingCriterionPython", "TestingCriterionScoreModel", @@ -131,7 +129,7 @@ class TestingCriterionLabelModelInputEvalItemContentOutputText(TypedDict, total= """The type of the output text. Always `output_text`.""" -class TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage(TypedDict, total=False): +class TestingCriterionLabelModelInputEvalItemContentInputImage(TypedDict, total=False): """An image input block used within EvalItem content arrays.""" image_url: Required[str] @@ -147,51 +145,13 @@ class TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage(TypedDict """ -class TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - TypedDict, total=False -): - """A text output from the model.""" - - text: Required[str] - """The text output from the model.""" - - type: Required[Literal["output_text"]] - """The type of the output text. Always `output_text`.""" - - -class TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - TypedDict, total=False -): - """An image input block used within EvalItem content arrays.""" - - image_url: Required[str] - """The URL of the image input.""" - - type: Required[Literal["input_image"]] - """The type of the image input. Always `input_image`.""" - - detail: str - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputTextParam, - TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudioParam, -] - TestingCriterionLabelModelInputEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, TestingCriterionLabelModelInputEvalItemContentOutputText, - TestingCriterionLabelModelInputEvalItemContentEvalItemInputImage, + TestingCriterionLabelModelInputEvalItemContentInputImage, ResponseInputAudioParam, - SequenceNotStr[TestingCriterionLabelModelInputEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + GraderInputsParam, ] diff --git a/src/openai/types/evals/create_eval_completions_run_data_source.py b/src/openai/types/evals/create_eval_completions_run_data_source.py index 34118c0dfb..726ae6abf0 100644 --- a/src/openai/types/evals/create_eval_completions_run_data_source.py +++ b/src/openai/types/evals/create_eval_completions_run_data_source.py @@ -6,6 +6,7 @@ from ..._utils import PropertyInfo from ..._models import BaseModel from ..shared.metadata import Metadata +from ..graders.grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..shared.response_format_text import ResponseFormatText from ..responses.easy_input_message import EasyInputMessage @@ -28,10 +29,7 @@ "InputMessagesTemplateTemplateEvalItem", "InputMessagesTemplateTemplateEvalItemContent", "InputMessagesTemplateTemplateEvalItemContentOutputText", - "InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "InputMessagesTemplateTemplateEvalItemContentInputImage", "InputMessagesItemReference", "SamplingParams", "SamplingParamsResponseFormat", @@ -104,7 +102,7 @@ class InputMessagesTemplateTemplateEvalItemContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): +class InputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -120,51 +118,13 @@ class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): """ -class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - BaseModel -): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - BaseModel -): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - InputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, InputMessagesTemplateTemplateEvalItemContentOutputText, - InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + InputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudio, - List[InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + GraderInputs, ] diff --git a/src/openai/types/evals/create_eval_completions_run_data_source_param.py b/src/openai/types/evals/create_eval_completions_run_data_source_param.py index 64c4844d43..6842f84af9 100644 --- a/src/openai/types/evals/create_eval_completions_run_data_source_param.py +++ b/src/openai/types/evals/create_eval_completions_run_data_source_param.py @@ -5,9 +5,9 @@ from typing import Dict, Union, Iterable, Optional from typing_extensions import Literal, Required, TypeAlias, TypedDict -from ..._types import SequenceNotStr from ..shared_params.metadata import Metadata from ..shared.reasoning_effort import ReasoningEffort +from ..graders.grader_inputs_param import GraderInputsParam from ..responses.easy_input_message_param import EasyInputMessageParam from ..shared_params.response_format_text import ResponseFormatText from ..responses.response_input_text_param import ResponseInputTextParam @@ -29,10 +29,7 @@ "InputMessagesTemplateTemplateEvalItem", "InputMessagesTemplateTemplateEvalItemContent", "InputMessagesTemplateTemplateEvalItemContentOutputText", - "InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "InputMessagesTemplateTemplateEvalItemContentInputImage", "InputMessagesItemReference", "SamplingParams", "SamplingParamsResponseFormat", @@ -103,7 +100,7 @@ class InputMessagesTemplateTemplateEvalItemContentOutputText(TypedDict, total=Fa """The type of the output text. Always `output_text`.""" -class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(TypedDict, total=False): +class InputMessagesTemplateTemplateEvalItemContentInputImage(TypedDict, total=False): """An image input block used within EvalItem content arrays.""" image_url: Required[str] @@ -119,51 +116,13 @@ class InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(TypedDict, """ -class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - TypedDict, total=False -): - """A text output from the model.""" - - text: Required[str] - """The text output from the model.""" - - type: Required[Literal["output_text"]] - """The type of the output text. Always `output_text`.""" - - -class InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - TypedDict, total=False -): - """An image input block used within EvalItem content arrays.""" - - image_url: Required[str] - """The URL of the image input.""" - - type: Required[Literal["input_image"]] - """The type of the image input. Always `input_image`.""" - - detail: str - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputTextParam, - InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudioParam, -] - InputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, InputMessagesTemplateTemplateEvalItemContentOutputText, - InputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + InputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudioParam, - SequenceNotStr[InputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + GraderInputsParam, ] diff --git a/src/openai/types/evals/run_cancel_response.py b/src/openai/types/evals/run_cancel_response.py index 791b1f0444..ea4797eecb 100644 --- a/src/openai/types/evals/run_cancel_response.py +++ b/src/openai/types/evals/run_cancel_response.py @@ -10,6 +10,7 @@ from .eval_api_error import EvalAPIError from ..responses.tool import Tool from ..shared.metadata import Metadata +from ..graders.grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio @@ -33,10 +34,7 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -158,7 +156,7 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -174,53 +172,13 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInp """ -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - BaseModel -): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - BaseModel -): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudio, - List[ - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio - ], + GraderInputs, ] diff --git a/src/openai/types/evals/run_create_params.py b/src/openai/types/evals/run_create_params.py index 0717f2ee20..02804c30da 100644 --- a/src/openai/types/evals/run_create_params.py +++ b/src/openai/types/evals/run_create_params.py @@ -9,6 +9,7 @@ from ..responses.tool_param import ToolParam from ..shared_params.metadata import Metadata from ..shared.reasoning_effort import ReasoningEffort +from ..graders.grader_inputs_param import GraderInputsParam from ..responses.response_input_text_param import ResponseInputTextParam from ..responses.response_input_audio_param import ResponseInputAudioParam from .create_eval_jsonl_run_data_source_param import CreateEvalJSONLRunDataSourceParam @@ -31,10 +32,7 @@ "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItem", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContent", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage", "DataSourceCreateEvalResponsesRunDataSourceInputMessagesItemReference", "DataSourceCreateEvalResponsesRunDataSourceSamplingParams", "DataSourceCreateEvalResponsesRunDataSourceSamplingParamsText", @@ -174,7 +172,7 @@ class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEva """The type of the output text. Always `output_text`.""" -class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage( +class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage( TypedDict, total=False ): """An image input block used within EvalItem content arrays.""" @@ -192,53 +190,13 @@ class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEva """ -class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - TypedDict, total=False -): - """A text output from the model.""" - - text: Required[str] - """The text output from the model.""" - - type: Required[Literal["output_text"]] - """The type of the output text. Always `output_text`.""" - - -class DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - TypedDict, total=False -): - """An image input block used within EvalItem content arrays.""" - - image_url: Required[str] - """The URL of the image input.""" - - type: Required[Literal["input_image"]] - """The type of the image input. Always `input_image`.""" - - detail: str - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputTextParam, - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudioParam, -] - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputTextParam, DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudioParam, - SequenceNotStr[ - DataSourceCreateEvalResponsesRunDataSourceInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio - ], + GraderInputsParam, ] diff --git a/src/openai/types/evals/run_create_response.py b/src/openai/types/evals/run_create_response.py index a860bd178a..2cb856de6f 100644 --- a/src/openai/types/evals/run_create_response.py +++ b/src/openai/types/evals/run_create_response.py @@ -10,6 +10,7 @@ from .eval_api_error import EvalAPIError from ..responses.tool import Tool from ..shared.metadata import Metadata +from ..graders.grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio @@ -33,10 +34,7 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -158,7 +156,7 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -174,53 +172,13 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInp """ -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - BaseModel -): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - BaseModel -): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudio, - List[ - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio - ], + GraderInputs, ] diff --git a/src/openai/types/evals/run_list_response.py b/src/openai/types/evals/run_list_response.py index aee471e2b6..defd4aa6f9 100644 --- a/src/openai/types/evals/run_list_response.py +++ b/src/openai/types/evals/run_list_response.py @@ -10,6 +10,7 @@ from .eval_api_error import EvalAPIError from ..responses.tool import Tool from ..shared.metadata import Metadata +from ..graders.grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio @@ -33,10 +34,7 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -158,7 +156,7 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -174,53 +172,13 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInp """ -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - BaseModel -): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - BaseModel -): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudio, - List[ - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio - ], + GraderInputs, ] diff --git a/src/openai/types/evals/run_retrieve_response.py b/src/openai/types/evals/run_retrieve_response.py index ff3564de54..4c218a0510 100644 --- a/src/openai/types/evals/run_retrieve_response.py +++ b/src/openai/types/evals/run_retrieve_response.py @@ -10,6 +10,7 @@ from .eval_api_error import EvalAPIError from ..responses.tool import Tool from ..shared.metadata import Metadata +from ..graders.grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio @@ -33,10 +34,7 @@ "DataSourceResponsesInputMessagesTemplateTemplateEvalItem", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent", "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage", "DataSourceResponsesInputMessagesItemReference", "DataSourceResponsesSamplingParams", "DataSourceResponsesSamplingParamsText", @@ -158,7 +156,7 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText( """The type of the output text. Always `output_text`.""" -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage(BaseModel): +class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -174,53 +172,13 @@ class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInp """ -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText( - BaseModel -): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage( - BaseModel -): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContent: TypeAlias = Union[ str, ResponseInputText, DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentOutputText, - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentEvalItemInputImage, + DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentInputImage, ResponseInputAudio, - List[ - DataSourceResponsesInputMessagesTemplateTemplateEvalItemContentAnArrayOfInputTextOutputTextInputImageAndInputAudio - ], + GraderInputs, ] diff --git a/src/openai/types/graders/__init__.py b/src/openai/types/graders/__init__.py index e0a909125e..4f70eb6c2f 100644 --- a/src/openai/types/graders/__init__.py +++ b/src/openai/types/graders/__init__.py @@ -3,10 +3,12 @@ from __future__ import annotations from .multi_grader import MultiGrader as MultiGrader +from .grader_inputs import GraderInputs as GraderInputs from .python_grader import PythonGrader as PythonGrader from .label_model_grader import LabelModelGrader as LabelModelGrader from .multi_grader_param import MultiGraderParam as MultiGraderParam from .score_model_grader import ScoreModelGrader as ScoreModelGrader +from .grader_inputs_param import GraderInputsParam as GraderInputsParam from .python_grader_param import PythonGraderParam as PythonGraderParam from .string_check_grader import StringCheckGrader as StringCheckGrader from .text_similarity_grader import TextSimilarityGrader as TextSimilarityGrader diff --git a/src/openai/types/graders/grader_inputs.py b/src/openai/types/graders/grader_inputs.py new file mode 100644 index 0000000000..edc966d889 --- /dev/null +++ b/src/openai/types/graders/grader_inputs.py @@ -0,0 +1,43 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union, Optional +from typing_extensions import Literal, TypeAlias + +from ..._models import BaseModel +from ..responses.response_input_text import ResponseInputText +from ..responses.response_input_audio import ResponseInputAudio + +__all__ = ["GraderInputs", "GraderInputItem", "GraderInputItemOutputText", "GraderInputItemInputImage"] + + +class GraderInputItemOutputText(BaseModel): + """A text output from the model.""" + + text: str + """The text output from the model.""" + + type: Literal["output_text"] + """The type of the output text. Always `output_text`.""" + + +class GraderInputItemInputImage(BaseModel): + """An image input block used within EvalItem content arrays.""" + + image_url: str + """The URL of the image input.""" + + type: Literal["input_image"] + """The type of the image input. Always `input_image`.""" + + detail: Optional[str] = None + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +GraderInputItem: TypeAlias = Union[ + str, ResponseInputText, GraderInputItemOutputText, GraderInputItemInputImage, ResponseInputAudio +] + +GraderInputs: TypeAlias = List[GraderInputItem] diff --git a/src/openai/types/graders/grader_inputs_param.py b/src/openai/types/graders/grader_inputs_param.py new file mode 100644 index 0000000000..7d8341eb32 --- /dev/null +++ b/src/openai/types/graders/grader_inputs_param.py @@ -0,0 +1,53 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from __future__ import annotations + +from typing import List, Union +from typing_extensions import Literal, Required, TypeAlias, TypedDict + +from ..responses.response_input_text_param import ResponseInputTextParam +from ..responses.response_input_audio_param import ResponseInputAudioParam + +__all__ = [ + "GraderInputsParam", + "GraderInputsParamItem", + "GraderInputsParamItemOutputText", + "GraderInputsParamItemInputImage", +] + + +class GraderInputsParamItemOutputText(TypedDict, total=False): + """A text output from the model.""" + + text: Required[str] + """The text output from the model.""" + + type: Required[Literal["output_text"]] + """The type of the output text. Always `output_text`.""" + + +class GraderInputsParamItemInputImage(TypedDict, total=False): + """An image input block used within EvalItem content arrays.""" + + image_url: Required[str] + """The URL of the image input.""" + + type: Required[Literal["input_image"]] + """The type of the image input. Always `input_image`.""" + + detail: str + """The detail level of the image to be sent to the model. + + One of `high`, `low`, or `auto`. Defaults to `auto`. + """ + + +GraderInputsParamItem: TypeAlias = Union[ + str, + ResponseInputTextParam, + GraderInputsParamItemOutputText, + GraderInputsParamItemInputImage, + ResponseInputAudioParam, +] + +GraderInputsParam: TypeAlias = List[GraderInputsParamItem] diff --git a/src/openai/types/graders/label_model_grader.py b/src/openai/types/graders/label_model_grader.py index def3dd7602..d3c942235e 100644 --- a/src/openai/types/graders/label_model_grader.py +++ b/src/openai/types/graders/label_model_grader.py @@ -4,19 +4,11 @@ from typing_extensions import Literal, TypeAlias from ..._models import BaseModel +from .grader_inputs import GraderInputs from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio -__all__ = [ - "LabelModelGrader", - "Input", - "InputContent", - "InputContentOutputText", - "InputContentEvalItemInputImage", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", -] +__all__ = ["LabelModelGrader", "Input", "InputContent", "InputContentOutputText", "InputContentInputImage"] class InputContentOutputText(BaseModel): @@ -29,7 +21,7 @@ class InputContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputContentEvalItemInputImage(BaseModel): +class InputContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -45,47 +37,8 @@ class InputContentEvalItemInputImage(BaseModel): """ -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(BaseModel): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(BaseModel): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - InputContent: TypeAlias = Union[ - str, - ResponseInputText, - InputContentOutputText, - InputContentEvalItemInputImage, - ResponseInputAudio, - List[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + str, ResponseInputText, InputContentOutputText, InputContentInputImage, ResponseInputAudio, GraderInputs ] diff --git a/src/openai/types/graders/label_model_grader_param.py b/src/openai/types/graders/label_model_grader_param.py index 6b6faa465d..a5b6959cff 100644 --- a/src/openai/types/graders/label_model_grader_param.py +++ b/src/openai/types/graders/label_model_grader_param.py @@ -6,19 +6,11 @@ from typing_extensions import Literal, Required, TypeAlias, TypedDict from ..._types import SequenceNotStr +from .grader_inputs_param import GraderInputsParam from ..responses.response_input_text_param import ResponseInputTextParam from ..responses.response_input_audio_param import ResponseInputAudioParam -__all__ = [ - "LabelModelGraderParam", - "Input", - "InputContent", - "InputContentOutputText", - "InputContentEvalItemInputImage", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", -] +__all__ = ["LabelModelGraderParam", "Input", "InputContent", "InputContentOutputText", "InputContentInputImage"] class InputContentOutputText(TypedDict, total=False): @@ -31,33 +23,7 @@ class InputContentOutputText(TypedDict, total=False): """The type of the output text. Always `output_text`.""" -class InputContentEvalItemInputImage(TypedDict, total=False): - """An image input block used within EvalItem content arrays.""" - - image_url: Required[str] - """The URL of the image input.""" - - type: Required[Literal["input_image"]] - """The type of the image input. Always `input_image`.""" - - detail: str - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(TypedDict, total=False): - """A text output from the model.""" - - text: Required[str] - """The text output from the model.""" - - type: Required[Literal["output_text"]] - """The type of the output text. Always `output_text`.""" - - -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(TypedDict, total=False): +class InputContentInputImage(TypedDict, total=False): """An image input block used within EvalItem content arrays.""" image_url: Required[str] @@ -73,21 +39,13 @@ class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInp """ -InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputTextParam, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudioParam, -] - InputContent: TypeAlias = Union[ str, ResponseInputTextParam, InputContentOutputText, - InputContentEvalItemInputImage, + InputContentInputImage, ResponseInputAudioParam, - SequenceNotStr[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + GraderInputsParam, ] diff --git a/src/openai/types/graders/score_model_grader.py b/src/openai/types/graders/score_model_grader.py index 7787c82bb6..85d11e8666 100644 --- a/src/openai/types/graders/score_model_grader.py +++ b/src/openai/types/graders/score_model_grader.py @@ -4,6 +4,7 @@ from typing_extensions import Literal, TypeAlias from ..._models import BaseModel +from .grader_inputs import GraderInputs from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text import ResponseInputText from ..responses.response_input_audio import ResponseInputAudio @@ -13,10 +14,7 @@ "Input", "InputContent", "InputContentOutputText", - "InputContentEvalItemInputImage", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "InputContentInputImage", "SamplingParams", ] @@ -31,7 +29,7 @@ class InputContentOutputText(BaseModel): """The type of the output text. Always `output_text`.""" -class InputContentEvalItemInputImage(BaseModel): +class InputContentInputImage(BaseModel): """An image input block used within EvalItem content arrays.""" image_url: str @@ -47,47 +45,8 @@ class InputContentEvalItemInputImage(BaseModel): """ -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(BaseModel): - """A text output from the model.""" - - text: str - """The text output from the model.""" - - type: Literal["output_text"] - """The type of the output text. Always `output_text`.""" - - -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(BaseModel): - """An image input block used within EvalItem content arrays.""" - - image_url: str - """The URL of the image input.""" - - type: Literal["input_image"] - """The type of the image input. Always `input_image`.""" - - detail: Optional[str] = None - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudio, -] - InputContent: TypeAlias = Union[ - str, - ResponseInputText, - InputContentOutputText, - InputContentEvalItemInputImage, - ResponseInputAudio, - List[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + str, ResponseInputText, InputContentOutputText, InputContentInputImage, ResponseInputAudio, GraderInputs ] diff --git a/src/openai/types/graders/score_model_grader_param.py b/src/openai/types/graders/score_model_grader_param.py index 1f9475d885..9f1c42e051 100644 --- a/src/openai/types/graders/score_model_grader_param.py +++ b/src/openai/types/graders/score_model_grader_param.py @@ -5,7 +5,7 @@ from typing import Union, Iterable, Optional from typing_extensions import Literal, Required, TypeAlias, TypedDict -from ..._types import SequenceNotStr +from .grader_inputs_param import GraderInputsParam from ..shared.reasoning_effort import ReasoningEffort from ..responses.response_input_text_param import ResponseInputTextParam from ..responses.response_input_audio_param import ResponseInputAudioParam @@ -15,10 +15,7 @@ "Input", "InputContent", "InputContentOutputText", - "InputContentEvalItemInputImage", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText", - "InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage", + "InputContentInputImage", "SamplingParams", ] @@ -33,7 +30,7 @@ class InputContentOutputText(TypedDict, total=False): """The type of the output text. Always `output_text`.""" -class InputContentEvalItemInputImage(TypedDict, total=False): +class InputContentInputImage(TypedDict, total=False): """An image input block used within EvalItem content arrays.""" image_url: Required[str] @@ -49,47 +46,13 @@ class InputContentEvalItemInputImage(TypedDict, total=False): """ -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText(TypedDict, total=False): - """A text output from the model.""" - - text: Required[str] - """The text output from the model.""" - - type: Required[Literal["output_text"]] - """The type of the output text. Always `output_text`.""" - - -class InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage(TypedDict, total=False): - """An image input block used within EvalItem content arrays.""" - - image_url: Required[str] - """The URL of the image input.""" - - type: Required[Literal["input_image"]] - """The type of the image input. Always `input_image`.""" - - detail: str - """The detail level of the image to be sent to the model. - - One of `high`, `low`, or `auto`. Defaults to `auto`. - """ - - -InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio: TypeAlias = Union[ - str, - ResponseInputTextParam, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioOutputText, - InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudioEvalItemInputImage, - ResponseInputAudioParam, -] - InputContent: TypeAlias = Union[ str, ResponseInputTextParam, InputContentOutputText, - InputContentEvalItemInputImage, + InputContentInputImage, ResponseInputAudioParam, - SequenceNotStr[InputContentAnArrayOfInputTextOutputTextInputImageAndInputAudio], + GraderInputsParam, ] From 5c260628385e9786607d798881f2500b5e0241c3 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 05:07:08 +0000 Subject: [PATCH 3/3] release: 2.12.0 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 9 +++++++++ pyproject.toml | 2 +- src/openai/_version.py | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e6c39adb99..0746cbe20a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.11.0" + ".": "2.12.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ff0878433f..ec61efaf79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 2.12.0 (2025-12-15) + +Full Changelog: [v2.11.0...v2.12.0](https://github.com/openai/openai-python/compare/v2.11.0...v2.12.0) + +### Features + +* **api:** api update ([a95c4d0](https://github.com/openai/openai-python/commit/a95c4d0952ff5eb767206574e687cb029a49a4ab)) +* **api:** fix grader input list, add dated slugs for sora-2 ([b2c389b](https://github.com/openai/openai-python/commit/b2c389bf5c3bde50bac2d9f60cce58f4aef44a41)) + ## 2.11.0 (2025-12-11) Full Changelog: [v2.10.0...v2.11.0](https://github.com/openai/openai-python/compare/v2.10.0...v2.11.0) diff --git a/pyproject.toml b/pyproject.toml index f4e5bdb208..7d6fec5c1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "openai" -version = "2.11.0" +version = "2.12.0" description = "The official Python library for the openai API" dynamic = ["readme"] license = "Apache-2.0" diff --git a/src/openai/_version.py b/src/openai/_version.py index 16036c3b6a..9d853d6512 100644 --- a/src/openai/_version.py +++ b/src/openai/_version.py @@ -1,4 +1,4 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. __title__ = "openai" -__version__ = "2.11.0" # x-release-please-version +__version__ = "2.12.0" # x-release-please-version