papyru 2.11.0.dev108__tar.gz → 2.11.1.dev114__tar.gz

{papyru-2.11.0.dev108/papyru.egg-info → papyru-2.11.1.dev114}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.0.dev108
+Version: 2.11.1.dev114
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/papyru/create_variant/component.py

@@ -1,3 +1,7 @@
+from typing import Optional
+
+import resi
+
 from papyru import XMLHelper
 
 from .edit_template.ean import insert_ean
@@ -10,15 +14,15 @@ from .resi import import_into_resi
 
 def create_component(template: str,
                      motive_image_info: ImageInfo,
-                     resi_instance: object,
+                     resi_instance: resi.Instance,
                      resi_url: str,
                      disposition_component: str,
                      disposition_manufacturer_address: str,
-                     disposition_title=None,
-                     motive_title=None,
-                     disposition_ean=None,
-                     ean=None,
-                     properties=None,
+                     disposition_title: Optional[str] = None,
+                     motive_title: Optional[str] = None,
+                     disposition_ean: Optional[str] = None,
+                     ean: Optional[str] = None,
+                     properties: Optional[resi.VersionProperties] = None,
                      ) -> str:
 
     doc = XMLHelper(template)

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/papyru/create_variant/edit_template/ean.py

@@ -1,5 +1,8 @@
 from os import getpid
 from subprocess import PIPE, Popen
+from typing import Optional
+
+import resi
 
 from papyru import XMLHelper
 from papyru.create_variant.constants import EAN_PLACEHOLDER_ID
@@ -9,11 +12,14 @@ from .xml import ImageInfo, find_placeholder, fit_image
 
 
 def insert_ean(doc: XMLHelper,
-               ean: str,
-               disposition: str,
-               resi_instance: object,
-               resi_url: str,
+               ean: Optional[str] = None,
+               disposition: Optional[str] = None,
+               resi_instance: Optional[resi.Instance] = None,
+               resi_url: Optional[str] = None,
                ) -> XMLHelper:
+    if ean is None:
+        return doc
+
     ph = find_placeholder(doc, 'image', EAN_PLACEHOLDER_ID)
 
     if ph is None:
@@ -36,7 +42,7 @@ def _create_ean(ean: str,
                 width: int,
                 height: int,
                 disposition: str,
-                resi_instance: any,
+                resi_instance: resi.Instance,
                 resi_url: str) -> str:
     _, ean_bytes = resi_instance.provide_version_bytes(
         generate_barcode_svg(ean).encode(),

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/papyru/create_variant/edit_template/manufacturer_address.py

@@ -1,5 +1,7 @@
 from logging import getLogger
 
+import resi
+
 from papyru import XMLHelper
 from papyru.create_variant.constants import (
     MANUFACTURER_ADDRESS_ALIGNMENT, MANUFACTURER_ADDRESS_COLOR_BACKGROUND,
@@ -16,7 +18,7 @@ log = getLogger(__name__)
 
 def insert_manufacturer_address(doc: XMLHelper,
                                 disposition: str,
-                                resi_instance: object,
+                                resi_instance: resi.Instance,
                                 resi_url: str,
                                 ) -> XMLHelper:
     ph = find_placeholder(doc, 'text', MANUFACTURER_ADDRESS_PLACEHOLDER_ID)
@@ -46,7 +48,7 @@ def _create_text_manufacturer_address(address: str,
                                       width: int,
                                       height: int,
                                       disposition: str,
-                                      resi_instance: any,
+                                      resi_instance: resi.Instance,
                                       resi_url: str) -> str:
     text_bytes = render_text(
         TextConfig(

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/papyru/create_variant/edit_template/render_text.py

@@ -5,6 +5,8 @@ from subprocess import run
 from tempfile import TemporaryDirectory
 from uuid import uuid4
 
+import resi
+
 
 @dataclass(frozen=True)
 class RGBAColor:
@@ -43,7 +45,7 @@ class TextConfig:
     height: int
 
 
-def render_text(config: TextConfig, resi_instance: object) -> bytes:
+def render_text(config: TextConfig, resi_instance: resi.Instance) -> bytes:
     # see `convert -list gravity`
     def _get_gravity(alignment: Alignment) -> str:
         h = ''

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/papyru/create_variant/edit_template/title.py

@@ -1,3 +1,7 @@
+from typing import Optional
+
+import resi
+
 from papyru import XMLHelper
 from papyru.create_variant.constants import (TITLE_ALIGNMENT,
                                              TITLE_COLOR_BACKGROUND,
@@ -11,19 +15,25 @@ from .xml import (ImageInfo, find_placeholder, fit_image,
 
 
 def insert_title(doc: XMLHelper,
-                 title: str,
-                 disposition: str,
-                 resi_instance: object,
-                 resi_url: any
+                 title: Optional[str] = None,
+                 disposition: Optional[str] = None,
+                 resi_instance: Optional[resi.Instance] = None,
+                 resi_url: Optional[str] = None
                  ) -> XMLHelper:
-    if title is None:
-        return doc
 
     ph = find_placeholder(doc, 'text', TITLE_PLACEHOLDER_ID)
 
     if ph is None:
         return doc
 
+    if title is None:
+        for tspan in ph.placeholder.findall('./{%s}%s'
+                                            % (doc.default_namespace,
+                                               'tspan')):
+            tspan.text = ''
+
+        return doc
+
     width = float(doc.get_attribute(ph.wrapper, 'width'))
     height = float(doc.get_attribute(ph.wrapper, 'height'))
 
@@ -42,7 +52,7 @@ def _create_title_image(title: str,
                         width: int,
                         height: int,
                         disposition: str,
-                        resi_instance: any,
+                        resi_instance: resi.Instance,
                         resi_url: str
                         ) -> str:
     text_bytes = render_text(

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114/papyru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.0.dev108
+Version: 2.11.1.dev114
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.0.dev108 → papyru-2.11.1.dev114}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='papyru',
-    version='2.11.0.dev108',
+    version='2.11.1.dev114',
     description=(
         'minimal REST library with OpenAPI-based validation for django'),
     author='puzzleYOU GmbH',