PyPDFForm 1.5.4__tar.gz → 1.5.6__tar.gz

{pypdfform-1.5.4 → pypdfform-1.5.6}/PKG-INFO

@@ -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 → pypdfform-1.5.6}/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-1.5.4 → pypdfform-1.5.6}/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.4 → pypdfform-1.5.6}/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-1.5.4 → pypdfform-1.5.6}/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-1.5.4 → pypdfform-1.5.6}/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.4 → pypdfform-1.5.6}/PyPDFForm/watermark.py

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

{pypdfform-1.5.4 → pypdfform-1.5.6}/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 → pypdfform-1.5.6}/PyPDFForm.egg-info/PKG-INFO

@@ -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 → pypdfform-1.5.6}/tests/test_functional_simple.py

@@ -3,7 +3,7 @@
 import os
 
 from PyPDFForm import FormWrapper, PdfWrapper
-from PyPDFForm.constants import T, V
+from PyPDFForm.constants import UNIQUE_SUFFIX_LENGTH, T, V
 from PyPDFForm.template import get_widgets_by_page
 
 
@@ -155,22 +155,17 @@ def test_undo_checkbox(pdf_samples, request):
         assert obj.stream == expected
 
 
-def test_add_object_id(template_stream):
+def test_merging_unique_suffix(template_stream):
     result = PdfWrapper()
-    ids = []
 
-    for i in range(5):
+    for i in range(10):
         obj = PdfWrapper(
             FormWrapper(template_stream).fill({"test": f"value-{i}"}).read()
         )
         result += obj
-        ids.append(id(obj))
 
     merged = PdfWrapper(result.read())
 
-    for each in ids[1:]:
-        assert f"test-{each}" in merged.widgets
-
     for page, widgets in get_widgets_by_page(result.read()).items():
         for widget in widgets:
             assert widget[T] in merged.widgets
@@ -179,4 +174,4 @@ def test_add_object_id(template_stream):
             elif V in widget and "value-" in widget[V]:
                 assert widget[V] == f"value-{page // 3}"
                 assert widget[T].split("-")[0] == "test"
-                assert int(widget[T].split("-")[1]) in ids[1:]
+                assert len(widget[T].split("-")[1]) == UNIQUE_SUFFIX_LENGTH