Replace json.dumps

- Pydantic models get `model_dump_json`
- Everything else gets `to_json`

Assisted-by: Codex

Author: datalogics-cgreen

src/pdfrest/models/_internal.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import json
 import re
 from collections.abc import Callable, Sequence
 from pathlib import PurePath
@@ -19,6 +18,7 @@
     model_serializer,
     model_validator,
 )
+from pydantic_core import to_json
 
 from pdfrest.types.public import PdfRedactionPreset
 
@@ -144,14 +144,17 @@ def _serialize_grouped_page_ranges(
 
 
 def _serialize_redactions(value: list[_PdfRedactionVariant]) -> str:
-    payload = [entry.model_dump(mode="json", exclude_none=True) for entry in value]
-    return json.dumps(payload, separators=(",", ":"))
+    return (
+        "["
+        + ",".join(entry.model_dump_json(exclude_none=True) for entry in value)
+        + "]"
+    )
 
 
 def _serialize_text_object_value(value: Any) -> Any:
     if isinstance(value, str):
         return value
-    return json.dumps(value, separators=(",", ":"))
+    return to_json(value).decode()
 
 
 def _serialize_text_objects(value: list[BaseModel]) -> str:
@@ -164,7 +167,7 @@ def _serialize_text_objects(value: list[BaseModel]) -> str:
         }
         for entry in value
     ]
-    return json.dumps(payload, separators=(",", ":"))
+    return to_json(payload).decode()
 
 
 def _allowed_mime_types(

tests/live/test_live_add_text_to_pdf.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-import json
-
 import pytest
+from pydantic_core import to_json
 
 from pdfrest import AsyncPdfRestClient, PdfRestApiError, PdfRestClient
 from pdfrest.models import PdfRestFile
@@ -57,7 +56,7 @@ def _serialize_text_object_for_extra_body(
     # Match add-text wire format where each non-string value is JSON-quoted.
     for key, value in list(serialized.items()):
         if not isinstance(value, str):
-            serialized[key] = json.dumps(value, separators=(",", ":"))
+            serialized[key] = to_json(value).decode()
     return serialized
 
 
@@ -120,17 +119,16 @@ def test_live_add_text_to_pdf_invalid_page(
             uploaded_pdf_for_text,
             text_objects=[_default_text_object()],
             extra_body={
-                "text_objects": json.dumps(
+                "text_objects": to_json(
                     [
                         _serialize_text_object_for_extra_body(
                             {
                                 **_default_text_object(),
                                 "page": 0,
                             }
                         )
-                    ],
-                    separators=(",", ":"),
-                )
+                    ]
+                ).decode()
             },
         )
 
@@ -150,16 +148,15 @@ async def test_live_async_add_text_to_pdf_invalid_page(
                 uploaded_pdf_for_text,
                 text_objects=[_default_text_object()],
                 extra_body={
-                    "text_objects": json.dumps(
+                    "text_objects": to_json(
                         [
                             _serialize_text_object_for_extra_body(
                                 {
                                     **_default_text_object(),
                                     "page": 0,
                                 }
                             )
-                        ],
-                        separators=(",", ":"),
-                    )
+                        ]
+                    ).decode()
                 },
             )

tests/test_add_text_to_pdf.py

@@ -6,6 +6,7 @@
 import httpx
 import pytest
 from pydantic import ValidationError
+from pydantic_core import to_json
 
 from pdfrest import AsyncPdfRestClient, PdfRestClient
 from pdfrest.models import PdfRestFileBasedResponse, PdfRestFileID
@@ -56,7 +57,7 @@ def _serialize_text_object_for_request(
     # Add-text payloads now quote non-string values inside the text_objects JSON.
     for key, value in list(serialized.items()):
         if not isinstance(value, str):
-            serialized[key] = json.dumps(value, separators=(",", ":"))
+            serialized[key] = to_json(value).decode()
     return serialized
 
 
@@ -73,13 +74,15 @@ def handler(request: httpx.Request) -> httpx.Response:
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["id"] == str(pdf_file.id)
             assert payload["output"] == "with-text"
-            assert payload["text_objects"] == json.dumps(
-                [
-                    _serialize_text_object_for_request(
-                        make_text_object(is_right_to_left=True)
-                    )
-                ],
-                separators=(",", ":"),
+            assert (
+                payload["text_objects"]
+                == to_json(
+                    [
+                        _serialize_text_object_for_request(
+                            make_text_object(is_right_to_left=True)
+                        )
+                    ]
+                ).decode()
             )
             return httpx.Response(
                 200,
@@ -132,9 +135,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             assert request.headers["X-Debug"] == "1"
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["rotation"] == 15
-            assert payload["text_objects"] == json.dumps(
-                [_serialize_text_object_for_request(overridden_text_object)],
-                separators=(",", ":"),
+            assert (
+                payload["text_objects"]
+                == to_json(
+                    [_serialize_text_object_for_request(overridden_text_object)],
+                ).decode()
             )
             captured_timeout["value"] = request.extensions.get("timeout")
             return httpx.Response(
@@ -167,10 +172,9 @@ def handler(request: httpx.Request) -> httpx.Response:
             extra_headers={"X-Debug": "1"},
             extra_body={
                 "rotation": 15,
-                "text_objects": json.dumps(
+                "text_objects": to_json(
                     [_serialize_text_object_for_request(overridden_text_object)],
-                    separators=(",", ":"),
-                ),
+                ).decode(),
             },
             timeout=0.25,
         )
@@ -288,13 +292,15 @@ def handler(request: httpx.Request) -> httpx.Response:
             seen["post"] += 1
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["id"] == str(pdf_file.id)
-            assert payload["text_objects"] == json.dumps(
-                [
-                    _serialize_text_object_for_request(
-                        make_text_object(page="all", is_right_to_left=True)
-                    )
-                ],
-                separators=(",", ":"),
+            assert (
+                payload["text_objects"]
+                == to_json(
+                    [
+                        _serialize_text_object_for_request(
+                            make_text_object(page="all", is_right_to_left=True)
+                        )
+                    ]
+                ).decode()
             )
             return httpx.Response(
                 200,
@@ -343,9 +349,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             assert request.headers["X-Test"] == "async"
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["text_size"] == 18
-            assert payload["text_objects"] == json.dumps(
-                [_serialize_text_object_for_request(overridden_text_object)],
-                separators=(",", ":"),
+            assert (
+                payload["text_objects"]
+                == to_json(
+                    [_serialize_text_object_for_request(overridden_text_object)],
+                ).decode()
             )
             captured_timeout["value"] = request.extensions.get("timeout")
             return httpx.Response(
@@ -378,10 +386,9 @@ def handler(request: httpx.Request) -> httpx.Response:
             extra_headers={"X-Test": "async"},
             extra_body={
                 "text_size": 18,
-                "text_objects": json.dumps(
+                "text_objects": to_json(
                     [_serialize_text_object_for_request(overridden_text_object)],
-                    separators=(",", ":"),
-                ),
+                ).decode(),
             },
             timeout=1.0,
         )

tests/test_files.py

@@ -12,6 +12,7 @@
 import httpx
 import pytest
 import pytest_asyncio
+from pydantic_core import to_json
 from typing_extensions import override
 
 from pdfrest import AsyncPdfRestClient, PdfRestClient
@@ -654,7 +655,7 @@ def handler(request: httpx.Request) -> httpx.Response:
             if request.method == "GET" and request.url.path == "/resource/file-id":
                 return httpx.Response(200, stream=_StaticStream(binary_content))
             if request.method == "GET" and request.url.path == "/resource/file-id-json":
-                payload = json.dumps(json_payload).encode("utf-8")
+                payload = to_json(json_payload)
                 return httpx.Response(200, stream=_StaticStream(payload))
             msg = f"Unexpected request: {request.method} {request.url}"
             raise AssertionError(msg)
@@ -739,7 +740,7 @@ def handler(request: httpx.Request) -> httpx.Response:
             if request.method == "GET" and request.url.path == "/resource/file-id":
                 return httpx.Response(200, stream=_StaticAsyncStream(binary_content))
             if request.method == "GET" and request.url.path == "/resource/file-id-json":
-                payload = json.dumps(json_payload).encode("utf-8")
+                payload = to_json(json_payload)
                 return httpx.Response(200, stream=_StaticAsyncStream(payload))
             msg = f"Unexpected request: {request.method} {request.url}"
             raise AssertionError(msg)

tests/test_pdf_redaction_preview.py

@@ -5,6 +5,7 @@
 import httpx
 import pytest
 from pydantic import ValidationError
+from pydantic_core import to_json
 
 from pdfrest import PdfRestClient
 from pdfrest.models import PdfRestFileBasedResponse, PdfRestFileID
@@ -107,7 +108,7 @@ def test_preview_redactions_reject_json_string(monkeypatch: pytest.MonkeyPatch)
     ):
         client.preview_redactions(
             input_file,
-            redactions=json.dumps([{"type": "literal", "value": "secret"}]),  # type: ignore[arg-type]
+            redactions=to_json([{"type": "literal", "value": "secret"}]).decode(),  # type: ignore[arg-type]
         )