blank-pdf: Set default args

Assisted-by: Codex

Author: datalogics-cgreen

src/pdfrest/client.py

@@ -3077,16 +3077,16 @@ def add_attachment_to_pdf(
     def blank_pdf(
         self,
         *,
-        page_size: PdfPageSize,
-        page_count: int,
+        page_size: PdfPageSize = "letter",
+        page_count: int = 1,
         page_orientation: PdfPageOrientation | None = None,
         output: str | None = None,
         extra_query: Query | None = None,
         extra_headers: AnyMapping | None = None,
         extra_body: Body | None = None,
         timeout: TimeoutTypes | None = None,
     ) -> PdfRestFileBasedResponse:
-        """Create a blank PDF with the specified size, count, and orientation."""
+        """Create a blank PDF with configurable size, count, and orientation."""
 
         payload: dict[str, Any] = {
             "page_size": page_size,
@@ -4516,16 +4516,16 @@ async def add_attachment_to_pdf(
     async def blank_pdf(
         self,
         *,
-        page_size: PdfPageSize,
-        page_count: int,
+        page_size: PdfPageSize = "letter",
+        page_count: int = 1,
         page_orientation: PdfPageOrientation | None = None,
         output: str | None = None,
         extra_query: Query | None = None,
         extra_headers: AnyMapping | None = None,
         extra_body: Body | None = None,
         timeout: TimeoutTypes | None = None,
     ) -> PdfRestFileBasedResponse:
-        """Asynchronously create a blank PDF with the specified size."""
+        """Asynchronously create a blank PDF with configurable size and count."""
 
         payload: dict[str, Any] = {
             "page_size": page_size,

src/pdfrest/models/_internal.py

@@ -1402,25 +1402,29 @@ def _normalize_custom_page_size(cls, data: Any) -> Any:
         if not isinstance(data, Mapping):
             return data
 
-        request_data = cast(Mapping[str, Any], data)
-        page_size = request_data.get("page_size")
-        if not isinstance(page_size, Sequence) or isinstance(
+        normalized_data: dict[str, Any] = dict(cast(Mapping[str, Any], data))
+        page_size = normalized_data.get("page_size")
+        if isinstance(page_size, Sequence) and not isinstance(
             page_size, (str, bytes, bytearray)
         ):
-            return request_data
-
-        custom_dimensions = list(page_size)
-        if len(custom_dimensions) != 2:
-            msg = (
-                "Custom page sizes must contain exactly two values: "
-                "custom_height and custom_width."
-            )
-            raise ValueError(msg)
+            custom_dimensions = list(page_size)
+            if len(custom_dimensions) != 2:
+                msg = (
+                    "Custom page sizes must contain exactly two values: "
+                    "custom_height and custom_width."
+                )
+                raise ValueError(msg)
+            normalized_data["page_size"] = "custom"
+            normalized_data["custom_height"] = custom_dimensions[0]
+            normalized_data["custom_width"] = custom_dimensions[1]
+
+        if (
+            normalized_data.get("page_size") is not None
+            and normalized_data.get("page_size") != "custom"
+            and normalized_data.get("page_orientation") is None
+        ):
+            normalized_data["page_orientation"] = "portrait"
 
-        normalized_data: dict[str, Any] = dict(request_data)
-        normalized_data["page_size"] = "custom"
-        normalized_data["custom_height"] = custom_dimensions[0]
-        normalized_data["custom_width"] = custom_dimensions[1]
         return normalized_data
 
     @model_validator(mode="after")

tests/test_blank_pdf.py

@@ -150,6 +150,91 @@ def handler(request: httpx.Request) -> httpx.Response:
     assert response.output_file.type == "application/pdf"
 
 
+def test_blank_pdf_defaults(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.delenv("PDFREST_API_KEY", raising=False)
+    output_id = str(PdfRestFileID.generate())
+
+    payload_dump = PdfBlankPayload.model_validate(
+        {
+            "page_size": "letter",
+            "page_count": 1,
+            "page_orientation": "portrait",
+        }
+    ).model_dump(mode="json", by_alias=True, exclude_none=True, exclude_unset=True)
+
+    seen: dict[str, int] = {"post": 0, "get": 0}
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.method == "POST" and request.url.path == "/blank-pdf":
+            seen["post"] += 1
+            payload = json.loads(request.content.decode("utf-8"))
+            assert payload == payload_dump
+            return httpx.Response(200, json={"outputId": [output_id]})
+        if request.method == "GET" and request.url.path == f"/resource/{output_id}":
+            seen["get"] += 1
+            return httpx.Response(
+                200,
+                json=build_file_info_payload(
+                    output_id,
+                    "blank-default.pdf",
+                    "application/pdf",
+                ),
+            )
+        msg = f"Unexpected request {request.method} {request.url}"
+        raise AssertionError(msg)
+
+    transport = httpx.MockTransport(handler)
+    with PdfRestClient(api_key=VALID_API_KEY, transport=transport) as client:
+        response = client.blank_pdf()
+
+    assert seen == {"post": 1, "get": 1}
+    assert isinstance(response, PdfRestFileBasedResponse)
+    assert response.output_file.type == "application/pdf"
+
+
+@pytest.mark.asyncio
+async def test_async_blank_pdf_defaults(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.delenv("PDFREST_API_KEY", raising=False)
+    output_id = str(PdfRestFileID.generate())
+
+    payload_dump = PdfBlankPayload.model_validate(
+        {
+            "page_size": "letter",
+            "page_count": 1,
+            "page_orientation": "portrait",
+        }
+    ).model_dump(mode="json", by_alias=True, exclude_none=True, exclude_unset=True)
+
+    seen: dict[str, int] = {"post": 0, "get": 0}
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.method == "POST" and request.url.path == "/blank-pdf":
+            seen["post"] += 1
+            payload = json.loads(request.content.decode("utf-8"))
+            assert payload == payload_dump
+            return httpx.Response(200, json={"outputId": [output_id]})
+        if request.method == "GET" and request.url.path == f"/resource/{output_id}":
+            seen["get"] += 1
+            return httpx.Response(
+                200,
+                json=build_file_info_payload(
+                    output_id,
+                    "blank-async-default.pdf",
+                    "application/pdf",
+                ),
+            )
+        msg = f"Unexpected request {request.method} {request.url}"
+        raise AssertionError(msg)
+
+    transport = httpx.MockTransport(handler)
+    async with AsyncPdfRestClient(api_key=ASYNC_API_KEY, transport=transport) as client:
+        response = await client.blank_pdf()
+
+    assert seen == {"post": 1, "get": 1}
+    assert isinstance(response, PdfRestFileBasedResponse)
+    assert response.output_file.type == "application/pdf"
+
+
 @pytest.mark.parametrize(
     "page_count",
     [
@@ -597,12 +682,6 @@ def test_blank_pdf_validation(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("PDFREST_API_KEY", raising=False)
     transport = httpx.MockTransport(lambda request: (_ for _ in ()).throw(RuntimeError))
 
-    with (
-        PdfRestClient(api_key=VALID_API_KEY, transport=transport) as client,
-        pytest.raises(ValueError, match="page_orientation is required"),
-    ):
-        client.blank_pdf(page_size="letter", page_count=1)
-
     with (
         PdfRestClient(api_key=VALID_API_KEY, transport=transport) as client,
         pytest.raises(ValueError, match="Custom page sizes must contain exactly two"),