fix: preserve strict validation in file batch polling

Author: nightcityblade

src/openai/resources/vector_stores/file_batches.py

@@ -15,7 +15,6 @@
 from ..._types import Body, Omit, Query, Headers, NotGiven, FileTypes, SequenceNotStr, omit, not_given
 from ..._utils import is_given, path_template, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
-from ..._models import construct_type_unchecked
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncCursorPage, AsyncCursorPage
@@ -34,19 +33,16 @@ def _coerce_vector_store_poll_response(
     *,
     batch_id: str,
     vector_store_id: str,
-) -> VectorStoreFileBatch | None:
+) -> dict[str, Any] | None:
     if data.get("object") != "vector_store" or data.get("id") != vector_store_id:
         return None
 
-    return construct_type_unchecked(
-        value={
-            **data,
-            "id": batch_id,
-            "object": "vector_store.files_batch",
-            "vector_store_id": vector_store_id,
-        },
-        type_=VectorStoreFileBatch,
-    )
+    return {
+        **data,
+        "id": batch_id,
+        "object": "vector_store.files_batch",
+        "vector_store_id": vector_store_id,
+    }
 
 
 class FileBatches(SyncAPIResource):
@@ -373,9 +369,17 @@ def poll(
             )
 
             data = response.parse(to=dict)
-            batch = _coerce_vector_store_poll_response(data, batch_id=batch_id, vector_store_id=vector_store_id)
-            if batch is None:
+            coerced_data = _coerce_vector_store_poll_response(
+                data, batch_id=batch_id, vector_store_id=vector_store_id
+            )
+            if coerced_data is None:
                 batch = response.parse()
+            else:
+                batch = response._client._process_response_data(
+                    data=coerced_data,
+                    cast_to=VectorStoreFileBatch,
+                    response=response.http_response,
+                )
 
             if batch.file_counts.in_progress > 0:
                 if not is_given(poll_interval_ms):
@@ -765,9 +769,17 @@ async def poll(
             )
 
             data = response.parse(to=dict)
-            batch = _coerce_vector_store_poll_response(data, batch_id=batch_id, vector_store_id=vector_store_id)
-            if batch is None:
+            coerced_data = _coerce_vector_store_poll_response(
+                data, batch_id=batch_id, vector_store_id=vector_store_id
+            )
+            if coerced_data is None:
                 batch = response.parse()
+            else:
+                batch = response._client._process_response_data(
+                    data=coerced_data,
+                    cast_to=VectorStoreFileBatch,
+                    response=response.http_response,
+                )
 
             if batch.file_counts.in_progress > 0:
                 if not is_given(poll_interval_ms):

tests/api_resources/vector_stores/test_file_batches.py

@@ -8,7 +8,7 @@
 import httpx
 import pytest
 
-from openai import OpenAI, AsyncOpenAI
+from openai import OpenAI, AsyncOpenAI, APIResponseValidationError
 from tests.utils import assert_matches_type
 from openai._utils import assert_signatures_in_sync
 from openai.pagination import SyncCursorPage, AsyncCursorPage
@@ -518,3 +518,37 @@ async def handler(request: httpx.Request) -> httpx.Response:
     assert_matches_type(VectorStoreFileBatch, file_batch, path=["response"])
     assert file_batch.id == "vsfb_abc123"
     assert file_batch.vector_store_id == "vs_abc123"
+
+
+def test_poll_preserves_strict_validation_for_coerced_vector_store_response() -> None:
+    def handler(request: httpx.Request) -> httpx.Response:
+        data = _completed_vector_store_response()
+        data["created_at"] = "invalid"
+        return httpx.Response(200, json=data)
+
+    with OpenAI(
+        api_key="My API Key",
+        base_url=base_url,
+        http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+        _strict_response_validation=True,
+    ) as client:
+        with pytest.raises(APIResponseValidationError):
+            client.vector_stores.file_batches.poll(batch_id="vsfb_abc123", vector_store_id="vs_abc123")
+
+
+async def test_async_poll_preserves_strict_validation_for_coerced_vector_store_response() -> None:
+    async def handler(request: httpx.Request) -> httpx.Response:
+        data = _completed_vector_store_response()
+        data["created_at"] = "invalid"
+        return httpx.Response(200, json=data)
+
+    async with AsyncOpenAI(
+        api_key="My API Key",
+        base_url=base_url,
+        http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)),
+        _strict_response_validation=True,
+    ) as async_client:
+        with pytest.raises(APIResponseValidationError):
+            await async_client.vector_stores.file_batches.poll(
+                batch_id="vsfb_abc123", vector_store_id="vs_abc123"
+            )