draftwright 0.2.11__tar.gz → 0.2.13__tar.gz

{draftwright-0.2.11 → draftwright-0.2.13}/CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## v0.2.13 — 2026-07-09
+
+**Compose-then-pack is now the layout authority.** This patch finishes the
+ViewBlock footprint migration: estimated and measured layout paths now use the
+same composed block model, furniture declarations reserve their real footprint,
+and measure/repack iterates until stable instead of trusting one measured pass.
+
+### Changed
+
+- **ViewBlock footprints now drive the orthographic stack.** The old
+  estimator-only plan-view balloon lift is gone; plan balloon headroom is part
+  of the plan block in both estimated and measured/repack layout. (#112)
+- **Measure/repack iterates to a fixed point.** Repack now keeps measuring and
+  repacking while view-owned footprints continue to grow, with bounded
+  convergence and tests for multi-pass growth. (#302)
+- **Estimated view-block composition is explicit.** Scale/page fitness, repack,
+  and furniture placement share the same composed block semantics instead of
+  rebuilding corridor estimates independently.
+
+### Fixed
+
+- **Declared callout furniture reserves layout footprint.** User-declared
+  furniture is now measured and fed into the layout model, reducing post-hoc
+  collisions from declarations that previously existed only at render time.
+- **Annotation-box composition owns strip sizing.** Strip depths reduce from
+  composed annotation boxes, making footprint sizing less dependent on divergent
+  scalar estimates.
+
+### Documentation
+
+- **Layout architecture docs reflect the current state.** ADR 0004 and the
+  layout primer now mark the core layout-authority tranche complete and separate
+  remaining work into hardening, coverage, detail-view, and manual-intent phases.
+
+## v0.2.12 — 2026-07-09
+
+**Sheet scripts now round-trip authored layout intent.** This patch finishes the next
+slice of the layout-authority work: below/right ladders, pinned edits, height ladders,
+detected envelopes, and AP242 authored dimensions now survive the declarative Sheet path
+without being invalidated by post-hoc placement or raw imported metadata.
+
+### Added
+
+- **Pinned edit intents route through the corridor solve.** `locate(..., pin=True)` and
+  pinned dimensions now become priority-ranked candidates in the shared corridor instead
+  of fixed post-hoc edits, so user intent participates in the same ordering/spacing model
+  as automatic dimensions. (#511)
+- **AP242 dimensional PMI lowers to authored drafting dimensions.** Imported AP242
+  size/location dimensions now become `AuthoredDimension` IR and generated Sheet scripts
+  emit `sheet.dimension(...)`; unsupported PMI records remain explicit raw fallbacks.
+  (#503, #422, #62)
+
+### Changed
+
+- **`place_dim` is deprecated.** Manual dimensions should use pinned candidate/dimension
+  intent instead of the old incremental edit path.
+- **Prismatic height ladders and detected envelopes round-trip through Sheet scripts.**
+  Generated scripts now preserve `StepLevelFeature` and detected `EnvelopeFeature`
+  fallbacks, preventing CTC01-style ladder swaps and raw STEP-envelope remeasurement
+  drift.
+
+### Fixed
+
+- **Below/right corridors now share one solve.** Side-hole locations, height ladders,
+  PMI/GD&T, envelope dims, and related below/right strip occupants negotiate in the shared
+  corridor rather than competing through separate late passes. (#477)
+- **Sheet script parity is tighter.** Generated scripts preserve member positions, step
+  levels, AP242 authored dimensions, raw PMI fallbacks, and detected envelopes so
+  direct-vs-script CTC01 output has matching annotation names.
+
 ## v0.2.11 — 2026-07-08
 
 **Automatic layout now has one authority.** Page/scale selection, section placement,

{draftwright-0.2.11 → draftwright-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwright
-Version: 0.2.11
+Version: 0.2.13
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -842,10 +842,9 @@ automatically, so you say *what* to dimension, not *where*:
 ```python
 dwg = build_drawing(part)
 
-# Inspect detected features and add a dimension in domain terms (auto-placed):
-for f in dwg.features("plan"):
-    dwg.place_dim(f.page_pos, (f.page_pos[0] + f.diameter, f.page_pos[1]),
-                  "below", "plan", dwg.draft, name="dim_pocket")
+# Inspect detected features and add a pinned dimension in domain terms:
+env = next(f for f in dwg.model().features if f.kind == "envelope")
+dwg.dimension(env, "length", role="width", side="below", pin=True)
 
 crit = dwg.lint_summary()   # {"passed", "score", "by_code", "issues":[…suggestion]}
 dwg.repair()                # auto-fix mechanically-fixable lint; never worsens
@@ -876,6 +875,7 @@ the section A–A trigger, the prismatic step-ladder + rotational furniture, and
 are all on the IR — the migration is complete (one path; the orchestrator is
 build → plan → render). See
 [`docs/target-architecture.md`](docs/target-architecture.md) and
+[`docs/layout-algorithm-primer.md`](docs/layout-algorithm-primer.md) for a short walkthrough, plus
 [`docs/adr/`](docs/adr/). The engine handles view layout (strip/zone model), scale
 selection, annotation placement, and section rendering.
 

{draftwright-0.2.11 → draftwright-0.2.13}/README.md

@@ -149,10 +149,9 @@ automatically, so you say *what* to dimension, not *where*:
 ```python
 dwg = build_drawing(part)
 
-# Inspect detected features and add a dimension in domain terms (auto-placed):
-for f in dwg.features("plan"):
-    dwg.place_dim(f.page_pos, (f.page_pos[0] + f.diameter, f.page_pos[1]),
-                  "below", "plan", dwg.draft, name="dim_pocket")
+# Inspect detected features and add a pinned dimension in domain terms:
+env = next(f for f in dwg.model().features if f.kind == "envelope")
+dwg.dimension(env, "length", role="width", side="below", pin=True)
 
 crit = dwg.lint_summary()   # {"passed", "score", "by_code", "issues":[…suggestion]}
 dwg.repair()                # auto-fix mechanically-fixable lint; never worsens
@@ -183,6 +182,7 @@ the section A–A trigger, the prismatic step-ladder + rotational furniture, and
 are all on the IR — the migration is complete (one path; the orchestrator is
 build → plan → render). See
 [`docs/target-architecture.md`](docs/target-architecture.md) and
+[`docs/layout-algorithm-primer.md`](docs/layout-algorithm-primer.md) for a short walkthrough, plus
 [`docs/adr/`](docs/adr/). The engine handles view layout (strip/zone model), scale
 selection, annotation placement, and section rendering.
 

{draftwright-0.2.11 → draftwright-0.2.13}/pyproject.toml

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

{draftwright-0.2.11 → draftwright-0.2.13}/src/draftwright/analysis.py

@@ -14,6 +14,7 @@ import logging
 import math
 import warnings
 from collections.abc import Callable
+from dataclasses import replace
 
 from build123d import Compound, Shape
 from build123d_drafting.helpers import draft_preset
@@ -31,6 +32,8 @@ from draftwright._core import (
     _legible_steps,
     _Projector,
 )
+from draftwright.model.ir import Datum, PartModel, StepFeature
+from draftwright.model.planner import plan_dimensions
 from draftwright.recognition import (
     analyse_cylinders,
     analyse_face_levels,
@@ -45,6 +48,7 @@ from draftwright.sheet import (
     StripDepths,
     _build_zones,
     _est_hole_table_sizes,
+    _est_planned_bore_callout_width,
     _layout_geometry,
     _measure_strips,
     _will_section,
@@ -96,6 +100,32 @@ def _declared_will_section(model, *, is_rotational=False, cx=0.0, cy=0.0) -> boo
     return False
 
 
+def _coerce_layout_model(model, part, decorations=None) -> PartModel | None:
+    """Return the caller-declared IR with authored decorations for layout sizing.
+
+    This mirrors the builder's render-time coercion, but stays local to analysis so
+    page/scale/strip selection can see the same authored callout text the renderer
+    will later place (#450).
+    """
+    if model is None:
+        return None
+    if isinstance(model, PartModel):
+        if decorations:
+            return replace(model, decorations={**model.decorations, **decorations})
+        return model
+    features = list(model)
+    bbox = part.bounding_box()
+    orientation = next((f.frame.axis for f in features if isinstance(f, StepFeature)), None)
+    datum = Datum(id="datum_xy", kind="point", at=(bbox.min.X, bbox.min.Y, bbox.min.Z))
+    return PartModel(
+        bbox=bbox,
+        orientation=orientation,
+        features=features,
+        datums=[datum],
+        decorations=decorations or {},
+    )
+
+
 def _import_step(path) -> Compound:
     """Read solid geometry from a STEP file via OCCT's ``STEPControl_Reader``.
 
@@ -299,6 +329,7 @@ def _analyse(
     page=None,
     pmi="off",
     model=None,
+    decorations=None,
 ) -> Analysis:
     """Load STEP or use a build123d Shape, analyse geometry, compute layout.
 
@@ -409,6 +440,17 @@ def _analyse(
     _draft_est = draft_preset(font_size=_FONT_SIZE, decimal_precision=1)
     _arrow_length = _draft_est.arrow_length
     _pad_around_text = _draft_est.pad_around_text
+    layout_model = _coerce_layout_model(model, part, decorations)
+    declared_bore_width = (
+        _est_planned_bore_callout_width(
+            plan_dimensions(layout_model),
+            _draft_est,
+            font_size=_FONT_SIZE,
+            pad_around_text=_pad_around_text,
+        )
+        if layout_model is not None
+        else 0.0
+    )
     holes = find_holes(part, cyls=(z_cyls, cross_cyls))
     patterns = find_hole_patterns(holes)
     bosses = find_bosses(part, cyls=(z_cyls, cross_cyls))  # detect once — the one inventory (#264)
@@ -442,6 +484,7 @@ def _analyse(
             bb,
             arrow_length=_arrow_length,
             pad_around_text=_pad_around_text,
+            declared_bore_callout_width=declared_bore_width,
         )
 
     def _pick_for_step_count(n_steps_i: int, strips_i: StripDepths) -> _ScalePick:
@@ -518,6 +561,7 @@ def _analyse(
         bb,
         arrow_length=_arrow_length,
         pad_around_text=_pad_around_text,
+        declared_bore_callout_width=declared_bore_width,
     )
     # View positions + iso empty-rectangle, shared with scale selection (_fits)
     # via _layout_geometry so placement and fit never diverge (#11).  _fit_iso_view

{draftwright-0.2.11 → draftwright-0.2.13}/src/draftwright/annotations/_common.py

@@ -293,6 +293,10 @@ class CorridorCandidate:
             ``priority`` is kept. An authored GD&T frame sets this above the auto dims so it
             is not dropped in favour of a lower-value auto dim purely by stacking-key order.
             Default 0 (every auto dim) → key order, unchanged.
+        anchored/natural: when ``anchored`` is true, the strip solve keeps this candidate
+            near its own natural stacking-axis page coordinate instead of the segment edge.
+            This is how user-authored pinned dimension intents join the shared solve
+            without being invalidated by a later first-fit pass.
         on_place/on_drop: the pass's own post-placement bookkeeping — coverage
             registration / drop lint + `Escalation`, or a slot's below-side fallthrough.
         force:      policy-B force-keep after the corridor-respecting pass (locations have
@@ -307,6 +311,8 @@ class CorridorCandidate:
     dedup: tuple | None = None
     precedence: int = 0
     priority: float = 0
+    anchored: bool = False
+    natural: float | None = None
     force: bool = False
     # The source IR feature this dim was rendered for — recorded as provenance when the
     # dim is placed at drain (ADR 0010). ``None`` leaves the annotation feature-less.
@@ -376,6 +382,8 @@ def solve_corridor(dwg, strip, view, axis, cands, tier):
     sizes = {c.name: c.size for c in kept if c.size is not None}  # real footprint (#61)
     forbid = {c.name: c.forbid for c in kept if c.forbid is not None}  # title-block box (#481)
     prio = {c.name: c.priority for c in kept if c.priority}  # over-capacity survival rank (#357)
+    anchored = {c.name: c.anchored for c in kept if c.anchored}
+    naturals = {c.name: c.natural for c in kept if c.natural is not None}
     left = {
         n
         for n, _ in place_strip_candidates(
@@ -389,6 +397,8 @@ def solve_corridor(dwg, strip, view, axis, cands, tier):
             sizes=sizes,
             forbid=forbid,
             priorities=prio,
+            anchored=anchored,
+            naturals=naturals,
         )
     }
     force_pairs = [(c.name, c.build) for c in kept if c.name in left and c.force]
@@ -407,6 +417,8 @@ def solve_corridor(dwg, strip, view, axis, cands, tier):
                 sizes=sizes,
                 forbid=forbid,
                 priorities=prio,
+                anchored=anchored,
+                naturals=naturals,
             )
         }
         if force_pairs
@@ -425,10 +437,13 @@ def solve_corridor(dwg, strip, view, axis, cands, tier):
 def register_corridor(dwg, key, strip, view, axis, tier, cand):
     """Queue a :class:`CorridorCandidate` under a shared corridor *key* so one
     :func:`drain_corridors` places the whole cross-pass set together (ADR 0009 end state).
-    The first registration for a key fixes its ``(strip, view, axis, tier)``."""
+    The first registration for a key fixes its ``(strip, view, axis)``; mixed producers on
+    the same corridor use the largest requested tier so spacing is not registration-order
+    dependent."""
     b = dwg._corridor_batch.setdefault(
         key, {"strip": strip, "view": view, "axis": axis, "tier": tier, "cands": []}
     )
+    b["tier"] = max(b["tier"], tier)
     b["cands"].append(cand)
 
 
@@ -453,6 +468,8 @@ def place_strip_candidates(
     sizes=None,
     forbid=None,
     priorities=None,
+    anchored=None,
+    naturals=None,
 ):
     """Collect-then-solve placement of location/feature dims on one strip (ADR 0009).
     The single shared strip placer that retires the ``Strip.allocate`` cursor (#150,
@@ -483,6 +500,11 @@ def place_strip_candidates(
     the lowest ``(priority, key)``, so a higher priority is kept — an authored GD&T frame
     is not dropped for a lower-value auto dim purely by stacking-key order.
 
+    *anchored* and *naturals* opt individual candidates into the weighted anchoring
+    mode in :func:`plan_strip`. This preserves the old segment-edge natural for every
+    caller that does not pass them, while letting authored pinned candidates express the
+    page coordinate they asked for inside the same shared solve.
+
     ``force=True`` skips that corridor check — the caller's last resort when no view took
     the dim cleanly: keep it on its natural view and accept the (same-feature) leader
     crossing rather than drop a real dimension (policy B). Candidates that find no strip
@@ -562,7 +584,6 @@ def place_strip_candidates(
 
     def _evaluate_segment(take, seg_lo, seg_hi):
         nat = seg_lo if inner == lo else seg_hi
-        anch = (0.0, nat) if axis == "y" else (nat, 0.0)
         # Keys order the tiers so the FIRST candidate lands on the inner tier: for an
         # inner=lo strip that is the lowest position (ascending keys); for a below strip
         # (inner=hi) it is the highest, so the keys reverse.
@@ -570,9 +591,14 @@ def place_strip_candidates(
             (
                 StripCandidate(
                     f"{(k if inner == lo else len(take) - 1 - k):04d}",
-                    anch,
+                    (
+                        (0.0, (naturals or {}).get(nb[0], nat))
+                        if axis == "y"
+                        else ((naturals or {}).get(nb[0], nat), 0.0)
+                    ),
                     (sizes or {}).get(nb[0], (tier, tier)),
                     priority=(priorities or {}).get(nb[0], 0.0),
+                    anchored=(anchored or {}).get(nb[0], False),
                 ),
                 nb,
             )