PyPDFForm 1.5.4__py3-none-any.whl → 1.5.6__py3-none-any.whl

PyPDFForm/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Contains any object users might need."""
 
-__version__ = "1.5.4"
+__version__ = "1.5.6"
 
 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/filler.py

@@ -13,7 +13,7 @@ from .coordinate import (get_draw_checkbox_radio_coordinates,
                          get_draw_text_coordinates,
                          get_text_line_x_coordinates)
 from .font import checkbox_radio_font_size
-from .image import any_image_to_jpg, get_image_dimensions
+from .image import get_image_dimensions
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.image import Image
@@ -61,7 +61,6 @@ def signature_image_handler(
     any_image_to_draw = False
     if stream is not None:
         any_image_to_draw = True
-        stream = any_image_to_jpg(stream)
         image_width, image_height = get_image_dimensions(stream)
         x, y, width, height = get_draw_image_coordinates_resolutions(
             widget, middleware.preserve_aspect_ratio, image_width, image_height

PyPDFForm/image.py

@@ -38,28 +38,3 @@ def get_image_dimensions(image_stream: bytes) -> Tuple[float, float]:
     image = Image.open(buff)
 
     return image.size
-
-
-def any_image_to_jpg(image_stream: bytes) -> bytes:
-    """Converts an image of any type to jpg."""
-
-    buff = BytesIO()
-    buff.write(image_stream)
-    buff.seek(0)
-
-    image = Image.open(buff)
-
-    if image.format == "JPEG":
-        buff.close()
-        return image_stream
-
-    rgb_image = Image.new("RGB", image.size, (255, 255, 255))
-    rgb_image.paste(image, mask=image.split()[3] if len(image.split()) == 4 else None)
-
-    with BytesIO() as _file:
-        rgb_image.save(_file, format="JPEG")
-        _file.seek(0)
-        result = _file.read()
-
-    buff.close()
-    return result

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/watermark.py

@@ -122,6 +122,7 @@ def draw_image(*args) -> None:
         coordinate_y,
         width=width,
         height=height,
+        mask="auto",
     )
 
     image_buff.close()

PyPDFForm/wrapper.py

@@ -13,14 +13,14 @@ 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 .image import any_image_to_jpg, rotate_image
+from .image import rotate_image
 from .middleware.dropdown import Dropdown
 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,9 +166,10 @@ class PdfWrapper(FormWrapper):
         if not other.stream:
             return self
 
+        unique_suffix = generate_unique_suffix()
         for k in self.widgets:
             if k in other.widgets:
-                other.update_widget_key(k, f"{k}-{id(other)}", defer=True)
+                other.update_widget_key(k, f"{k}-{unique_suffix}", defer=True)
 
         other.commit_widget_key_updates()
 
@@ -353,7 +354,6 @@ class PdfWrapper(FormWrapper):
         """Draws an image on a PDF form."""
 
         image = fp_or_f_obj_or_stream_to_stream(image)
-        image = any_image_to_jpg(image)
         image = rotate_image(image, rotation)
         watermarks = create_watermarks_and_draw(
             self.stream, page_number, "image", [[image, x, y, width, height]]

{pypdfform-1.5.4.dist-info → pypdfform-1.5.6.dist-info}/METADATA

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

{pypdfform-1.5.4.dist-info → pypdfform-1.5.6.dist-info}/RECORD

@@ -1,15 +1,15 @@
-PyPDFForm/__init__.py,sha256=7kE_CzxALB37_zXnvY-D6uR_PPuFMpPVucShuQjQOCk,178
+PyPDFForm/__init__.py,sha256=8onImOXUVxYFLD0V7_lKqLrFSh0joz4139XMS03cWKQ,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/filler.py,sha256=BWj3CpRWTrNCNBrMMptdxW9Nac6pnQCl3xOw5l0QPy8,7597
 PyPDFForm/font.py,sha256=TbFLY4G72d7cQ3VG2g4HaYKROzQPQUmh6-8ynN6hzXY,5713
-PyPDFForm/image.py,sha256=SflPlzoTFZro2Fvd7u7bF-1mmg7D0e8YjePbQXW8YyY,1429
+PyPDFForm/image.py,sha256=IsmT2_LAvoGTxbsrelXnP8B4vUKetOVwp6oiE9MGnU8,835
 PyPDFForm/patterns.py,sha256=Z548TjpQpaVepctvlRYe0-2i7Aws96fo-ncG82CUX14,5423
 PyPDFForm/template.py,sha256=LlnZTNF5UPLkiGqnSgHNcVr_Af6vJyg6vBf7jVD5wAM,15470
-PyPDFForm/utils.py,sha256=9omR-oT3OdZqioxpiGqA9_P0GSFC6mg4Y1xrLvWOzkk,4309
-PyPDFForm/watermark.py,sha256=L4LfzjjyJ6TDq9ad2dbtQYheBOic1_oZ7smhFFekNog,4725
-PyPDFForm/wrapper.py,sha256=tbmJIwvu4anaol7wQpmWL908CC04d_IAVRfE39K3y6k,11697
+PyPDFForm/utils.py,sha256=hMWGLyTZJSQG4gItlnQLq8RxnV4bM2sL6_-RmLqSwtE,4721
+PyPDFForm/watermark.py,sha256=eDGQKXc4j1uUhAAE1VeQXGHQ9FO4h9mSKExv3gnNTZg,4746
+PyPDFForm/wrapper.py,sha256=fxvwP-bGqq7yAFjUr4PtHBUVU_f0cdrQMtmamOPrk5s,11716
 PyPDFForm/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyPDFForm/middleware/base.py,sha256=Sjo8O9RrdBu73r4BCMPuLXnrl1hzjb1dlTOPeIgrhOU,1150
 PyPDFForm/middleware/checkbox.py,sha256=0EWFECXYdz9SNxgGe1QCcRrdxLVUIJpzRYwKfGRA9e4,1346
@@ -23,8 +23,8 @@ PyPDFForm/widgets/base.py,sha256=nb6HEfRdWSjZc_Th1XI62PIlgREn_JiApGC-epb6jAg,334
 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.4.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-pypdfform-1.5.4.dist-info/METADATA,sha256=4FkB1rXuP42Wz06oxGdgDYtGOweJ8ddfFEUz74tyQZE,4376
-pypdfform-1.5.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-pypdfform-1.5.4.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-pypdfform-1.5.4.dist-info/RECORD,,
+pypdfform-1.5.6.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+pypdfform-1.5.6.dist-info/METADATA,sha256=oO2397bLIYzKMC1VboqZpQM5oyzBP3-2_7HM-LACuoo,4376
+pypdfform-1.5.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+pypdfform-1.5.6.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+pypdfform-1.5.6.dist-info/RECORD,,