From b694f947d1eee8065b489f2c8450dfa0892b9f2f Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 22:39:37 +0000 Subject: [PATCH 1/2] Allow explicit lint-free drawing preview exports --- src/draftwright/drawing.py | 2 ++ src/draftwright/drawing_export.py | 10 ++++++++-- tests/test_issue_2209_export_preview.py | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 tests/test_issue_2209_export_preview.py diff --git a/src/draftwright/drawing.py b/src/draftwright/drawing.py index 0a2d9748..7f64eb12 100644 --- a/src/draftwright/drawing.py +++ b/src/draftwright/drawing.py @@ -2634,6 +2634,7 @@ def export( formats, dpi: int = 150, reproducible: bool | None = None, + lint: bool = True, ) -> dict[str, str]: return export_drawing( self, @@ -2641,6 +2642,7 @@ def export( formats=formats, dpi=dpi, reproducible=reproducible, + lint=lint, supported_formats=self._EXPORT_FORMATS, lint_and_log=self._lint_and_log, write_svg=self._write_svg, diff --git a/src/draftwright/drawing_export.py b/src/draftwright/drawing_export.py index 605461db..d55fe38f 100644 --- a/src/draftwright/drawing_export.py +++ b/src/draftwright/drawing_export.py @@ -87,13 +87,14 @@ def export_drawing( formats, dpi: int = 150, reproducible: bool | None = None, + lint: bool = True, supported_formats, lint_and_log, write_svg, write_dxf, pdf_text_runs, ) -> dict[str, str]: - """Lint, then write the requested output *formats*; return ``{format: path}``. + """By default, lint before writing *formats*; return ``{format: path}``. *formats* is a format name or an iterable from ``("svg", "dxf", "pdf", "png")``. PDF renders from the SVG and PNG from the PDF, so the SVG/PDF are written as intermediates @@ -111,6 +112,10 @@ def export_drawing( part (+2.0% of a whole CTC-01 job). The cost grows with part count, so a part-heavy sheet may want ``False`` — see :func:`draftwright.export._elements`. Passing the keyword here overrides the drawing's default for this call only. + + ``lint=False`` skips the export-time critique and log for disposable previews. + It does not validate the drawing: call ``drawing.lint()`` or export with the + default before treating an output as a final technical drawing. """ drawing.finalize() # #426: drain any recorded intents before export (no-op if none) # An explicit keyword wins; otherwise the drawing's own default (build_drawing's). @@ -129,7 +134,8 @@ def export_drawing( raise ValueError(f"png export needs dpi > 0, got {dpi}") # Validate before lint: declared-drawing critique may build recognition evidence. - lint_and_log() + if lint: + lint_and_log() want_set = set(want) paths: dict[str, str] = {} diff --git a/tests/test_issue_2209_export_preview.py b/tests/test_issue_2209_export_preview.py new file mode 100644 index 00000000..49dfc8a1 --- /dev/null +++ b/tests/test_issue_2209_export_preview.py @@ -0,0 +1,22 @@ +"""An explicitly disposable export need not repeat the drawing's lint (#2209).""" + +import pytest +from build123d import Box + +from draftwright import build_drawing + + +def test_preview_export_skips_lint_but_normal_export_keeps_it(tmp_path, monkeypatch): + drawing = build_drawing(Box(20, 10, 5), page="A4", scale=1) + + def fail_if_linted(): + raise RuntimeError("export lint ran") + + monkeypatch.setattr(drawing, "_lint_and_log", fail_if_linted) + paths = drawing.export(str(tmp_path / "preview"), formats=("svg",), lint=False) + assert paths["svg"] == str(tmp_path / "preview.svg") + assert (tmp_path / "preview.svg").is_file() + + with pytest.raises(RuntimeError, match="export lint ran"): + drawing.export(str(tmp_path / "final"), formats=("svg",)) + assert not (tmp_path / "final.svg").exists() From 8bed6541d2e3543e28ea5852f30f7b4ef9917fbc Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 23:19:58 +0000 Subject: [PATCH 2/2] Place preview export regression in behavior suite --- tests/test_export_formats.py | 16 ++++++++++++++++ tests/test_issue_2209_export_preview.py | 22 ---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 tests/test_issue_2209_export_preview.py diff --git a/tests/test_export_formats.py b/tests/test_export_formats.py index b4baab72..11260bb2 100644 --- a/tests/test_export_formats.py +++ b/tests/test_export_formats.py @@ -245,3 +245,19 @@ def test_make_drawing_keeps_its_tuple_output(self, tmp_path): svg, dxf = make_drawing(Box(30, 20, 10), out=str(tmp_path / "mk")) assert Path(svg).exists() and svg.endswith(".svg") assert Path(dxf).exists() and dxf.endswith(".dxf") + + +def test_preview_export_skips_lint_but_normal_export_keeps_it_issue_2209(tmp_path, monkeypatch): + drawing = build_drawing(Box(20, 10, 5), page="A4", scale=1) + + def fail_if_linted(): + raise RuntimeError("export lint ran") + + monkeypatch.setattr(drawing, "_lint_and_log", fail_if_linted) + paths = drawing.export(str(tmp_path / "preview"), formats=("svg",), lint=False) + assert paths["svg"] == str(tmp_path / "preview.svg") + assert (tmp_path / "preview.svg").is_file() + + with pytest.raises(RuntimeError, match="export lint ran"): + drawing.export(str(tmp_path / "final"), formats=("svg",)) + assert not (tmp_path / "final.svg").exists() diff --git a/tests/test_issue_2209_export_preview.py b/tests/test_issue_2209_export_preview.py deleted file mode 100644 index 49dfc8a1..00000000 --- a/tests/test_issue_2209_export_preview.py +++ /dev/null @@ -1,22 +0,0 @@ -"""An explicitly disposable export need not repeat the drawing's lint (#2209).""" - -import pytest -from build123d import Box - -from draftwright import build_drawing - - -def test_preview_export_skips_lint_but_normal_export_keeps_it(tmp_path, monkeypatch): - drawing = build_drawing(Box(20, 10, 5), page="A4", scale=1) - - def fail_if_linted(): - raise RuntimeError("export lint ran") - - monkeypatch.setattr(drawing, "_lint_and_log", fail_if_linted) - paths = drawing.export(str(tmp_path / "preview"), formats=("svg",), lint=False) - assert paths["svg"] == str(tmp_path / "preview.svg") - assert (tmp_path / "preview.svg").is_file() - - with pytest.raises(RuntimeError, match="export lint ran"): - drawing.export(str(tmp_path / "final"), formats=("svg",)) - assert not (tmp_path / "final.svg").exists()