draftwright 0.2.4__tar.gz → 0.2.6__tar.gz

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

@@ -1,6 +1,68 @@
 # Changelog
 
-## Unreleased
+## v0.2.6 — 2026-07-05
+
+**ADR 0011 — the IR as a public input: declare features, don't only detect them.**
+Detection stays the default, but the caller can now *supply* the feature model, so a
+part you built parametrically reads as its own drawing and misdetection becomes
+recoverable by construction. Plus the first Phase-2 aspect layer (tolerances + fits).
+
+### Added
+
+- **`build_drawing(part, model=…)`** accepts a caller-supplied `PartModel` (or a
+  `Sequence[Feature]`); when given, **detection is skipped** and the auto-pass dimensions
+  the declared features. Detection and declaration are two producers of the same IR (#447,
+  ADR 0011 Phase 0).
+- **Object → feature constructors** `draftwright.model.hole` / `boss` / `step` / `slot` /
+  `pattern` / `envelope` — read a feature's geometry off the build123d object you built (⌀
+  from the cylindrical face, axis/location from the bbox), or supply explicit values (#447).
+- **The fluent `Sheet` façade** (`draftwright.Sheet`) — reference the objects you built,
+  declare their drawing aspects, `.build()` / `.export()`. `Sheet.from_part()` seeds the
+  hybrid override mode from detection (#447, Phase 1).
+- **Toleranced dimensions** — a `±` / limit tolerance on a diameter, step, or hole bore,
+  rendered on both the linear and ⌀-callout paths (`Sheet.tolerance(...)`, or a
+  `decorations=` side-layer) (#28, Phase 2 P2a).
+- **Fit-class deviation** — `Sheet.fit("H7")` resolves an ISO 286 fit class to its limit
+  deviation for the feature's nominal ⌀, rendered as the class code (`ø20 H7`, default) or
+  the signed deviations (`show="deviation"` → `ø20 +0.021/0`). Common classes; fails loud
+  outside its table (#29, Phase 2 P2a.2).
+
+### Changed
+
+- **Object constructors honour explicit overrides** — a passed object supplies *defaults*;
+  each explicit keyword overrides that field independently, and invalid public input fails
+  at declaration with a clear `ValueError` (#451, #452).
+- **A declared hole/pattern renders at its declared position** even where detection missed
+  it — the callout membership is sourced from the declared model, not only detection (#448).
+- **`Sheet.model()` / `Sheet.from_part()`** no longer build a full drawing just to return
+  the IR — feature inspection/seeding is now a cheap, no-render path (#453).
+
+### Fixed
+
+- A narrow diameter band hidden under a larger OD silhouette is no longer silently
+  undimensioned (the two feature inventories agreed) (#298).
+
+## v0.2.5 — 2026-07-04
+
+**The editable write API and record-then-finalize.** A detected drawing became an editable
+object, and a generated `--script` became a runnable reconstruction that reaches auto-pass
+quality.
+
+### Added
+
+- **`dwg.model()`** exposes the detected `PartModel` as a read surface, plus feature-
+  referenced add verbs `dimension()` / `callout()` / `locate()` / `furniture()` /
+  `section()` and `drop(feature)`, with a machine-checked completeness audit (#400).
+- **Record-then-finalize** (#426): the verbs record intents in deferred mode and
+  `dwg.finalize()` (auto-run by export) drains them through the auto-pass's own solvers, so
+  a reconstruction reaches auto-pass quality; `--script` now emits a runnable detect-only
+  reconstruction.
+
+### Changed
+
+- **Dimension-line spacing now follows ISO 129-1 / ASME Y14.5 convention** (#347): a wider
+  first-line gap (8 → 10 mm) and tighter, uniform parallel stacking (between-line clear gap
+  4 → 2.5 mm), with the inter-view corridor widened in step. Re-drifts every drawing.
 
 ## v0.2.4 — 2026-07-03
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwright
-Version: 0.2.4
+Version: 0.2.6
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright

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

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

{draftwright-0.2.4 → draftwright-0.2.6}/src/draftwright/__init__.py

@@ -30,6 +30,7 @@ _LAZY = {
     "make_drawing": "draftwright.builder",
     "Drawing": "draftwright.drawing",
     "FeatureInfo": "draftwright.drawing",
+    "Sheet": "draftwright.sheet_dsl",
     "fix_svg_page_size": "draftwright.export",
     "lint_feature_coverage": "draftwright.linting",
     "PmiRecord": "draftwright.pmi",
@@ -78,6 +79,7 @@ if TYPE_CHECKING:  # static analysers / IDEs — no runtime import, no kernel co
     from draftwright.linting import lint_feature_coverage
     from draftwright.pmi import PmiRecord, extract_pmi
     from draftwright.sheet import choose_scale
+    from draftwright.sheet_dsl import Sheet
 
 
 def __dir__():
@@ -91,6 +93,7 @@ __all__ = [
     "Drawing",
     "FeatureInfo",
     "PmiRecord",
+    "Sheet",
     "analyse_face_levels",
     "build_drawing",
     "choose_scale",

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

@@ -30,6 +30,7 @@ from build123d_drafting.helpers import (
     format_drawing_scale,
 )
 
+from draftwright.fits import FitClass
 from draftwright.fonts import PLEX_MONO, PLEX_SANS_CONDENSED
 from draftwright.layout import _greedy_strip_1d, _solve_strip_1d
 
@@ -86,6 +87,30 @@ def _fmt(v: float) -> str:
     return str(r) if abs(v - r) < 1e-6 else f"{v:.1f}"
 
 
+def _tol_suffix(tolerance, draft) -> str:
+    """The ``±`` / limit tolerance suffix to append to a **callout** label (a ø leader
+    or a hole callout), matching byte-for-byte what ``Dimension(tolerance=…)`` renders
+    on a linear dim (helpers ``_format_label``): a symmetric ``float`` → ``" ±t"``; an
+    ``(lower, upper)`` pair → ``" +upper -lower"`` — all rounded to the draft precision.
+
+    draftwright owns this suffix ONLY because the pinned helpers' ``Leader`` /
+    ``HoleCallout`` take no ``tolerance=`` yet, so we bake it into the label string
+    ourselves. Delete this once helpers grows a first-class tolerance parameter for
+    those two (extraction tracked as #449) — ``Dimension`` formats its own (#28 / P2a).
+
+    A resolved fit (:class:`~draftwright.fits.FitClass`, P2a.2) renders its own class-code
+    or deviation suffix — it rides the same ``tolerance`` field as an aspect marker."""
+    if tolerance is None:
+        return ""
+    if isinstance(tolerance, FitClass):
+        return tolerance.suffix()
+    prec = draft.decimal_precision
+    if isinstance(tolerance, (int, float)):
+        return f" ±{round(tolerance, prec):.{prec}f}"
+    lo, hi = tolerance
+    return f" +{round(hi, prec):.{prec}f} -{round(lo, prec):.{prec}f}"
+
+
 def _tag_sequence(n):
     """``A, B, …, Z, AA, AB, …`` — deterministic hole-table tags for *n* rows."""
     tags = []
@@ -162,6 +187,15 @@ def _dim(p1, p2, side, distance, draft, **kwargs):
     return d
 
 
+# Dimension-line spacing (page-mm, scale-independent), the single source of truth for
+# BOTH the ADR 0009 strip carve (via the `Strip` dataclass defaults below) and the
+# sheet.py halo/depth estimates that must reserve the same space. Per ISO 129-1 / ASME
+# Y14.5, the FIRST dimension line sits furthest from the outline (clears the outline +
+# extension-line origins) and subsequent parallel lines stack tighter and uniform (#347).
+_STRIP_GAP = 10.0  # clearance between the view outline and the first dimension line
+_STRIP_SPACING = 2.5  # clear gap between successive parallel dimension lines (beyond the label)
+
+
 @dataclass
 class Strip:
     """A one-dimensional annotation band adjacent to an orthographic view.
@@ -184,8 +218,8 @@ class Strip:
     anchor: float
     outer_limit: float
     direction: float = 1.0
-    gap: float = 8.0
-    spacing: float = 4.0
+    gap: float = _STRIP_GAP
+    spacing: float = _STRIP_SPACING
 
     @property
     def available(self) -> float:
@@ -220,7 +254,6 @@ _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)
 )
@@ -572,8 +605,11 @@ def _iso_bbox(dwg):
 # 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
+# The base inter-view corridor: one first-line gap + one dimension tier. Tracks
+# _STRIP_GAP so widening the first-line gap (#347) keeps the below-plan / between-view
+# corridors from razor-fitting the first dim line (the #130 slack guarantee): 10 + 10.
+_DIM_PAD = _STRIP_GAP + _SLOT_DIM_HEIGHT  # 20.0
+# _STRIP_GAP / _STRIP_SPACING are defined above (beside the `Strip` dataclass they seed).
 
 _PAGE_SIZES = {
     "A4": (297.0, 210.0),

{draftwright-0.2.4 → draftwright-0.2.6}/src/draftwright/analysis.py

@@ -179,6 +179,26 @@ _STEP_MIN_AREA_FRAC = 0.01
 # ---------------------------------------------------------------------------
 
 
+def _solids_body(part, src: str = "part"):
+    """The part reduced to just its solids — the geometry the drawing is *of*.
+
+    AP242 STEP files (and hand-built Compounds) can carry non-solid geometry beside
+    the solid — PMI presentation wires, leader curves, construction edges/sketches —
+    which, left in, draw as phantom rectangles in every view and inflate the bounding
+    box, corrupting the scale choice and the envelope dimensions. Shared by
+    :func:`_analyse` and :meth:`draftwright.Sheet.model` (#453) so the model a caller
+    *inspects* is wrapped from the exact same body the engine *draws*."""
+    solids = part.solids()
+    if not solids:
+        return part
+    body = solids[0] if len(solids) == 1 else Compound(children=list(solids))
+    if body.bounding_box().size != part.bounding_box().size or len(part.edges()) != len(
+        body.edges()
+    ):
+        _log.info("Dropping non-solid geometry from %s (PMI presentation data)", src)
+    return body
+
+
 def _analyse(
     step_file, title, number, tolerance, drawn_by, out, scale=None, page=None, pmi="off"
 ) -> Analysis:
@@ -192,22 +212,7 @@ def _analyse(
     else:
         part = _import_step(step_file)
         src = str(step_file)
-    # AP242 STEP files carry PMI presentation geometry (annotation-plane
-    # border wires, leader curves) beside the solid; left in, it draws as
-    # phantom rectangles in every view and inflates the bounding box —
-    # corrupting the scale choice and the envelope dimensions. The drawing
-    # is of the solids.
-    solids = part.solids()
-    if solids:
-        body = solids[0] if len(solids) == 1 else Compound(children=list(solids))
-        if body.bounding_box().size != part.bounding_box().size or len(part.edges()) != len(
-            body.edges()
-        ):
-            _log.info(
-                "Dropping non-solid geometry from %s (PMI presentation data)",
-                src,
-            )
-        part = body
+    part = _solids_body(part, src)
 
     # Semantic PMI extraction (AP242 only; separate read-only pass).
     pmi_records: list = []

{draftwright-0.2.4 → draftwright-0.2.6}/src/draftwright/annotate.py

@@ -10,4 +10,5 @@ from draftwright.annotations.from_model import _detect_step_repeat  # noqa: F401
 from draftwright.annotations.orchestrator import (  # noqa: F401
     _auto_annotate,
     _wrap_rows,
+    build_model,
 )

{draftwright-0.2.4 → draftwright-0.2.6}/src/draftwright/annotations/_common.py

@@ -302,6 +302,9 @@ class CorridorCandidate:
     dedup: tuple | None = None
     precedence: int = 0
     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.
+    feature: object | None = None
 
 
 def solve_corridor(dwg, strip, view, axis, cands, tier):
@@ -353,13 +356,16 @@ def solve_corridor(dwg, strip, view, axis, cands, tier):
                 _promote_losers(c)
         return
     pairs = [(c.name, c.build) for c in kept]
-    left = {n for n, _ in place_strip_candidates(dwg, strip, view, axis, pairs, tier)}
+    feats = {c.name: c.feature for c in kept if c.feature is not None}  # provenance (ADR 0010)
+    left = {
+        n for n, _ in place_strip_candidates(dwg, strip, view, axis, pairs, tier, features=feats)
+    }
     force_pairs = [(c.name, c.build) for c in kept if c.name in left and c.force]
     still = (
         {
             n
             for n, _ in place_strip_candidates(
-                dwg, strip, view, axis, force_pairs, tier, force=True
+                dwg, strip, view, axis, force_pairs, tier, force=True, features=feats
             )
         }
         if force_pairs
@@ -393,7 +399,7 @@ def drain_corridors(dwg):
     dwg._corridor_batch = {}
 
 
-def place_strip_candidates(dwg, strip, view, axis, cands, tier, *, force=False):
+def place_strip_candidates(dwg, strip, view, axis, cands, tier, *, force=False, features=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,
     P3): each candidate in *cands* — an ``(name, build(pos)->dim)`` pair — is spaced by
@@ -481,7 +487,9 @@ def place_strip_candidates(dwg, strip, view, axis, cands, tier, *, force=False):
             if not force and _box_hits(_geom_box(dim), blockers):  # corridor crosses a leader
                 todo.append((name, build))
                 continue
-            dwg.add(dim, name, view=view)
+            # Record feature provenance (ADR 0010): the drain-time seam for corridor-placed
+            # dims — `features` maps this batch's names to their source IR feature.
+            dwg.add(dim, name, view=view, feature=(features or {}).get(name))
     return todo