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

PyPDFForm/__init__.py

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

PyPDFForm/adapter.py

@@ -12,7 +12,7 @@ def readable(obj: Any) -> bool:
 
 
 def fp_or_f_obj_or_stream_to_stream(
-    fp_or_f_obj_or_stream: Union[bytes, str, BinaryIO]
+    fp_or_f_obj_or_stream: Union[bytes, str, BinaryIO],
 ) -> bytes:
     """Converts a file path or a file object to a stream."""
 

PyPDFForm/constants.py

@@ -76,11 +76,11 @@ NEW_LINE_SYMBOL = "\n"
 IMAGE_FIELD_IDENTIFIER = "event.target.buttonImportIcon();"
 
 DEFAULT_CHECKBOX_STYLE = "\u2713"
-DEFAULT_RADIO_STYLE = "\u25CF"
+DEFAULT_RADIO_STYLE = "\u25cf"
 BUTTON_STYLES = {
     "4": "\u2713",  # check
-    "5": "\u00D7",  # cross
-    "l": "\u25CF",  # circle
+    "5": "\u00d7",  # cross
+    "l": "\u25cf",  # circle
 }
 
 COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO = DEFAULT_FONT_SIZE / 100

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

@@ -1,8 +1,21 @@
 # -*- 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

PyPDFForm/middleware/signature.py

@@ -20,6 +20,8 @@ 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/wrapper.py

@@ -71,6 +71,13 @@ class FormWrapper:
 class PdfWrapper(FormWrapper):
     """A class to represent a PDF form."""
 
+    USER_PARAMS = [
+        "global_font",
+        "global_font_size",
+        "global_font_color",
+        "use_full_widget_name",
+    ]
+
     def __init__(
         self,
         template: Union[bytes, str, BinaryIO] = b"",
@@ -82,11 +89,8 @@ class PdfWrapper(FormWrapper):
         self.widgets = {}
         self._keys_to_update = []
 
-        self.global_font = kwargs.get("global_font")
-        self.global_font_size = kwargs.get("global_font_size")
-        self.global_font_color = kwargs.get("global_font_color")
-
-        self.use_full_widget_name = kwargs.get("use_full_widget_name", False)
+        for each in self.USER_PARAMS:
+            setattr(self, each, kwargs.get(each))
 
         self._init_helper()
 
@@ -95,7 +99,9 @@ class PdfWrapper(FormWrapper):
 
         refresh_not_needed = {}
         new_widgets = (
-            build_widgets(self.read(), self.use_full_widget_name) if self.read() else {}
+            build_widgets(self.read(), getattr(self, "use_full_widget_name"))
+            if self.read()
+            else {}
         )
         for k, v in self.widgets.items():
             if k in new_widgets:
@@ -109,9 +115,9 @@ class PdfWrapper(FormWrapper):
                 and isinstance(value, Text)
                 and not refresh_not_needed.get(key)
             ):
-                value.font = self.global_font
-                value.font_size = self.global_font_size
-                value.font_color = self.global_font_color
+                value.font = getattr(self, "global_font")
+                value.font_size = getattr(self, "global_font_size")
+                value.font_color = getattr(self, "global_font_color")
 
     @property
     def sample_data(self) -> dict:
@@ -133,7 +139,12 @@ class PdfWrapper(FormWrapper):
     def pages(self) -> List[PdfWrapper]:
         """Returns a list of pdf wrapper objects where each is a page of the PDF form."""
 
-        return [self.__class__(each) for each in get_page_streams(self.stream)]
+        return [
+            self.__class__(
+                each, **{param: getattr(self, param) for param in self.USER_PARAMS}
+            )
+            for each in get_page_streams(self.stream)
+        ]
 
     def change_version(self, version: str) -> PdfWrapper:
         """Changes the version of the PDF."""
@@ -258,7 +269,7 @@ class PdfWrapper(FormWrapper):
     ) -> PdfWrapper:
         """Updates the key of an existed widget on a PDF form."""
 
-        if self.use_full_widget_name:
+        if getattr(self, "use_full_widget_name"):
             raise NotImplementedError
 
         if defer:
@@ -275,7 +286,7 @@ class PdfWrapper(FormWrapper):
     def commit_widget_key_updates(self) -> PdfWrapper:
         """Commits all deferred widget key updates on a PDF form."""
 
-        if self.use_full_widget_name:
+        if getattr(self, "use_full_widget_name"):
             raise NotImplementedError
 
         old_keys = [each[0] for each in self._keys_to_update]

{PyPDFForm-1.5.1.dist-info → PyPDFForm-1.5.3.dist-info}/METADATA

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

{PyPDFForm-1.5.1.dist-info → PyPDFForm-1.5.3.dist-info}/RECORD

@@ -1,30 +1,30 @@
-PyPDFForm/__init__.py,sha256=fM6oW3DZ3IPldn96No6E_Qf9uwf-R9ZkMZf54oZ2T-w,178
-PyPDFForm/adapter.py,sha256=WFP-r8FLeKa-D9mFO9AphOcuXgyeAI1Ak0d-YsqxsK4,861
-PyPDFForm/constants.py,sha256=48mxgyY3UgiVO2UIZuDe_B8KOE5bedyujnOjk6MtzHQ,1749
-PyPDFForm/coordinate.py,sha256=V_ZZQ1pXtVPAyfMJCX7fKoEimK7XwX6bU3VQ0nKOhQA,7314
-PyPDFForm/filler.py,sha256=ztYU-Rk_LKfCw-BhmdIDnK7ez-5jSPoi2Ho3xvbO4Io,7487
+PyPDFForm/__init__.py,sha256=GbSU_vP9pxo3lFMOfxaLUhhW6V5_26Xh7t3B3b6rEK0,178
+PyPDFForm/adapter.py,sha256=qt0lqd7zRzaMHD2As47oiIhungO3AyWbAkxx1ZAZi9A,862
+PyPDFForm/constants.py,sha256=xj9CSq7PlCpAowKAlK0o8YPgPkBkJjRDToI8aiqC_c0,1749
+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=QYGQrQs2VuvnRjrfxZfCeMxVj0gd6r_8Yi2RQ30NEQY,11375
+PyPDFForm/wrapper.py,sha256=dxcFnkMv7zwT75BWZxgbrpl-Ty1dB98gjiP6xp9ihAU,11565
 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/image.py,sha256=zR31u3dPVwhxECMGb6KaHFQrTKtbF5djBDmoyPl3WK0,475
 PyPDFForm/middleware/radio.py,sha256=uffpK15U1gUn7mkyOcMwZByZo-I2cMWWsW3sBb1WeYk,801
-PyPDFForm/middleware/signature.py,sha256=m7tNvGZ7fQ0yuVKzSlLbNQ2IILo1GDnjzMDzMnYCKVM,1104
+PyPDFForm/middleware/signature.py,sha256=cDsJX7q-KSZi9Sd90Gx1c9cMyTqZBExZ-enWJMjFZNw,1147
 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.1.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-PyPDFForm-1.5.1.dist-info/METADATA,sha256=yHnhAICnAw0eO_IU3UwiuDIEF447E55A1PiO4CQCs9A,4376
-PyPDFForm-1.5.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyPDFForm-1.5.1.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-PyPDFForm-1.5.1.dist-info/RECORD,,
+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,,