PyPDFForm 5.2.0__tar.gz → 5.2.1__tar.gz

{pypdfform-5.2.0 → pypdfform-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 5.2.0
+Version: 5.2.1
 Summary: The Python library & CLI for PDF forms.
 Author: Jinge Li
 License-Expression: MIT
@@ -24,7 +24,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cryptography<49.0.0,>=48.0.0
+Requires-Dist: cryptography<50.0.0,>=48.0.0
 Requires-Dist: fonttools<5.0.0,>=4.63.0
 Requires-Dist: pikepdf<11.0.0,>=10.7.2
 Requires-Dist: pillow<13.0.0,>=12.2.0

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/__init__.py

@@ -18,7 +18,7 @@ from Python code or from the command line.
 
 import logging
 
-__version__ = "5.2.0"
+__version__ = "5.2.1"
 
 from .lib.annotations import Annotations
 from .lib.assets.blank import BlankPage

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/filler.py

@@ -57,7 +57,9 @@ def signature_image_handler(
     any_image_to_draw = False
     if stream is not None:
         any_image_to_draw = True
-        image_width, image_height = get_image_dimensions(stream)
+        image_width, image_height = (
+            get_image_dimensions(stream) if middleware.preserve_aspect_ratio else (0, 0)
+        )
         x, y, width, height = get_draw_image_resolutions(
             widget, middleware.preserve_aspect_ratio, image_width, image_height
         )

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/image.py

@@ -7,6 +7,7 @@ calculating the resolutions for drawing an image on a PDF page, taking into
 account whether to preserve the aspect ratio.
 """
 
+from functools import lru_cache
 from io import BytesIO
 from typing import Tuple
 
@@ -50,12 +51,13 @@ def rotate_image(image_stream: bytes, rotation: float | int) -> bytes:
     return result
 
 
+@lru_cache
 def get_image_dimensions(image_stream: bytes) -> Tuple[float, float]:
     """
     Retrieves the width and height of an image from its byte stream.
 
-    This function uses the PIL library to open the image from the provided byte stream
-    and returns its dimensions (width and height) as a tuple of floats.
+    This cached function uses the PIL library to open the image from the provided
+    byte stream and returns its dimensions (width and height) as a tuple of floats.
 
     Args:
         image_stream (bytes): The image data as bytes.
@@ -63,13 +65,8 @@ def get_image_dimensions(image_stream: bytes) -> Tuple[float, float]:
     Returns:
         Tuple[float, float]: The width and height of the image in pixels.
     """
-    buff = BytesIO()
-    buff.write(image_stream)
-    buff.seek(0)
-
-    image = Image.open(buff)
-
-    return image.size
+    with Image.open(BytesIO(image_stream)) as image:
+        return image.size
 
 
 def get_draw_image_resolutions(

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/template.py

@@ -449,8 +449,7 @@ def update_widget_keys(
     out = PdfWriter()
     out.append(pdf)
 
-    for i, old_key in enumerate(old_keys):
-        _update_single_widget_key(out, widgets, old_key, new_keys[i], indices[i])
+    _apply_widget_key_updates(out, widgets, old_keys, new_keys, indices)
 
     with BytesIO() as f:
         out.write(f)
@@ -458,35 +457,44 @@ def update_widget_keys(
         return f.read()
 
 
-def _update_single_widget_key(
+def _apply_widget_key_updates(
     writer: PdfWriter,
     widgets: Dict[str, WIDGET_TYPES],
-    old_key: str,
-    new_key: str,
-    index: int,
+    old_keys: List[str],
+    new_keys: List[str],
+    indices: List[int],
 ) -> None:
     """
-    Updates a single widget key in a PDF template.
+    Applies queued widget key updates to matching annotations.
+
+    The update queue is converted into a lookup keyed by old widget name, then
+    each annotation is checked against that lookup as pages are traversed.
+    Non-radio widgets honor the requested occurrence index, while radio widgets
+    update every annotation in the radio group.
 
     Args:
         writer (PdfWriter): The PDF writer object.
         widgets (Dict[str, WIDGET_TYPES]): A dictionary of widgets in the template.
-        old_key (str): The old widget key to be replaced.
-        new_key (str): The new widget key to replace the old key.
-        index (int): The index of the widget to update if multiple widgets have the same name.
+        old_keys (List[str]): The old widget keys to replace.
+        new_keys (List[str]): The new widget keys to apply.
+        indices (List[int]): Widget occurrence indices for duplicate field names.
     """
-    tracker = -1
+    updates = {old_key: (new_keys[i], indices[i]) for i, old_key in enumerate(old_keys)}
+    trackers = {}
+
     for page in writer.pages:
         for annot in page.get(Annots, []):
             annot = cast(DictionaryObject, annot.get_object())
             key = get_widget_key(annot.get_object(), False)
 
-            widget = widgets.get(key)
-            if widget is None or old_key != key:
+            if key not in updates:
                 continue
 
-            tracker += 1
-            if not isinstance(widget, Radio) and tracker != index:
-                continue
+            widget = widgets.get(key)
+            if widget is not None:
+                trackers[key] = trackers.get(key, -1) + 1
+                new_key, index = updates[key]
+                if not isinstance(widget, Radio) and trackers[key] != index:
+                    continue
 
-            update_annotation_name(annot, new_key)
+                update_annotation_name(annot, new_key)

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/watermark.py

@@ -9,6 +9,7 @@ and to copy specific widgets from the watermarks to the original PDF.
 """
 
 from collections import defaultdict
+from functools import lru_cache
 from io import BytesIO
 from typing import Any, Dict, List, Optional
 
@@ -21,6 +22,20 @@ from .constants import Annots
 from .patterns import get_widget_key
 
 
+@lru_cache(maxsize=128)
+def _get_image_reader(image_stream: bytes) -> ImageReader:
+    """
+    Creates a cached ReportLab image reader for an image byte stream.
+
+    Args:
+        image_stream (bytes): The image data as a byte stream.
+
+    Returns:
+        ImageReader: The cached ReportLab image reader.
+    """
+    return ImageReader(BytesIO(image_stream))
+
+
 def draw_text(canvas: Canvas, **kwargs) -> None:
     """
     Draws a text string on the given canvas using the specified font, size, and color.
@@ -206,12 +221,8 @@ def draw_image(canvas: Canvas, **kwargs) -> None:
     width = kwargs["width"]
     height = kwargs["height"]
 
-    image_buff = BytesIO()
-    image_buff.write(image_stream)
-    image_buff.seek(0)
-
     canvas.drawImage(
-        ImageReader(image_buff),
+        _get_image_reader(image_stream),
         coordinate_x,
         coordinate_y,
         width=width,
@@ -219,8 +230,6 @@ def draw_image(canvas: Canvas, **kwargs) -> None:
         mask="auto",
     )
 
-    image_buff.close()
-
 
 def create_watermarks_and_draw(
     pdf: bytes, to_draw: List[dict], font_mapping: Optional[Dict[str, str]] = None

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/widgets/base.py

@@ -15,6 +15,7 @@ Classes:
 from __future__ import annotations
 
 from dataclasses import dataclass
+from functools import lru_cache
 from inspect import signature
 from io import BytesIO
 from typing import List, Optional
@@ -102,6 +103,28 @@ class Widget:
             if each in kwargs:
                 self.hook_params.append((each, kwargs.get(each)))
 
+    @staticmethod
+    @lru_cache
+    def _get_default_field_flags(acro_form_class: type, acro_form_func: str) -> tuple:
+        """
+        Retrieves the default field flags for a ReportLab AcroForm method.
+
+        Args:
+            acro_form_class (type): The ReportLab AcroForm class.
+            acro_form_func (str): The AcroForm method name.
+
+        Returns:
+            tuple: The default field flags split into individual flag names.
+        """
+        default_flags = signature(
+            getattr(acro_form_class, acro_form_func)
+        ).parameters.get(fieldFlags)
+        return (
+            tuple(default_flags.default.split(" "))
+            if default_flags and default_flags.default
+            else ()
+        )
+
     def _required_handler(self, canvas: Canvas) -> None:
         """
         Handles the 'Required' flag for the widget's AcroForm field.
@@ -115,13 +138,8 @@ class Widget:
         Args:
             canvas (Canvas): The ReportLab canvas object used for PDF operations.
         """
-        default_flags = signature(
-            getattr(canvas.acroForm, self.ACRO_FORM_FUNC)
-        ).parameters.get(fieldFlags)
-        default_flags = (
-            default_flags.default.split(" ")
-            if default_flags and default_flags.default
-            else []
+        default_flags = list(
+            self._get_default_field_flags(type(canvas.acroForm), self.ACRO_FORM_FUNC)
         )
 
         if self.acro_form_params.get(required):

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/widgets/signature.py

@@ -120,6 +120,11 @@ class SignatureWidget:
             annot_type_to_annot[key] = annot.get_object()
 
         for i, p in enumerate(input_pdf.pages):
+            page_widgets = page_to_widgets.get(i + 1, [])
+            if not page_widgets:
+                result.append(b"")
+                continue
+
             # pylint: disable=R0801
             watermark = BytesIO()
             canvas = Canvas(
@@ -135,8 +140,6 @@ class SignatureWidget:
 
             out = PdfWriter(watermark)
 
-            page_widgets = page_to_widgets.get(i + 1, [])
-
             widgets_to_copy = []
             for widget in page_widgets:
                 widget_to_copy = annot_type_to_annot[

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm/lib/wrapper.py

@@ -20,7 +20,7 @@ from __future__ import annotations
 
 from collections import defaultdict
 from dataclasses import asdict
-from functools import cached_property
+from functools import lru_cache
 from os import PathLike
 from typing import (
     TYPE_CHECKING,
@@ -241,6 +241,27 @@ class PdfWrapper:
         if self._read():
             self._available_fonts.update(**get_all_available_fonts(self._read()))
 
+    @staticmethod
+    @lru_cache
+    def _get_page_streams_with_widgets(stream: bytes) -> tuple[bytes, ...]:
+        """
+        Extracts page streams while preserving the original page widgets.
+
+        Args:
+            stream (bytes): The PDF stream to split into pages.
+
+        Returns:
+            tuple[bytes, ...]: Single-page PDF streams with widgets preserved.
+        """
+
+        return tuple(
+            # Case: Single watermark PDF, extracting a specific page to the first output page.
+            copy_watermark_widgets(page_stream, stream, None, i)
+            for i, page_stream in enumerate(
+                get_page_streams(remove_all_widgets(stream))
+            )
+        )
+
     def _reregister_font(self) -> PdfWrapper:
         """
         Reregisters fonts after PDF content modifications.
@@ -334,7 +355,7 @@ class PdfWrapper:
 
         return list(self._available_fonts.keys())
 
-    @cached_property
+    @property
     def pages(self) -> Sequence[PdfWrapper]:
         """
         Returns a list of `PdfWrapper` objects, each representing a single page in the PDF document.
@@ -347,11 +368,10 @@ class PdfWrapper:
 
         result = [
             self.__class__(
-                # Case: Single watermark PDF, extracting a specific page to the first output page.
-                copy_watermark_widgets(each, self._read(), None, i),
+                each,
                 **{param: getattr(self, param) for param, _ in self.USER_PARAMS},
             )
-            for i, each in enumerate(get_page_streams(remove_all_widgets(self._read())))
+            for each in self._get_page_streams_with_widgets(self._read())
         ]
 
         # because copy_watermark_widgets and remove_all_widgets

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 5.2.0
+Version: 5.2.1
 Summary: The Python library & CLI for PDF forms.
 Author: Jinge Li
 License-Expression: MIT
@@ -24,7 +24,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cryptography<49.0.0,>=48.0.0
+Requires-Dist: cryptography<50.0.0,>=48.0.0
 Requires-Dist: fonttools<5.0.0,>=4.63.0
 Requires-Dist: pikepdf<11.0.0,>=10.7.2
 Requires-Dist: pillow<13.0.0,>=12.2.0

{pypdfform-5.2.0 → pypdfform-5.2.1}/PyPDFForm.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cryptography<49.0.0,>=48.0.0
+cryptography<50.0.0,>=48.0.0
 fonttools<5.0.0,>=4.63.0
 pikepdf<11.0.0,>=10.7.2
 pillow<13.0.0,>=12.2.0

{pypdfform-5.2.0 → pypdfform-5.2.1}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "cryptography>=48.0.0,<49.0.0",
+    "cryptography>=48.0.0,<50.0.0",
     "fonttools>=4.63.0,<5.0.0",
     "pikepdf>=10.7.2,<11.0.0",
     "pillow>=12.2.0,<13.0.0",