python-pptx2 2.18.0__tar.gz → 2.20.0__tar.gz

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/HISTORY.rst

@@ -15,6 +15,29 @@ can sit beside both ``python-pptx`` (``pptx``) and ``power-pptx``
 .. _`scanny/python-pptx`: https://github.com/scanny/python-pptx
 
 
+2.20.0 (2026-08-30)
++++++++++++++++++++
+
+Added
+.....
+
+* CSS three-digit hex shorthand (``#888`` → ``#888888``) is accepted
+  anywhere a color hex string is.
+
+* **Agent-friendly kwargs, everywhere.** The alias/fuzzy normalization
+  introduced for ``add_text`` now covers the whole shape-creation
+  surface via a reusable ``@agent_friendly`` decorator: ``add_shape``
+  (``shape_type=``), ``add_picture`` / ``add_svg_picture`` /
+  ``add_movie`` (``image=`` / ``video=``), ``add_table``
+  (``columns=``), ``add_chart`` (``data=``, ``width=``/``height=`` for
+  ``cx``/``cy``), ``add_textbox``, ``add_connector`` (``x1/y1/x2/y2``),
+  ``add_group_shape``, ``add_ole_object``, and the six diagram recipes
+  (``items=`` / ``stages=`` / ``nodes=`` / ``colour=`` ...). All of
+  them accept ``x``/``y``/``w``/``h`` geometry keywords, substitute
+  synonyms without allowing contradictions, and raise ``TypeErrors``
+  that list every accepted argument.
+
+
 2.18.0 (2026-08-30)
 +++++++++++++++++++
 

{python_pptx2-2.18.0/src/python_pptx2.egg-info → python_pptx2-2.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pptx2
-Version: 2.18.0
+Version: 2.20.0
 Summary: Create, read, and update PowerPoint 2007+ (.pptx) files. Fork of power-pptx / python-pptx, published as python-pptx2.
 Author: Matěj Štágl
 Author-email: stagl@wattlescript.org

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/__init__.py

@@ -57,7 +57,7 @@ from pptx2.parts.slide import (
 if TYPE_CHECKING:
     from pptx2.opc.package import Part
 
-__version__ = "2.18.0"
+__version__ = "2.20.0"
 
 sys.modules["pptx2.exceptions"] = exceptions
 del sys

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/_agent_friendly.py

@@ -23,23 +23,21 @@ caller bug and still raises.
 from __future__ import annotations
 
 import difflib
+import functools
+import inspect
 
 # Canonical kwarg -> spellings other ecosystems use for the same thing.
 SYNONYMS: dict[str, tuple[str, ...]] = {
     "text": ("txt", "string", "content", "label", "caption", "value"),
-    "font": ("font_family", "fontfamily", "font_name", "fontname", "typeface", "family", "face"),
+    "font": (
+        "font_family", "fontfamily", "font_name", "fontname", "typeface", "family", "face",
+    ),
     "size_pt": ("size", "font_size", "fontsize", "pt_size", "point_size"),
     "align": ("halign", "ha", "horizontal_align", "horizontal_alignment", "text_align", "text_alignment"),
     "anchor": ("valign", "va", "vertical_align", "vertical_alignment", "v_align"),
     "color": (
-        "colour",
-        "font_color",
-        "font_colour",
-        "text_color",
-        "text_colour",
-        "fg_color",
-        "line_color",
-        "stroke_color",
+        "colour", "font_color", "font_colour", "text_color", "text_colour",
+        "fg_color", "line_color", "stroke_color",
     ),
     "weight_pt": ("weight", "line_weight", "width_pt", "stroke_width"),
     "bold": ("font_bold", "is_bold"),
@@ -53,6 +51,8 @@ SYNONYMS: dict[str, tuple[str, ...]] = {
     "height": ("h",),
     "start": ("begin", "start_point", "start_shape", "from", "source"),
     "end": ("to", "end_point", "end_shape", "target"),
+    "image_file": ("image", "img", "path", "file", "filename", "image_path", "file_path"),
+    "steps": ("items", "stages", "nodes", "boxes"),
 }
 
 _ALIAS_TO_CANONICAL: dict[str, str] = {
@@ -89,17 +89,28 @@ def absorb_agent_kwargs(
     method: str,
     kwargs: dict,
     canonical_names: "list[str] | tuple[str, ...]",
+    extra_synonyms: "dict[str, tuple[str, ...]] | None" = None,
+    pass_through_unknown: bool = False,
 ) -> dict:
     """Map alias / near-miss *kwargs* onto canonical names; raise else.
 
     *canonical_names* lists the kwargs the method actually understands
-    (including any already-bound explicit parameters).  Returns a dict
-    containing only canonical names.  A synonym that matches a canonical
-    the caller already supplied with a *different* value raises
+    (including any already-bound explicit parameters).  *extra_synonyms*
+    adds call-site-specific spellings (e.g. ``{"cx": ("width", "w")}``
+    for ``add_chart``).  Returns a dict containing only canonical names
+    — unless *pass_through_unknown* is set (for functions that accept
+    ``**kwargs`` themselves), in which case unabsorbable names are
+    passed through verbatim.  A synonym that matches a canonical the
+    caller already supplied with a *different* value raises
     ``TypeError``; equal values are fine.
     """
     known = list(canonical_names)
-    alias_space = [a for a in _ALIAS_TO_CANONICAL if a not in known]
+    alias_map = dict(_ALIAS_TO_CANONICAL)
+    if extra_synonyms:
+        for canonical, aliases in extra_synonyms.items():
+            for alias in aliases:
+                alias_map[alias] = canonical
+    alias_space = [a for a in alias_map if a not in known]
     candidates = known + alias_space
 
     resolved: dict = {}
@@ -112,7 +123,7 @@ def absorb_agent_kwargs(
                 )
             resolved[name] = value
             continue
-        canonical = _ALIAS_TO_CANONICAL.get(name)
+        canonical = alias_map.get(name)
         if canonical is not None and canonical not in known:
             # The alias resolves to an argument this method doesn't take
             # (e.g. ``to=`` on add_text); fall through to the fuzzy/error
@@ -121,6 +132,9 @@ def absorb_agent_kwargs(
         if canonical is None:
             canonical = _did_you_mean(name, candidates, known)
             if canonical is None:
+                if pass_through_unknown:
+                    resolved[name] = value
+                    continue
                 raise TypeError(
                     f"{method}(): got an unexpected keyword argument {name!r}. "
                     f"Accepted: {', '.join(sorted(known))} "
@@ -134,3 +148,63 @@ def absorb_agent_kwargs(
             )
         resolved[canonical] = value
     return resolved
+
+
+def agent_friendly(extra_synonyms=None):
+    """Decorator: make a method/function absorb alias and fuzzy kwargs.
+
+    Wrap any public helper so its keyword arguments get the full
+    treatment from :func:`absorb_agent_kwargs` — global synonyms,
+    per-call *extra_synonyms*, fuzzy near-misses, and didactic errors —
+    without touching its body.  Usable bare (``@agent_friendly``) or
+    with per-method synonyms.  A keyword that repeats a value already
+    bound positionally (through a synonym or exact name) is dropped when
+    equal and raises ``TypeError`` when it contradicts::
+
+        @agent_friendly({"cx": ("width", "w"), "cy": ("height", "h")})
+        def add_chart(self, x, y, cx, cy, chart_type, chart_data): ...
+    """
+    if callable(extra_synonyms):  # used bare: @agent_friendly above def
+        return _decorate_friendly(extra_synonyms, None)
+
+    def decorator(func):
+        return _decorate_friendly(func, extra_synonyms)
+
+    return decorator
+
+
+def _decorate_friendly(func, extra_synonyms):
+    sig = inspect.signature(func)
+    has_self = bool(sig.parameters) and next(iter(sig.parameters)) in ("self", "cls")
+    param_list = [
+        p
+        for p in sig.parameters.values()
+        if p.kind not in (inspect.Parameter.VAR_POSITIONAL, inspect.Parameter.VAR_KEYWORD)
+        and p.name not in ("self", "cls")
+    ]
+    known = tuple(p.name for p in param_list)
+    takes_var_kw = any(
+        p.kind == inspect.Parameter.VAR_KEYWORD for p in sig.parameters.values()
+    )
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        if kwargs:
+            kwargs = absorb_agent_kwargs(
+                func.__name__, kwargs, known, extra_synonyms,
+                pass_through_unknown=takes_var_kw,
+            )
+            offset = 1 if has_self else 0
+            for i, p in enumerate(param_list[: len(args) - offset]):
+                if p.name in kwargs:
+                    if kwargs[p.name] != args[offset + i]:
+                        raise TypeError(
+                            f"{func.__name__}(): {p.name} given positionally "
+                            f"({args[offset + i]!r}) and by keyword "
+                            f"({kwargs[p.name]!r}) with different values"
+                        )
+                    del kwargs[p.name]
+        return func(*args, **kwargs)
+
+    return wrapper
+

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/_color.py

@@ -41,6 +41,9 @@ def coerce_color(value: Any) -> RGBColor:
         return value
     if isinstance(value, str):
         s = value.lstrip("#")
+        if len(s) == 3:
+            # CSS shorthand: '#888' -> '#888888' (a common generator habit)
+            s = "".join(ch * 2 for ch in s)
         if len(s) != 6:
             raise ValueError(
                 "color hex string must be 6 digits "

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/diagrams.py

@@ -32,6 +32,7 @@ import math
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Sequence
 
+from pptx2._agent_friendly import agent_friendly
 from pptx2.enum.shapes import MSO_SHAPE
 from pptx2.geometry import BBox
 from pptx2.util import Emu, Inches, Pt
@@ -245,6 +246,14 @@ def _card(
 # ----------------------------------------------------------------------------- pipelines
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+    }
+
+)
 def horizontal_pipeline(
     slide,
     bbox: BBox,
@@ -312,6 +321,14 @@ def horizontal_pipeline(
     return PipelineResult(cards=cards, arrows=arrows)
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+    }
+
+)
 def vertical_pipeline(
     slide,
     bbox: BBox,
@@ -371,6 +388,15 @@ def vertical_pipeline(
 # ----------------------------------------------------------------------------- hub
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+        "spokes": ("items", "stages", "nodes"),
+        "centre": ("center", "hub", "hub_label", "title"),
+    }
+)
 def hub_and_spoke(
     slide,
     bbox: BBox,
@@ -479,6 +505,14 @@ def hub_and_spoke(
 # ----------------------------------------------------------------------------- cycle
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+    }
+
+)
 def cycle(
     slide,
     bbox: BBox,
@@ -553,6 +587,15 @@ def cycle(
 # ----------------------------------------------------------------------------- decision tree
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+        "branches": ("items", "nodes", "children", "steps"),
+        "root": ("root_label", "title", "center"),
+    }
+)
 def decision_tree(
     slide,
     bbox: BBox,
@@ -675,6 +718,14 @@ def decision_tree(
 # ----------------------------------------------------------------------------- columns
 
 
+@agent_friendly(
+    {
+        "text_color": ("color", "colour", "fg_color", "text_colour"),
+        "accent": ("accent_color", "primary", "primary_color"),
+        "fill": ("fill_color", "background", "bg"),
+        "columns": ("items", "cols", "sections"),
+    }
+)
 def comparison_columns(
     slide,
     bbox: BBox,

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/shapes/shapetree.py

@@ -34,6 +34,7 @@ from pptx2.shapes.placeholder import (
     TablePlaceholder,
 )
 from pptx2.shared import ParentedElementProxy
+from pptx2._agent_friendly import agent_friendly
 from pptx2.util import Emu, _coerce_emu, lazyproperty
 
 if TYPE_CHECKING:
@@ -567,6 +568,7 @@ class _BaseGroupShapes(_BaseShapes):
         super(_BaseGroupShapes, self).__init__(grpSp, parent)
         self._grpSp = grpSp
 
+    @agent_friendly({"cx": ("width", "w"), "cy": ("height", "h"), "chart_data": ("data", "chartdata"), "chart_type": ("type", "charttype")})
     def add_chart(
         self,
         chart_type: XL_CHART_TYPE,
@@ -601,6 +603,7 @@ class _BaseGroupShapes(_BaseShapes):
         _apply_horizontal_bar_default(shape, chart_type)
         return cast("Chart", shape)
 
+    @agent_friendly({"connector_type": ("type", "kind", "connector"), "begin_x": ("x1", "start_x"), "begin_y": ("y1", "start_y"), "end_x": ("x2", "to_x"), "end_y": ("y2", "to_y")})
     def add_connector(
         self,
         connector_type: MSO_CONNECTOR_TYPE,
@@ -621,6 +624,7 @@ class _BaseGroupShapes(_BaseShapes):
         self._recalculate_extents()
         return cast(Connector, self._shape_factory(cxnSp))
 
+    @agent_friendly({"shapes": ("items", "members")})
     def add_group_shape(self, shapes: Iterable[BaseShape] = ()) -> GroupShape:
         """Return a |GroupShape| object newly appended to this shape tree.
 
@@ -639,6 +643,7 @@ class _BaseGroupShapes(_BaseShapes):
             grpSp.recalculate_extents()
         return cast(GroupShape, self._shape_factory(grpSp))
 
+    @agent_friendly
     def add_ole_object(
         self,
         object_file: str | IO[bytes],
@@ -700,6 +705,7 @@ class _BaseGroupShapes(_BaseShapes):
         self._recalculate_extents()
         return cast(GraphicFrame, self._shape_factory(graphicFrame))
 
+    @agent_friendly
     def add_picture(
         self,
         image_file: str | os.PathLike[str] | IO[bytes],
@@ -762,6 +768,7 @@ class _BaseGroupShapes(_BaseShapes):
             picture.top = Emu(ct + new_top)
         return picture
 
+    @agent_friendly({"svg_file": ("svg", "svg_path", "svg_source")})
     def add_svg_picture(
         self,
         svg_file,
@@ -825,6 +832,7 @@ class _BaseGroupShapes(_BaseShapes):
         self._recalculate_extents()
         return cast(Picture, self._shape_factory(pic))
 
+    @agent_friendly({"autoshape_type_id": ("shape_type", "autoshape_type", "shape", "preset_shape")})
     def add_shape(
         self,
         autoshape_type_id: MSO_SHAPE,
@@ -863,6 +871,7 @@ class _BaseGroupShapes(_BaseShapes):
             shape.top = Emu(ct + new_top)
         return shape
 
+    @agent_friendly
     def add_textbox(
         self,
         left: Length,
@@ -1498,6 +1507,7 @@ class _BaseGroupShapes(_BaseShapes):
         sp = self._spTree.add_textbox(id_, name, x, y, cx, cy)
         return sp
 
+    @agent_friendly({"cols": ("columns", "num_cols", "col_count"), "rows": ("num_rows", "row_count")})
     def add_table(
         self,
         rows: int,
@@ -1549,6 +1559,7 @@ class _BaseGroupShapes(_BaseShapes):
             tbl.vert_banding = False
         return shape
 
+    @agent_friendly({"movie_file": ("video", "video_file", "movie", "path", "file")})
     def add_movie(
         self,
         movie_file: str | IO[bytes],

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/src/pptx2/skill/references/basics.md

@@ -452,9 +452,13 @@ end. `move` raises `IndexError` out of range; `reorder` raises
 
 ### Forgiving keyword arguments
 
-The one-call helpers (`add_text`, `add_equation`, `add_arrow`) absorb
-cross-library and near-miss kwargs, so the `font_family=` / `halign=` /
-`fontsize=` / `colour` / `x,y,w,h` / `begin,to` habits of other
-ecosystems just work. Synonyms substitute, never contradict (two
-different values for the same logical argument still raise), and a
-truly unknown kwarg raises a `TypeError` listing every accepted name.
+Every shape helper (`add_text`, `add_shape`, `add_picture`,
+`add_table`, `add_chart`, `add_textbox`, `add_connector`, `add_movie`,
+`add_arrow`, `add_equation`, ...) and the diagram recipes
+(`horizontal_pipeline`, `hub_and_spoke`, ...) absorb cross-library and
+near-miss kwargs: `font_family=`, `halign=`/`valign=`, `fontsize=`,
+`colour`, `x,y,w,h` geometry keywords, `shape_type=`, `image=`,
+`columns=`, `data=`, `begin=`/`to=`, `items=`/`nodes=` ... Synonyms
+substitute, never contradict (two different values for the same
+logical argument still raise), and a truly unknown kwarg raises a
+`TypeError` listing every accepted name.

{python_pptx2-2.18.0 → python_pptx2-2.20.0/src/python_pptx2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pptx2
-Version: 2.18.0
+Version: 2.20.0
 Summary: Create, read, and update PowerPoint 2007+ (.pptx) files. Fork of power-pptx / python-pptx, published as python-pptx2.
 Author: Matěj Štágl
 Author-email: stagl@wattlescript.org

{python_pptx2-2.18.0 → python_pptx2-2.20.0}/tests/test_shape_helpers.py

@@ -180,6 +180,66 @@ class DescribeAddArrowSynonyms:
         assert arrow.begin_x == Inches(0)
 
 
+class DescribeAgentFriendlyShapeApi:
+    """Every shapes.add_* absorbs cross-library kwargs, not just add_text."""
+
+    def it_add_shape_takes_shape_type_and_xywh(self, slide):
+        rect = slide.shapes.add_shape(
+            shape_type=MSO_SHAPE.RECTANGLE,
+            x=Inches(1), y=Inches(1), w=Inches(2), h=Inches(1),
+        )
+        assert (rect.left, rect.top) == (Inches(1), Inches(1))
+
+    def it_add_picture_takes_image_and_xywh(self, slide, tmp_path):
+        import struct, zlib
+
+        def _png(path):
+            def chunk(tag, data):
+                c = struct.pack(">I", len(data)) + tag + data
+                return c + struct.pack(">I", zlib.crc32(tag + data) & 0xFFFFFFFF)
+            ihdr = struct.pack(">IIBBBBB", 1, 1, 8, 2, 0, 0, 0)
+            raw = b"\x00\xff\x00\x00"
+            blob = (b"\x89PNG\r\n\x1a\n" + chunk(b"IHDR", ihdr)
+                    + chunk(b"IDAT", zlib.compress(raw)) + chunk(b"IEND", b""))
+            path.write_bytes(blob)
+
+        pic_path = tmp_path / "dot.png"
+        _png(pic_path)
+        pic = slide.shapes.add_picture(
+            image=str(pic_path), x=Inches(1), y=Inches(1), w=Inches(1), h=Inches(1)
+        )
+        assert pic.left == Inches(1)
+
+    def it_add_table_takes_columns_and_xywh(self, slide):
+        gf = slide.shapes.add_table(
+            rows=2, columns=3, x=Inches(1), y=Inches(1), w=Inches(6), h=Inches(2)
+        )
+        assert len(gf.table.columns) == 3
+
+    def it_add_textbox_takes_xywh(self, slide):
+        tb = slide.shapes.add_textbox(x=Inches(2), y=Inches(2), w=Inches(3), h=Inches(1))
+        assert tb.top == Inches(2)
+
+    def it_add_connector_takes_x1y1x2y2(self, slide):
+        cxn = slide.shapes.add_connector(
+            MSO_CONNECTOR_TYPE.STRAIGHT,
+            x1=Inches(0), y1=Inches(0), x2=Inches(2), y2=Inches(2),
+        )
+        assert cxn.begin_x == Inches(0)
+
+    def it_unknown_kwarg_error_lists_accepted_names(self, slide):
+        with pytest.raises(TypeError, match="Accepted"):
+            slide.shapes.add_textbox(Inches(0), Inches(0), Inches(1), Inches(1), bogus=1)
+
+    def it_diagram_recipes_absorb_item_and_colour_synonyms(self, slide):
+        from pptx2 import BBox
+        from pptx2.diagrams import horizontal_pipeline
+
+        horizontal_pipeline(
+            slide, BBox.from_inches(0.5, 1, 12, 1.5), items=["a", "b"], colour="#0D0D0D"
+        )
+
+
 class DescribeSetTextPreservingFormat:
     def it_preserves_font_attributes_across_replacement(self, slide):
         tx = slide.shapes.add_text(
@@ -368,3 +428,12 @@ class DescribeSlideHelpers:
     def it_rejects_unknown_near_type_in_find_empty_region(self, slide):
         with pytest.raises(TypeError):
             slide.find_empty_region(near="not-a-shape")
+
+
+class DescribeCssHexShorthand:
+    def it_expands_three_digit_hex(self, slide):
+        rect = slide.shapes.add_shape(
+            MSO_SHAPE.RECTANGLE, Inches(0), Inches(0), Inches(2), Inches(1)
+        )
+        rect.fill_hex("#888")
+        assert str(rect.fill.fore_color.rgb) == "888888"