draftwright 0.4.33__tar.gz → 0.4.35__tar.gz

{draftwright-0.4.33 → draftwright-0.4.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: draftwright
-Version: 0.4.33
+Version: 0.4.35
 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.4.33 → draftwright-0.4.35}/pyproject.toml

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

{draftwright-0.4.33 → draftwright-0.4.35}/src/draftwright/_core.py

@@ -1371,6 +1371,11 @@ class Analysis:
     # from the effective mode so the ignored-PMI diagnostic can distinguish that default from
     # an explicit opt-out without widening the three-mode renderer contract (#623).
     pmi_defaulted: bool
+    # True when this layout is a member projection of a Document's sealed acquisition.
+    document_member: bool = False
+    # Exact top-level annotation objects supplied by the Document acquisition. Member-authored
+    # annotations are absent even when they carry external provenance of their own.
+    document_source_annotations: tuple[object, ...] = ()
     # Standing ISO 7200 title-block fields (#766) — defaulted, so they sit after the
     # non-default fields above. Defaults preserve the prior output: revision "A", the rest
     # blank (the TitleBlock helper's own defaults).

{draftwright-0.4.33 → draftwright-0.4.35}/src/draftwright/analysis.py

@@ -868,8 +868,8 @@ def _analyse(
             or {"status": "not_evaluated", "gauge": None, "refusal_reason": None}
         )
         src = str(_reuse.step_file)
-        pmi_defaulted = _reuse.pmi_defaulted
-        pmi_mode = _reuse.pmi_mode
+        pmi_defaulted = pmi is None
+        pmi_mode = _reuse.pmi_mode if pmi_defaulted else pmi
         pmi_report = _reuse.pmi_report
         pmi_records = _reuse.pmi if pmi_mode != "off" else []
         bb = _reuse.bb
@@ -1192,7 +1192,11 @@ def _analyse(
     )
     sizing_groups = annotation_groups(strip_sizing_model, sizing_groups)
     bore_callout_width = _est_planned_bore_callout_width(
-        sizing_groups, _draft_est, font_size=_FONT_SIZE, pad_around_text=_pad_around_text
+        sizing_groups,
+        _draft_est,
+        font_size=_FONT_SIZE,
+        pad_around_text=_pad_around_text,
+        include_source_pmi=_document_input is None or pmi_mode == "annotate",
     )
     section_count = _planned_section_count(
         sizing_model,
@@ -1517,6 +1521,10 @@ def _analyse(
         pmi_report=pmi_report,
         pmi_mode=pmi_mode,
         pmi_defaulted=pmi_defaulted,
+        document_member=_document_input is not None,
+        document_source_annotations=(
+            _document_input.source_annotations() if _document_input is not None else ()
+        ),
         # The sizing model IS the render model when detection ran (identical inputs by
         # construction — #584 WP1 A); store it so the pipeline never detects twice
         # (ADR 1 (was 0008 Amdt 5), #602). A declared model (layout_model) is NOT stored: the

{draftwright-0.4.33 → draftwright-0.4.35}/src/draftwright/annotations/_common.py

@@ -19,7 +19,7 @@ from pathlib import Path
 from typing import Any
 
 from build123d import FontStyle
-from build123d_drafting.helpers import DEFAULT_FONT_PATH, Dimension, Note, SafeDimension
+from build123d_drafting.helpers import DEFAULT_FONT_PATH, Dimension, Leader, Note, SafeDimension
 
 from draftwright._core import (  # noqa: F401 — _anno_box re-exported (#700)
     _STRIP_SPACING,
@@ -1862,10 +1862,44 @@ def annotation_ink_clear(dwg, candidate, *, view=None, additional=()) -> bool:
         ):
             return False
         if annotation_segments:
-            if not crossable_strokes and any(
-                _segments_cross_or_overlap(start, end, fixed_start, fixed_end)
-                for start, end in candidate_segments
-                for fixed_start, fixed_end in annotation_segments
+            candidate_tip = getattr(candidate, "tip", None)
+            annotation_tip = getattr(annotation, "tip", None)
+            candidate_elbow = getattr(candidate, "elbow", None)
+            annotation_elbow = getattr(annotation, "elbow", None)
+            shares_leader_trunk = (
+                type(candidate) is Leader
+                and type(annotation) is Leader
+                and candidate_tip is not None
+                and annotation_tip is not None
+                and candidate_elbow is not None
+                and annotation_elbow is not None
+                and math.dist(tuple(candidate_tip[:2]), tuple(annotation_tip[:2])) <= 1e-6
+                and abs(
+                    (candidate_elbow[0] - candidate_tip[0])
+                    * (annotation_elbow[1] - annotation_tip[1])
+                    - (candidate_elbow[1] - candidate_tip[1])
+                    * (annotation_elbow[0] - annotation_tip[0])
+                )
+                <= 1e-6
+                and (
+                    (candidate_elbow[0] - candidate_tip[0])
+                    * (annotation_elbow[0] - annotation_tip[0])
+                    + (candidate_elbow[1] - candidate_tip[1])
+                    * (annotation_elbow[1] - annotation_tip[1])
+                )
+                > 0.0
+            )
+            # Collinear, same-direction leaders from one physical target form a trunk with
+            # separate shelves. Their label-region checks above remain authoritative. Exact
+            # type checks exclude routed leaders, whose paths can cross again away from the tip.
+            if (
+                not crossable_strokes
+                and not shares_leader_trunk
+                and any(
+                    _segments_cross_or_overlap(start, end, fixed_start, fixed_end)
+                    for start, end in candidate_segments
+                    for fixed_start, fixed_end in annotation_segments
+                )
             ):
                 return False
             continue
@@ -2832,6 +2866,10 @@ class PlacementContext:
     # Whether the model was DECLARED (vs detected) — the ADR 4 (was 0011) gate the orchestrator reads,
     # threaded off ``getattr(dwg, "_model_declared")`` (#639).
     model_declared: bool = False
+    # Document models are declared for common-geometry authority, while their imported PMI
+    # remains discovery-sourced and obeys the member's pmi= policy (#1794).
+    document_member: bool = False
+    document_source_annotation_ids: frozenset[int] = frozenset()
     # Per-run cache for :meth:`feature_of_hole_at` — the model is fixed after build, so a
     # per-ctx (per-run) index is correct (mirrors the old ``Drawing._hole_feature_index``).
     _hole_feature_index: Any = field(default=None, repr=False)
@@ -3630,9 +3668,9 @@ def place_strip_candidates(
                 continue
             real = _geom_box(dim)
             solved.append((name, natural if _real_box_conflict(name, real) else dim))
-    # Curved ink can enclose large empty rectangles. After the shared strip
-    # solve, try a bounded contraction using actual segments and labels against
-    # both committed ink and this batch. Never move an anchored dimension.
+    # Some annotation ink can enclose large empty rectangles. After the shared
+    # strip solve, try a bounded contraction using actual segments and labels
+    # against both committed ink and this batch. Never move an anchored item.
     active_names = {name for name, _build in cands}
     label_clear = view_label_clearance(dwg, view) if compact_candidates else None
     for name, alternatives in (compact_candidates or {}).items():
@@ -3643,8 +3681,13 @@ def place_strip_candidates(
         index = next((i for i, (key, _dim) in enumerate(solved) if key == name), None)
         original = solved[index][1] if index is not None else None
         others = [item for key, item in solved if key != name]
-        for candidate in alternatives():
-            if original is not None and candidate.arc_radius >= original.arc_radius - 1e-6:
+        for candidate in alternatives(original):
+            if (
+                original is not None
+                and hasattr(candidate, "arc_radius")
+                and hasattr(original, "arc_radius")
+                and candidate.arc_radius >= original.arc_radius - 1e-6
+            ):
                 break
             box = _geom_box(candidate)
             if (
@@ -3672,7 +3715,12 @@ def place_strip_candidates(
                     entry["strip_pos"] = entry["pos"]
                     entry["pos"] = (label[idx] + label[idx + 2]) / 2
             if tp is not None:
-                tp.setdefault("angular_contractions", []).append(name)
+                trace_field = (
+                    "angular_contractions"
+                    if hasattr(candidate, "arc_radius")
+                    else "ink_contractions"
+                )
+                tp.setdefault(trace_field, []).append(name)
             break
     for name, dim in solved:
         # Record feature provenance (ADR 5 (was 0010)): the drain-time seam for corridor-placed