watermark-pdf: Serialize to strings for payload

Assisted-by: Codex

Author: datalogics-cgreen

src/pdfrest/models/_internal.py

@@ -163,6 +163,10 @@ def _serialize_as_comma_separated_string(value: list[Any] | None) -> str | None:
     return ",".join(str(element) for element in value)
 
 
+def _serialize_as_string(value: Any) -> str:
+    return str(value)
+
+
 def _serialize_file_ids(value: list[PdfRestFile]) -> str:
     return ",".join(str(file.id) for file in value)
 
@@ -1648,7 +1652,9 @@ class _BasePdfWatermarkPayload(BaseModel):
         AfterValidator(_validate_output_prefix),
     ] = None
     opacity: Annotated[
-        float, Field(serialization_alias="opacity", ge=0, le=1, default=0.5)
+        float,
+        Field(serialization_alias="opacity", ge=0, le=1, default=0.5),
+        PlainSerializer(_serialize_as_string),
     ] = 0.5
     horizontal_alignment: Annotated[
         WatermarkHorizontalAlignment,
@@ -1658,9 +1664,21 @@ class _BasePdfWatermarkPayload(BaseModel):
         WatermarkVerticalAlignment,
         Field(serialization_alias="vertical_alignment", default="center"),
     ] = "center"
-    x: Annotated[int, Field(serialization_alias="x", default=0)] = 0
-    y: Annotated[int, Field(serialization_alias="y", default=0)] = 0
-    rotation: Annotated[int, Field(serialization_alias="rotation", default=0)] = 0
+    x: Annotated[
+        int,
+        Field(serialization_alias="x", default=0),
+        PlainSerializer(_serialize_as_string),
+    ] = 0
+    y: Annotated[
+        int,
+        Field(serialization_alias="y", default=0),
+        PlainSerializer(_serialize_as_string),
+    ] = 0
+    rotation: Annotated[
+        int,
+        Field(serialization_alias="rotation", default=0),
+        PlainSerializer(_serialize_as_string),
+    ] = 0
     pages: Annotated[
         list[AscendingPageRange] | None,
         Field(serialization_alias="pages", min_length=1, default=None),
@@ -1687,6 +1705,7 @@ class PdfTextWatermarkPayload(_BasePdfWatermarkPayload):
     text_size: Annotated[
         int,
         Field(serialization_alias="text_size", ge=5, le=100, default=72),
+        PlainSerializer(_serialize_as_string),
     ] = 72
     text_color_rgb: Annotated[
         tuple[RgbChannel, RgbChannel, RgbChannel] | None,
@@ -1744,7 +1763,9 @@ class PdfImageWatermarkPayload(_BasePdfWatermarkPayload):
         PlainSerializer(_serialize_as_first_file_id),
     ]
     watermark_file_scale: Annotated[
-        float, Field(serialization_alias="watermark_file_scale", ge=0, default=0.5)
+        float,
+        Field(serialization_alias="watermark_file_scale", ge=0, default=0.5),
+        PlainSerializer(_serialize_as_string),
     ] = 0.5
 
 

tests/test_watermark_pdf.py

@@ -216,7 +216,7 @@ def handler(request: httpx.Request) -> httpx.Response:
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["watermark_text"] == "Draft"
             assert payload["text_color_cmyk"] == "0,0,0,50"
-            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)
@@ -285,8 +285,8 @@ def handler(request: httpx.Request) -> httpx.Response:
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["id"] == str(input_file.id)
             assert payload["watermark_file_id"] == str(watermark_file.id)
-            assert payload["watermark_file_scale"] == 0.75
-            assert payload["opacity"] == 0.2
+            assert payload["watermark_file_scale"] == "0.75"
+            assert payload["opacity"] == "0.2"
             assert payload["output"] == "custom-image"
             assert payload["debug"] == "yes"
             return httpx.Response(
@@ -1098,9 +1098,9 @@ def handler(request: httpx.Request) -> httpx.Response:
             assert payload["text_color_rgb"] == "12,34,56"
             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={
@@ -1172,8 +1172,8 @@ def handler(request: httpx.Request) -> httpx.Response:
             payload = json.loads(request.content.decode("utf-8"))
             assert payload["id"] == str(input_file.id)
             assert payload["watermark_file_id"] == str(watermark_file.id)
-            assert payload["watermark_file_scale"] == 0.6
-            assert payload["opacity"] == 0.25
+            assert payload["watermark_file_scale"] == "0.6"
+            assert payload["opacity"] == "0.25"
             assert payload["output"] == "async-custom-image"
             assert payload["debug"] == "async"
             return httpx.Response(