PyPDFForm 2.2.6__py3-none-any.whl → 2.2.7__py3-none-any.whl

PyPDFForm/__init__.py

@@ -5,7 +5,7 @@ This package provides tools for filling PDF forms, drawing text and images,
 and manipulating PDF form elements programmatically.
 """
 
-__version__ = "2.2.6"
+__version__ = "2.2.7"
 
 from .wrapper import FormWrapper, PdfWrapper
 

PyPDFForm/filler.py

@@ -38,7 +38,7 @@ from .patterns import (WIDGET_KEY_PATTERNS, simple_flatten_generic,
                        simple_flatten_radio, simple_update_checkbox_value,
                        simple_update_dropdown_value, simple_update_radio_value,
                        simple_update_text_value)
-from .template import get_widgets_by_page
+from .template import get_widget_full_key, get_widgets_by_page
 from .utils import (checkbox_radio_to_draw, extract_widget_property,
                     stream_to_io)
 from .watermark import create_watermarks_and_draw, merge_watermarks_with_pdf
@@ -220,6 +220,7 @@ def get_drawn_stream(to_draw: dict, stream: bytes, action: str) -> bytes:
 def fill(
     template_stream: bytes,
     widgets: Dict[str, WIDGET_TYPES],
+    use_full_widget_name: bool,
 ) -> bytes:
     """Fills a PDF form using watermark technique for complex rendering.
 
@@ -231,6 +232,7 @@ def fill(
     Args:
         template_stream: Input PDF form as bytes
         widgets: Dictionary mapping field names to widget middleware
+        use_full_widget_name: If True, uses the full widget name as the key in the widgets dictionary
 
     Returns:
         bytes: Filled PDF form as bytes
@@ -253,6 +255,8 @@ def fill(
         line_borders_to_draw[page] = []
         for widget_dict in widget_dicts:
             key = extract_widget_property(widget_dict, WIDGET_KEY_PATTERNS, None, str)
+            if use_full_widget_name:
+                key = get_widget_full_key(widget_dict)
             text_needs_to_be_drawn = False
             to_draw = x = y = None
 

PyPDFForm/template.py

@@ -246,15 +246,14 @@ def get_widgets_by_page(pdf: bytes) -> Dict[int, List[dict]]:
     return result
 
 
-def get_widget_full_key(widget: dict) -> Union[str, None]:
+def get_widget_full_key(widget: dict) -> str:
     """Constructs a widget's full hierarchical key including parent names.
 
     Args:
         widget: PDF widget dictionary
 
     Returns:
-        Union[str, None]: Full key in format "parent.child" if parent exists,
-            otherwise None
+        str: Full key in format "parent.child" if parent exists, otherwise the widget's key
     """
 
     key = extract_widget_property(widget, WIDGET_KEY_PATTERNS, None, str)
@@ -264,9 +263,9 @@ def get_widget_full_key(widget: dict) -> Union[str, None]:
         and T in widget[Parent].get_object()
         and widget[Parent].get_object()[T] != key
     ):
-        return f"{widget[Parent].get_object()[T]}.{key}"
+        key = f"{get_widget_full_key(widget[Parent].get_object())}.{key}"
 
-    return None
+    return key
 
 
 def construct_widget(widget: dict, key: str) -> Union[WIDGET_TYPES, None]:

PyPDFForm/utils.py

@@ -104,10 +104,13 @@ def checkbox_radio_to_draw(
     return new_widget
 
 
-def preview_widget_to_draw(widget: WIDGET_TYPES, with_preview_text: bool) -> Text:
+def preview_widget_to_draw(
+    widget_name: str, widget: WIDGET_TYPES, with_preview_text: bool
+) -> Text:
     """Creates preview version of a widget showing field name/location.
 
     Args:
+        widget_name: Name of the widget to generate preview for
         widget: Widget to generate preview for
         with_preview_text: Whether to include field name in preview
 
@@ -117,7 +120,7 @@ def preview_widget_to_draw(widget: WIDGET_TYPES, with_preview_text: bool) -> Tex
 
     new_widget = Text(
         name=widget.name,
-        value="{" + f" {widget.name} " + "}" if with_preview_text else None,
+        value="{" + f" {widget_name} " + "}" if with_preview_text else None,
     )
     new_widget.font = DEFAULT_FONT
     new_widget.font_size = DEFAULT_FONT_SIZE

PyPDFForm/wrapper.py

@@ -362,9 +362,10 @@ class PdfWrapper(FormWrapper):
             fill(
                 self.stream,
                 {
-                    key: preview_widget_to_draw(value, True)
+                    key: preview_widget_to_draw(key, value, True)
                     for key, value in self.widgets.items()
                 },
+                getattr(self, "use_full_widget_name"),
             )
         )
 
@@ -391,9 +392,10 @@ class PdfWrapper(FormWrapper):
                 fill(
                     self.stream,
                     {
-                        key: preview_widget_to_draw(value, False)
+                        key: preview_widget_to_draw(key, value, False)
                         for key, value in self.widgets.items()
                     },
+                    getattr(self, "use_full_widget_name"),
                 )
             ),
             color,
@@ -434,7 +436,9 @@ class PdfWrapper(FormWrapper):
         if self.read():
             self.widgets = set_character_x_paddings(self.stream, self.widgets)
 
-        self.stream = remove_all_widgets(fill(self.stream, self.widgets))
+        self.stream = remove_all_widgets(
+            fill(self.stream, self.widgets, getattr(self, "use_full_widget_name"))
+        )
 
         return self
 

{pypdfform-2.2.6.dist-info → pypdfform-2.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 2.2.6
+Version: 2.2.7
 Summary: The Python library for PDF forms.
 Author: Jinge Li
 License-Expression: MIT

{pypdfform-2.2.6.dist-info → pypdfform-2.2.7.dist-info}/RECORD

@@ -1,15 +1,15 @@
-PyPDFForm/__init__.py,sha256=cCocr2KFIvseeYcsUJhTvM4m8Z8eo3aJLamlTpjYOqg,328
+PyPDFForm/__init__.py,sha256=r3unIF6eX0bQ9fRotGNv_5feWcA35-AiSA4k9gF3BR8,328
 PyPDFForm/adapter.py,sha256=_5fP5UR-NzjDDayJmBRO36DgbnbUzNbjZtHZtPvSM14,1909
 PyPDFForm/constants.py,sha256=3ed0j11cWd9Uo4s-XvZwwJojPSz8aqdmZgaEishWjqE,2342
 PyPDFForm/coordinate.py,sha256=gQI7z-GsdCO33Qny5kXLBs6Y2TW5KO_mJ2in64fvXcg,16412
-PyPDFForm/filler.py,sha256=VnxRdSP2NpiQsGkDfAuFA6oS2dmARQA3ArO8q_O0o1o,14006
+PyPDFForm/filler.py,sha256=f8xgMBTCVWpwQm56ojhLXOo6A_R7oQCooSLUD5qZICA,14253
 PyPDFForm/font.py,sha256=eRbDyQFhXUkHzyZvCtru9Ypg_ukfbBAnSM5xNzPb5ss,7280
 PyPDFForm/image.py,sha256=aYk7BC-AHiqt73durGIQ3e6gE5Ggbdr8jmkCUaQdsk8,1627
 PyPDFForm/patterns.py,sha256=Zv80gZswYFlFuo6eXL1j8bMyckavXPuw55D8IzcvIW0,9472
-PyPDFForm/template.py,sha256=v1ZM52xHCzO8Xm7EXinbTepm2G7MU7StUgCFtuUdcbI,18899
-PyPDFForm/utils.py,sha256=M07Q_2defFGmhBqvgEoQ9pt_IYZwXCsqrMljlKYYwIM,8487
+PyPDFForm/template.py,sha256=WFU6KnGWJ06lQ1GdjdYxmfToL2ash_c9g4z2yiWGebo,18889
+PyPDFForm/utils.py,sha256=QxJSG96FHGch863UdBPT8DdTKN9gVzQzA2ezifTm7z4,8575
 PyPDFForm/watermark.py,sha256=Ni6Y2-DSaAaxqXtCSTrmDOMO0XW7-u3Hucr6J4njtG8,12475
-PyPDFForm/wrapper.py,sha256=mCoJtYHM-OSogXKiQTA8XHlD0dnWwonPYcou4zMdtzg,25359
+PyPDFForm/wrapper.py,sha256=-Yp8mnehn2Ho-5O5v7cojHcoBotjeWhi_qM9NAIpTDk,25544
 PyPDFForm/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyPDFForm/middleware/base.py,sha256=d4z7M7pm80176cC4H85m3ZRWzAu_Fm1HkwQkmSSi-WE,2832
 PyPDFForm/middleware/checkbox.py,sha256=gRGhFySPoIpKBseoiOTS3WggoBBik12dXbZ-LJKzIwM,2611
@@ -27,8 +27,8 @@ PyPDFForm/widgets/image.py,sha256=6y8Ysmk49USr_qWOXD6KGL6cch516cUIlrxoj0pJy9Q,79
 PyPDFForm/widgets/radio.py,sha256=ipadJyHbgftDUvjGk15kapzgHPN3HjdF_iB_7amXR6o,2737
 PyPDFForm/widgets/signature.py,sha256=EndajR-SQWDZyVfbvDoz5Bjuer5KbURjFlRGqxeXYeY,5115
 PyPDFForm/widgets/text.py,sha256=HP2cPEUAzK5QL3kDfMz7gQcC3svCpmYuyFItBjlrBpI,1233
-pypdfform-2.2.6.dist-info/licenses/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-pypdfform-2.2.6.dist-info/METADATA,sha256=OHfkmG1BfxJVEDUNV8h8DpPl7c-Jbwmsyteln69rkFY,5605
-pypdfform-2.2.6.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-pypdfform-2.2.6.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-pypdfform-2.2.6.dist-info/RECORD,,
+pypdfform-2.2.7.dist-info/licenses/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+pypdfform-2.2.7.dist-info/METADATA,sha256=AGsBkSQv4d11UOfNlrnDn8oHBU8KouKIjgJQSTlZiyM,5605
+pypdfform-2.2.7.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pypdfform-2.2.7.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+pypdfform-2.2.7.dist-info/RECORD,,

{pypdfform-2.2.6.dist-info → pypdfform-2.2.7.dist-info}/WHEEL

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