decksmith 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

decksmith/renderers/text.py

@@ -1,127 +1,153 @@
-"""
-This module contains the TextRenderer class for drawing text on cards.
-"""
-
-import operator
-from pathlib import Path
-from typing import Any, Dict, Optional
-
-import pandas as pd
-from PIL import ImageDraw, ImageFont
-
-from decksmith.logger import logger
-from decksmith.utils import apply_anchor, get_wrapped_text
-
-
-class TextRenderer:
-    """
-    A class to render text elements on a card.
-    """
-
-    def __init__(self, base_path: Optional[Path] = None):
-        self.base_path = base_path
-
-    def render(
-        self,
-        draw: ImageDraw.ImageDraw,
-        element: Dict[str, Any],
-        calculate_pos_func,
-        store_pos_func,
-    ):
-        """
-        Draws text on the card.
-        Args:
-            draw (ImageDraw.ImageDraw): The PIL ImageDraw object.
-            element (Dict[str, Any]): The text element specification.
-            calculate_pos_func (callable): Function to calculate absolute position.
-            store_pos_func (callable): Function to store element position.
-        """
-        assert element.pop("type") == "text", "Element type must be 'text'"
-
-        element = self._prepare_text_element(element)
-
-        original_pos = calculate_pos_func(element)
-        element["position"] = original_pos
-
-        # Calculate anchor offset if needed
-        if "anchor" in element:
-            bbox = draw.textbbox(
-                xy=(0, 0),
-                text=element.get("text"),
-                font=element["font"],
-                spacing=element.get("line_spacing", 4),
-                align=element.get("align", "left"),
-            )
-            anchor_point = apply_anchor(bbox, element.pop("anchor"))
-            element["position"] = tuple(map(operator.sub, original_pos, anchor_point))
-
-        # Draw text
-        draw.text(
-            xy=element.get("position"),
-            text=element.get("text"),
-            fill=element.get("color", None),
-            font=element["font"],
-            spacing=element.get("line_spacing", 4),
-            align=element.get("align", "left"),
-            stroke_width=element.get("stroke_width", 0),
-            stroke_fill=element.get("stroke_color", None),
-        )
-
-        # Store position
-        if "id" in element:
-            bbox = draw.textbbox(
-                xy=element.get("position"),
-                text=element.get("text"),
-                font=element["font"],
-                spacing=element.get("line_spacing", 4),
-                align=element.get("align", "left"),
-            )
-            store_pos_func(element["id"], bbox)
-
-    def _prepare_text_element(self, element: Dict[str, Any]) -> Dict[str, Any]:
-        """Prepares text element properties."""
-        if pd.isna(element["text"]):
-            element["text"] = " "
-
-        # Font setup
-        font_size = element.pop("font_size", 10)
-        if font_path := element.pop("font_path", False):
-            # Resolve font path relative to base_path if provided
-            if self.base_path and not Path(font_path).is_absolute():
-                potential_path = self.base_path / font_path
-                if potential_path.exists():
-                    font_path = str(potential_path)
-
-            try:
-                element["font"] = ImageFont.truetype(
-                    font_path, font_size, encoding="unic"
-                )
-            except OSError:
-                logger.error("Could not load font: %s. Using default.", font_path)
-                element["font"] = ImageFont.load_default(font_size)
-        else:
-            element["font"] = ImageFont.load_default(font_size)
-
-        if font_variant := element.pop("font_variant", None):
-            try:
-                element["font"].set_variation_by_name(font_variant)
-            except AttributeError:
-                logger.warning(
-                    "Font variant '%s' not supported for this font.", font_variant
-                )
-
-        # Text wrapping
-        if line_length := element.pop("width", False):
-            element["text"] = get_wrapped_text(
-                element["text"], element["font"], line_length
-            )
-
-        # Colors and position
-        if position := element.pop("position", [0, 0]):
-            element["position"] = tuple(position)
-        if color := element.pop("color", [0, 0, 0]):
-            element["color"] = tuple(color)
-        if stroke_color := element.pop("stroke_color", None):
-            element["stroke_color"] = tuple(stroke_color)
-
-        return element
+"""
+This module contains the TextRenderer class for drawing text on cards.
+"""
+
+import operator
+from pathlib import Path
+from typing import Any, Dict, Optional
+
+import pandas as pd
+from PIL import Image, ImageDraw, ImageFont
+
+from decksmith.utils import apply_anchor, get_wrapped_text
+
+
+class TextRenderer:
+    """
+    A class to render text elements on a card.
+    """
+
+    def __init__(self, base_path: Optional[Path] = None):
+        self.base_path = base_path
+
+    def render(
+        self,
+        card: Image.Image,
+        element: Dict[str, Any],
+        calculate_pos_func,
+        store_pos_func,
+    ) -> Image.Image:
+        """
+        Draws text on the card.
+        Args:
+            card (Image.Image): The card image object.
+            element (Dict[str, Any]): The text element specification.
+            calculate_pos_func (callable): Function to calculate absolute position.
+            store_pos_func (callable): Function to store element position.
+        Returns:
+            Image.Image: The updated card image.
+        """
+        assert element.pop("type") == "text", "Element type must be 'text'"
+
+        element = self._prepare_text_element(element)
+
+        original_pos = calculate_pos_func(element)
+        element["position"] = original_pos
+
+        layer = Image.new("RGBA", card.size, (0, 0, 0, 0))
+        draw = ImageDraw.Draw(layer, "RGBA")
+
+        # Calculate anchor offset if needed
+        if "anchor" in element:
+            bbox = draw.textbbox(
+                xy=(0, 0),
+                text=element.get("text"),
+                font=element["font"],
+                spacing=element.get("line_spacing", 4),
+                align=element.get("align", "left"),
+            )
+            anchor_point = apply_anchor(bbox, element.pop("anchor"))
+            element["position"] = tuple(map(operator.sub, original_pos, anchor_point))
+
+        # Draw text
+        draw.text(
+            xy=element.get("position"),
+            text=element.get("text"),
+            fill=element.get("color", None),
+            font=element["font"],
+            spacing=element.get("line_spacing", 4),
+            align=element.get("align", "left"),
+            stroke_width=element.get("stroke_width", 0),
+            stroke_fill=element.get("stroke_color", None),
+        )
+
+        card = Image.alpha_composite(card, layer)
+
+        # Store position
+        if "id" in element:
+            bbox = draw.textbbox(
+                xy=element.get("position"),
+                text=element.get("text"),
+                font=element["font"],
+                spacing=element.get("line_spacing", 4),
+                align=element.get("align", "left"),
+            )
+            store_pos_func(element["id"], bbox)
+
+        return card
+
+    def _prepare_text_element(self, element: Dict[str, Any]) -> Dict[str, Any]:
+        """Prepares text element properties."""
+        if pd.isna(element["text"]):
+            element["text"] = " "
+
+        # Font setup
+        font_size = element.pop("font_size", 10)
+        if font_path := element.pop("font_path", None):
+            # Resolve font path relative to base_path if provided
+            if self.base_path and not Path(font_path).is_absolute():
+                potential_path = self.base_path / font_path
+                if potential_path.exists():
+                    font_path = str(potential_path)
+
+            try:
+                element["font"] = ImageFont.truetype(
+                    font_path, font_size, encoding="unic"
+                )
+            except OSError as exc:
+                raise OSError(f"Could not load font: {font_path}") from exc
+        else:
+            element["font"] = ImageFont.load_default(font_size)
+
+        if font_variant := element.pop("font_variant", None):
+            try:
+                names = element["font"].get_variation_names()
+            except (AttributeError, OSError):
+                names = []
+
+            # Normalize names to strings (some fonts return bytes)
+            names = [
+                name.decode("utf-8") if isinstance(name, bytes) else name
+                for name in names
+            ]
+
+            if names:
+                if font_variant not in names:
+                    raise ValueError(
+                        f"Font variant '{font_variant}' not found. "
+                        f"Available variants: {', '.join(names)}"
+                    )
+                element["font"].set_variation_by_name(font_variant)
+            else:
+                try:
+                    element["font"].set_variation_by_name(font_variant)
+                except (AttributeError, OSError) as exc:
+                    raise ValueError(
+                        f"Font variant '{font_variant}' not supported for this font."
+                    ) from exc
+
+        # Text wrapping
+        if line_length := element.pop("width", False):
+            element["text"] = get_wrapped_text(
+                element["text"], element["font"], line_length
+            )
+
+        # Colors and position
+        if position := element.pop("position", [0, 0]):
+            element["position"] = tuple(position)
+        if color := element.pop("color", [0, 0, 0]):
+            element["color"] = tuple(color)
+        if stroke_color := element.pop("stroke_color", None):
+            element["stroke_color"] = tuple(stroke_color)
+
+        return element

decksmith/validate.py

@@ -39,6 +39,7 @@ SPECS_FOR_TYPE: Dict[str, Dict[str, Any]] = {
             "?*rotate": "<?int>",
             "?*flip": "<?str>",
             "?*resize": ["<?int>"],
+            "?*opacity": "<?int>",
         },
     },
     "circle": {
@@ -90,10 +91,17 @@ def validate_element(element: Dict[str, Any], element_type: str):
     """
     Validates an element of a card against a spec, raising an exception
     if it does not meet the spec.
+
     Args:
         element (dict): The card element.
         element_type (str): The type of the element
+
+    Raises:
+        ValueError: If the element type is unknown.
+        jval.exceptions.ValidationException: If the element does not match the spec.
     """
+    if element_type not in SPECS_FOR_TYPE:
+        raise ValueError(f"Unknown element type: {element_type}")
     spec = ELEMENT_SPEC | SPECS_FOR_TYPE[element_type]
     validate(element, spec)
 
@@ -102,13 +110,15 @@ def validate_card(card: Dict[str, Any]):
     """
     Validates a card against a spec, raising an exception
     if it does not meet the spec.
+
     Args:
         card (Dict[str, Any]): The card.
+
+    Raises:
+        jval.exceptions.ValidationException: If the card does not match the spec.
     """
-    # print(f"DEBUG:\n{card=}")
     validate(card, CARD_SPEC)
     for element in card["elements"]:
-        # print(f"DEBUG: {element['type']}")
         validate_element(element, element["type"])
 
 
@@ -123,6 +133,8 @@ def transform_card(card: Dict[str, Any]) -> Dict[str, Any]:
         Dict[str, Any]: The transformed card with all automatic casts applied.
     """
     for element in card.get("elements", []):
+        if isinstance(element, str):
+            raise ValueError(f"Element '{element}' cannot be empty")
         if element.get("type") == "text" and "text" in element:
             if pd.isna(element["text"]):
                 element["text"] = None

{decksmith-0.9.1.dist-info → decksmith-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: decksmith
-Version: 0.9.1
+Version: 0.9.3
 Summary: A command-line application to dynamically generate decks of cards from a YAML specification and a CSV data file, inspired by nandeck.
 License-Expression: GPL-2.0-only
 Author: Julio Cabria
@@ -28,6 +28,8 @@ Description-Content-Type: text/markdown
 
 # DeckSmith
 
+[julynx.github.io/decksmith](https://julynx.github.io/decksmith/)
+
 *A powerful application to dynamically generate decks of cards from a YAML specification and a CSV data file.*
 
 <br>

decksmith-0.9.3.dist-info/RECORD

@@ -0,0 +1,27 @@
+decksmith/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+decksmith/card_builder.py,sha256=vkQDY5hXLrfCxqkjwF6Q87jLxQe4tLmi-ZybFzt_DGw,6213
+decksmith/deck_builder.py,sha256=73p_IxDgH2bbkfow1bTg_eDXhjcALQbVFuudORxZ-E8,3689
+decksmith/export.py,sha256=2dOS59440qwziLG3tvvUzpapAqqHF9TSPqHQHYa_mh0,6057
+decksmith/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+decksmith/gui/app.py,sha256=dDJwMOm6HHTAIewYHcc0zqghxr-k_tXRZmI_44QJ3EM,10707
+decksmith/gui/static/css/style.css,sha256=FMRF5VSGeRGM2CIn2hOe3bnnwNhFq6JRAHTq9wcW0Ak,14172
+decksmith/gui/static/img/decksmith.ico,sha256=bkz7MTDpQELzP2GSvR42Jn7OgIw_j0uBhN4L2i-m1uo,28366
+decksmith/gui/static/js/main.js,sha256=aOwnTIzWvwqBcO9otoB25B43Tbcv_H-JnZ1j8ZvY32s,24125
+decksmith/gui/templates/index.html,sha256=-rZ-eO7O35gh5bJrQrb-5M-tnYEqSVqGWJh5sCe2e5c,9551
+decksmith/image_ops.py,sha256=SU2h_DC2t06adIwFrJdYp9skHSSj8834x8LV9l6z3qE,5073
+decksmith/logger.py,sha256=uSMzIpv7xT7ICMz4a88x_Z9-Izz0WU9MdZ9JEwWnOC4,1020
+decksmith/macro.py,sha256=prHs0fTIqxE5kjT1usqnWg8CNZEoWUVNAezD-qJslRY,1584
+decksmith/main.py,sha256=W5ve6W7D2sFgLRgskuo54H_PDIDMJTcO4JPNgfRCgZI,4681
+decksmith/project.py,sha256=3tp-uWmlVjA1NB-ZElmCK93M3eL-LknbDuZCUqwPVGE,3479
+decksmith/renderers/__init__.py,sha256=xF0SsNJSQEbY-NoSN0N4admLTGc_4JcZumDMpQahWBM,76
+decksmith/renderers/image.py,sha256=5HzKzELhpwN3WMq2Ni7NT-qmTYHuJaBA8jYVAcxioZw,2153
+decksmith/renderers/shapes.py,sha256=iSCCr4hn2lj4EGchq324_eHtuuYAhemYP9PSEUFBkxM,7855
+decksmith/renderers/text.py,sha256=b7NZn5mb8oCg5BzsupH-1-KzveAKCl6YJKcANbzCeRQ,5525
+decksmith/templates/deck.csv,sha256=8P3XknSg6kXulNyAmqFHgJDIzGjMnvdMQ8ctTtUoIzE,782
+decksmith/templates/deck.yaml,sha256=3BMpTUH1It25wrmQXZSrERoPo4-8TBKXKxfaRtYowt8,1034
+decksmith/utils.py,sha256=-QHYbNKQeB1SXB5Ovswn6Yql9sfSb5CmSNVpsw3LiVM,2909
+decksmith/validate.py,sha256=-HNgV1fPhnNUIJK9xI2CBGJwc2HLhChjLEik9cihER4,4245
+decksmith-0.9.3.dist-info/entry_points.txt,sha256=-usRztjj2gnfmPubb8nFYHD22drzThAmSfM6geWI98Y,48
+decksmith-0.9.3.dist-info/METADATA,sha256=g0VD563NLJ0URE68wENn6PSZDWcpy9uPSSWrpgsJL2g,4316
+decksmith-0.9.3.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+decksmith-0.9.3.dist-info/RECORD,,

decksmith-0.9.1.dist-info/RECORD

@@ -1,26 +0,0 @@
-decksmith/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-decksmith/card_builder.py,sha256=hxDVS7-dngCiT392pP2aiWgasfSp1ou3v3lzWmLXxL4,5618
-decksmith/deck_builder.py,sha256=J_Zdj4m-tXPSZh67mEyOCQ_CTphRCsPiyHSh1HcNM0M,3305
-decksmith/export.py,sha256=rzRGdyfK1YXu_k9cpkXvNFZZBkpfXW5zPr_iotlJxcY,5979
-decksmith/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-decksmith/gui/app.py,sha256=NQPR_hfCVvrr0QnEUmJXQv_A4lFXXoF8_OostVLwZkU,10178
-decksmith/gui/static/css/style.css,sha256=djBsKvc7tm7VaK5PWm1vFtan_PyEWESWjckgNSevr2s,13582
-decksmith/gui/static/js/main.js,sha256=A1Vz4kxlokqTadESYT7PlZf4XkVlaT0AXmSNNSrmixw,21680
-decksmith/gui/templates/index.html,sha256=xQhMFPzkCo1F6qR48NHjLkk12wzgn0Hh0LXTA4ShueE,8949
-decksmith/image_ops.py,sha256=8UzibqfoED_Jch-lt--l2LIAoIwdBrXH7so5UqY5pqw,4737
-decksmith/logger.py,sha256=uSMzIpv7xT7ICMz4a88x_Z9-Izz0WU9MdZ9JEwWnOC4,1020
-decksmith/macro.py,sha256=prHs0fTIqxE5kjT1usqnWg8CNZEoWUVNAezD-qJslRY,1584
-decksmith/main.py,sha256=Jm98JBo3a2H_S7mwHEWg8NzyUBXdbFewFxzlpPxjDLI,4653
-decksmith/project.py,sha256=QbhSOAveCuQ05P2Dp-uIc7hkC_o0-NAq3LIWQ4g-FnU,3885
-decksmith/renderers/__init__.py,sha256=xF0SsNJSQEbY-NoSN0N4admLTGc_4JcZumDMpQahWBM,76
-decksmith/renderers/image.py,sha256=SKj_21wlAjHGEG6M0GGu4OkwmJrxf0Nnk9TCu_2BP38,2218
-decksmith/renderers/shapes.py,sha256=iSCCr4hn2lj4EGchq324_eHtuuYAhemYP9PSEUFBkxM,7855
-decksmith/renderers/text.py,sha256=rN3vYUPWy_OpbxiGI5nydOu2V4O1CnoVKaqRIv64waU,4465
-decksmith/templates/deck.csv,sha256=8P3XknSg6kXulNyAmqFHgJDIzGjMnvdMQ8ctTtUoIzE,782
-decksmith/templates/deck.yaml,sha256=3BMpTUH1It25wrmQXZSrERoPo4-8TBKXKxfaRtYowt8,1034
-decksmith/utils.py,sha256=-QHYbNKQeB1SXB5Ovswn6Yql9sfSb5CmSNVpsw3LiVM,2909
-decksmith/validate.py,sha256=uNkBg0ruZp63gOu687Ed2hrtepV9Ez6NwnikKfvexzs,3813
-decksmith-0.9.1.dist-info/entry_points.txt,sha256=-usRztjj2gnfmPubb8nFYHD22drzThAmSfM6geWI98Y,48
-decksmith-0.9.1.dist-info/METADATA,sha256=u3WtryzgPYzisJIQ-gjvL4NaxmeTmM6uUKMeqUx7HZA,4249
-decksmith-0.9.1.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
-decksmith-0.9.1.dist-info/RECORD,,