watermark-pdf: Serialize parameters as strings

Assisted-by: Codex

Author: datalogics-cgreen

src/pdfrest/models/_internal.py

@@ -144,6 +144,19 @@ def _serialize_as_comma_separated_string(value: list[Any] | None) -> str | None:
     return ",".join(str(element) for element in value)
 
 
+def _serialize_watermark_field_values(payload: dict[str, Any]) -> dict[str, Any]:
+    for key in ("text_size", "watermark_file_scale", "opacity", "x", "y", "rotation"):
+        if key in payload:
+            payload[key] = str(payload[key])
+    if "behind_page" in payload:
+        behind_page_value = payload["behind_page"]
+        if isinstance(behind_page_value, bool):
+            payload["behind_page"] = "true" if behind_page_value else "false"
+        else:
+            payload["behind_page"] = str(behind_page_value)
+    return payload
+
+
 def _serialize_file_ids(value: list[PdfRestFile]) -> str:
     return ",".join(str(file.id) for file in value)
 
@@ -1699,7 +1712,7 @@ def _serialize_text_color(
             payload["text_color_cmyk"] = _serialize_as_comma_separated_string(
                 serialized_color
             )
-        return payload
+        return _serialize_watermark_field_values(payload)
 
 
 class PdfImageWatermarkPayload(_BasePdfWatermarkPayload):
@@ -1722,6 +1735,13 @@ class PdfImageWatermarkPayload(_BasePdfWatermarkPayload):
         float, Field(serialization_alias="watermark_file_scale", ge=0, default=0.5)
     ] = 0.5
 
+    @model_serializer(mode="wrap")
+    def _serialize_watermark_values(
+        self, handler: Callable[[PdfImageWatermarkPayload], dict[str, Any]]
+    ) -> dict[str, Any]:
+        payload = handler(self)
+        return _serialize_watermark_field_values(payload)
+
 
 class PdfXfaToAcroformsPayload(BaseModel):
     """Adapt caller options into a pdfRest-ready XFA-to-AcroForms request payload."""

tests/test_watermark_pdf.py

@@ -174,7 +174,7 @@ def handler(request: httpx.Request) -> httpx.Response:
             assert payload["watermark_text"] == "Draft"
             assert payload["text_color_cmyk"] == "0,0,0,50"
             assert "text_color_rgb" not in payload
-            assert payload["opacity"] == 0.25
+            assert payload["opacity"] == "0.25"
             assert payload["output"] == "custom"
             assert payload["debug"] == "yes"
             assert payload["id"] == str(input_file.id)
@@ -242,12 +242,12 @@ def handler(request: httpx.Request) -> httpx.Response:
             captured_timeout["value"] = request.extensions.get("timeout")
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["watermark_file_id"] == str(watermark_file.id)
-            assert payload["watermark_file_scale"] == pytest.approx(0.65)
+            assert payload["watermark_file_scale"] == "0.65"
             assert payload["horizontal_alignment"] == "left"
             assert payload["vertical_alignment"] == "top"
-            assert payload["x"] == -24
-            assert payload["y"] == 48
-            assert payload["rotation"] == 15
+            assert payload["x"] == "-24"
+            assert payload["y"] == "48"
+            assert payload["rotation"] == "15"
             assert payload["debug"] == "img-sync"
             assert payload["id"] == str(input_file.id)
             return httpx.Response(
@@ -593,9 +593,9 @@ def handler(request: httpx.Request) -> httpx.Response:
             assert payload["watermark_text"] == "AsyncDraft"
             assert payload["horizontal_alignment"] == "left"
             assert payload["vertical_alignment"] == "bottom"
-            assert payload["x"] == -72
-            assert payload["y"] == 144
-            assert payload["rotation"] == 30
+            assert payload["x"] == "-72"
+            assert payload["y"] == "144"
+            assert payload["rotation"] == "30"
             return httpx.Response(
                 200,
                 json={
@@ -663,13 +663,13 @@ def handler(request: httpx.Request) -> httpx.Response:
             captured_timeout["value"] = request.extensions.get("timeout")
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["watermark_file_id"] == str(watermark_file.id)
-            assert payload["watermark_file_scale"] == pytest.approx(0.25)
-            assert payload["opacity"] == pytest.approx(0.85)
+            assert payload["watermark_file_scale"] == "0.25"
+            assert payload["opacity"] == "0.85"
             assert payload["horizontal_alignment"] == "right"
             assert payload["vertical_alignment"] == "bottom"
-            assert payload["x"] == 12
-            assert payload["y"] == -18
-            assert payload["rotation"] == 330
+            assert payload["x"] == "12"
+            assert payload["y"] == "-18"
+            assert payload["rotation"] == "330"
             assert payload["debug"] == "img-async"
             assert payload["id"] == str(input_file.id)
             return httpx.Response(