draftwright 0.4.12__tar.gz → 0.4.14__tar.gz

{draftwright-0.4.12 → draftwright-0.4.14}/CHANGELOG.md

@@ -2,8 +2,27 @@
 
 ## Unreleased
 
+### Added
+
+- New lint code `annotation_ink_overlap`: reports another annotation's line-work —
+  a dimension line, an extension line or a leader shaft — drawn through a label's
+  text, which `annotation_overlap` cannot see because it compares label boxes to
+  each other and to nothing else. Measured as the longest connected stroke path
+  crossing the label's exact polygon (or its axis-aligned box), in millimetres,
+  with a 0.5 mm floor. It scores on legibility, so
+  dense sheets that previously scored clean now score lower — 17 findings on
+  NIST CTC-02 AP203 alone, every sampled one confirmed a real defect by rendering.
+  Repair does not yet act on it (#1333) and the corridor solve does not yet avoid
+  it (#1334) (#1321, #1332).
+
 ### Changed
 
+- `annotation_overlap` now reports the whole defect when the same pair also draws
+  line-work through one of the two labels: the message names the crosser, the label
+  crossed and the millimetres, and replaces the "use `label_offset_x`" remedy, which
+  is the advice that case contradicts. `LintIssue.suggestion` is `None` for those
+  issues rather than a snippet that re-places the text (#1321, #1332).
+
 - Recogniser integration now uses only the exact `b123d-recognisers` dependency in
   `pyproject.toml` and `uv.lock`. The separate release-evidence record, dependency-bump workflow,
   candidate-checkout harness, and release-time capability-version rewrites have been removed;

{draftwright-0.4.12 → draftwright-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: draftwright
-Version: 0.4.12
+Version: 0.4.14
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright
@@ -685,7 +685,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: <3.15,>=3.10
 Requires-Dist: antlr4-python3-runtime<4.10
 Requires-Dist: b123d-recognisers==0.3.1
-Requires-Dist: build123d-drafting-helpers>=0.14.1
+Requires-Dist: build123d-drafting-helpers>=0.14.2
 Requires-Dist: build123d<0.11,>=0.9.0; python_full_version < '3.13'
 Requires-Dist: build123d<0.12,>=0.11; python_full_version >= '3.13'
 Requires-Dist: numpy>=1.24

{draftwright-0.4.12 → draftwright-0.4.14}/docs/reference/recogniser-capabilities.md

@@ -64,3 +64,34 @@ pass.
 `bosses` is the fully consumed reference family. `repeating-radial-profiles` is the opposite
 reference: it remains geometry-only critique evidence for a separately authored gear declaration,
 with no inferred gear feature added to fill the table.
+
+## Passage compatibility boundary
+
+The installed `b123d-recognisers==0.3.1` release already contains the `passages` family introduced
+in 0.2.6. Draftwright declares its schema-v1 `Passage` output exhaustively but deliberately keeps
+the family `unsupported`, with the drafting decision tracked by issue #1245. This is a truthful
+consumer disposition: the geometry remains visible in the aggregate inventory, while Draftwright
+does not invent an IR feature, DSL declaration, generated code, drawing annotation, or completeness
+requirement for it.
+
+Draftwright's exact dependency pin must remain on a reviewed released version in the interval
+`>=0.2.6,<0.4.0` until the separately reviewed F4b transition is ready. The lower boundary ensures
+the installed manifest really contains `passages`; the upper boundary prevents accidental adoption
+of the planned 0.4 compatibility change.
+
+The reviewed future 0.4 model is a distinct migration, not latent behavior in this declaration:
+
+- `SectionPassage` will be the authoritative physical output and aggregate census source;
+- legacy `Passage` values will be an accepted-only compatibility projection;
+- `recognise_passages(..., ledger=...)` will be a fail-loud unavailable compatibility operation;
+- the writer-free `recognise_passages` name will remain public but non-authoritative; and
+- rich split-junction passages can supersede a currently rendered Slot claim, moving ownership to
+  the Passage family through `SLOT_SUPERSEDED_BY_PASSAGE`; and
+- the capability contract must represent those API and per-output roles exhaustively before the
+  dependency pin can cross 0.4.
+
+That migration must update the package release, Draftwright adapter and declaration model,
+validator, tests, exact pin, and lockfile together. The current validator remains unchanged and
+fail closed; there is no forward declaration or stale-manifest exception. Crossing 0.4 also
+requires #1245 to decide what those newly Passage-owned occurrences draw, or an explicit reviewed
+decision to accept the resulting loss of the existing Slot callout.

{draftwright-0.4.12 → draftwright-0.4.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.4.12"
+version = "0.4.14"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -17,7 +17,7 @@ dependencies = [
     # 3.13+. Mirrors pzfreo/build123d-mcp's dependency handling.
     "build123d>=0.9.0,<0.11 ; python_full_version < '3.13'",
     "build123d>=0.11,<0.12 ; python_full_version >= '3.13'",
-    "build123d-drafting-helpers>=0.14.1",
+    "build123d-drafting-helpers>=0.14.2",
     "b123d-recognisers==0.3.1",
     "numpy>=1.24",
     # PNG raster export (SVG→PDF→PNG). Both permissively licensed (Pillow HPND; pypdfium2

draftwright-0.4.14/src/draftwright/_build_profile.py

@@ -0,0 +1,186 @@
+"""Pytest plugin and runner support for reproducible build-cost profiles (#1307)."""
+
+from __future__ import annotations
+
+import json
+import re
+import sys
+from collections import defaultdict
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from functools import wraps
+from pathlib import Path
+from time import perf_counter
+from typing import Any
+
+_MIN_REPORT_SECONDS = 0.005
+_STATE: _ProfileState | None = None
+_CURRENT_NODEID = "<collection>"
+
+
+@dataclass
+class _ProfileState:
+    output_dir: Path
+    worker_id: str
+    collected: int | None = None
+    calls: dict[tuple[str, str], list[float]] = field(
+        default_factory=lambda: defaultdict(lambda: [0, 0.0])
+    )
+    phases: list[dict[str, Any]] = field(default_factory=list)
+
+    def record_call(self, seam: str, seconds: float) -> None:
+        aggregate = self.calls[(_CURRENT_NODEID, seam)]
+        aggregate[0] += 1
+        aggregate[1] += seconds
+
+    def write(self, exitstatus: int) -> Path:
+        self.output_dir.mkdir(parents=True, exist_ok=True)
+        safe_worker = re.sub(r"[^A-Za-z0-9_.-]", "_", self.worker_id)
+        path = self.output_dir / f"profile-{safe_worker}.json"
+        payload = {
+            "worker_id": self.worker_id,
+            "collected": self.collected,
+            "exitstatus": exitstatus,
+            "calls": [
+                {
+                    "nodeid": nodeid,
+                    "seam": seam,
+                    "count": int(values[0]),
+                    "seconds": values[1],
+                }
+                for (nodeid, seam), values in sorted(self.calls.items())
+            ],
+            "phases": self.phases,
+        }
+        path.write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+        return path
+
+
+def _timed(seam: str, function: Callable[..., Any]) -> Callable[..., Any]:
+    @wraps(function)
+    def wrapper(*args, **kwargs):
+        started = perf_counter()
+        try:
+            return function(*args, **kwargs)
+        finally:
+            assert _STATE is not None
+            _STATE.record_call(seam, perf_counter() - started)
+
+    return wrapper
+
+
+def pytest_addoption(parser) -> None:
+    group = parser.getgroup("draftwright-build-profile")
+    group.addoption(
+        "--build-profile-dir",
+        help="write one Draftwright build profile JSON file per pytest-xdist worker",
+    )
+
+
+def pytest_configure(config) -> None:
+    global _STATE
+    output = config.getoption("--build-profile-dir")
+    if not output:
+        return
+
+    worker_input = getattr(config, "workerinput", None)
+    # Under xdist the controller executes no tests; worker processes write the useful files.
+    if worker_input is None and getattr(config.option, "numprocesses", None):
+        return
+
+    worker_id = worker_input.get("workerid", "worker") if worker_input else "main"
+    _STATE = _ProfileState(Path(output).resolve(), worker_id)
+
+    import draftwright.builder as builder
+    import draftwright.sheet as sheet
+
+    draftwright = sys.modules["draftwright"]
+    builder_public = _timed("builder.build_drawing", builder.build_drawing)
+    builder.build_drawing = builder_public
+    # The public lazy package attribute and Sheet's import-time binding otherwise bypass a
+    # patch installed only on builder.py. That omission made the first #1307 census a lower
+    # bound, so all three bindings are explicit here.
+    setattr(draftwright, "build_drawing", builder_public)
+    sheet.build_drawing = _timed("sheet.build_drawing", sheet.build_drawing)
+    builder._build_drawing_once = _timed(
+        "builder._build_drawing_once", builder._build_drawing_once
+    )
+
+
+def pytest_collection_finish(session) -> None:
+    if _STATE is not None:
+        _STATE.collected = len(session.items)
+
+
+def pytest_runtest_logstart(nodeid, location) -> None:
+    del location
+    global _CURRENT_NODEID
+    _CURRENT_NODEID = nodeid
+
+
+def pytest_runtest_logfinish(nodeid, location) -> None:
+    del nodeid, location
+    global _CURRENT_NODEID
+    _CURRENT_NODEID = "<between-tests>"
+
+
+def pytest_runtest_logreport(report) -> None:
+    if _STATE is not None and report.duration >= _MIN_REPORT_SECONDS:
+        _STATE.phases.append(
+            {
+                "nodeid": report.nodeid,
+                "phase": report.when,
+                "seconds": report.duration,
+                "outcome": report.outcome,
+            }
+        )
+
+
+def pytest_sessionfinish(session, exitstatus) -> None:
+    del session
+    if _STATE is not None:
+        _STATE.write(int(exitstatus))
+
+
+def build_pytest_command(output_dir: Path, pytest_args: list[str]) -> list[str]:
+    """Return argv without joining *pytest_args* into a shell-expanded module string."""
+    return [
+        "uv",
+        "run",
+        "pytest",
+        "-p",
+        "draftwright._build_profile",
+        f"--build-profile-dir={output_dir}",
+        *pytest_args,
+    ]
+
+
+def summarise_profiles(output_dir: Path, expected_collected: int) -> dict[str, Any]:
+    paths = sorted(output_dir.glob("profile-*.json"))
+    if not paths:
+        raise ValueError(f"no worker profiles were written to {output_dir}")
+
+    by_seam: dict[str, list[float]] = defaultdict(lambda: [0, 0.0])
+    workers = []
+    for path in paths:
+        payload = json.loads(path.read_text(encoding="utf-8"))
+        collected = payload.get("collected")
+        if collected != expected_collected:
+            raise ValueError(
+                f"{path.name} collected {collected!r}, expected {expected_collected}; "
+                "refusing to report a successful empty or partial profile"
+            )
+        workers.append(payload["worker_id"])
+        for call in payload["calls"]:
+            aggregate = by_seam[call["seam"]]
+            aggregate[0] += call["count"]
+            aggregate[1] += call["seconds"]
+
+    return {
+        "expected_collected": expected_collected,
+        "workers": workers,
+        "seams": {
+            seam: {"count": int(values[0]), "seconds": values[1]}
+            for seam, values in sorted(by_seam.items())
+        },
+    }

{draftwright-0.4.12 → draftwright-0.4.14}/src/draftwright/_core.py

@@ -358,7 +358,10 @@ _QUOTED_RE = re.compile(r"'([^']*)'")
 
 @functools.lru_cache(maxsize=512)
 def _text_size(
-    text: str, font_size: float, font_path: str | None = PLEX_MONO, font: str = "Arial"
+    text: str,
+    font_size: float,
+    font_path: str | None = PLEX_MONO,
+    font: str = "Arial",
 ) -> tuple[float, float]:
     """Measured rendered (width, height) (page-mm) of *text* at *font_size*.
 

{draftwright-0.4.12 → draftwright-0.4.14}/src/draftwright/_geometry.py

@@ -456,6 +456,15 @@ def _convex_polygons_overlap(left, right) -> bool:
 
     if len(left) < 3 or len(right) < 3:
         return False
+    left_x, left_y = zip(*left, strict=True)
+    right_x, right_y = zip(*right, strict=True)
+    if (
+        max(left_x) <= min(right_x)
+        or max(right_x) <= min(left_x)
+        or max(left_y) <= min(right_y)
+        or max(right_y) <= min(left_y)
+    ):
+        return False
     axes: list[tuple[float, float]] = []
     for points in (left, right):
         axes.extend(