PyPDFForm 1.5.3__py3-none-any.whl → 1.5.5__py3-none-any.whl

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/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/middleware/image.py

@@ -1,21 +1,10 @@
 # -*- 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
+    preserve_aspect_ratio = False

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/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/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/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.dist-info → pypdfform-1.5.5.dist-info}/METADATA

@@ -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.dist-info → pypdfform-1.5.5.dist-info}/RECORD

@@ -1,30 +1,30 @@
-PyPDFForm/__init__.py,sha256=GbSU_vP9pxo3lFMOfxaLUhhW6V5_26Xh7t3B3b6rEK0,178
+PyPDFForm/__init__.py,sha256=VxRRjNYIxOegNyxVGwbWiwcQptP0jdjpW_aJjF-nZYY,178
 PyPDFForm/adapter.py,sha256=qt0lqd7zRzaMHD2As47oiIhungO3AyWbAkxx1ZAZi9A,862
-PyPDFForm/constants.py,sha256=xj9CSq7PlCpAowKAlK0o8YPgPkBkJjRDToI8aiqC_c0,1749
+PyPDFForm/constants.py,sha256=iHCwbnypwgMe5T_hMZIJJixySkOlXgtXuNlI2UUptJ8,1775
 PyPDFForm/coordinate.py,sha256=uZGGFiTUIrD9VX-bzgUpKlFAzK7VJppW1corGXvT-pY,7712
 PyPDFForm/filler.py,sha256=wPVd6lwCPyZ8qPIKK1rLlKFLEWWPcYNPjuXqpC04Cws,7657
 PyPDFForm/font.py,sha256=TbFLY4G72d7cQ3VG2g4HaYKROzQPQUmh6-8ynN6hzXY,5713
 PyPDFForm/image.py,sha256=SflPlzoTFZro2Fvd7u7bF-1mmg7D0e8YjePbQXW8YyY,1429
 PyPDFForm/patterns.py,sha256=Z548TjpQpaVepctvlRYe0-2i7Aws96fo-ncG82CUX14,5423
 PyPDFForm/template.py,sha256=LlnZTNF5UPLkiGqnSgHNcVr_Af6vJyg6vBf7jVD5wAM,15470
-PyPDFForm/utils.py,sha256=9omR-oT3OdZqioxpiGqA9_P0GSFC6mg4Y1xrLvWOzkk,4309
+PyPDFForm/utils.py,sha256=hMWGLyTZJSQG4gItlnQLq8RxnV4bM2sL6_-RmLqSwtE,4721
 PyPDFForm/watermark.py,sha256=L4LfzjjyJ6TDq9ad2dbtQYheBOic1_oZ7smhFFekNog,4725
-PyPDFForm/wrapper.py,sha256=dxcFnkMv7zwT75BWZxgbrpl-Ty1dB98gjiP6xp9ihAU,11565
+PyPDFForm/wrapper.py,sha256=B0L0aj9ed7jLlPEaUG-xqkEfQzIoZuSxTnCeVFmxfJQ,11774
 PyPDFForm/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyPDFForm/middleware/base.py,sha256=Sjo8O9RrdBu73r4BCMPuLXnrl1hzjb1dlTOPeIgrhOU,1150
 PyPDFForm/middleware/checkbox.py,sha256=0EWFECXYdz9SNxgGe1QCcRrdxLVUIJpzRYwKfGRA9e4,1346
 PyPDFForm/middleware/dropdown.py,sha256=_RXs9o3vWH_a402zhTOYE_mcWbtFfVU7bReYcEFAIyk,793
-PyPDFForm/middleware/image.py,sha256=zR31u3dPVwhxECMGb6KaHFQrTKtbF5djBDmoyPl3WK0,475
-PyPDFForm/middleware/radio.py,sha256=uffpK15U1gUn7mkyOcMwZByZo-I2cMWWsW3sBb1WeYk,801
-PyPDFForm/middleware/signature.py,sha256=cDsJX7q-KSZi9Sd90Gx1c9cMyTqZBExZ-enWJMjFZNw,1147
+PyPDFForm/middleware/image.py,sha256=tQrLKZUKOz90jKxuUQpTP4Awuvtf0I92LeANH0k6mzQ,212
+PyPDFForm/middleware/radio.py,sha256=KfwOtlnMk5B2y8KbqD-ONN5AbkHa4TF5NzdcZlbNyDk,598
+PyPDFForm/middleware/signature.py,sha256=1ZOkBKectZ7kptJMQ-EuOA_xI7j8dlwseo2p2Z0FS2o,1138
 PyPDFForm/middleware/text.py,sha256=7HFHy_lfBFfYbSUzgVKovSoShbNP6L7tiILIw-9_kpo,1549
 PyPDFForm/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyPDFForm/widgets/base.py,sha256=nb6HEfRdWSjZc_Th1XI62PIlgREn_JiApGC-epb6jAg,3348
 PyPDFForm/widgets/checkbox.py,sha256=MGB6NGI-XMBz4j2erykgYOCd1pswvthuQ6UFowQOd4o,503
 PyPDFForm/widgets/dropdown.py,sha256=2_R5xcLUWAL0G4raVgWWtE7TJdiWJITay-Gtl8YI2QI,705
 PyPDFForm/widgets/text.py,sha256=sCB8CQAjh30QOGr8FTIDSk3X6dXSHJztOz6YkKEBDss,691
-PyPDFForm-1.5.3.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-PyPDFForm-1.5.3.dist-info/METADATA,sha256=GwIvR6NToB1-7l6XqlvxGct0x0gOhOrwjLL7Jg9ZAgg,4376
-PyPDFForm-1.5.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyPDFForm-1.5.3.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-PyPDFForm-1.5.3.dist-info/RECORD,,
+pypdfform-1.5.5.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+pypdfform-1.5.5.dist-info/METADATA,sha256=Bx7Ty8G_SSx9AL9z27NrwRVAWYudmtmRf1xULqfteK4,4376
+pypdfform-1.5.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+pypdfform-1.5.5.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+pypdfform-1.5.5.dist-info/RECORD,,

{PyPDFForm-1.5.3.dist-info → pypdfform-1.5.5.dist-info}/WHEEL

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