PyPDFForm 2.3.3__py3-none-any.whl → 2.5.0__py3-none-any.whl

PyPDFForm/__init__.py

@@ -5,7 +5,7 @@ This package provides tools for filling PDF forms, drawing text and images,
 and manipulating PDF form elements programmatically.
 """
 
-__version__ = "2.3.3"
+__version__ = "2.5.0"
 
 from .wrapper import FormWrapper, PdfWrapper
 

PyPDFForm/filler.py

@@ -337,6 +337,7 @@ def enable_adobe_mode(reader: PdfReader, writer: PdfWriter, adobe_mode: bool) ->
 def simple_fill(
     template: bytes,
     widgets: Dict[str, WIDGET_TYPES],
+    use_full_widget_name: bool,
     flatten: bool = False,
     adobe_mode: bool = False,
 ) -> bytes:
@@ -350,6 +351,7 @@ def simple_fill(
     Args:
         template: Input PDF form as bytes
         widgets: Dictionary mapping field names to widget middleware
+        use_full_widget_name: If True, uses the full widget name as the key in the widgets dictionary
         flatten: If True, makes form fields read-only
         adobe_mode: If True, enables Adobe Acrobat compatibility
 
@@ -367,7 +369,7 @@ def simple_fill(
     for page in out.pages:
         for annot in page.get(Annots, []):
             annot = cast(DictionaryObject, annot.get_object())
-            key = get_widget_key(annot.get_object(), False)
+            key = get_widget_key(annot.get_object(), use_full_widget_name)
 
             widget = widgets.get(key)
             if widget is None or widget.value is None:

PyPDFForm/hooks.py

@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+"""Module containing hook functions for PDF form widget manipulation.
+
+This module provides functions to apply various transformations and modifications
+to PDF form widgets through a hook system. It allows dynamic modification of
+widget properties like font sizes and other attributes.
+"""
+
+import sys
+from io import BytesIO
+from typing import cast
+
+from pypdf import PdfReader, PdfWriter
+from pypdf.generic import (ArrayObject, DictionaryObject, FloatObject,
+                           NameObject, NumberObject, TextStringObject)
+
+from .constants import (COMB, DA, FONT_COLOR_IDENTIFIER, FONT_SIZE_IDENTIFIER,
+                        MULTILINE, Annots, Ff, Parent, Q, Rect)
+from .template import get_widget_key
+from .utils import stream_to_io
+
+
+def trigger_widget_hooks(
+    pdf: bytes,
+    widgets: dict,
+    use_full_widget_name: bool,
+) -> bytes:
+    """Apply all registered widget hooks to a PDF document.
+
+    Args:
+        pdf: The input PDF document as bytes
+        widgets: Dictionary mapping widget names to widget objects
+        use_full_widget_name: Whether to use full widget names including parent hierarchy
+
+    Returns:
+        The modified PDF document as bytes
+
+    Note:
+        This function processes all pages and annotations in the PDF, applying
+        any hooks registered in the widget objects.
+    """
+
+    pdf_file = PdfReader(stream_to_io(pdf))
+    output = PdfWriter()
+    output.append(pdf_file)
+
+    for page in output.pages:
+        for annot in page.get(Annots, []):
+            annot = cast(DictionaryObject, annot.get_object())
+            key = get_widget_key(annot.get_object(), use_full_widget_name)
+
+            widget = widgets.get(key)
+            if widget is None or not widget.hooks_to_trigger:
+                continue
+
+            for hook in widget.hooks_to_trigger:
+                getattr(sys.modules[__name__], hook[0])(annot, hook[1])
+
+    for widget in widgets.values():
+        widget.hooks_to_trigger = []
+
+    with BytesIO() as f:
+        output.write(f)
+        f.seek(0)
+        return f.read()
+
+
+def update_text_field_font_size(annot: DictionaryObject, val: float) -> None:
+    """Update the font size of a text field widget.
+
+    Args:
+        annot: The PDF annotation (widget) dictionary object
+        val: The new font size value to apply
+
+    Note:
+        Handles both direct font size specification and inherited font sizes
+        from parent objects. Modifies the DA (default appearance) string.
+    """
+
+    if Parent in annot and DA not in annot:
+        text_appearance = annot[Parent][DA]
+    else:
+        text_appearance = annot[DA]
+
+    text_appearance = text_appearance.split(" ")
+    font_size_index = 0
+    for i, value in enumerate(text_appearance):
+        if value.startswith(FONT_SIZE_IDENTIFIER):
+            font_size_index = i - 1
+            break
+
+    text_appearance[font_size_index] = str(val)
+    new_text_appearance = " ".join(text_appearance)
+
+    if Parent in annot and DA not in annot:
+        annot[NameObject(Parent)][NameObject(DA)] = TextStringObject(
+            new_text_appearance
+        )
+    else:
+        annot[NameObject(DA)] = TextStringObject(new_text_appearance)
+
+
+def update_text_field_font_color(annot: DictionaryObject, val: tuple) -> None:
+    """Update the font color of a text field widget.
+
+    Args:
+        annot: The PDF annotation (widget) dictionary object
+        val: Tuple containing RGB color values (e.g. (1, 0, 0) for red)
+
+    Note:
+        Handles both direct font color specification and inherited font colors
+        from parent objects. Modifies the DA (default appearance) string to
+        include the new color values after the font size identifier.
+    """
+
+    if Parent in annot and DA not in annot:
+        text_appearance = annot[Parent][DA]
+    else:
+        text_appearance = annot[DA]
+
+    text_appearance = text_appearance.split(" ")
+    font_size_identifier_index = 0
+    for i, value in enumerate(text_appearance):
+        if value == FONT_SIZE_IDENTIFIER:
+            font_size_identifier_index = i
+            break
+
+    new_text_appearance = (
+        text_appearance[:font_size_identifier_index]
+        + [FONT_SIZE_IDENTIFIER]
+        + [str(each) for each in val]
+    )
+    new_text_appearance = " ".join(new_text_appearance) + FONT_COLOR_IDENTIFIER
+
+    if Parent in annot and DA not in annot:
+        annot[NameObject(Parent)][NameObject(DA)] = TextStringObject(
+            new_text_appearance
+        )
+    else:
+        annot[NameObject(DA)] = TextStringObject(new_text_appearance)
+
+
+def update_text_field_alignment(annot: DictionaryObject, val: int) -> None:
+    """Update text alignment for text field annotations.
+
+    Modifies the alignment (Q) field of a text field annotation to set the
+    specified text alignment.
+
+    Args:
+        annot: PDF text field annotation dictionary to modify
+        val: Alignment value to set (typically 0=left, 1=center, 2=right)
+    """
+
+    annot[NameObject(Q)] = NumberObject(val)
+
+
+def update_text_field_multiline(annot: DictionaryObject, val: bool) -> None:
+    """Update multiline flag for text field annotations.
+
+    Modifies the field flags (Ff) of a text field annotation to set or
+    clear the multiline flag based on the input value.
+
+    Args:
+        annot: PDF text field annotation dictionary to modify
+        val: Whether to enable multiline (True) or disable (False)
+    """
+
+    if val:
+        annot[NameObject(Ff)] = NumberObject(int(annot[NameObject(Ff)]) | MULTILINE)
+
+
+def update_text_field_comb(annot: DictionaryObject, val: bool) -> None:
+    """Update comb formatting flag for text field annotations.
+
+    Modifies the field flags (Ff) of a text field annotation to set or
+    clear the comb flag which enables/disables comb formatting.
+
+    Args:
+        annot: PDF text field annotation dictionary to modify
+        val: Whether to enable comb formatting (True) or disable (False)
+    """
+
+    if val:
+        annot[NameObject(Ff)] = NumberObject(int(annot[NameObject(Ff)]) | COMB)
+
+
+def update_check_radio_size(annot: DictionaryObject, val: float) -> None:
+    """Update the size of a checkbox or radio button widget while maintaining center position.
+
+    Args:
+        annot: PDF annotation dictionary containing the widget to modify
+        val: New size value (width and height) for the widget
+
+    Note:
+        The widget will be resized symmetrically around its center point,
+        maintaining the same center position while changing its dimensions.
+    """
+
+    rect = annot[Rect]
+    center_x = (rect[0] + rect[2]) / 2
+    center_y = (rect[1] + rect[3]) / 2
+    new_rect = [
+        FloatObject(center_x - val / 2),
+        FloatObject(center_y - val / 2),
+        FloatObject(center_x + val / 2),
+        FloatObject(center_y + val / 2),
+    ]
+    annot[NameObject(Rect)] = ArrayObject(new_rect)
+
+
+# TODO: remove this and switch to hooks
+NON_ACRO_FORM_PARAM_TO_FUNC = {
+    ("TextWidget", "alignment"): update_text_field_alignment,
+    ("TextWidget", "multiline"): update_text_field_multiline,
+    ("TextWidget", "comb"): update_text_field_comb,
+}

PyPDFForm/middleware/base.py

@@ -26,6 +26,8 @@ class Widget:
     - Any widget-specific functionality
     """
 
+    SET_ATTR_TRIGGER_HOOK_MAP = {}
+
     def __init__(
         self,
         name: str,
@@ -48,6 +50,28 @@ class Widget:
         self.border_style = None
         self.dash_array = None
         self.render_widget = None
+        self.hooks_to_trigger = []
+
+    def __setattr__(self, name: str, value: Any) -> None:
+        """Sets an attribute on the widget with special handling for hook-triggering attributes.
+
+        For attributes listed in SET_ATTR_TRIGGER_HOOK_MAP, when set to non-None values,
+        adds a hook to hooks_to_trigger list with the mapped hook name and value.
+        All other attributes are set normally via the standard object.__setattr__.
+
+        Args:
+            name: Name of the attribute to set
+            value: Value to set the attribute to
+
+        Note:
+            The hook triggering only occurs when:
+            1. The attribute is in SET_ATTR_TRIGGER_HOOK_MAP
+            2. The value being set is not None
+        """
+
+        if name in self.SET_ATTR_TRIGGER_HOOK_MAP and value is not None:
+            self.hooks_to_trigger.append((self.SET_ATTR_TRIGGER_HOOK_MAP[name], value))
+        super().__setattr__(name, value)
 
     @property
     def name(self) -> str:

PyPDFForm/middleware/checkbox.py

@@ -25,6 +25,10 @@ class Checkbox(Widget):
     Inherits from Widget base class and extends it with checkbox-specific features.
     """
 
+    SET_ATTR_TRIGGER_HOOK_MAP = {
+        "size": "update_check_radio_size",
+    }
+
     BUTTON_STYLE_MAPPING = {
         "check": "4",
         "cross": "5",

PyPDFForm/middleware/text.py

@@ -27,6 +27,11 @@ class Text(Widget):
     Inherits from Widget base class and extends it with text-specific features.
     """
 
+    SET_ATTR_TRIGGER_HOOK_MAP = {
+        "font_size": "update_text_field_font_size",
+        "font_color": "update_text_field_font_color",
+    }
+
     def __init__(
         self,
         name: str,

PyPDFForm/patterns.py

@@ -19,9 +19,9 @@ from pypdf.generic import (ArrayObject, DictionaryObject, NameObject,
                            NumberObject, TextStringObject)
 
 from .constants import (AP, AS, BC, BG, BS, CA, DA, DV, FT,
-                        IMAGE_FIELD_IDENTIFIER, JS, MK, MULTILINE, READ_ONLY,
-                        TU, A, Btn, Ch, D, Ff, I, N, Off, Opt, Parent, Q, S,
-                        Sig, T, Tx, V, W, Yes)
+                        IMAGE_FIELD_IDENTIFIER, JS, MK, READ_ONLY, TU, A, Btn,
+                        Ch, D, Ff, I, N, Off, Opt, Parent, Q, S, Sig, T, Tx, V,
+                        W, Yes)
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.image import Image
@@ -273,38 +273,3 @@ def update_annotation_name(annot: DictionaryObject, val: str) -> None:
         annot[NameObject(Parent)][NameObject(T)] = TextStringObject(val)
     else:
         annot[NameObject(T)] = TextStringObject(val)
-
-
-def update_created_text_field_alignment(annot: DictionaryObject, val: int) -> None:
-    """Update text alignment for created text field annotations.
-
-    Modifies the alignment (Q) field of a text field annotation created
-    by the library to set the specified text alignment.
-
-    Args:
-        annot: PDF text field annotation dictionary to modify
-        val: Alignment value to set (typically 0=left, 1=center, 2=right)
-    """
-
-    annot[NameObject(Q)] = NumberObject(val)
-
-
-def update_created_text_field_multiline(annot: DictionaryObject, val: bool) -> None:
-    """Update multiline flag for created text field annotations.
-
-    Modifies the field flags (Ff) of a text field annotation created by
-    the library to set or clear the multiline flag based on the input value.
-
-    Args:
-        annot: PDF text field annotation dictionary to modify
-        val: Whether to enable multiline (True) or disable (False)
-    """
-
-    if val:
-        annot[NameObject(Ff)] = NumberObject(int(annot[NameObject(Ff)]) | MULTILINE)
-
-
-NON_ACRO_FORM_PARAM_TO_FUNC = {
-    ("TextWidget", "alignment"): update_created_text_field_alignment,
-    ("TextWidget", "multiline"): update_created_text_field_multiline,
-}

PyPDFForm/widgets/base.py

@@ -16,7 +16,7 @@ from reportlab.lib.colors import Color
 from reportlab.pdfgen.canvas import Canvas
 
 from ..constants import Annots
-from ..patterns import NON_ACRO_FORM_PARAM_TO_FUNC
+from ..hooks import NON_ACRO_FORM_PARAM_TO_FUNC
 from ..template import get_widget_key
 from ..utils import stream_to_io
 

PyPDFForm/widgets/text.py

@@ -36,6 +36,6 @@ class TextWidget(Widget):
         ("max_length", "maxlen"),
     ]
     COLOR_PARAMS = ["font_color", "bg_color", "border_color"]
-    ALLOWED_NON_ACRO_FORM_PARAMS = ["alignment", "multiline"]
+    ALLOWED_NON_ACRO_FORM_PARAMS = ["alignment", "multiline", "comb"]
     NONE_DEFAULTS = ["max_length"]
     ACRO_FORM_FUNC = "textfield"

PyPDFForm/wrapper.py

@@ -26,6 +26,7 @@ from .constants import (DEFAULT_FONT, DEFAULT_FONT_COLOR, DEFAULT_FONT_SIZE,
 from .coordinate import generate_coordinate_grid
 from .filler import fill, simple_fill
 from .font import register_font
+from .hooks import trigger_widget_hooks
 from .image import rotate_image
 from .middleware.dropdown import Dropdown
 from .middleware.text import Text
@@ -62,16 +63,21 @@ class FormWrapper:
     def __init__(
         self,
         template: Union[bytes, str, BinaryIO] = b"",
+        **kwargs,
     ) -> None:
         """Initializes the base form wrapper with a PDF template.
 
         Args:
             template: PDF form as bytes, file path, or file object. Defaults to
                 empty bytes if not provided.
+            **kwargs: Additional options:
+                use_full_widget_name: If True, uses complete widget names including
+                    field hierarchy (default: False)
 
         Initializes:
             - Internal PDF stream from the template
             - Basic form filling capabilities
+            - Widget naming configuration from kwargs
 
         Note:
             This base class is designed to be extended by PdfWrapper which adds
@@ -79,7 +85,8 @@ class FormWrapper:
         """
 
         super().__init__()
-        self.stream = fp_or_f_obj_or_stream_to_stream(template)
+        self._stream = fp_or_f_obj_or_stream_to_stream(template)
+        self.use_full_widget_name = kwargs.get("use_full_widget_name", False)
 
     def read(self) -> bytes:
         """Returns the raw bytes of the PDF form data.
@@ -92,7 +99,7 @@ class FormWrapper:
             bytes: The complete PDF document as a byte string
         """
 
-        return self.stream
+        return self._stream
 
     def fill(
         self,
@@ -102,28 +109,43 @@ class FormWrapper:
         """Fills form fields in the PDF with provided values.
 
         Takes a dictionary of field names to values and updates the corresponding
-        form fields in the PDF. Only fields that exist in the template PDF will
-        be filled - unknown field names are silently ignored.
+        form fields in the PDF. Supports these value types:
+            - Strings for text fields
+            - Booleans for checkboxes (True=checked, False=unchecked)
+            - Integers for numeric fields and dropdown selections
+
+        Only fields that exist in the template PDF will be filled - unknown field
+        names are silently ignored.
 
         Args:
-            data: Dictionary mapping field names to values (str, bool or int)
+            data: Dictionary mapping field names to values. Supported types:
+                str: For text fields
+                bool: For checkboxes (True=checked)
+                int: For numeric fields and dropdown selections
             **kwargs: Additional options:
-                flatten: If True, makes form fields read-only after filling
-                adobe_mode: If True, uses Adobe-compatible filling logic
+                flatten (bool): If True, makes form fields read-only after filling
+                    (default: False)
+                adobe_mode (bool): If True, uses Adobe-compatible filling logic
+                    (default: False)
 
         Returns:
             FormWrapper: Returns self to allow method chaining
         """
 
-        widgets = build_widgets(self.stream, False, False) if self.stream else {}
+        widgets = (
+            build_widgets(self.read(), self.use_full_widget_name, False)
+            if self.read()
+            else {}
+        )
 
         for key, value in data.items():
             if key in widgets:
                 widgets[key].value = value
 
-        self.stream = simple_fill(
+        self._stream = simple_fill(
             self.read(),
             widgets,
+            use_full_widget_name=self.use_full_widget_name,
             flatten=kwargs.get("flatten", False),
             adobe_mode=kwargs.get("adobe_mode", False),
         )
@@ -156,6 +178,8 @@ class PdfWrapper(FormWrapper):
         ("use_full_widget_name", False),
         ("render_widgets", True),
     ]
+    # TODO: remove, always default to True
+    TRIGGER_WIDGET_HOOKS = False
 
     def __init__(
         self,
@@ -234,6 +258,31 @@ class PdfWrapper(FormWrapper):
                 value.font_size = getattr(self, "global_font_size")
                 value.font_color = getattr(self, "global_font_color")
 
+    def read(self) -> bytes:
+        """Returns the raw bytes of the PDF form data with optional widget hook processing.
+
+        Extends FormWrapper.read() with additional functionality:
+        - Triggers any registered widget hooks if TRIGGER_WIDGET_HOOKS is True
+        - Maintains all parent class behavior of returning raw PDF bytes
+
+        The method first processes any widget hooks that need triggering, then delegates
+        to the parent class's read() implementation to return the PDF bytes.
+
+        Returns:
+            bytes: The complete PDF document as a byte string, after any hook processing
+        """
+
+        if self.TRIGGER_WIDGET_HOOKS and any(
+            widget.hooks_to_trigger for widget in self.widgets.values()
+        ):
+            self._stream = trigger_widget_hooks(
+                self._stream,
+                self.widgets,
+                getattr(self, "use_full_widget_name"),
+            )
+
+        return super().read()
+
     @property
     def sample_data(self) -> dict:
         """Generates a dictionary of sample values for all form fields.
@@ -266,7 +315,7 @@ class PdfWrapper(FormWrapper):
         """
 
         for each in VERSION_IDENTIFIERS:
-            if self.stream.startswith(each):
+            if self.read().startswith(each):
                 return each.replace(VERSION_IDENTIFIER_PREFIX, b"").decode()
 
         return None
@@ -288,7 +337,7 @@ class PdfWrapper(FormWrapper):
 
         return [
             self.__class__(
-                copy_watermark_widgets(each, self.stream, None, i),
+                copy_watermark_widgets(each, self.read(), None, i),
                 **{param: getattr(self, param) for param, _ in self.USER_PARAMS},
             )
             for i, each in enumerate(get_page_streams(remove_all_widgets(self.read())))
@@ -307,7 +356,7 @@ class PdfWrapper(FormWrapper):
             PdfWrapper: Returns self to allow method chaining
         """
 
-        self.stream = self.stream.replace(
+        self._stream = self.read().replace(
             VERSION_IDENTIFIER_PREFIX + bytes(self.version, "utf-8"),
             VERSION_IDENTIFIER_PREFIX + bytes(version, "utf-8"),
             1,
@@ -330,10 +379,10 @@ class PdfWrapper(FormWrapper):
             PdfWrapper: New wrapper containing merged PDF
         """
 
-        if not self.stream:
+        if not self.read():
             return other
 
-        if not other.stream:
+        if not other.read():
             return self
 
         unique_suffix = generate_unique_suffix()
@@ -343,7 +392,7 @@ class PdfWrapper(FormWrapper):
 
         other.commit_widget_key_updates()
 
-        return self.__class__(merge_two_pdfs(self.stream, other.stream))
+        return self.__class__(merge_two_pdfs(self.read(), other.read()))
 
     @property
     def preview(self) -> bytes:
@@ -360,7 +409,7 @@ class PdfWrapper(FormWrapper):
 
         return remove_all_widgets(
             fill(
-                self.stream,
+                self.read(),
                 {
                     key: preview_widget_to_draw(key, value, True)
                     for key, value in self.widgets.items()
@@ -387,10 +436,10 @@ class PdfWrapper(FormWrapper):
             PdfWrapper: Returns self to allow method chaining
         """
 
-        self.stream = generate_coordinate_grid(
+        self._stream = generate_coordinate_grid(
             remove_all_widgets(
                 fill(
-                    self.stream,
+                    self.read(),
                     {
                         key: preview_widget_to_draw(key, value, False)
                         for key, value in self.widgets.items()
@@ -433,15 +482,15 @@ class PdfWrapper(FormWrapper):
                 self.widgets[key] = dropdown_to_text(value)
 
         update_text_field_attributes(
-            self.stream, self.widgets, getattr(self, "use_full_widget_name")
+            self.read(), self.widgets, getattr(self, "use_full_widget_name")
         )
         if self.read():
             self.widgets = set_character_x_paddings(
-                self.stream, self.widgets, getattr(self, "use_full_widget_name")
+                self.read(), self.widgets, getattr(self, "use_full_widget_name")
             )
 
-        self.stream = remove_all_widgets(
-            fill(self.stream, self.widgets, getattr(self, "use_full_widget_name"))
+        self._stream = remove_all_widgets(
+            fill(self.read(), self.widgets, getattr(self, "use_full_widget_name"))
         )
 
         return self
@@ -506,10 +555,10 @@ class PdfWrapper(FormWrapper):
         obj = _class(name=name, page_number=page_number, x=x, y=y, **kwargs)
         watermarks = obj.watermarks(self.read())
 
-        self.stream = copy_watermark_widgets(self.read(), watermarks, [name], None)
+        self._stream = copy_watermark_widgets(self.read(), watermarks, [name], None)
         if obj.non_acro_form_params:
-            self.stream = handle_non_acro_form_params(
-                self.stream, name, obj.non_acro_form_params
+            self._stream = handle_non_acro_form_params(
+                self.read(), name, obj.non_acro_form_params
             )
 
         key_to_refresh = ""
@@ -548,7 +597,7 @@ class PdfWrapper(FormWrapper):
             self._keys_to_update.append((old_key, new_key, index))
             return self
 
-        self.stream = update_widget_keys(
+        self._stream = update_widget_keys(
             self.read(), self.widgets, [old_key], [new_key], [index]
         )
         self._init_helper()
@@ -576,7 +625,7 @@ class PdfWrapper(FormWrapper):
         new_keys = [each[1] for each in self._keys_to_update]
         indices = [each[2] for each in self._keys_to_update]
 
-        self.stream = update_widget_keys(
+        self._stream = update_widget_keys(
             self.read(), self.widgets, old_keys, new_keys, indices
         )
         self._init_helper()
@@ -624,7 +673,7 @@ class PdfWrapper(FormWrapper):
             new_widget.text_lines = text.split(NEW_LINE_SYMBOL)
 
         watermarks = create_watermarks_and_draw(
-            self.stream,
+            self.read(),
             page_number,
             "text",
             [
@@ -637,9 +686,9 @@ class PdfWrapper(FormWrapper):
         )
 
         stream_with_widgets = self.read()
-        self.stream = merge_watermarks_with_pdf(self.stream, watermarks)
-        self.stream = copy_watermark_widgets(
-            remove_all_widgets(self.stream), stream_with_widgets, None, None
+        self._stream = merge_watermarks_with_pdf(self.read(), watermarks)
+        self._stream = copy_watermark_widgets(
+            remove_all_widgets(self.read()), stream_with_widgets, None, None
         )
 
         return self
@@ -675,16 +724,16 @@ class PdfWrapper(FormWrapper):
         image = fp_or_f_obj_or_stream_to_stream(image)
         image = rotate_image(image, rotation)
         watermarks = create_watermarks_and_draw(
-            self.stream,
+            self.read(),
             page_number,
             "image",
             [{"stream": image, "x": x, "y": y, "width": width, "height": height}],
         )
 
         stream_with_widgets = self.read()
-        self.stream = merge_watermarks_with_pdf(self.stream, watermarks)
-        self.stream = copy_watermark_widgets(
-            remove_all_widgets(self.stream), stream_with_widgets, None, None
+        self._stream = merge_watermarks_with_pdf(self.read(), watermarks)
+        self._stream = copy_watermark_widgets(
+            remove_all_widgets(self.read()), stream_with_widgets, None, None
         )
 
         return self

{pypdfform-2.3.3.dist-info → pypdfform-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 2.3.3
+Version: 2.5.0
 Summary: The Python library for PDF forms.
 Author: Jinge Li
 License-Expression: MIT
@@ -10,7 +10,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -18,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cryptography

{pypdfform-2.3.3.dist-info → pypdfform-2.5.0.dist-info}/RECORD

@@ -1,34 +1,35 @@
-PyPDFForm/__init__.py,sha256=CIeFI9ZbT-rwWJRuFoM1sf-_594uyi0_dZQZR9f8b2Y,328
+PyPDFForm/__init__.py,sha256=wAEMuODSkOqin_uUjzUY5oitVvnunyq9iTT7k_VrRbM,328
 PyPDFForm/adapter.py,sha256=_5fP5UR-NzjDDayJmBRO36DgbnbUzNbjZtHZtPvSM14,1909
 PyPDFForm/constants.py,sha256=3ed0j11cWd9Uo4s-XvZwwJojPSz8aqdmZgaEishWjqE,2342
 PyPDFForm/coordinate.py,sha256=gQI7z-GsdCO33Qny5kXLBs6Y2TW5KO_mJ2in64fvXcg,16412
-PyPDFForm/filler.py,sha256=zyI_dBATc6ldZlJnQHhryj221CwWdkyVtlcrIYPhXvQ,13967
+PyPDFForm/filler.py,sha256=oCXDzz8paw8-MIQLiTTv5goYlfCfz_EcczCj8K4JB3g,14116
 PyPDFForm/font.py,sha256=eRbDyQFhXUkHzyZvCtru9Ypg_ukfbBAnSM5xNzPb5ss,7280
+PyPDFForm/hooks.py,sha256=e9mjZgGl7t9Spok3Tgwl9Osmlzx4vod-5z5jVF84x-Q,7117
 PyPDFForm/image.py,sha256=aYk7BC-AHiqt73durGIQ3e6gE5Ggbdr8jmkCUaQdsk8,1627
-PyPDFForm/patterns.py,sha256=VH7cgAFHLKEUIfE1yIlifIJ9mc0Eb2Kqo-krk34HGOY,9316
+PyPDFForm/patterns.py,sha256=nkvtwsm1dbHjAH7FBNwMR5YI6_Jj16KYBm1HxB12vOk,8100
 PyPDFForm/template.py,sha256=N_Pj3SaSKs3sqIuIdtgHPXvxIHLnHeR2M9IwRCWWKoQ,20043
 PyPDFForm/utils.py,sha256=QxJSG96FHGch863UdBPT8DdTKN9gVzQzA2ezifTm7z4,8575
 PyPDFForm/watermark.py,sha256=yvtZKcdPAPprBVEWcFZEnZMJcTwVpQ6u72m0jqYHxx8,12357
-PyPDFForm/wrapper.py,sha256=hBgSkHq0VjzY5VDdT_XHmHt6yr2LPq6hXqBy-LcJCdc,25674
+PyPDFForm/wrapper.py,sha256=ndk6isS8scu9nxGsgcA9MU1-NNzYsqMLtxm3EY4aqSQ,27678
 PyPDFForm/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyPDFForm/middleware/base.py,sha256=Ex--sUtQqpjFYWi3oAMqjuay_HYToHFMwRtdgWusckI,2802
-PyPDFForm/middleware/checkbox.py,sha256=gRGhFySPoIpKBseoiOTS3WggoBBik12dXbZ-LJKzIwM,2611
+PyPDFForm/middleware/base.py,sha256=lHIWBs2axKDYZj4rYRHrBHzSqF7yk0o9S8uAFTWspSA,3783
+PyPDFForm/middleware/checkbox.py,sha256=sUk5hclIKYE8N85ZYvYOI_SYK2WVqlqIP7oBYWlv_yY,2695
 PyPDFForm/middleware/dropdown.py,sha256=McuZl8Pc2IYPkEHRmM1OcEsh9njekySqjqVxRmQKmWU,1773
 PyPDFForm/middleware/image.py,sha256=HlPUsIktj-NryIkwwdZlilvrd6sZYifs9IuDgTHp7uQ,950
 PyPDFForm/middleware/radio.py,sha256=M4yqHYzHj0jvOGbjYdqeYnNAlYhTF-h47qxqrjXDOoU,1921
 PyPDFForm/middleware/signature.py,sha256=0gexCQwHCEOrjrgvUXeJJCGo2plfSEbXlykPJJCqpfA,2380
-PyPDFForm/middleware/text.py,sha256=eAxeVwboPPlnDT4aaOi7UpQ_xPmnlzkIbUOtRm1VMd0,2944
+PyPDFForm/middleware/text.py,sha256=VWL2kLXY_UTz1DkUJOgai9VczU3E4yn_Sa5LwUVTgt4,3091
 PyPDFForm/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyPDFForm/widgets/base.py,sha256=nzRmZFRXjc4fKySMwVQs6YzPxnhnxcgFWnMUvOySWz4,5330
+PyPDFForm/widgets/base.py,sha256=vrWsnrFumgZScSMzRtqxapIkFm3yvasV_xIs2lmI2a0,5327
 PyPDFForm/widgets/bedrock.py,sha256=j6beU04kaQzpAIFZHI5VJLaDT5RVAAa6LzkU1luJpN8,137660
 PyPDFForm/widgets/checkbox.py,sha256=_1I5yh1211RgRUyWzd3NNYpI9JchqJNSJWaZAhl2uOo,1248
 PyPDFForm/widgets/dropdown.py,sha256=zszIT5MI6ggBRUEn7oGBKK0pKmDC9LQw3RnqaKG8ocQ,1764
 PyPDFForm/widgets/image.py,sha256=6y8Ysmk49USr_qWOXD6KGL6cch516cUIlrxoj0pJy9Q,797
 PyPDFForm/widgets/radio.py,sha256=ipadJyHbgftDUvjGk15kapzgHPN3HjdF_iB_7amXR6o,2737
 PyPDFForm/widgets/signature.py,sha256=FdXzja3RTuyU9iyA5Y1yPb4Gsfe4rYlM4gcwekIuwog,4997
-PyPDFForm/widgets/text.py,sha256=HP2cPEUAzK5QL3kDfMz7gQcC3svCpmYuyFItBjlrBpI,1233
-pypdfform-2.3.3.dist-info/licenses/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-pypdfform-2.3.3.dist-info/METADATA,sha256=Xvokh3kh7VxfWjHqELYDLiEGPZdPAGeNk7PS0ePk7BQ,4738
-pypdfform-2.3.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-pypdfform-2.3.3.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-pypdfform-2.3.3.dist-info/RECORD,,
+PyPDFForm/widgets/text.py,sha256=O9aTZLnpB_k-ZWx6jNbfKbVLq-O1zjwN3reBMwTNG2M,1241
+pypdfform-2.5.0.dist-info/licenses/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+pypdfform-2.5.0.dist-info/METADATA,sha256=r860fmyW62b7Vl9lIJiIVllhtQOKrunEnL9DQb0Bu-0,4688
+pypdfform-2.5.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pypdfform-2.5.0.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+pypdfform-2.5.0.dist-info/RECORD,,

{pypdfform-2.3.3.dist-info → pypdfform-2.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any