Tool count 131 -> 154; 474 -> 1242 collected tests. The release exists for two measured reasons. A 149-tool catalog costs a client ~40,300 tokens before it has asked for anything, and a drafter searching the way drafters think -- FILLET, BPOLY, QSELECT, WBLOCK -- scored df=0 against the stock index, because those words were simply not in the data. Discovery and batching - DISCOVERY_MODE=search replaces the catalog with search_tools + call_tool, ranked over an AutoCAD command and synonym corpus (discovery/aliases.py) on top of fastmcp's BM25 index. Measured: 40,305 -> 356 tokens advertised. - cad_batch runs a step list in one round trip; fields= projects result-heavy responses. The `core` profile is gone -- discovery replaced it. Honesty debt (Tier 0) - OCS/ECS: `extrusion` appeared nowhere in this codebase, so mirrored and rotated geometry reported coordinates that were quietly wrong. backends/ocs.py translates at the backend boundary; every tool coordinate is WCS on both engines, and a tilted plane refuses rather than answering with a number that looks fine. - drawing_save_as(fmt="dwg") wrote DXF bytes to a .dwg path. drawing_audit never repaired. analysis_measure_area shoelaced points the caller typed in. - ezdxf calls gained a per-call timeout, so one hung call can no longer wedge a server whose document lock is a single asyncio.Lock. Architecture - The 1854-line backend ABC is 19 contract modules; @capability(key, reason=) makes optional methods declarative and a gate fails on undeclared holes. - 8 layout/viewport tools, CHSPACE, CAD_PROGID escape hatch. - Wave A: selection filters, boundary tracing, hatch depth, annotation objects, measurement -- 13 tools of a planned 39. The REGION and 2D-boolean family was cut on evidence: add_region() yields zero ACIS bytes and the greiner_hormann substitute loses 28.2% of the area on a square with one semicircular edge. Verified against a live AutoCAD 2026, which found four COM defects no amount of reading would have caught -- AcadPViewport has no ViewCenter, and the line that set it had been swallowed by a bare except since v1.4. Benchmark v3 (15 tasks) and what it caught - v2 scored this server 10/10, which carried no information: every task in it exercised something the server was built around. Five tasks were added because they can fail, and three did while being written -- a hatch could not be measured though the refusal listed HATCH as measurable, the boundary tools and the measure tool disagreed about the same shape (139.2177 vs 139.2699), and a circle stored as two bulged vertices measured 0.0. - Competitor reports are NOT re-scored. They are pinned v1.4 runs against v2 and were never asked these five questions; the chart shows those rows `not run`. - Correctness A/B: 21/24 -> 24/24, zero regressions. Performance, stated plainly The published v1.4 perf report was recorded on CPython 3.14 and the new one on 3.11.15, so the apparent 2-6x speedup is the interpreter, not this release. Re-measured on one interpreter, v1.5.0 is 28% slower creating entities and 22% slower on the 10k roundtrip. Fully attributed: EZDXF_CALL_TIMEOUT=0 restores v1.4.0's exact numbers. That is the deadlock fix being paid for, the knob is documented, and winning it back is on the 1.6 roadmap. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
256 lines
7.3 KiB
Python
256 lines
7.3 KiB
Python
"""Creating geometry.
|
|
|
|
Split out of the single 1854-line ``AutoCADBackend`` ABC in v1.5.0 (M7).
|
|
``AutoCADBackend`` composes every contract in this package, so importing
|
|
``backends.base.AutoCADBackend`` is unchanged for callers.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from abc import ABC, abstractmethod
|
|
from typing import TYPE_CHECKING
|
|
|
|
from backends.capability import capability
|
|
|
|
if TYPE_CHECKING:
|
|
from backends.base import EntityInfo
|
|
|
|
|
|
class EntityCreationContract(ABC):
|
|
@abstractmethod
|
|
async def entity_create_line(
|
|
self,
|
|
x1: float,
|
|
y1: float,
|
|
x2: float,
|
|
y2: float,
|
|
z1: float = 0.0,
|
|
z2: float = 0.0,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
linetype: str | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_circle(
|
|
self,
|
|
cx: float,
|
|
cy: float,
|
|
radius: float,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_arc(
|
|
self,
|
|
cx: float,
|
|
cy: float,
|
|
radius: float,
|
|
start_angle: float,
|
|
end_angle: float,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_polyline(
|
|
self,
|
|
points: list[list[float]],
|
|
closed: bool = False,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_text(
|
|
self,
|
|
text: str,
|
|
x: float,
|
|
y: float,
|
|
height: float = 2.5,
|
|
rotation: float = 0.0,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_mtext(
|
|
self,
|
|
text: str,
|
|
x: float,
|
|
y: float,
|
|
width: float = 100.0,
|
|
height: float = 2.5,
|
|
rotation: float = 0.0,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_table(
|
|
self,
|
|
x: float,
|
|
y: float,
|
|
rows: list[list[str]],
|
|
headers: list[str] | None = None,
|
|
column_widths: list[float] | None = None,
|
|
row_height: float = 7.0,
|
|
text_height: float = 2.5,
|
|
title: str | None = None,
|
|
layer: str = "TEXT",
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def leader_create_mleader(
|
|
self,
|
|
points: list[list[float]],
|
|
text: str,
|
|
text_height: float = 2.5,
|
|
landing_gap: float = 1.0,
|
|
arrow_size: float = 2.5,
|
|
layer: str = "DIM",
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_hatch(
|
|
self,
|
|
pattern: str,
|
|
boundary_points: list[list[float]],
|
|
scale: float = 1.0,
|
|
angle: float = 0.0,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_spline(
|
|
self,
|
|
fit_points: list[list[float]],
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_ellipse(
|
|
self,
|
|
cx: float,
|
|
cy: float,
|
|
major_x: float,
|
|
major_y: float,
|
|
ratio: float = 0.5,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_point(
|
|
self,
|
|
x: float,
|
|
y: float,
|
|
layer: str | None = None,
|
|
color: int | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
@abstractmethod
|
|
async def entity_create_block_ref(
|
|
self,
|
|
name: str,
|
|
x: float,
|
|
y: float,
|
|
scale_x: float = 1.0,
|
|
scale_y: float = 1.0,
|
|
rotation: float = 0.0,
|
|
layer: str | None = None,
|
|
) -> EntityInfo: ...
|
|
|
|
# ── hatch depth (M8 / F4) ────────────────────────────────────────────────
|
|
|
|
@abstractmethod
|
|
async def hatch_set_gradient(
|
|
self,
|
|
handle: str,
|
|
color1: list[int],
|
|
color2: list[int],
|
|
rotation: float = 0.0,
|
|
centered: float = 0.0,
|
|
one_color: bool = False,
|
|
tint: float = 0.0,
|
|
name: str = "LINEAR",
|
|
) -> dict:
|
|
"""Replace a hatch's fill with a two-colour gradient. ``{ok, handle, gradient}``."""
|
|
...
|
|
|
|
@abstractmethod
|
|
async def hatch_edit(
|
|
self,
|
|
handle: str,
|
|
pattern: str = "",
|
|
scale: float | None = None,
|
|
angle: float | None = None,
|
|
color: int | None = None,
|
|
style: str = "",
|
|
) -> dict:
|
|
"""Edit an existing hatch in place. Returns ``{ok, handle, changed}``.
|
|
|
|
``changed`` names exactly the attributes that moved: an omitted
|
|
parameter must leave its attribute alone, because a partial edit that
|
|
quietly resets the rest is data loss. ``style`` is the island style —
|
|
``normal``, ``outer`` or ``ignore``.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
async def hatch_add_boundary(self, handle: str, edges: list[dict]) -> dict:
|
|
"""Add one boundary path built from typed edges.
|
|
|
|
Returns ``{ok, handle, path_count, edge_types}``. Edges are
|
|
``{"type": "line"|"arc"|"ellipse", ...}``. Typed edges exist because a
|
|
boundary API that only accepts vertex lists silently straightens every
|
|
curve it is given.
|
|
"""
|
|
...
|
|
|
|
# ── annotation objects (M8 / F15) ────────────────────────────────────────
|
|
|
|
@capability( # noqa: B027 — @capability supplies the body
|
|
"wipeout",
|
|
reason=(
|
|
"ActiveX has no wipeout constructor — ModelSpace.AddWipeout does not exist "
|
|
"(verified against AutoCAD 2026); WIPEOUT is a command only. Use the headless "
|
|
"backend (AUTOCAD_MCP_BACKEND=ezdxf), or run WIPEOUT in AutoCAD directly."
|
|
),
|
|
)
|
|
async def entity_create_wipeout(
|
|
self, points: list[list[float]], layer: str | None = None
|
|
) -> dict:
|
|
"""Mask the drawing behind a closed polygon. Returns ``{ok, handle, points}``.
|
|
|
|
Refuses fewer than three points: a zero-area mask masks nothing while
|
|
reporting success.
|
|
"""
|
|
...
|
|
|
|
@capability( # noqa: B027 — @capability supplies the body
|
|
"revcloud",
|
|
reason=(
|
|
"ActiveX exposes no revision-cloud member and driving the REVCLOUD command "
|
|
"blind against a live drawing is unverified. Use the headless backend "
|
|
"(AUTOCAD_MCP_BACKEND=ezdxf), or run REVCLOUD in AutoCAD directly."
|
|
),
|
|
)
|
|
async def entity_create_revcloud(
|
|
self,
|
|
points: list[list[float]],
|
|
segment_length: float,
|
|
layer: str | None = None,
|
|
closed: bool = True,
|
|
) -> dict:
|
|
"""Draw a revision cloud along a path. Returns ``{ok, handle, segments}``.
|
|
|
|
A revision cloud *is* a polyline whose every segment carries an arc
|
|
bulge; a segment length longer than the path yields no arcs at all, so
|
|
that case is refused rather than returned as a rectangle.
|
|
"""
|
|
...
|