some changes to address merge problems

Author: matthewfranglen

pydantic_ai_slim/pydantic_ai/models/openai.py

@@ -505,7 +505,9 @@ async def _completions_create(
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
             raise  # pragma: lax no cover
 
-    def _process_response(self, response: chat.ChatCompletion | str) -> ModelResponse:
+    def _process_response(
+        self, response: chat.ChatCompletion | str, model_request_parameters: ModelRequestParameters
+    ) -> ModelResponse:
         """Process a non-streamed response, and prepare a message to return."""
         # Although the OpenAI SDK claims to return a Pydantic model (`ChatCompletion`) from the chat completions function:
         # * it hasn't actually performed validation (presumably they're creating the model with `model_construct` or something?!)

tests/models/test_model_names.py

@@ -70,7 +70,9 @@ def get_model_names(model_name_type: Any) -> Iterator[str]:
     moonshotai_names = [f'moonshotai:{n}' for n in get_model_names(MoonshotAIModelName)]
     mistral_names = [f'mistral:{n}' for n in get_model_names(MistralModelName)]
     openai_names = [f'openai:{n}' for n in get_model_names(OpenAIModelName)] + [
-        n for n in get_model_names(OpenAIModelName) if n.startswith('o1') or n.startswith('gpt') or n.startswith('o3')
+        n
+        for n in get_model_names(OpenAIModelName)
+        if n.startswith('o1') or n.startswith('gpt') or n.startswith('o3') or n.startswith('o4')
     ]
     bedrock_names = [f'bedrock:{n}' for n in get_model_names(BedrockModelName)]
     deepseek_names = ['deepseek:deepseek-chat', 'deepseek:deepseek-reasoner']

tests/models/test_openai_responses.py

@@ -1942,7 +1942,9 @@ def test_openai_responses_model_freeform_function_unsupported_model_error():
     # GPT-4 doesn't support freeform function calling
     model = OpenAIResponsesModel('gpt-4o', provider=OpenAIProvider(api_key='foobar'))
 
-    with pytest.raises(UserError, match='uses freeform function calling but gpt-4o does not support'):
+    with pytest.raises(
+        UserError, match='uses freeform function calling but .* does not support freeform function calling'
+    ):
         model._map_tool_definition(freeform_tool)  # type: ignore[reportPrivateUsage]