fix

Author: seratch

src/agents/models/openai_responses.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Literal, Union, cast, overload
 
-from openai import APIStatusError, AsyncOpenAI, AsyncStream, NotGiven, Omit, NOT_GIVEN, omit
+from openai import APIStatusError, AsyncOpenAI, AsyncStream, Omit, omit
 from openai.types import ChatModel
 from openai.types.responses import (
     Response,
@@ -266,12 +266,10 @@ async def _fetch_response(
         converted_tools_payload = _to_dump_compatible(converted_tools.tools)
         response_format = Converter.get_response_format(output_schema)
         should_omit_model = prompt is not None and not self._model_is_explicit
-        model_param: str | ChatModel | NotGiven = (
-            self.model if not should_omit_model else NOT_GIVEN
-        )
+        model_param: str | ChatModel | Omit = self.model if not should_omit_model else omit
         should_omit_tools = prompt is not None and len(converted_tools_payload) == 0
-        tools_param: list[ToolParam] | NotGiven = (
-            converted_tools_payload if not should_omit_tools else NOT_GIVEN
+        tools_param: list[ToolParam] | Omit = (
+            converted_tools_payload if not should_omit_tools else omit
         )
 
         include_set: set[str] = set(converted_tools.includes)

tests/test_agent_prompt.py

@@ -1,12 +1,13 @@
+from __future__ import annotations
+
 import pytest
-from openai import NOT_GIVEN
+from openai import omit
 
 from agents import Agent, Prompt, RunConfig, RunContextWrapper, Runner
 from agents.models.interface import Model, ModelProvider
 from agents.models.openai_responses import OpenAIResponsesModel
 
-from .fake_model import FakeModel
-from .fake_model import get_response_obj
+from .fake_model import FakeModel, get_response_obj
 from .test_responses import get_text_message
 
 
@@ -139,5 +140,5 @@ def __init__(self):
 
     expected_prompt = {"id": "pmpt_agent", "version": None, "variables": None}
     assert called_kwargs["prompt"] == expected_prompt
-    assert called_kwargs["model"] is NOT_GIVEN
-    assert called_kwargs["tools"] is NOT_GIVEN
+    assert called_kwargs["model"] is omit
+    assert called_kwargs["tools"] is omit

tests/test_openai_responses.py

@@ -3,7 +3,7 @@
 from typing import Any
 
 import pytest
-from openai import NOT_GIVEN
+from openai import omit
 from openai.types.responses import ResponseCompletedEvent
 
 from agents import ModelSettings, ModelTracing, __version__
@@ -99,7 +99,7 @@ def __init__(self):
     )
 
     assert called_kwargs["prompt"] == {"id": "pmpt_123"}
-    assert called_kwargs["model"] is NOT_GIVEN
+    assert called_kwargs["model"] is omit
 
 
 @pytest.mark.allow_call_model_methods
@@ -134,4 +134,4 @@ def __init__(self):
         prompt={"id": "pmpt_123"},
     )
 
-    assert called_kwargs["tools"] is NOT_GIVEN
+    assert called_kwargs["tools"] is omit