Add AutoCAD MCP premium skill and backend APIs
Introduce the autocad-mcp-premium skill with workflow docs, examples, and references (.claude/skills/autocad-mcp-premium/*). Add PlanSpec/critique plumbing and engineering helpers (engineering/plan_spec.py, engineering/critique.py) plus tests and a smoke script. Extend backend API (backends/base.py) with corner operations and premium meta-tools (trim/extend/fillet/chamfer, drawing_plan, drawing_critique, point_from_snap, construction_xline/clear, drawing_apply_iso_layers, dimension_auto, entity_select_smart) and implement COM backend corner ops (backends/com_backend.py) with placeholders for meta-tools. Update CLAUDE.md to document the premium drawing rules and standard workflow. Misc: add examples, references, and tests for premium features, and minor server/backend adjustments.
This commit is contained in:
U-C4N
@@ -21,6 +21,17 @@ from .layers import (
|
||||
ensure_engineering_layers,
|
||||
ensure_standard_linetypes,
|
||||
)
|
||||
from .plan_spec import (
|
||||
ALL_CRITIQUE_FOCUSES,
|
||||
ISO_128_LINEWEIGHTS_MM,
|
||||
CritiqueFocus,
|
||||
DimStyle,
|
||||
Issue,
|
||||
LayerSetId,
|
||||
PlanSpec,
|
||||
SheetSize,
|
||||
SnapType,
|
||||
)
|
||||
from .section import apply_section_hatch, cutting_plane_line
|
||||
|
||||
# Agent B contributes titleblock + validator. Imports are guarded so this
|
||||
@@ -62,4 +73,13 @@ __all__ = [
|
||||
"DrawingValidator",
|
||||
"ValidationResult",
|
||||
"ValidationFinding",
|
||||
"PlanSpec",
|
||||
"Issue",
|
||||
"CritiqueFocus",
|
||||
"SheetSize",
|
||||
"LayerSetId",
|
||||
"DimStyle",
|
||||
"SnapType",
|
||||
"ALL_CRITIQUE_FOCUSES",
|
||||
"ISO_128_LINEWEIGHTS_MM",
|
||||
]
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
"""Premium-quality critique checks for finished drawings.
|
||||
|
||||
Each focus runs an independent check; new focuses must be added to the
|
||||
`CritiqueFocus` Literal in plan_spec.py *and* registered here. Closed enum
|
||||
keeps drawing_critique scope from drifting.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import math
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from .layers import ENGINEERING_LAYERS
|
||||
from .plan_spec import (
|
||||
ALL_CRITIQUE_FOCUSES,
|
||||
ISO_128_LINEWEIGHTS_MM,
|
||||
CritiqueFocus,
|
||||
Issue,
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from backends.base import AutoCADBackend
|
||||
|
||||
|
||||
# Layer-name → expected ACI color, derived from ENGINEERING_LAYERS.
|
||||
_EXPECTED_LAYER_COLOR: dict[str, int] = {
|
||||
name: color for name, color, _lt, _lw, _desc in ENGINEERING_LAYERS
|
||||
}
|
||||
|
||||
# Dimension entity types that should sit on the DIM layer.
|
||||
_DIM_TYPES = {
|
||||
"DIMENSION", "DIMLINEAR", "DIMALIGNED", "DIMANGULAR",
|
||||
"DIMRADIUS", "DIMDIAMETER", "DIMORDINATE",
|
||||
}
|
||||
|
||||
|
||||
async def _check_iso128(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""Layer lineweights must be in ISO_128_LINEWEIGHTS_MM (or -3=ByLayer
|
||||
sentinel meaning 'inherit')."""
|
||||
issues: list[Issue] = []
|
||||
try:
|
||||
layers = await backend.layer_list()
|
||||
except Exception as exc:
|
||||
return [Issue("warning", "iso128", f"layer_list failed: {exc}")]
|
||||
allowed = set(ISO_128_LINEWEIGHTS_MM)
|
||||
for lyr in layers:
|
||||
lw = float(lyr.lineweight)
|
||||
# AutoCAD sentinels: -1 (Default), -2 (ByBlock), -3 (ByLayer);
|
||||
# 0.0 = ezdxf's "use default" — not an ISO 128 violation.
|
||||
if lw <= 0:
|
||||
continue
|
||||
# ezdxf returns lineweight in mm-hundredths (e.g. 25 = 0.25mm) for
|
||||
# some entity properties; the layer dataclass already normalises to mm.
|
||||
if lw not in allowed and (lw / 100.0) not in allowed:
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus="iso128",
|
||||
message=(
|
||||
f"Layer '{lyr.name}' lineweight {lw} mm is not in the "
|
||||
f"ISO 128 set {sorted(allowed)}."
|
||||
),
|
||||
detail={"layer": lyr.name, "lineweight": lw},
|
||||
))
|
||||
return issues
|
||||
|
||||
|
||||
async def _check_layer_color(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""Engineering-standard layers must keep their canonical ACI color."""
|
||||
issues: list[Issue] = []
|
||||
try:
|
||||
layers = await backend.layer_list()
|
||||
except Exception:
|
||||
return []
|
||||
for lyr in layers:
|
||||
expected = _EXPECTED_LAYER_COLOR.get(lyr.name)
|
||||
if expected is None:
|
||||
continue # unknown layer — caller's responsibility
|
||||
if int(lyr.color) != int(expected):
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus="layer_color",
|
||||
message=(
|
||||
f"Layer '{lyr.name}' has color {lyr.color}; "
|
||||
f"engineering standard expects {expected}."
|
||||
),
|
||||
detail={"layer": lyr.name, "got": int(lyr.color), "expected": expected},
|
||||
))
|
||||
return issues
|
||||
|
||||
|
||||
async def _check_construction_left(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""CONSTRUCTION layer must be empty before drawing_finalize."""
|
||||
try:
|
||||
ents = await backend.entity_list(layer_filter="CONSTRUCTION", limit=5000)
|
||||
except Exception:
|
||||
return []
|
||||
if not ents:
|
||||
return []
|
||||
return [Issue(
|
||||
severity="error",
|
||||
focus="construction_left",
|
||||
message=(
|
||||
f"{len(ents)} entity/entities still on CONSTRUCTION layer. "
|
||||
"Call construction_clear() before drawing_finalize."
|
||||
),
|
||||
handles=[e.handle for e in ents[:50]],
|
||||
detail={"count": len(ents)},
|
||||
)]
|
||||
|
||||
|
||||
async def _check_untrimmed_corner(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""Two LINE endpoints within `tol` but not exactly equal usually means a
|
||||
corner where one line overshoots — TRIM/EXTEND/FILLET was forgotten."""
|
||||
tol = 0.5 # mm — generous; tighten via PlanSpec.notes later
|
||||
try:
|
||||
lines = await backend.entity_list(type_filter="LINE", limit=5000)
|
||||
except Exception:
|
||||
return []
|
||||
endpoints: list[tuple[str, tuple[float, float]]] = []
|
||||
for ln in lines:
|
||||
s = ln.properties.get("start")
|
||||
e = ln.properties.get("end")
|
||||
if s and e:
|
||||
endpoints.append((ln.handle, (float(s[0]), float(s[1]))))
|
||||
endpoints.append((ln.handle, (float(e[0]), float(e[1]))))
|
||||
issues: list[Issue] = []
|
||||
n = len(endpoints)
|
||||
seen: set[frozenset[str]] = set()
|
||||
for i in range(n):
|
||||
h1, p1 = endpoints[i]
|
||||
for j in range(i + 1, n):
|
||||
h2, p2 = endpoints[j]
|
||||
if h1 == h2:
|
||||
continue
|
||||
d = math.hypot(p1[0] - p2[0], p1[1] - p2[1])
|
||||
if 1e-9 < d <= tol:
|
||||
key = frozenset((h1, h2))
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus="untrimmed_corner",
|
||||
message=(
|
||||
f"Lines {h1} and {h2} have endpoints {d:.3f} mm apart — "
|
||||
"likely an untrimmed corner (use entity_trim or entity_fillet)."
|
||||
),
|
||||
handles=[h1, h2],
|
||||
detail={"gap_mm": d, "p1": list(p1), "p2": list(p2)},
|
||||
))
|
||||
return issues
|
||||
|
||||
|
||||
async def _check_duplicate_entities(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""Two LINEs with identical endpoints (in either direction) are duplicates."""
|
||||
try:
|
||||
lines = await backend.entity_list(type_filter="LINE", limit=5000)
|
||||
except Exception:
|
||||
return []
|
||||
seen: dict[tuple, str] = {}
|
||||
issues: list[Issue] = []
|
||||
for ln in lines:
|
||||
s = ln.properties.get("start")
|
||||
e = ln.properties.get("end")
|
||||
if not (s and e):
|
||||
continue
|
||||
k1 = (round(s[0], 4), round(s[1], 4), round(e[0], 4), round(e[1], 4))
|
||||
k2 = (k1[2], k1[3], k1[0], k1[1])
|
||||
for key in (k1, k2):
|
||||
if key in seen:
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus="duplicate_entities",
|
||||
message=f"Lines {seen[key]} and {ln.handle} are duplicates.",
|
||||
handles=[seen[key], ln.handle],
|
||||
))
|
||||
break
|
||||
else:
|
||||
seen[k1] = ln.handle
|
||||
return issues
|
||||
|
||||
|
||||
async def _check_dim_overlap(backend: "AutoCADBackend") -> list[Issue]:
|
||||
"""Two dimensions whose insertion points are within `tol` likely overlap."""
|
||||
tol = 5.0 # mm
|
||||
try:
|
||||
ents = await backend.entity_list(layer_filter="DIM", limit=5000)
|
||||
except Exception:
|
||||
return []
|
||||
dim_points: list[tuple[str, tuple[float, float]]] = []
|
||||
for e in ents:
|
||||
if e.type not in _DIM_TYPES and "DIM" not in e.type:
|
||||
continue
|
||||
ip = (e.properties.get("text_position")
|
||||
or e.properties.get("defpoint")
|
||||
or e.properties.get("insertion_point"))
|
||||
if ip and len(ip) >= 2:
|
||||
dim_points.append((e.handle, (float(ip[0]), float(ip[1]))))
|
||||
issues: list[Issue] = []
|
||||
seen: set[frozenset[str]] = set()
|
||||
for i, (h1, p1) in enumerate(dim_points):
|
||||
for j in range(i + 1, len(dim_points)):
|
||||
h2, p2 = dim_points[j]
|
||||
d = math.hypot(p1[0] - p2[0], p1[1] - p2[1])
|
||||
if d <= tol:
|
||||
key = frozenset((h1, h2))
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus="dim_overlap",
|
||||
message=f"Dimensions {h1} and {h2} are {d:.2f} mm apart — likely overlapping.",
|
||||
handles=[h1, h2],
|
||||
))
|
||||
return issues
|
||||
|
||||
|
||||
_FOCUS_DISPATCH = {
|
||||
"iso128": _check_iso128,
|
||||
"layer_color": _check_layer_color,
|
||||
"dim_overlap": _check_dim_overlap,
|
||||
"untrimmed_corner": _check_untrimmed_corner,
|
||||
"duplicate_entities": _check_duplicate_entities,
|
||||
"construction_left": _check_construction_left,
|
||||
}
|
||||
|
||||
|
||||
async def run_critique(
|
||||
backend: "AutoCADBackend",
|
||||
focus: list[CritiqueFocus] | None = None,
|
||||
) -> list[Issue]:
|
||||
"""Dispatch each requested focus check and return aggregated issues."""
|
||||
foci = list(focus) if focus is not None else list(ALL_CRITIQUE_FOCUSES)
|
||||
issues: list[Issue] = []
|
||||
for f in foci:
|
||||
check = _FOCUS_DISPATCH.get(f)
|
||||
if check is None:
|
||||
issues.append(Issue(
|
||||
severity="warning",
|
||||
focus=f, # type: ignore[arg-type]
|
||||
message=f"Unknown critique focus '{f}' (closed enum).",
|
||||
))
|
||||
continue
|
||||
issues.extend(await check(backend))
|
||||
return issues
|
||||
+57
-1
@@ -25,6 +25,49 @@ ENGINEERING_LAYERS: list[tuple[str, int, str, float, str]] = [
|
||||
("CONSTRUCTION", 250, "Continuous", 0.05, "scratch / construction"),
|
||||
]
|
||||
|
||||
|
||||
# P&ID standard layer set (de-facto, distilled from ISO 10628 + common practice).
|
||||
PID_LAYERS: list[tuple[str, int, str, float, str]] = [
|
||||
("0", 7, "Continuous", 0.25, "default"),
|
||||
("PROCESS-PIPING-MAIN", 1, "Continuous", 0.70, "main process line (heavy)"),
|
||||
("PROCESS-PIPING-SECONDARY", 2, "Continuous", 0.50, "secondary process line"),
|
||||
("PROCESS-EQUIPMENT", 7, "Continuous", 0.50, "vessels / pumps / drums"),
|
||||
("PROCESS-VALVES", 3, "Continuous", 0.35, "valves / fittings"),
|
||||
("INSTRUMENT-SYMBOL", 4, "Continuous", 0.35, "instrument bubbles / FCFs"),
|
||||
("INSTRUMENT-LINE-SIGNAL", 4, "DASHED", 0.18, "pneumatic / electrical signal"),
|
||||
("INSTRUMENT-TAG-TEXT", 7, "Continuous", 0.25, "tag labels"),
|
||||
("ELECTRICAL-LINE", 6, "DASHDOT", 0.18, "electrical line"),
|
||||
("UTILITY-LINE", 5, "PHANTOM", 0.25, "utility (steam, water, air)"),
|
||||
("INSULATION-HATCH", 8, "Continuous", 0.13, "insulation hatch"),
|
||||
("DIM", 2, "Continuous", 0.18, "dimensions"),
|
||||
("TEXT-NOTES", 7, "Continuous", 0.25, "free-form notes"),
|
||||
("TITLEBLOCK", 7, "Continuous", 0.50, "drawing border + title"),
|
||||
("CONSTRUCTION", 250, "Continuous", 0.05, "scratch / construction"),
|
||||
]
|
||||
|
||||
|
||||
# ISO 13567-style layer naming kit (Agent2-Element6-Presentation2-Status1).
|
||||
# This is a *starter* set — extend as needed per discipline.
|
||||
ISO13567_LAYERS: list[tuple[str, int, str, float, str]] = [
|
||||
("0", 7, "Continuous", 0.25, "default"),
|
||||
("M-GEOMET-E-N", 7, "Continuous", 0.50, "Mechanical / geometry / edge / new"),
|
||||
("M-HIDDEN-E-N", 3, "HIDDEN", 0.25, "Mechanical / hidden edge"),
|
||||
("M-CENTL-E-N", 1, "CENTER", 0.18, "Mechanical / centerlines"),
|
||||
("M-PHANT-E-N", 6, "PHANTOM", 0.18, "Mechanical / phantom"),
|
||||
("M-DIMEN-T-N", 2, "Continuous", 0.18, "Mechanical / dimension text"),
|
||||
("M-TEXT-T-N", 7, "Continuous", 0.25, "Mechanical / annotation text"),
|
||||
("M-HATCH-H-N", 8, "Continuous", 0.13, "Mechanical / hatch"),
|
||||
("M-TITLE-T-N", 7, "Continuous", 0.50, "Title block"),
|
||||
("M-CONST-E-N", 250, "Continuous", 0.05, "Construction (scratch)"),
|
||||
]
|
||||
|
||||
|
||||
LAYER_SET_REGISTRY: dict[str, list[tuple[str, int, str, float, str]]] = {
|
||||
"mech": ENGINEERING_LAYERS,
|
||||
"pid": PID_LAYERS,
|
||||
"iso13567": ISO13567_LAYERS,
|
||||
}
|
||||
|
||||
STANDARD_LINETYPES: list[str] = ["CENTER", "HIDDEN", "PHANTOM", "DASHED", "DASHDOT"]
|
||||
|
||||
|
||||
@@ -51,6 +94,19 @@ async def ensure_standard_linetypes(backend: "AutoCADBackend") -> dict[str, str]
|
||||
|
||||
async def ensure_engineering_layers(backend: "AutoCADBackend") -> dict[str, str]:
|
||||
"""Idempotently create every layer in ENGINEERING_LAYERS via backend.layer_create."""
|
||||
return await apply_layer_set(backend, "mech")
|
||||
|
||||
|
||||
async def apply_layer_set(
|
||||
backend: "AutoCADBackend", standard: str = "mech",
|
||||
) -> dict[str, str]:
|
||||
"""Idempotently apply a named layer set ('mech', 'pid', 'iso13567')."""
|
||||
layer_set = LAYER_SET_REGISTRY.get(standard)
|
||||
if layer_set is None:
|
||||
raise RuntimeError(
|
||||
f"Unknown layer set '{standard}'. "
|
||||
f"Choose one of: {sorted(LAYER_SET_REGISTRY)}"
|
||||
)
|
||||
await ensure_standard_linetypes(backend)
|
||||
|
||||
try:
|
||||
@@ -60,7 +116,7 @@ async def ensure_engineering_layers(backend: "AutoCADBackend") -> dict[str, str]
|
||||
existing = set()
|
||||
|
||||
results: dict[str, str] = {}
|
||||
for name, color, linetype, lineweight, _desc in ENGINEERING_LAYERS:
|
||||
for name, color, linetype, lineweight, _desc in layer_set:
|
||||
if name.lower() in existing:
|
||||
results[name] = "exists"
|
||||
continue
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
"""Premium drawing planning + critique data models.
|
||||
|
||||
PlanSpec is committed up-front by the LLM via `drawing_plan(...)` before any
|
||||
geometry is created; CritiqueFocus is a closed enum to keep
|
||||
`drawing_critique(...)` scope from drifting.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Literal
|
||||
|
||||
SheetSize = Literal["A4", "A3", "A2", "A1", "A0"]
|
||||
LayerSetId = Literal["iso13567", "mech", "pid"]
|
||||
DimStyle = Literal["chain", "baseline", "ordinate", "mixed"]
|
||||
CritiqueFocus = Literal[
|
||||
"iso128",
|
||||
"layer_color",
|
||||
"dim_overlap",
|
||||
"untrimmed_corner",
|
||||
"duplicate_entities",
|
||||
"construction_left",
|
||||
]
|
||||
SnapType = Literal["end", "mid", "center", "quad", "int", "perp", "near"]
|
||||
|
||||
ALL_CRITIQUE_FOCUSES: tuple[CritiqueFocus, ...] = (
|
||||
"iso128",
|
||||
"layer_color",
|
||||
"dim_overlap",
|
||||
"untrimmed_corner",
|
||||
"duplicate_entities",
|
||||
"construction_left",
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
class PlanSpec:
|
||||
"""Drawing intent committed before geometry creation.
|
||||
|
||||
Returned by `drawing_plan(...)` and replayed by `drawing_critique(...)` to
|
||||
verify the finished drawing matches the original intent.
|
||||
"""
|
||||
|
||||
intent: str
|
||||
sheet_size: SheetSize
|
||||
scale: float
|
||||
layer_set_id: LayerSetId
|
||||
view_count: int = 1
|
||||
dim_style: DimStyle = "chain"
|
||||
notes: list[str] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"intent": self.intent,
|
||||
"sheet_size": self.sheet_size,
|
||||
"scale": self.scale,
|
||||
"layer_set_id": self.layer_set_id,
|
||||
"view_count": self.view_count,
|
||||
"dim_style": self.dim_style,
|
||||
"notes": list(self.notes),
|
||||
}
|
||||
|
||||
|
||||
@dataclass
|
||||
class Issue:
|
||||
"""One problem reported by `drawing_critique(...)`."""
|
||||
|
||||
severity: Literal["error", "warning", "info"]
|
||||
focus: CritiqueFocus
|
||||
message: str
|
||||
handles: list[str] = field(default_factory=list)
|
||||
detail: dict = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"severity": self.severity,
|
||||
"focus": self.focus,
|
||||
"message": self.message,
|
||||
"handles": list(self.handles),
|
||||
"detail": self.detail,
|
||||
}
|
||||
|
||||
|
||||
# ISO 128 lineweight set (mm). Any lineweight outside this set is flagged.
|
||||
ISO_128_LINEWEIGHTS_MM: tuple[float, ...] = (
|
||||
0.13, 0.18, 0.25, 0.35, 0.50, 0.70, 1.00, 1.40, 2.00,
|
||||
)
|
||||
Reference in New Issue
Block a user