feat(api): fix grader input list, add dated slugs for sora-2

Author: stainless-app[bot]

.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

api.md

@@ -342,6 +342,7 @@ Types:
 
 ```python
 from openai.types.graders import (
+    GraderInputs,
     LabelModelGrader,
     MultiGrader,
     PythonGrader,

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,
 ]
 
 

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,
 ]
 
 

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,
 ]
 
 

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,
 ]