draftwright 0.1.12__tar.gz → 0.1.13__tar.gz

{draftwright-0.1.12 → draftwright-0.1.13}/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## Unreleased
 
+## v0.1.13 — 2026-06-27
+
+### Changed
+
+- **Requires `build123d-drafting-helpers>=0.13.0`; text pinned to bundled fonts**
+  (#149, ADR 0006). draftwright now vendors IBM Plex (OFL-1.1) and renders and
+  measures all text via `font_path` — IBM Plex Mono for dimensions/callouts/notes,
+  IBM Plex Sans Condensed for the title block — instead of resolving the system
+  font name `"Arial"`. Resolving a name substitutes a different font on Linux,
+  which shifted the whole sheet ~1 mm; pinning a bundled font file makes generated
+  layout **deterministic across Linux/macOS/Windows** and gives a consistent
+  typeface. **Drawing output changes**: positions shift slightly from prior
+  releases and labels render in IBM Plex (helpers #172).
+
+### Internal
+
+- **Compiler-pipeline module split** (#138, ADR 0005). The two large modules
+  `make_drawing.py` (3,907 lines) and `annotate.py` (2,587) were decomposed into a
+  DAG of focused stage modules — `projection`, `sheet`, `analysis`, `drawing`,
+  `builder`, the `annotations/` subpackage (sections/turned/pmi/holes/orchestrator),
+  alongside the existing `registry`/`linting`/`repair`/`export`/`fonts`. Annotation
+  identity, the lint coverage signal, and the deterministic repair loop each gained a
+  single owner; `make_drawing.py` / `annotate.py` are now thin compat facades, so all
+  existing imports and the `draftwright` CLI entry point keep working. A golden-output
+  regression gate verified every step is behaviour-preserving (output byte-identical),
+  and mypy was tightened on the settled contracts. No public API or drawing-output
+  change. (Phases #160–#166.)
+
 ## v0.1.12 — 2026-06-21
 
 ### Changed

{draftwright-0.1.12 → draftwright-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwright
-Version: 0.1.12
+Version: 0.1.13
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -680,7 +680,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: <3.15,>=3.10
-Requires-Dist: build123d-drafting-helpers>=0.12.0
+Requires-Dist: build123d-drafting-helpers>=0.13.0
 Requires-Dist: build123d>=0.9.0
 Requires-Dist: kiwisolver<2,>=1.4
 Requires-Dist: numpy>=1.24
@@ -756,8 +756,7 @@ make_drawing(part, out="drawing", title="My Part", number="DWG-001")
 # Composable: get a Drawing object to inspect or extend
 dwg = build_drawing(part, title="My Part")
 issues = dwg.lint()          # list[LintIssue]
-dwg.export_svg("drawing.svg")
-dwg.export_dxf("drawing.dxf")
+svg_path, dxf_path = dwg.export("drawing")
 ```
 
 ### From a STEP file

{draftwright-0.1.12 → draftwright-0.1.13}/README.md

@@ -66,8 +66,7 @@ make_drawing(part, out="drawing", title="My Part", number="DWG-001")
 # Composable: get a Drawing object to inspect or extend
 dwg = build_drawing(part, title="My Part")
 issues = dwg.lint()          # list[LintIssue]
-dwg.export_svg("drawing.svg")
-dwg.export_dxf("drawing.dxf")
+svg_path, dxf_path = dwg.export("drawing")
 ```
 
 ### From a STEP file

{draftwright-0.1.12 → draftwright-0.1.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.1.12"
+version = "0.1.13"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -12,7 +12,7 @@ authors = [{ name = "Paul Fremantle", email = "pzfreo@gmail.com" }]
 requires-python = ">=3.10,<3.15"
 dependencies = [
     "build123d>=0.9.0",
-    "build123d-drafting-helpers>=0.12.0",
+    "build123d-drafting-helpers>=0.13.0",
     "kiwisolver>=1.4,<2",
     "numpy>=1.24",
 ]
@@ -59,10 +59,17 @@ include = [
 testpaths = ["tests"]
 timeout = 300
 # `slow` covers the heavy end-to-end builds over the large NIST CTC fixtures
-# (minutes each). They are deselected by default for a fast normal run; run the
-# full suite with `-m ""` or just the slow tier with `-m slow` (CI runs both).
-markers = ["slow: heavy end-to-end CTC fixture builds (deselected by default)"]
-addopts = "--tb=short --cov=src/draftwright --cov-report=term-missing --cov-report=xml -m 'not slow'"
+# (minutes each), deselected by default. `smoke` is a curated, build-light subset
+# (~30 s) for a quick local "did I break something obvious" check — run it with
+# `uv run pytest -m smoke`. The default run is the full fast tier (`-m 'not slow'`,
+# ~8 min); CI owns that plus the slow tier across the OS/Python matrix.
+markers = [
+    "slow: heavy end-to-end CTC fixture builds (deselected by default)",
+    "smoke: curated build-light subset for a fast local check (~30 s)",
+]
+# Coverage is a CI concern (it adds ~13% locally and instruments every line); the
+# CI workflow passes the --cov flags explicitly. Keep the local default lean.
+addopts = "--tb=short -m 'not slow'"
 
 [tool.coverage.run]
 source = ["src/draftwright"]
@@ -79,6 +86,14 @@ python_version = "3.10"
 ignore_missing_imports = true
 check_untyped_defs = true
 warn_unused_ignores = true
+# Tightened on the settled module contracts (#138 / ADR 0005 P7). disallow_untyped_defs
+# stays off (geometry helpers lean on untyped build123d returns); these flags catch
+# real gaps without demanding annotations everywhere.
+no_implicit_optional = true
+warn_redundant_casts = true
+strict_equality = true
+warn_return_any = true
+extra_checks = true
 
 [tool.ruff]
 line-length = 99
@@ -94,5 +109,6 @@ dev = [
     "pytest>=8",
     "pytest-cov>=5",
     "pytest-timeout>=2",
+    "pytest-xdist>=3",
     "ruff>=0.4",
 ]

{draftwright-0.1.12 → draftwright-0.1.13}/src/draftwright/__init__.py

@@ -11,19 +11,18 @@ Requires build123d-drafting-helpers for annotation primitives.
 Licensed under the GNU Affero General Public License v3 (AGPL-3.0).
 """
 
+from draftwright.analysis import analyse_face_levels, dedup_diams
 from draftwright.make_drawing import (
     Drawing,
     FeatureInfo,
-    analyse_face_levels,
     build_drawing,
-    choose_scale,
-    dedup_diams,
     fix_svg_page_size,
     generate_script,
     lint_feature_coverage,
     make_drawing,
 )
 from draftwright.pmi import PmiRecord, extract_pmi
+from draftwright.sheet import choose_scale
 
 __all__ = [
     "Drawing",

{draftwright-0.1.12 → draftwright-0.1.13}/src/draftwright/_core.py

@@ -10,21 +10,22 @@ the dimension/format helpers, and the layout constants).  It imports only from
 
 from __future__ import annotations
 
+import functools
 import logging
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from types import SimpleNamespace
 
-from build123d import BoundBox, Location, Shape
+from build123d import Align, BoundBox, Location, Mode, Shape, Text
 from build123d_drafting.helpers import (
-    _TB_COL_FRACTIONS,  # private: title-block column widths — tight coupling, see CLAUDE.md
     Dimension,
     TitleBlock,
     draft_preset,
     format_drawing_scale,
 )
 
+from draftwright.fonts import PLEX_MONO, PLEX_SANS_CONDENSED
 from draftwright.layout import _greedy_strip_1d, _solve_strip_1d
 
 _log = logging.getLogger(__name__)
@@ -64,6 +65,38 @@ def _tag_sequence(n):
 
 _DIAM_RE = re.compile(r"[øØ⌀]\s*(\d+(?:\.\d+)?)")
 
+# A single-quoted label lifted from a lint message, e.g. "labels 'A' and 'B' …".
+# Shared by the #29 lint suggestions (linting.py) and the #30 repair loop.
+_QUOTED_RE = re.compile(r"'([^']*)'")
+
+
+@functools.lru_cache(maxsize=512)
+def _text_width(text: str, font_size: float, font_path: str = PLEX_MONO) -> float:
+    """Measured rendered width (page-mm) of *text* at *font_size*.
+
+    Uses build123d's ``Text`` — the same primitive ``Dimension``/``HoleCallout``
+    stroke their labels with — so callout-width estimates use real glyph metrics
+    instead of a character-count fudge (#31).  Pinned to a vendored font **file**
+    (``font_path``), not a system font *name*: name resolution substitutes a
+    different font on Linux, which makes this estimate — and the layout it feeds —
+    platform-variant (#149). The default is the same face the annotations render
+    with, so estimate and render agree.  Cached because the same numeric labels
+    recur across holes and the rasterisation is the costly part.
+    """
+    if not text:
+        return 0.0
+    return (
+        Text(
+            txt=text,
+            font_size=font_size,
+            font_path=font_path,
+            align=(Align.CENTER, Align.CENTER),
+            mode=Mode.PRIVATE,
+        )
+        .bounding_box()
+        .size.X
+    )
+
 
 def _axis_letter(obj) -> str:
     """Letter (``"x"``/``"y"``/``"z"``) of ``obj.axis``'s dominant component.
@@ -193,6 +226,12 @@ _SLOT_DIM_DEPTH = 2 * _FONT_SIZE + _PAD  # sv_zones.below: overall depth dimensi
 _SLOT_DIM_HEIGHT = 2 * _FONT_SIZE + 2 * _PAD  # fv_zones.right: overall height dim
 
 
+_STRIP_SPACING = 4.0  # page-mm between successive annotations in a strip
+_MIN_VIEW_MM = (
+    10.0  # min projected view dimension; below it annotation geometry degenerates (#129)
+)
+
+
 _SLOT_DIM_STEP = 4 * _FONT_SIZE + _PAD  # fv_zones.right: step-height dimension
 
 
@@ -362,6 +401,7 @@ class Analysis:
     bbox_max: float
     holes: list
     patterns: list
+    slots: list
     z_diams: list[float]
     cross_diams: list[float]
     cyls: tuple[list, list]
@@ -433,29 +473,140 @@ def _add_title_block(dwg, a: Analysis):
         revision="A",
         legal_owner="",
         width=a.TB_W,
-        draft=dwg.draft,
+        # Title block renders in condensed sans (the tight ISO 7200 cells), a
+        # different face from the monospace dimensions — so it carries its own
+        # pinned-font draft rather than reusing dwg.draft (#149).
+        draft=draft_preset(
+            font_size=dwg.draft.font_size,
+            decimal_precision=dwg.draft.decimal_precision,
+            font_path=PLEX_SANS_CONDENSED,
+        ),
     )
-    # Drawn-by cell geometry, taken from the block itself rather than hardcoded,
-    # so the hyperlink rect tracks any upstream TitleBlock layout change: the
-    # two-row block's bottom row is half the block height, and the cell spans
-    # from the first column divider (_TB_COL_FRACTIONS[0]) to the right edge.
-    cell_h = tb.block_bbox["height"] / 2.0
+    # Drawn-by cell geometry, from the block's own public cell bbox (#139) rather
+    # than hardcoded column fractions, so the hyperlink rect tracks any upstream
+    # TitleBlock layout change. Build-frame bbox; translated to page space below.
+    cell = tb.drawn_by_cell_bbox()
     tb = tb.locate(Location((a.PAGE_W - a.TB_W - _TB_CLEAR, _TB_CLEAR, 0)))
     dwg.add(tb, "title_block")
 
     # Record that cell's page-space rectangle so export() can place a clickable
-    # draftwright hyperlink over the "… / draftwright" author text. Keeps the
-    # block at its standard two rows — no extra height, no layout impact (a
-    # third row would squeeze the dense-part hole table).
+    # draftwright hyperlink over the "… / draftwright" author text. The build-frame
+    # cell corners are offset by the block's page location (bx, _TB_CLEAR).
     bx = a.PAGE_W - a.TB_W - _TB_CLEAR
     dwg._draftwright_link_rect = (
-        bx + _TB_COL_FRACTIONS[0] * a.TB_W,
-        _TB_CLEAR,
-        bx + a.TB_W,
-        _TB_CLEAR + cell_h,
+        bx + cell["min_x"],
+        _TB_CLEAR + cell["min_y"],
+        bx + cell["max_x"],
+        _TB_CLEAR + cell["max_y"],
     )
 
 
 def _iso_bbox(dwg):
     """(min_x, min_y, max_x, max_y) of the placed iso view, hidden lines included."""
     return dwg.view_bounds("iso")
+
+
+# --- page/scale selection + sheet-layout constants and helpers --------------
+# Relocated from make_drawing for the sheet.py split (#162). Shared by sheet.py
+# (choose_scale/_layout_geometry) and make_drawing's repack pass, so they live
+# here in the shared base to keep the DAG acyclic.
+_DIM_PAD = 18.0
+_STRIP_GAP = 8.0
+
+_PAGE_SIZES = {
+    "A4": (297.0, 210.0),
+    "A3": (420.0, 297.0),
+    "A2": (594.0, 420.0),
+    "A1": (841.0, 594.0),
+    "A0": (1189.0, 841.0),
+}
+
+_SCALES = [10.0, 5.0, 2.0, 1.0, 0.5, 0.2]
+
+# Horizontal page budget to reserve for the isometric view during scale
+# selection and view placement, as a fraction of bbox_max * scale.  This is a
+# deliberate *under-estimate*, not the true projected size (a cube's iso
+# projection is ~1.63*bbox_max wide): the iso is the last column and is fitted
+# to the actual largest-empty-rect afterwards by _fit_iso_view(), which shrinks
+# it to whatever space is genuinely left.  A true fit test here is circular —
+# the empty rect depends on the very view positions this estimate feeds — so
+# the budget stays a single, named factor rather than a recomputed fit (#31).
+_ISO_WIDTH_BUDGET = 0.7
+
+# Scale selection accepts a layout when the largest empty rectangle left for the
+# iso view can hold a square of at least this fraction of the iso's natural size
+# (bbox_max * scale * _ISO_WIDTH_BUDGET).  Below 1.0 because _fit_iso_view scales
+# the iso down to whatever space remains, so a modestly smaller rectangle still
+# renders a legible iso — letting a long/short part enlarge onto a sheet (e.g.
+# 2:1 on A3) where the strict row model would have under-scaled it.
+_ISO_MIN_FIT_FRAC = 0.6
+
+
+# Automatic scale/page preference ladder, first-fit.  The enlargement/unity
+# region is page-major: every standard scale on the smallest sheet (A4) is tried
+# before moving to the next sheet, so a part lands on the smallest sheet it fits
+# at the largest scale that sheet allows — e.g. a 20×15×10 part gets 2:1 on A4,
+# not 5:1 on A3.  Reductions (below 1:1) keep their legibility-vs-sheet balance
+# (least reduction first) so a large part is not over-reduced onto a small sheet.
+_LADDER = [
+    # A4 — smallest sheet first, largest scale first
+    (10.0, 297.0, 210.0, 120.0),  # A4 10:1
+    (5.0, 297.0, 210.0, 120.0),  # A4 5:1
+    (2.0, 297.0, 210.0, 120.0),  # A4 2:1
+    (1.0, 297.0, 210.0, 120.0),  # A4 1:1
+    # A3
+    (5.0, 420.0, 297.0, 150.0),  # A3 5:1
+    (2.0, 420.0, 297.0, 150.0),  # A3 2:1
+    (1.0, 420.0, 297.0, 150.0),  # A3 1:1
+    # A2
+    (2.0, 594.0, 420.0, 150.0),  # A2 2:1
+    (1.0, 594.0, 420.0, 150.0),  # A2 1:1
+    # A1
+    (1.0, 841.0, 594.0, 150.0),  # A1 1:1
+    # Reductions — least reduction first, so a too-big part is not crammed onto a
+    # small sheet at an illegible scale.
+    (0.5, 594.0, 420.0, 150.0),  # A2 1:2
+    (0.2, 420.0, 297.0, 150.0),  # A3 1:5
+    (0.2, 594.0, 420.0, 150.0),  # A2 1:5
+    (0.5, 841.0, 594.0, 150.0),  # A1 1:2
+    (0.2, 841.0, 594.0, 150.0),  # A1 1:5
+    (0.5, 1189.0, 841.0, 150.0),  # A0 1:2
+    (0.2, 1189.0, 841.0, 150.0),  # A0 1:5
+]
+
+
+def _tb_width(page_w: float) -> float:
+    """Title-block width for a page: 120 mm on A4, 150 mm on A3 and larger."""
+    return 120.0 if page_w <= 297.0 else 150.0
+
+
+def _parse_page(page) -> tuple:
+    """Resolve a page spec to ``(PAGE_W, PAGE_H, TB_W)``.
+
+    Accepts an ISO name (``"A4"``…``"A0"``, case-insensitive), a
+    ``"WIDTHxHEIGHT"`` string in mm (e.g. ``"420x297"``), or a
+    ``(width, height)`` tuple in mm.
+    """
+    if isinstance(page, str):
+        name = page.strip().upper()
+        if name in _PAGE_SIZES:
+            pw, ph = _PAGE_SIZES[name]
+        else:
+            m = re.fullmatch(r"(\d+(?:\.\d+)?)\s*[xX×]\s*(\d+(?:\.\d+)?)", page.strip())
+            if not m:
+                raise ValueError(
+                    f"unknown page size {page!r} — expected one of "
+                    f"{', '.join(_PAGE_SIZES)} or WIDTHxHEIGHT in mm (e.g. '420x297')"
+                )
+            pw, ph = float(m.group(1)), float(m.group(2))
+    else:
+        try:
+            pw, ph = float(page[0]), float(page[1])
+        except (TypeError, ValueError, IndexError):
+            raise ValueError(
+                f"invalid page size {page!r} — expected an ISO name, "
+                f"'WIDTHxHEIGHT', or a (width, height) tuple in mm"
+            ) from None
+    if pw <= 0 or ph <= 0:
+        raise ValueError(f"page dimensions must be positive, got {page!r}")
+    return pw, ph, _tb_width(pw)