add fixes for types

Author: GDaamn

pydantic_ai_slim/pydantic_ai/models/openai.py

@@ -1012,29 +1012,30 @@ def _map_tool_definition(self, f: ToolDefinition) -> responses.FunctionToolParam
             ),
         }
 
-    def _get_response_id_and_trim(
-        self, messages: list[ModelMessage]
-    ) -> tuple[list[ModelMessage], str | NotGiven | None]:
+    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.
-        response_id = NOT_GIVEN
-        latest_model_response: list[ModelMessage] = []
+        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 (self.model_name in m.model_name):  # type: ignore
-                response_id = m.provider_response_id
+            if isinstance(m, ModelResponse) and m.model_name:
+                if self.model_name in m.model_name:
+                    response_id = m.provider_response_id
+                else:
+                    # Mixed model responses invalidate response_id,
+                    # so the history is kept intact.
+                    response_id = None
+                    break
             elif isinstance(m, ModelRequest):
-                latest_model_response = [m]
+                latest_model_request = m
             else:
-                # Mixed model responses invalidate response_id,
-                # so the history is kept intact.
-                response_id = NOT_GIVEN
-                break
-        if response_id:
-            messages = latest_model_response
+                pass
+        if response_id and latest_model_request:
+            messages = [latest_model_request]
         return messages, response_id
 
     async def _map_messages(