PyPDFForm 1.5.3__tar.gz → 1.5.5__tar.gz

{pypdfform-1.5.3 → pypdfform-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPDFForm
-Version: 1.5.3
+Version: 1.5.5
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Contains any object users might need."""
 
-__version__ = "1.5.3"
+__version__ = "1.5.5"
 
 from .wrapper import FormWrapper, PdfWrapper
 

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/constants.py

@@ -84,6 +84,7 @@ BUTTON_STYLES = {
 }
 
 COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO = DEFAULT_FONT_SIZE / 100
+UNIQUE_SUFFIX_LENGTH = 20
 
 # Used for adjusting paragraph font size
 FONT_SIZE_REDUCE_STEP = 0.5

pypdfform-1.5.5/PyPDFForm/middleware/image.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+"""Contains image field middleware."""
+
+from .signature import Signature
+
+
+class Image(Signature):
+    """A class to represent an image field widget."""
+
+    preserve_aspect_ratio = False

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/middleware/radio.py

@@ -7,16 +7,7 @@ from .checkbox import Checkbox
 class Radio(Checkbox):
     """A class to represent a radiobutton widget."""
 
-    def __init__(
-        self,
-        name: str,
-        value: int = None,
-    ) -> None:
-        """Constructs all attributes for the radiobutton."""
-
-        super().__init__(name, value)
-
-        self.number_of_options = 0
+    number_of_options = 0
 
     @property
     def schema_definition(self) -> dict:

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/middleware/signature.py

@@ -11,6 +11,8 @@ from .base import Widget
 class Signature(Widget):
     """A class to represent a signature field widget."""
 
+    preserve_aspect_ratio = True
+
     def __init__(
         self,
         name: str,
@@ -20,8 +22,6 @@ class Signature(Widget):
 
         super().__init__(name, value)
 
-        self.preserve_aspect_ratio = True
-
     @property
     def schema_definition(self) -> dict:
         """Json schema definition of the signature field."""

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/utils.py

@@ -2,6 +2,8 @@
 """Contains utility helpers."""
 
 from io import BytesIO
+from secrets import choice
+from string import ascii_letters, digits, punctuation
 from typing import BinaryIO, List, Union
 
 from pypdf import PdfReader, PdfWriter
@@ -9,7 +11,8 @@ from pypdf.generic import DictionaryObject
 
 from .constants import (BUTTON_STYLES, DEFAULT_CHECKBOX_STYLE, DEFAULT_FONT,
                         DEFAULT_FONT_COLOR, DEFAULT_FONT_SIZE,
-                        DEFAULT_RADIO_STYLE, PREVIEW_FONT_COLOR, WIDGET_TYPES)
+                        DEFAULT_RADIO_STYLE, PREVIEW_FONT_COLOR,
+                        UNIQUE_SUFFIX_LENGTH, WIDGET_TYPES)
 from .middleware.checkbox import Checkbox
 from .middleware.radio import Radio
 from .middleware.text import Text
@@ -150,3 +153,14 @@ def traverse_pattern(
         if result:
             return result
     return None
+
+
+def generate_unique_suffix() -> str:
+    """Generates a unique suffix string for widgets during form merging."""
+
+    return "".join(
+        [
+            choice(ascii_letters + digits + punctuation.replace("-", ""))
+            for _ in range(UNIQUE_SUFFIX_LENGTH)
+        ]
+    )

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm/wrapper.py

@@ -19,8 +19,8 @@ from .middleware.text import Text
 from .template import (build_widgets, dropdown_to_text,
                        set_character_x_paddings, update_text_field_attributes,
                        update_widget_keys, widget_rect_watermarks)
-from .utils import (get_page_streams, merge_two_pdfs, preview_widget_to_draw,
-                    remove_all_widgets)
+from .utils import (generate_unique_suffix, get_page_streams, merge_two_pdfs,
+                    preview_widget_to_draw, remove_all_widgets)
 from .watermark import create_watermarks_and_draw, merge_watermarks_with_pdf
 from .widgets.base import handle_non_acro_form_params
 from .widgets.checkbox import CheckBoxWidget
@@ -166,10 +166,14 @@ class PdfWrapper(FormWrapper):
         if not other.stream:
             return self
 
-        new_obj = self.__class__()
-        new_obj.stream = merge_two_pdfs(self.stream, other.stream)
+        unique_suffix = generate_unique_suffix()
+        for k in self.widgets:
+            if k in other.widgets:
+                other.update_widget_key(k, f"{k}-{unique_suffix}", defer=True)
 
-        return new_obj
+        other.commit_widget_key_updates()
+
+        return self.__class__(merge_two_pdfs(self.stream, other.stream))
 
     @property
     def preview(self) -> bytes:

{pypdfform-1.5.3 → pypdfform-1.5.5}/PyPDFForm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPDFForm
-Version: 1.5.3
+Version: 1.5.5
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{pypdfform-1.5.3 → pypdfform-1.5.5}/tests/test_functional_simple.py

@@ -2,7 +2,9 @@
 
 import os
 
-from PyPDFForm import FormWrapper
+from PyPDFForm import FormWrapper, PdfWrapper
+from PyPDFForm.constants import UNIQUE_SUFFIX_LENGTH, T, V
+from PyPDFForm.template import get_widgets_by_page
 
 
 def test_fill(template_stream, pdf_samples, data_dict, request):
@@ -151,3 +153,25 @@ def test_undo_checkbox(pdf_samples, request):
 
         assert len(obj.stream) == len(expected)
         assert obj.stream == expected
+
+
+def test_merging_unique_suffix(template_stream):
+    result = PdfWrapper()
+
+    for i in range(10):
+        obj = PdfWrapper(
+            FormWrapper(template_stream).fill({"test": f"value-{i}"}).read()
+        )
+        result += obj
+
+    merged = PdfWrapper(result.read())
+
+    for page, widgets in get_widgets_by_page(result.read()).items():
+        for widget in widgets:
+            assert widget[T] in merged.widgets
+            if widget[T] == "test":
+                assert widget[V] == "value-0"
+            elif V in widget and "value-" in widget[V]:
+                assert widget[V] == f"value-{page // 3}"
+                assert widget[T].split("-")[0] == "test"
+                assert len(widget[T].split("-")[1]) == UNIQUE_SUFFIX_LENGTH

pypdfform-1.5.3/PyPDFForm/middleware/image.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Contains image field middleware."""
-
-from typing import BinaryIO, Union
-
-from .signature import Signature
-
-
-class Image(Signature):
-    """A class to represent an image field widget."""
-
-    def __init__(
-        self,
-        name: str,
-        value: Union[bytes, str, BinaryIO] = None,
-    ) -> None:
-        """Constructs all attributes for the image field."""
-
-        super().__init__(name, value)
-
-        self.preserve_aspect_ratio = False