update logic

update logic

update logic

update logic

Author: GDaamn

pydantic_ai_slim/pydantic_ai/models/openai.py

@@ -935,9 +935,11 @@ async def _responses_create(
             tool_choice = 'required'
         else:
             tool_choice = 'auto'
+
         previous_response_id = model_settings.get('openai_previous_response_id')
         if previous_response_id == 'auto':
             messages, previous_response_id = self._get_response_id_and_trim(messages)
+
         instructions, openai_messages = await self._map_messages(messages)
         reasoning = self._get_reasoning(model_settings)
 
@@ -1049,26 +1051,21 @@ def _map_tool_definition(self, f: ToolDefinition) -> responses.FunctionToolParam
         }
 
     def _get_response_id_and_trim(self, messages: list[ModelMessage]) -> tuple[list[ModelMessage], str | None]:
-        # If the message history contains only openai responses,
-        # we can limit the history to the most recent ModelRequest.
-        # The provider_response_id from the latest ModelResponse is
-        # then passed as previous_response_id to preserve context.
+        # In `auto` mode, the history is trimmed up to (but not including)
+        # the latest ModelResponse with a valid `provider_response_id`.
+        # This is then passed as `previous_response_id` in the next request
+        # to maintain context along with the trimmed history.
         response_id = None
-        latest_model_request: ModelRequest | None = None
-        for m in messages:
-            # Openai may return a dated model_name that differs from self.model_name
-            # (e.g., "gpt-5" vs "gpt-5-2025-08-07").
-            if isinstance(m, ModelResponse) and m.model_name and (self.model_name in m.model_name):
+        trimmed_messages: list[ModelMessage] = []
+        for m in reversed(messages):
+            if isinstance(m, ModelResponse) and m.provider_name == self.system:
                 response_id = m.provider_response_id
-            elif isinstance(m, ModelRequest):
-                latest_model_request = m
-            else:
-                # Mixed model responses invalidate response_id,
-                # so the history is kept intact.
-                response_id = None
                 break
-        if response_id and latest_model_request:
-            return [latest_model_request], response_id
+            else:
+                trimmed_messages.append(m)
+
+        if response_id and trimmed_messages:
+            return list(reversed(trimmed_messages)), response_id
         else:
             return messages, None
 

tests/models/test_openai_responses.py

@@ -1192,6 +1192,21 @@ async def test_openai_previous_response_id_auto_mode(allow_model_requests: None,
 async def test_openai_previous_response_id_mixed_model_history(allow_model_requests: None, openai_api_key: str):
     """Test if invalid previous response id is ignored when history contains non-OpenAI responses"""
     history = [
+        # ModelRequest(
+        #     parts=[
+        #         UserPromptPart(
+        #             content='The first secret key is sesame',
+        #         ),
+        #     ],
+        # ),
+        # ModelResponse(
+        #     parts=[
+        #         TextPart(content='Open sesame! What would you like to unlock?'),
+        #     ],
+        #     model_name='gpt-5',
+        #     provider_name='openai',
+        #     provider_response_id='resp_68b9bd97025c8195b443af591ca2345c08cb6072affe6099',
+        # ),
         ModelRequest(
             parts=[
                 UserPromptPart(
@@ -1203,21 +1218,6 @@ async def test_openai_previous_response_id_mixed_model_history(allow_model_reque
             parts=[
                 TextPart(content='Open sesame! What would you like to unlock?'),
             ],
-            model_name='gpt-5',
-            provider_name='openai',
-            provider_response_id='resp_68b9bd97025c8195b443af591ca2345c08cb6072affe6099',
-        ),
-        ModelRequest(
-            parts=[
-                UserPromptPart(
-                    content='The second secret key is olives',
-                ),
-            ],
-        ),
-        ModelResponse(
-            parts=[
-                TextPart(content='Understood'),
-            ],
             model_name='claude-3-5-sonnet-latest',
             provider_name='anthropic',
             provider_response_id='msg_01XUQuedGz9gusk4xZm4gWJj',
@@ -1240,15 +1240,6 @@ async def test_openai_previous_response_id_mixed_model_history(allow_model_reque
             ModelResponse(
                 parts=[TextPart(content='Open sesame! What would you like to unlock?')],
                 usage=RequestUsage(),
-                model_name='gpt-5',
-                timestamp=IsDatetime(),
-                provider_name='openai',
-                provider_response_id='resp_68b9bd97025c8195b443af591ca2345c08cb6072affe6099',
-            ),
-            ModelRequest(parts=[UserPromptPart(content='The second secret key is olives', timestamp=IsDatetime())]),
-            ModelResponse(
-                parts=[TextPart(content='Understood')],
-                usage=RequestUsage(),
                 model_name='claude-3-5-sonnet-latest',
                 timestamp=IsDatetime(),
                 provider_name='anthropic',