draftwright 0.2.2__tar.gz → 0.2.4__tar.gz

{draftwright-0.2.2 → draftwright-0.2.4}/CHANGELOG.md

@@ -2,6 +2,84 @@
 
 ## Unreleased
 
+## v0.2.4 — 2026-07-03
+
+A follow-up patch on the ADR 0009 placement rebuild in 0.2.3: it finishes unifying
+the shared "above-view" dimension corridor, adds a layout-overflow safety net, and
+makes two more drop paths non-silent.
+
+### Changed
+
+- **Plan-view X location dimensions, side-view Y location dimensions, and a
+  coincident slot-position dimension now share one collect-then-solve pass** (ADR
+  0009 Amendment 6, #345/#346). Previously each pass carved the strip independently,
+  so a hole location and a slot position measuring the same datum span could both be
+  drawn, and the location ladder could come out non-monotonic. One solve now dedups
+  the coincident span (keeping the higher-priority location dimension) and orders the
+  whole ladder as segregated, monotonic runs — feature-size dimensions nearest the
+  view, datum locations nesting outward by distance.
+
+### Fixed
+
+- **`choose_scale` never returns an overflowing layout** (#350). Scale selection
+  could pick a scale whose composed block layout exceeded the drawable area; it now
+  rejects any overflowing candidate.
+- **A hole location and a coincident slot position are no longer drawn twice** (#345),
+  including at fractional datum distances where a display-value snap gap previously let
+  the duplicate escape deduplication.
+- **The plan-view location ladder is monotonic** (#346) — running dimensions off a
+  shared datum stack outward in ascending order instead of interleaving.
+- **A dropped balloon is non-silent** (#387). A balloon that cannot be placed now
+  reports the drop and clears its `callout_dropped` state precisely, instead of
+  vanishing with no on-sheet signal.
+
+## v0.2.3 — 2026-07-03
+
+A large patch release: the **annotation-placement engine was rebuilt** as a
+collect-then-solve *boundary-labeling* stage (ADR 0009). Placement is now
+deterministic and minimises total leader length, and the recurring class of
+overlaps where a label was drawn on top of an "invisible" occupant — a leader
+shaft, a witness/extension line, the section hatch — is removed by construction.
+Drawing output changes for many turned, cross-drilled, and multi-feature parts.
+
+### Changed
+
+- **Every annotation in a view's margin is now placed by one collect-then-solve
+  pass** (ADR 0009, #317–#323). Dimensions, hole callouts, turned-diameter
+  leaders, and the section hatch share a single occupancy model instead of several
+  independent passes each blind to the others. When a strip is over capacity it now
+  drops the *lowest-priority* annotation (smallest bore first) rather than whichever
+  pass happened to run last. The legacy strip cursor is retired.
+- **Leader placement minimises total leader length, deterministically** (P4,
+  #318). A per-strip solve places each label at the shortest-leader position that
+  keeps the labels in order and clear of keep-out rows (a view centre-line, a
+  dimension's extension line); central/coaxial callouts are anchored to the
+  view-centre row. Output is reproducible across platforms and Python versions.
+- **`scipy` is no longer a dependency** — the leader solve is a small deterministic
+  algorithm (weighted-median isotonic regression), not a linear program.
+- **Output changes** for turned, cross-drilled, and multi-feature parts whose
+  margin annotations are now positioned by the unified solver.
+
+### Fixed
+
+- **A PMI bore-diameter dimension spans the bore radius, not the full diameter**
+  (#360). A `pmi="annotate"` diameter callout drew its witness lines at ±diameter
+  from the centre — twice too wide, missing the bore edges.
+- **A bore coaxial with a rotational part's turning axis is no longer
+  over-dimensioned** (#309). It carried a redundant offset *and* height location
+  dimension even though its centre mark already locates it.
+- **A dropped turned step-length chain is no longer silent** (#362). When a turned
+  head's shoulders are too crowded to dimension, the drop is now reported
+  (`step_dim_dropped`) instead of vanishing with no lint or on-sheet signal.
+- **A diameter callout can no longer overprint a bore callout's leader shaft**
+  (#358). The turned-diameter column now avoids the *full* footprint of existing
+  annotations, not just their text boxes.
+- **The balloon ring hugs its dimensions on a cramped sheet** (#349) — its band
+  depth is clamped to the drawable area.
+- **Dimension detection is robust to `SafeDimension`** (#335/#349) — the corridor
+  and balloon-ring filters test the dimension *type*, not a class-name string, so a
+  future dimension subclass can't slip through.
+
 ## v0.2.2 — 2026-06-30
 
 A patch release of turned-part dimension-placement fixes and a CLI start-up

{draftwright-0.2.2 → draftwright-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwright
-Version: 0.2.2
+Version: 0.2.4
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -700,24 +700,70 @@ Description-Content-Type: text/markdown
 Automated technical-drawing generation for [build123d](https://github.com/gumyr/build123d).
 Point it at a solid (or a STEP file) and get a fully-annotated multi-view engineering
 drawing — orthographic views, dimensions, section A–A, ISO hatching, title block — ready
-to export as SVG and DXF.
+to export as PDF, SVG, and DXF.
+
+![Example engineering drawing generated by draftwright](docs/images/example.png)
+
+*A mounting plate, generated automatically: three dimensioned orthographic views, a
+counterbored bore callout (`⌀18 THRU ⊔ ⌀30 ↓14`), a `4× ⌀8 THRU` hole-pattern callout,
+Section A–A with ISO hatching, an isometric, and an ISO 7200 title block — every
+annotation placed by the engine.*
+
+## Quick start
+
+```
+pip install draftwright
+```
+
+### Command line
+
+Point it at a STEP file — that's the whole workflow:
+
+```
+draftwright my_part.step --title "Mounting Plate" --number DWG-001
+# writes my_part.pdf (the default)
+```
+
+Choose formats, scale, and page; or emit an editable drawing script:
+
+```
+draftwright my_part.step --format pdf,dxf     # also: svg, all
+draftwright my_part.step --scale 2 --page A3  # override the auto scale / page
+draftwright my_part.step --script             # write an editable .py drawing script
+```
+
+`draftwright --help` lists every flag; `--version` prints the version.
+
+### Python
+
+One call turns a build123d solid (or a STEP file) into a drawing. This is the exact
+part in the image above:
 
 ```python
 from build123d import Box, Cylinder, Pos
 from draftwright import make_drawing
 
-part = Box(80, 60, 20) - Pos(0, 0, 5) * Cylinder(8, 20)
-make_drawing(part, out="my_part", title="Mounting Block", number="DWG-001")
-# writes my_part.svg and my_part.dxf
+part = (
+    Box(100, 70, 24)
+    - Pos(0, 0, 0) * Cylinder(9, 40)     # central bore, counterbored below
+    - Pos(0, 0, 8) * Cylinder(15, 20)    # counterbore → triggers Section A–A
+    - Pos(-38, 24, 0) * Cylinder(4, 40)  # 4× corner holes (recognised as a pattern)
+    - Pos(38, 24, 0) * Cylinder(4, 40)
+    - Pos(-38, -24, 0) * Cylinder(4, 40)
+    - Pos(38, -24, 0) * Cylinder(4, 40)
+)
+make_drawing(part, out="my_part", title="Mounting Plate", number="DWG-001")
+# writes my_part.svg and my_part.dxf   (or from a STEP file: make_drawing(step_file="p.step", out="my_part"))
 ```
 
-Or from the command line:
+For inspection and editing, get a composable `Drawing`:
 
-```
-draftwright my_part.step --title "Mounting Block" --number DWG-001
-# writes my_part.pdf (the default); add --format to choose:
-draftwright my_part.step --format pdf,dxf    # PDF + DXF
-draftwright my_part.step --format all        # PDF + SVG + DXF
+```python
+from draftwright import build_drawing
+
+dwg = build_drawing(part, title="Mounting Plate")
+issues = dwg.lint()                       # list[LintIssue] — coverage, page bounds, ISO
+svg_path, dxf_path = dwg.export("my_part")
 ```
 
 ## What it produces
@@ -734,48 +780,14 @@ draftwright my_part.step --format all        # PDF + SVG + DXF
 - **Lint** — `Drawing.lint()` checks annotation coverage, page bounds, and ISO compliance
   and returns structured `LintIssue` objects
 
-All output is real build123d geometry, so SVG and DXF export come from the same source
-and dimensions are live on the DXF layer.
-
-## Installation
-
-```
-pip install draftwright
-```
+All output is real build123d geometry, so PDF, SVG, and DXF all come from the same
+source and dimensions are live on the DXF layer.
 
 Requires Python ≥ 3.10 and build123d ≥ 0.9.0. Annotation primitives are provided by
 [`build123d-drafting-helpers`](https://github.com/pzfreo/build123d-drafting-helpers),
-which is installed automatically as a dependency.
-
-## Usage
+installed automatically as a dependency.
 
-### From a build123d solid
-
-```python
-from draftwright import make_drawing, build_drawing, Drawing
-
-# One-shot: write SVG + DXF
-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]
-svg_path, dxf_path = dwg.export("drawing")
-```
-
-### From a STEP file
-
-```python
-from draftwright import make_drawing
-make_drawing(step_file="part.step", out="drawing")
-```
-
-Or via the CLI:
-
-```
-draftwright part.step --out drawing --scale 2 --page A3
-draftwright part.step --script   # write an editable .py drawing script instead
-```
+## Going further
 
 ### Scale and page control
 
@@ -833,3 +845,5 @@ build → plan → render). See
 [`docs/target-architecture.md`](docs/target-architecture.md) and
 [`docs/adr/`](docs/adr/). The engine handles view layout (strip/zone model), scale
 selection, annotation placement, and section rendering.
+
+The codebase has been entirely written by LLM (Claude Code) under detailed guidance from a person.

{draftwright-0.2.2 → draftwright-0.2.4}/README.md

@@ -9,24 +9,70 @@
 Automated technical-drawing generation for [build123d](https://github.com/gumyr/build123d).
 Point it at a solid (or a STEP file) and get a fully-annotated multi-view engineering
 drawing — orthographic views, dimensions, section A–A, ISO hatching, title block — ready
-to export as SVG and DXF.
+to export as PDF, SVG, and DXF.
+
+![Example engineering drawing generated by draftwright](docs/images/example.png)
+
+*A mounting plate, generated automatically: three dimensioned orthographic views, a
+counterbored bore callout (`⌀18 THRU ⊔ ⌀30 ↓14`), a `4× ⌀8 THRU` hole-pattern callout,
+Section A–A with ISO hatching, an isometric, and an ISO 7200 title block — every
+annotation placed by the engine.*
+
+## Quick start
+
+```
+pip install draftwright
+```
+
+### Command line
+
+Point it at a STEP file — that's the whole workflow:
+
+```
+draftwright my_part.step --title "Mounting Plate" --number DWG-001
+# writes my_part.pdf (the default)
+```
+
+Choose formats, scale, and page; or emit an editable drawing script:
+
+```
+draftwright my_part.step --format pdf,dxf     # also: svg, all
+draftwright my_part.step --scale 2 --page A3  # override the auto scale / page
+draftwright my_part.step --script             # write an editable .py drawing script
+```
+
+`draftwright --help` lists every flag; `--version` prints the version.
+
+### Python
+
+One call turns a build123d solid (or a STEP file) into a drawing. This is the exact
+part in the image above:
 
 ```python
 from build123d import Box, Cylinder, Pos
 from draftwright import make_drawing
 
-part = Box(80, 60, 20) - Pos(0, 0, 5) * Cylinder(8, 20)
-make_drawing(part, out="my_part", title="Mounting Block", number="DWG-001")
-# writes my_part.svg and my_part.dxf
+part = (
+    Box(100, 70, 24)
+    - Pos(0, 0, 0) * Cylinder(9, 40)     # central bore, counterbored below
+    - Pos(0, 0, 8) * Cylinder(15, 20)    # counterbore → triggers Section A–A
+    - Pos(-38, 24, 0) * Cylinder(4, 40)  # 4× corner holes (recognised as a pattern)
+    - Pos(38, 24, 0) * Cylinder(4, 40)
+    - Pos(-38, -24, 0) * Cylinder(4, 40)
+    - Pos(38, -24, 0) * Cylinder(4, 40)
+)
+make_drawing(part, out="my_part", title="Mounting Plate", number="DWG-001")
+# writes my_part.svg and my_part.dxf   (or from a STEP file: make_drawing(step_file="p.step", out="my_part"))
 ```
 
-Or from the command line:
+For inspection and editing, get a composable `Drawing`:
 
-```
-draftwright my_part.step --title "Mounting Block" --number DWG-001
-# writes my_part.pdf (the default); add --format to choose:
-draftwright my_part.step --format pdf,dxf    # PDF + DXF
-draftwright my_part.step --format all        # PDF + SVG + DXF
+```python
+from draftwright import build_drawing
+
+dwg = build_drawing(part, title="Mounting Plate")
+issues = dwg.lint()                       # list[LintIssue] — coverage, page bounds, ISO
+svg_path, dxf_path = dwg.export("my_part")
 ```
 
 ## What it produces
@@ -43,48 +89,14 @@ draftwright my_part.step --format all        # PDF + SVG + DXF
 - **Lint** — `Drawing.lint()` checks annotation coverage, page bounds, and ISO compliance
   and returns structured `LintIssue` objects
 
-All output is real build123d geometry, so SVG and DXF export come from the same source
-and dimensions are live on the DXF layer.
-
-## Installation
-
-```
-pip install draftwright
-```
+All output is real build123d geometry, so PDF, SVG, and DXF all come from the same
+source and dimensions are live on the DXF layer.
 
 Requires Python ≥ 3.10 and build123d ≥ 0.9.0. Annotation primitives are provided by
 [`build123d-drafting-helpers`](https://github.com/pzfreo/build123d-drafting-helpers),
-which is installed automatically as a dependency.
-
-## Usage
+installed automatically as a dependency.
 
-### From a build123d solid
-
-```python
-from draftwright import make_drawing, build_drawing, Drawing
-
-# One-shot: write SVG + DXF
-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]
-svg_path, dxf_path = dwg.export("drawing")
-```
-
-### From a STEP file
-
-```python
-from draftwright import make_drawing
-make_drawing(step_file="part.step", out="drawing")
-```
-
-Or via the CLI:
-
-```
-draftwright part.step --out drawing --scale 2 --page A3
-draftwright part.step --script   # write an editable .py drawing script instead
-```
+## Going further
 
 ### Scale and page control
 
@@ -142,3 +154,5 @@ build → plan → render). See
 [`docs/target-architecture.md`](docs/target-architecture.md) and
 [`docs/adr/`](docs/adr/). The engine handles view layout (strip/zone model), scale
 selection, annotation placement, and section rendering.
+
+The codebase has been entirely written by LLM (Claude Code) under detailed guidance from a person.

{draftwright-0.2.2 → draftwright-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.2.2"
+version = "0.2.4"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }

{draftwright-0.2.2 → draftwright-0.2.4}/src/draftwright/_core.py

@@ -14,7 +14,7 @@ import functools
 import logging
 import re
 from collections.abc import Callable
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from pathlib import Path
 from types import SimpleNamespace
 from typing import TYPE_CHECKING
@@ -166,16 +166,17 @@ def _dim(p1, p2, side, distance, draft, **kwargs):
 class Strip:
     """A one-dimensional annotation band adjacent to an orthographic view.
 
-    Annotations are stacked outward from the view edge by calling
-    :meth:`allocate`.  The cursor starts at ``anchor + direction * gap`` and
-    advances after each successful allocation.
+    A plain geometry record: the collect-then-solve placers (ADR 0009) read its
+    bounds (:func:`~draftwright.annotations._common.strip_free_span`) and carve
+    around the placed annotations. The mutable ``allocate``/``peek`` cursor was
+    retired once every placer moved to the carve (#150).
 
     Attributes:
         anchor:      Page coordinate of the view edge this strip starts from.
         outer_limit: Page coordinate at which the strip ends (page margin,
                      neighbouring view, or title-block boundary).
-        direction:   ``+1`` — cursor moves away from anchor (right/above);
-                     ``-1`` — cursor retreats from anchor (left/below).
+        direction:   ``+1`` — stacks away from anchor (right/above);
+                     ``-1`` — stacks back toward smaller coords (left/below).
         gap:         Clearance between the view edge and the first annotation.
         spacing:     Clearance between successive annotations.
     """
@@ -185,56 +186,12 @@ class Strip:
     direction: float = 1.0
     gap: float = 8.0
     spacing: float = 4.0
-    _cursor: float = field(init=False, compare=False, repr=False)
-
-    def __post_init__(self):
-        self._cursor = self.anchor + self.direction * self.gap
-
-    # ------------------------------------------------------------------
-    # Public API
 
     @property
     def available(self) -> float:
         """Total space available in this strip (mm)."""
         return abs(self.outer_limit - self.anchor)
 
-    @property
-    def depth_used(self) -> float:
-        """How far the cursor has advanced from the anchor (mm)."""
-        return abs(self._cursor - self.anchor)
-
-    def peek(self, size: float) -> float | None:
-        """Return what ``allocate(size)`` would return without advancing the cursor."""
-        if self.direction == 1:
-            start = self._cursor
-            return start if (start + size) <= self.outer_limit else None
-        else:
-            end = self._cursor
-            return end if (end - size) >= self.outer_limit else None
-
-    def allocate(self, size: float) -> float | None:
-        """Reserve *size* mm; return the near-edge page coordinate, or ``None`` if full.
-
-        The returned value is the page coordinate of the annotation's
-        dimension line (or leader elbow).  Convert to a relative offset with::
-
-            distance = abs(page_coord - strip.anchor)
-        """
-        if self.direction == 1:
-            start = self._cursor
-            end = start + size
-            if end > self.outer_limit:
-                return None
-            self._cursor = end + self.spacing
-            return start
-        else:
-            end = self._cursor
-            start = end - size
-            if start < self.outer_limit:
-                return None
-            self._cursor = start - self.spacing
-            return end
-
 
 @dataclass
 class ViewZones:
@@ -626,7 +583,11 @@ _PAGE_SIZES = {
     "A0": (1189.0, 841.0),
 }
 
-_SCALES = [10.0, 5.0, 2.0, 1.0, 0.5, 0.2]
+# ISO 5455 scale series (1-2-5 decades). Enlargements + 1:1 first, then reductions
+# down to 1:10000 so a very large part still gets a scale that FITS rather than an
+# overflowing layout (#350). Ordered largest-scale-first for "least reduction first".
+_SCALES = [10.0, 5.0, 2.0, 1.0]
+_SCALES += [0.5, 0.2, 0.1, 0.05, 0.02, 0.01, 0.005, 0.002, 0.001, 0.0005, 0.0002, 0.0001]
 
 # 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
@@ -677,6 +638,19 @@ _LADDER = [
     (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
+    # Past 1:5 keep reducing on A0 (the largest sheet) through the rest of the ISO 5455
+    # series, so a part too big for A0 1:5 still gets a scale that FITS rather than an
+    # overflowing layout (#350). A0 1:10000 holds anything up to ~8.4 m of drawn height.
+    (0.1, 1189.0, 841.0, 150.0),  # A0 1:10
+    (0.05, 1189.0, 841.0, 150.0),  # A0 1:20
+    (0.02, 1189.0, 841.0, 150.0),  # A0 1:50
+    (0.01, 1189.0, 841.0, 150.0),  # A0 1:100
+    (0.005, 1189.0, 841.0, 150.0),  # A0 1:200
+    (0.002, 1189.0, 841.0, 150.0),  # A0 1:500
+    (0.001, 1189.0, 841.0, 150.0),  # A0 1:1000
+    (0.0005, 1189.0, 841.0, 150.0),  # A0 1:2000
+    (0.0002, 1189.0, 841.0, 150.0),  # A0 1:5000
+    (0.0001, 1189.0, 841.0, 150.0),  # A0 1:10000
 ]