Skip to content

AI turns documents or topics into real, native PowerPoint decks—with native shapes, transitions and animations, data-backed charts and tables on demand, audio narration from speaker notes, and support for your own .pptx templates. · by Hugo He

fix(native-chart): allocate chart parts without colliding with restored sources

hugohe3970d9cc9c23c
diff --git a/skills/ppt-master/scripts/docs/svg-pipeline.md b/skills/ppt-master/scripts/docs/svg-pipeline.md
index 42863b3d..7e9ab706 100644
--- a/skills/ppt-master/scripts/docs/svg-pipeline.md
+++ b/skills/ppt-master/scripts/docs/svg-pipeline.md
@@ -131,6 +131,10 @@ original hierarchy level and `graphicFrame` type. Markers without a source id
keep generated chart grouping, id allocation, and naming unchanged. Rebuilt
chart relationships point to the newly generated chart/workbook parts;
restored packages keep their source parts.
+New chart part families reserve unused names across the complete export
+(including source/template parts, workbooks, relationships, and ChartEx
+styles/colors); conflicting writes or content types fail with the part path
+and both owners, while identical immutable source dependencies may be reused.
A page edit rebuilds that output page; a changed
materialized or derived resource rebuilds every output page that references it.
diff --git a/skills/ppt-master/scripts/pptx_ooxml/package.py b/skills/ppt-master/scripts/pptx_ooxml/package.py
index ef3d546e..14c95ebb 100644
--- a/skills/ppt-master/scripts/pptx_ooxml/package.py
+++ b/skills/ppt-master/scripts/pptx_ooxml/package.py
@@ -1,14 +1,14 @@
-"""Write-side OOXML package plumbing for source-preserving slide cloning.
+"""Write-side OOXML package plumbing for slide cloning and native objects.
Content-type override insertion, relationship-element construction / lookup, and
-part-number allocation used when cloning slides into a new package.
+part allocation, and collision checks for a complete export package.
"""
from __future__ import annotations
import posixpath
import re
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
from pathlib import Path
from xml.etree import ElementTree as ET
@@ -33,6 +33,79 @@ _EXPLICIT_SLIDE_REL_KINDS = frozenset({
})
+class PackagePartRegistry:
+ """Reserve package names and reject conflicting native-object writes."""
+
+ def __init__(
+ self,
+ package_root: Path | None = None,
+ content_types: dict[str, str] | None = None,
+ ) -> None:
+ self.package_root = package_root
+ self.parts: dict[str, bytes] = {}
+ self.content_types = dict(content_types or {})
+ self.owners: dict[str, str] = {}
+ self.source_names: set[str] = set()
+ if package_root is not None:
+ self.reserve_source(
+ (path.relative_to(package_root).as_posix()
+ for path in package_root.rglob("*") if path.is_file()),
+ "template/source package",
+ )
+ self.reserve_source(self.content_types, "template/source content types")
+
+ def reserve_source(self, names: Iterable[str], owner: str) -> None:
+ """Reserve immutable source names before visiting any new objects."""
+ for name in names:
+ if name not in self.owners:
+ self.owners[name] = owner
+ self.source_names.add(name)
+
+ def next_index(
+ self, patterns: tuple[str, ...], start: int, occupied: Iterable[str] = (),
+ ) -> int:
+ """Keep the preferred number unless any member of the part family exists."""
+ used = self.owners.keys() | set(occupied)
+ while any(pattern.format(start) in used for pattern in patterns):
+ start += 1
+ return start
+
+ def register(
+ self,
+ parts: dict[str, bytes],
+ content_types: dict[str, str],
+ owner: str,
+ *,
+ source: bool = False,
+ ) -> None:
+ """Register an entire object atomically; identical source parts may be reused."""
+ for name in parts.keys() | content_types.keys():
+ previous_owner = self.owners.get(name)
+ existing = self.parts.get(name)
+ if existing is None and self.package_root is not None:
+ path = self.package_root / name
+ if path.is_file():
+ existing = path.read_bytes()
+ previous_type = self.content_types.get(name)
+ content_type = content_types.get(name)
+ collision = previous_owner is not None and (
+ not source or name not in self.source_names
+ or (existing is not None and existing != parts.get(name))
+ )
+ if collision or (previous_type and content_type and previous_type != content_type):
+ raise RuntimeError(
+ f"OOXML part collision: {name!r} between {previous_owner!r} and {owner!r}; "
+ "use a distinct part name for each new object"
+ )
+ for name in parts.keys() | content_types.keys():
+ if name not in self.parts:
+ self.owners[name] = owner
+ if source:
+ self.source_names.add(name)
+ self.parts.update(parts)
+ self.content_types.update(content_types)
+
+
def unreferenced_slide_relationships(
slide: ET.Element,
relationships: ET.Element,
diff --git a/skills/ppt-master/scripts/svg_to_pptx/drawingml/context.py b/skills/ppt-master/scripts/svg_to_pptx/drawingml/context.py
index c1534472..580c3704 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/drawingml/context.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/drawingml/context.py
@@ -7,6 +7,8 @@ from typing import TYPE_CHECKING, Any
from xml.etree import ElementTree as ET
from dataclasses import dataclass, field
+from pptx_ooxml.package import PackagePartRegistry
+
if TYPE_CHECKING:
from .theme_colors import ThemeColorSpec
from .theme_fonts import ThemeFontSpec
@@ -84,6 +86,7 @@ class ConvertContext:
rel_entries: list[dict[str, str]] = field(default_factory=list)
package_files: dict[str, bytes] = field(default_factory=dict)
content_type_overrides: dict[str, str] = field(default_factory=dict)
+ package_parts: PackagePartRegistry = field(default_factory=PackagePartRegistry)
rel_id_counter: int = 2 # rId1 reserved for slideLayout
svg_dir: Path | None = None
# Explicit project boundary for deterministic resource resolution. Public
@@ -266,6 +269,7 @@ class ConvertContext:
rel_entries=self.rel_entries,
package_files=self.package_files,
content_type_overrides=self.content_type_overrides,
+ package_parts=self.package_parts,
rel_id_counter=self.rel_id_counter,
svg_dir=self.svg_dir,
resource_root=self.resource_root,
diff --git a/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py b/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
index 0b836d3b..7339f0c3 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
@@ -13,6 +13,7 @@ from typing import Any
from xml.etree import ElementTree as ET
from native_payloads import NativePayloadError, hydrate_native_payload_refs
+from pptx_ooxml.package import PackagePartRegistry
from hyperlink_contract import (
SHAPE_HYPERLINK_ATTR,
project_hyperlink_errors,
@@ -125,6 +126,7 @@ from ..native_objects import (
native_replacement_kind,
native_marker_transform,
require_fresh_native_fallback,
+ reserve_source_chart_parts,
snapshot_native_fallback_freshness,
)
from ..native_objects.formula import formula_fallback_xml
@@ -2035,6 +2037,7 @@ def convert_svg_to_slide_shapes(
promote_background: bool = True,
text_flow: str | None = None,
dangerous_nonconforming_export: bool = False,
+ package_parts: PackagePartRegistry | None = None,
) -> tuple[
str,
dict[str, bytes],
@@ -2083,6 +2086,8 @@ def convert_svg_to_slide_shapes(
Parsing, resource, conversion, and package failures remain blocking.
resource_root: Explicit project boundary for local images and icons.
Omit only for direct library calls that require legacy inference.
+ package_parts: Shared native-part registry for the complete export,
+ including the template/source package and previously rebuilt slides.
Returns:
(slide_xml, media_files, rel_entries, anim_targets,
@@ -2441,12 +2446,15 @@ def convert_svg_to_slide_shapes(
theme_font_spec=theme_font_spec,
theme_color_spec=theme_color_spec,
primary_language=primary_language,
+ package_parts=package_parts if package_parts is not None else PackagePartRegistry(),
inherited_styles=_extract_inheritable_styles(root),
opacity_multiplier=1.0 if root_opacity is None else root_opacity,
parent_by_id={id(child): parent for parent in root.iter() for child in parent},
text_font_sizes=text_font_sizes,
text_letter_spacings=text_letter_spacings,
)
+ if native_objects:
+ reserve_source_chart_parts(root, ctx)
shapes: list[str] = []
converted = 0
skipped = 0
diff --git a/skills/ppt-master/scripts/svg_to_pptx/native_objects/__init__.py b/skills/ppt-master/scripts/svg_to_pptx/native_objects/__init__.py
index 774f5536..15ef20d3 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/native_objects/__init__.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/native_objects/__init__.py
@@ -339,6 +339,23 @@ def _grow_chart_frame_for_axis_labels(
return off_x, off_y, ext_cx, ext_cy
+def reserve_source_chart_parts(root: ET.Element, ctx: ConvertContext) -> None:
+ """Reserve source chart packages even when they follow newly authored charts."""
+ for elem in root.iter():
+ if native_replacement_kind(elem) != "chart":
+ continue
+ source = _decode_source_chart_package(_load_payload(elem, "chart"))
+ if source is not None:
+ ctx.package_parts.reserve_source(source[2], _chart_part_owner(elem, ctx))
+
+
+def _chart_part_owner(elem: ET.Element, ctx: ConvertContext) -> str:
+ return (
+ f"slide {ctx.slide_num} chart {elem.get('id')!r} "
+ f"(source shape {elem.get('data-pptx-shape-id')!r})"
+ )
+
+
def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str, Any]) -> ShapeResult:
source_package = _decode_source_chart_package(payload)
chart_data = None if source_package is not None else _chart_data(payload)
@@ -357,6 +374,21 @@ def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str
rel_id = ctx.next_rel_id()
local_index = 1 + sum(1 for part in ctx.package_files if part.startswith("ppt/charts/chart"))
part_index = ctx.slide_num * 100 + local_index
+ if source_package is None:
+ is_chartex = chart_data is not None and chart_data["kind"] == "chartex"
+ chart_pattern = "chartEx{}.xml" if is_chartex else "chart{}.xml"
+ patterns = (
+ f"ppt/charts/{chart_pattern}",
+ f"ppt/charts/_rels/{chart_pattern}.rels",
+ "ppt/embeddings/Microsoft_Excel_Sheet{}.xlsx",
+ )
+ if is_chartex:
+ patterns += ("ppt/charts/style{}.xml", "ppt/charts/colors{}.xml")
+ part_index = ctx.package_parts.next_index(
+ patterns, part_index, ctx.package_files.keys() | ctx.content_type_overrides.keys(),
+ )
+ parts: dict[str, bytes] = {}
+ content_types: dict[str, str] = {}
workbook_name = f"Microsoft_Excel_Sheet{part_index}.xlsx"
workbook_part = f"ppt/embeddings/{workbook_name}"
if source_package is not None:
@@ -369,14 +401,8 @@ def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str
"type": CHART_REL_TYPE,
"target": posixpath.relpath(chart_part, "ppt/slides"),
})
- for part_name, part_payload in source_parts.items():
- existing = ctx.package_files.get(part_name)
- if existing is not None and existing != part_payload:
- raise RuntimeError(
- f"Native PPTX chart source package part collision: {part_name}"
- )
- ctx.package_files[part_name] = part_payload
- ctx.content_type_overrides.update(source_content_types)
+ parts = source_parts
+ content_types = source_content_types
elif chart_data is not None and chart_data["kind"] == "chartex":
chart_name = f"chartEx{part_index}.xml"
style_name = f"style{part_index}.xml"
@@ -396,18 +422,18 @@ def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str
"type": CHARTEX_REL_TYPE,
"target": f"../charts/{chart_name}",
})
- ctx.package_files[chart_part] = _chart_ex_xml(payload, chart_data, chart_rels_id="rId1")
- ctx.package_files[chart_rels_part] = _chart_ex_rels_xml(
+ parts[chart_part] = _chart_ex_xml(payload, chart_data, chart_rels_id="rId1")
+ parts[chart_rels_part] = _chart_ex_rels_xml(
f"../embeddings/{workbook_name}",
style_name,
colors_name,
)
- ctx.package_files[style_part] = _chart_ex_style_xml()
- ctx.package_files[colors_part] = _chart_ex_colors_xml(payload)
- ctx.package_files[workbook_part] = _minimal_chart_ex_workbook(chart_data)
- ctx.content_type_overrides[chart_part] = CHARTEX_CONTENT_TYPE
- ctx.content_type_overrides[style_part] = CHART_STYLE_CONTENT_TYPE
- ctx.content_type_overrides[colors_part] = CHART_COLOR_STYLE_CONTENT_TYPE
+ parts[style_part] = _chart_ex_style_xml()
+ parts[colors_part] = _chart_ex_colors_xml(payload)
+ parts[workbook_part] = _minimal_chart_ex_workbook(chart_data)
+ content_types[chart_part] = CHARTEX_CONTENT_TYPE
+ content_types[style_part] = CHART_STYLE_CONTENT_TYPE
+ content_types[colors_part] = CHART_COLOR_STYLE_CONTENT_TYPE
else:
chart_name = f"chart{part_index}.xml"
chart_part = f"ppt/charts/{chart_name}"
@@ -422,7 +448,7 @@ def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str
"type": CHART_REL_TYPE,
"target": f"../charts/{chart_name}",
})
- ctx.package_files[chart_part] = _chart_xml(
+ parts[chart_part] = _chart_xml(
elem,
payload,
chart_rels_id="rId1",
@@ -431,13 +457,19 @@ def _build_native_chart(elem: ET.Element, ctx: ConvertContext, payload: dict[str
primary_language=ctx.primary_language,
chart_bounds=(off_x, off_y, ext_cx, ext_cy),
)
- ctx.package_files[chart_rels_part] = _chart_rels_xml(f"../embeddings/{workbook_name}")
+ parts[chart_rels_part] = _chart_rels_xml(f"../embeddings/{workbook_name}")
assert chart_data is not None
if chart_data["kind"] == "xy":
- ctx.package_files[workbook_part] = _minimal_xy_chart_workbook(chart_data)
+ parts[workbook_part] = _minimal_xy_chart_workbook(chart_data)
else:
- ctx.package_files[workbook_part] = _minimal_category_chart_workbook(chart_data)
- ctx.content_type_overrides[chart_part] = CHART_CONTENT_TYPE
+ parts[workbook_part] = _minimal_category_chart_workbook(chart_data)
+ content_types[chart_part] = CHART_CONTENT_TYPE
+
+ ctx.package_parts.register(
+ parts, content_types, _chart_part_owner(elem, ctx), source=source_package is not None,
+ )
+ ctx.package_files.update(parts)
+ ctx.content_type_overrides.update(content_types)
source_name = elem.get("data-pptx-shape-name") if source_id is not None else None
name = _xml_escape(str(source_name or payload.get("name") or elem.get("id") or f"Native Chart {shape_id}"))
diff --git a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
index 58b7a326..4308b492 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
@@ -71,7 +71,7 @@ from pptx_opc_validation import (
)
from pptx_workspace import WorkspaceResourceSpec
from pptx_ooxml.clone import clone_presentation_slides
-from pptx_ooxml.package import prune_unreferenced_directory_parts
+from pptx_ooxml.package import PackagePartRegistry, prune_unreferenced_directory_parts
from language_tags import language_uses_rtl, office_language_tag
from hyperlink_contract import (
HYPERLINK_REL_TYPE,
@@ -7223,6 +7223,7 @@ def create_pptx_with_native_svg(
image_exts_used: set[str] = set()
package_exts_used: set[str] = set()
package_content_overrides: dict[str, str] = {}
+ package_parts = PackagePartRegistry(extract_dir, _content_type_overrides(extract_dir))
notes_slides_created: set[int] = set()
notes_master_parts_used: set[str] = set()
notes_master_theme_parts_created: set[str] = set()
@@ -7595,6 +7596,7 @@ def create_pptx_with_native_svg(
image_scale=image_scale,
image_quality=image_quality,
native_objects=native_objects,
+ package_parts=package_parts,
animation_group_overrides=converter_group_overrides,
theme_font_spec=active_theme_font_spec,
theme_color_spec=active_theme_color_spec,
diff --git a/skills/ppt-master/scripts/tests/test_native_chart_part_allocation.py b/skills/ppt-master/scripts/tests/test_native_chart_part_allocation.py
new file mode 100644
index 00000000..509df647
--- /dev/null
+++ b/skills/ppt-master/scripts/tests/test_native_chart_part_allocation.py
@@ -0,0 +1,253 @@
+#!/usr/bin/env python3
+"""
+PPT Master - Native Chart Part Allocation Regression Tests
+
+Exercise source preservation, chart-family allocation and collision errors
+through the public SVG converter, with fixtures constructed in this module.
+
+Usage:
+ python3 -m unittest tests.test_native_chart_part_allocation
+
+Examples:
+ Run the module from the scripts directory.
+
+Dependencies:
+ Standard library and the local SVG-to-PPTX converter.
+"""
+
+from __future__ import annotations
+
+import base64
+import hashlib
+import io
+import json
+import posixpath
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+from xml.etree import ElementTree as ET
+from zipfile import ZipFile
+
+from pptx_ooxml.package import PackagePartRegistry
+from svg_to_pptx.drawingml.converter import convert_svg_to_slide_shapes
+
+
+NS = {
+ "c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
+ "cx": "http://schemas.microsoft.com/office/drawing/2014/chartex",
+ "p": "http://schemas.openxmlformats.org/presentationml/2006/main",
+ "r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+ "rel": "http://schemas.openxmlformats.org/package/2006/relationships",
+ "x": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+}
+SVG_NS = "http://www.w3.org/2000/svg"
+
+
+def _chart(name: str, *, values: tuple = (3, 2), source: dict | None = None,
+ chartex: bool = False) -> str:
+ elem = ET.Element(f"{{{SVG_NS}}}g", {
+ "id": name,
+ "data-pptx-replace-with": "chart",
+ "data-pptx-native-authority": "json",
+ })
+ payload = {
+ "type": "column", "name": name,
+ "x": 100, "y": 100, "width": 600, "height": 400,
+ "categories": ["A", "B"], "series": [{"name": "Values", "values": values}],
+ }
+ if source is not None:
+ payload["source_package"] = source
+ if chartex:
+ payload.update(type="treemap", levels=[["A", "B"]], values=values)
+ ET.SubElement(elem, f"{{{SVG_NS}}}metadata", {"type": "application/json"}).text = json.dumps(payload)
+ return ET.tostring(elem, encoding="unicode")
+
+
+def _blob(data: bytes) -> dict:
+ return {"encoding": "base64", "payload": base64.b64encode(data).decode("ascii"),
+ "sha256": hashlib.sha256(data).hexdigest()}
+
+
+def _export(body: str, **kwargs: object) -> tuple:
+ with tempfile.TemporaryDirectory() as temporary:
+ root = Path(temporary)
+ svg = root / "chart.svg"
+ svg.write_text(f'<svg xmlns="{SVG_NS}" viewBox="0 0 1280 720">{body}</svg>', encoding="utf-8")
+ xml, _media, rels, _targets, parts, types = convert_svg_to_slide_shapes(
+ svg, resource_root=root, native_objects=True, **kwargs,
+ )
+ return ET.fromstring(xml), rels, parts, types
+
+
+def _source(chart_index: int = 102, workbook_index: int = 102,
+ *, values: tuple = (11, 12), extras: dict | None = None) -> dict:
+ slide, _rels, parts, types = _export(_chart("source", values=values))
+ renamed = {}
+ renamed_types = {}
+ for name, data in parts.items():
+ new_name = name.replace("chart101.xml", f"chart{chart_index}.xml").replace(
+ "Sheet101.xlsx", f"Sheet{workbook_index}.xlsx",
+ )
+ if name.endswith(".rels"):
+ data = data.replace(b"Sheet101.xlsx", f"Sheet{workbook_index}.xlsx".encode())
+ renamed[new_name] = data
+ if name in types:
+ renamed_types[new_name] = types[name]
+ renamed.update(extras or {})
+ return {
+ "chart_part": f"ppt/charts/chart{chart_index}.xml",
+ "frame": _blob(ET.tostring(slide.find(".//p:graphicFrame", NS))),
+ "parts": [{"name": name, **_blob(data), "content_type": renamed_types.get(name)}
+ for name, data in renamed.items()],
+ }
+
+
+def _chart_rows(slide: ET.Element, rels: list, parts: dict) -> list[dict]:
+ rows = []
+ for frame in slide.findall(".//p:graphicFrame", NS):
+ reference = next(iter(frame.findall(".//c:chart", NS) + frame.findall(".//cx:chart", NS)))
+ relation = next(rel for rel in rels if rel["id"] == reference.get(f"{{{NS['r']}}}id"))
+ chart_part = posixpath.normpath(posixpath.join("ppt/slides", relation["target"]))
+ rels_part = posixpath.join("ppt/charts/_rels", posixpath.basename(chart_part) + ".rels")
+ chart_rels = ET.fromstring(parts[rels_part])
+ workbook_rel = next(rel for rel in chart_rels if rel.get("Type").endswith("/package"))
+ workbook_part = posixpath.normpath(posixpath.join("ppt/charts", workbook_rel.get("Target")))
+ chart = ET.fromstring(parts[chart_part])
+ values = [node.text for node in chart.findall(".//c:ser/c:val/c:numRef/c:numCache/c:pt/c:v", NS)]
+ if reference.tag == f"{{{NS['cx']}}}chart":
+ values = [node.text for node in chart.findall(".//cx:numDim/cx:lvl/cx:pt", NS)]
+ with ZipFile(io.BytesIO(parts[workbook_part])) as workbook:
+ sheet = ET.fromstring(workbook.read("xl/worksheets/sheet1.xml"))
+ workbook_values = [sheet.find(f".//x:c[@r='B{row}']/x:v", NS).text for row in (2, 3)]
+ rows.append({"chart": chart_part, "rels": rels_part, "workbook": workbook_part,
+ "values": values, "workbook_values": workbook_values})
+ return rows
+
+
+class NativeChartPartAllocationTests(unittest.TestCase):
+ def assert_source_unchanged(self, source: dict, parts: dict, types: dict) -> None:
+ for item in source["parts"]:
+ self.assertEqual(parts[item["name"]], base64.b64decode(item["payload"]))
+ if item.get("content_type"):
+ self.assertEqual(types[item["name"]], item["content_type"])
+
+ def test_preserved_and_rebuilt_charts_keep_independent_data_in_both_orders(self) -> None:
+ for source_index in (101, 102):
+ for source_first in (True, False):
+ with self.subTest(source_index=source_index, source_first=source_first):
+ source = _source(source_index, source_index)
+ markers = [_chart("preserved", source=source), _chart("rebuilt")]
+ if not source_first:
+ markers.reverse()
+ slide, rels, parts, types = _export("".join(markers))
+ rows = _chart_rows(slide, rels, parts)
+ for key in ("chart", "rels", "workbook"):
+ self.assertEqual(len({row[key] for row in rows}), 2)
+ expected = [["11", "12"], ["3", "2"]]
+ if not source_first:
+ expected.reverse()
+ self.assertEqual([row["values"] for row in rows], expected)
+ self.assertEqual([row["workbook_values"] for row in rows], expected)
+ self.assert_source_unchanged(source, parts, types)
+
+ def test_workbook_collision_alone_advances_the_whole_family(self) -> None:
+ source = _source(7, 102)
+ slide, rels, parts, types = _export(_chart("preserved", source=source) + _chart("rebuilt"))
+ rows = _chart_rows(slide, rels, parts)
+ self.assertEqual(rows[1]["chart"], "ppt/charts/chart103.xml")
+ self.assertEqual(rows[1]["workbook_values"], ["3", "2"])
+ self.assert_source_unchanged(source, parts, types)
+
+ def test_every_existing_family_member_and_content_type_reserves_the_number(self) -> None:
+ for chartex in (False, True):
+ prefix = "chartEx" if chartex else "chart"
+ names = [f"ppt/charts/{prefix}101.xml", f"ppt/charts/_rels/{prefix}101.xml.rels",
+ "ppt/embeddings/Microsoft_Excel_Sheet101.xlsx"]
+ if chartex:
+ names += ["ppt/charts/style101.xml", "ppt/charts/colors101.xml"]
+ for name in names:
+ for override_only in (False, True):
+ with self.subTest(name=name, override_only=override_only):
+ with tempfile.TemporaryDirectory() as temporary:
+ root = Path(temporary)
+ if not override_only:
+ path = root / name
+ path.parent.mkdir(parents=True, exist_ok=True)
+ path.write_bytes(b"source bytes")
+ registry = PackagePartRegistry(root, {name: "source/content-type"})
+ slide, rels, parts, _types = _export(
+ _chart("rebuilt", chartex=chartex), package_parts=registry,
+ )
+ row = _chart_rows(slide, rels, parts)[0]
+ self.assertEqual(row["chart"], f"ppt/charts/{prefix}102.xml")
+ self.assertEqual(row["workbook_values"], ["3", "2"])
+ self.assertNotIn(name, parts)
+
+ def test_chartex_skips_preserved_style_and_colors(self) -> None:
+ for name in ("style102.xml", "colors102.xml", "_rels/chartEx102.xml.rels"):
+ with self.subTest(name=name):
+ source = _source(7, 7, extras={
+ f"ppt/charts/{name}": f'<Relationships xmlns="{NS["rel"]}"/>'.encode(),
+ })
+ slide, rels, parts, types = _export(
+ _chart("preserved", source=source) + _chart("rebuilt", chartex=True),
+ )
+ rows = _chart_rows(slide, rels, parts)
+ self.assertEqual(rows[1]["chart"], "ppt/charts/chartEx103.xml")
+ self.assertEqual(rows[1]["values"], ["3", "2"])
+ self.assert_source_unchanged(source, parts, types)
+
+ def test_legacy_numbers_stay_unchanged_without_collisions(self) -> None:
+ slide, rels, parts, _types = _export(
+ _chart("first") + _chart("second", chartex=True) + _chart("third"),
+ )
+ self.assertEqual([row["chart"] for row in _chart_rows(slide, rels, parts)],
+ ["ppt/charts/chart101.xml", "ppt/charts/chartEx102.xml", "ppt/charts/chart103.xml"])
+
+ def test_more_than_one_hundred_charts_cannot_collide_with_the_next_slide(self) -> None:
+ registry = PackagePartRegistry()
+ _export("".join(_chart(f"chart-{index}") for index in range(101)), package_parts=registry)
+ slide, rels, parts, _types = _export(_chart("next-page"), slide_num=2, package_parts=registry)
+ self.assertEqual(_chart_rows(slide, rels, parts)[0]["chart"], "ppt/charts/chart202.xml")
+
+ def test_nested_charts_share_the_package_registry(self) -> None:
+ source = _source()
+ slide, rels, parts, _types = _export(
+ f'<g id="left">{_chart("preserved", source=source)}</g>'
+ f'<g id="right">{_chart("rebuilt")}</g>',
+ )
+ self.assertEqual([row["values"] for row in _chart_rows(slide, rels, parts)],
+ [["11", "12"], ["3", "2"]])
+
+ def test_duplicate_new_writes_fail_even_when_the_bytes_match(self) -> None:
+ with patch.object(PackagePartRegistry, "next_index", return_value=101):
+ with self.assertRaisesRegex(RuntimeError, r"part collision: .*ppt/.*first.*second"):
+ _export(_chart("first") + _chart("second"))
+
+ def test_conflicting_source_bytes_name_both_objects(self) -> None:
+ with self.assertRaisesRegex(RuntimeError, r"part collision: .*ppt/.*first.*second"):
+ _export(_chart("first", source=_source()) + _chart("second", source=_source(values=(8, 9))))
+
+ def test_conflicting_source_content_types_fail_before_registration(self) -> None:
+ source = _source()
+ changed = json.loads(json.dumps(source))
+ changed["parts"][0]["content_type"] = "conflicting/content-type"
+ with self.assertRaisesRegex(RuntimeError, r"part collision: .*chart102.xml.*first.*second"):
+ _export(_chart("first", source=source) + _chart("second", source=changed))
+
+ def test_identical_source_dependencies_can_be_reused(self) -> None:
+ source = _source()
+ _slide, _rels, parts, types = _export(_chart("first", source=source) + _chart("second", source=source))
+ self.assertEqual(len(parts), 3)
+ self.assert_source_unchanged(source, parts, types)
+
+ def test_source_cannot_overwrite_a_template_part(self) -> None:
+ source = _source()
+ with tempfile.TemporaryDirectory() as temporary:
+ root = Path(temporary)
+ part = root / source["chart_part"]
+ part.parent.mkdir(parents=True)
+ part.write_bytes(b"template bytes")
+ with self.assertRaisesRegex(RuntimeError, r"part collision: .*chart102.xml.*template/source.*source"):
+ _export(_chart("source", source=source), package_parts=PackagePartRegistry(root))