fix failed tests and lint

Author: Ddper

src/agents/models/openai_chatcompletions.py

@@ -570,18 +570,25 @@ def _get_client(self) -> AsyncOpenAI:
 
 
 class _Converter:
+
+    @classmethod
+    def is_openai(cls, client: AsyncOpenAI):
+        return str(client.base_url).startswith("https://api.openai.com")
+
     @classmethod
     def get_store_param(cls, client: AsyncOpenAI, model_settings: ModelSettings) -> bool | None:
         # Match the behavior of Responses where store is True when not given
-        default_store = True if str(client.base_url).startswith("https://api.openai.com") else None
+        default_store = True if cls.is_openai(client) else None
         return model_settings.store if model_settings.store is not None else default_store
 
     @classmethod
-    def get_stream_options_param(cls, client: AsyncOpenAI, model_settings: ModelSettings) -> dict | None:
-        default_include_usage = True if str(client.base_url).startswith("https://api.openai.com") else None
+    def get_stream_options_param(
+            cls, client: AsyncOpenAI, model_settings: ModelSettings
+    ) -> dict[str, bool] | None:
+        default_include_usage = True if cls.is_openai(client) else None
         include_usage = model_settings.include_usage if model_settings.include_usage is not None \
             else default_include_usage
-        stream_options = {"include_usage": include_usage} if include_usage is not None else NOT_GIVEN
+        stream_options = {"include_usage": include_usage} if include_usage is not None else None
         return stream_options
 
     @classmethod

tests/test_openai_chatcompletions.py

@@ -282,7 +282,7 @@ def __init__(self, completions: DummyCompletions) -> None:
     # Check OpenAI client was called for streaming
     assert completions.kwargs["stream"] is True
     assert completions.kwargs["store"] is NOT_GIVEN
-    assert completions.kwargs["stream_options"] == {"include_usage": True}
+    assert completions.kwargs["stream_options"] is NOT_GIVEN
     # Response is a proper openai Response
     assert isinstance(response, Response)
     assert response.id == FAKE_RESPONSES_ID