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

PyPDFForm/__init__.py

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

PyPDFForm/coordinate.py

@@ -40,6 +40,9 @@ def get_draw_checkbox_radio_coordinates(
 
 def get_draw_image_coordinates_resolutions(
     widget: dict,
+    preserve_aspect_ratio: bool,
+    image_width: float,
+    image_height: float,
 ) -> Tuple[float, float, float, float]:
     """
     Returns coordinates and resolutions to draw image at given a PDF form signature/image widget.
@@ -50,6 +53,18 @@ def get_draw_image_coordinates_resolutions(
     width = abs(float(widget[Rect][0]) - float(widget[Rect][2]))
     height = abs(float(widget[Rect][1]) - float(widget[Rect][3]))
 
+    if preserve_aspect_ratio:
+        ratio = max(image_width / width, image_height / height)
+
+        new_width = image_width / ratio
+        new_height = image_height / ratio
+
+        x += abs(new_width - width) / 2
+        y += abs(new_height - height) / 2
+
+        width = new_width
+        height = new_height
+
     return x, y, width, height
 
 

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
+from .image import any_image_to_jpg, get_image_dimensions
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.image import Image
@@ -62,7 +62,10 @@ def signature_image_handler(
     if stream is not None:
         any_image_to_draw = True
         stream = any_image_to_jpg(stream)
-        x, y, width, height = get_draw_image_coordinates_resolutions(widget)
+        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
+        )
         images_to_draw.append(
             [
                 stream,

PyPDFForm/image.py

@@ -2,7 +2,7 @@
 """Contains helpers for image."""
 
 from io import BytesIO
-from typing import Union
+from typing import Tuple, Union
 
 from PIL import Image
 
@@ -28,6 +28,18 @@ def rotate_image(image_stream: bytes, rotation: Union[float, int]) -> bytes:
     return result
 
 
+def get_image_dimensions(image_stream: bytes) -> Tuple[float, float]:
+    """Gets the width and height of an image."""
+
+    buff = BytesIO()
+    buff.write(image_stream)
+    buff.seek(0)
+
+    image = Image.open(buff)
+
+    return image.size
+
+
 def any_image_to_jpg(image_stream: bytes) -> bytes:
     """Converts an image of any type to jpg."""
 

PyPDFForm/middleware/image.py

@@ -6,3 +6,5 @@ from .signature import Signature
 
 class Image(Signature):
     """A class to represent an image field widget."""
+
+    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,

PyPDFForm/wrapper.py

@@ -166,10 +166,13 @@ class PdfWrapper(FormWrapper):
         if not other.stream:
             return self
 
-        new_obj = self.__class__()
-        new_obj.stream = merge_two_pdfs(self.stream, other.stream)
+        for k in self.widgets:
+            if k in other.widgets:
+                other.update_widget_key(k, f"{k}-{id(other)}", 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.2.dist-info → pypdfform-1.5.4.dist-info}/METADATA

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

{PyPDFForm-1.5.2.dist-info → pypdfform-1.5.4.dist-info}/RECORD

@@ -1,30 +1,30 @@
-PyPDFForm/__init__.py,sha256=-SiFL-rTPed5J5k_a2JG6rtcU_vGtAZigzoS-S_Sfmk,178
+PyPDFForm/__init__.py,sha256=7kE_CzxALB37_zXnvY-D6uR_PPuFMpPVucShuQjQOCk,178
 PyPDFForm/adapter.py,sha256=qt0lqd7zRzaMHD2As47oiIhungO3AyWbAkxx1ZAZi9A,862
 PyPDFForm/constants.py,sha256=xj9CSq7PlCpAowKAlK0o8YPgPkBkJjRDToI8aiqC_c0,1749
-PyPDFForm/coordinate.py,sha256=V_ZZQ1pXtVPAyfMJCX7fKoEimK7XwX6bU3VQ0nKOhQA,7314
-PyPDFForm/filler.py,sha256=ztYU-Rk_LKfCw-BhmdIDnK7ez-5jSPoi2Ho3xvbO4Io,7487
+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=sjXPg9fjenNFj12a321xHX6JvuJs6PJRGLzpSNw5mVU,1180
+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/watermark.py,sha256=L4LfzjjyJ6TDq9ad2dbtQYheBOic1_oZ7smhFFekNog,4725
-PyPDFForm/wrapper.py,sha256=dxcFnkMv7zwT75BWZxgbrpl-Ty1dB98gjiP6xp9ihAU,11565
+PyPDFForm/wrapper.py,sha256=tbmJIwvu4anaol7wQpmWL908CC04d_IAVRfE39K3y6k,11697
 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=xjPxRiGBWFEU3EQGGqJXY1iMX1kmr0jO8O9iVUC5rcc,177
-PyPDFForm/middleware/radio.py,sha256=uffpK15U1gUn7mkyOcMwZByZo-I2cMWWsW3sBb1WeYk,801
-PyPDFForm/middleware/signature.py,sha256=m7tNvGZ7fQ0yuVKzSlLbNQ2IILo1GDnjzMDzMnYCKVM,1104
+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.2.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-PyPDFForm-1.5.2.dist-info/METADATA,sha256=15iix1PjDLJk3OLrQTFdKRpt-dmH2JaL-vcjWCuPksc,4376
-PyPDFForm-1.5.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyPDFForm-1.5.2.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-PyPDFForm-1.5.2.dist-info/RECORD,,
+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.2.dist-info → pypdfform-1.5.4.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