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>
165 lines
6.5 KiB
Python
165 lines
6.5 KiB
Python
"""Measurement and analysis.
|
|
|
|
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 AnalysisContract(ABC):
|
|
# ── boundary tracing (M8 / F3) ───────────────────────────────────────────
|
|
|
|
@capability( # noqa: B027 — @capability supplies the body
|
|
"boundary_trace",
|
|
reason=(
|
|
"ActiveX exposes no BOUNDARY member; the live path would have to drive the "
|
|
"-BOUNDARY command blind, which has not been verified against a live AutoCAD. "
|
|
"Use the headless backend (AUTOCAD_MCP_BACKEND=ezdxf), or run BOUNDARY in "
|
|
"AutoCAD directly."
|
|
),
|
|
)
|
|
async def boundary_trace(
|
|
self, x: float, y: float, layer: str | None = None, tolerance: float = 1e-9
|
|
) -> dict:
|
|
"""AutoCAD's BOUNDARY/BPOLY: trace the closed loop enclosing a seed point.
|
|
|
|
Returns ``{ok, handle, vertices, area, closed, source_handles}``.
|
|
``vertices`` is a count, ``area`` is unsigned.
|
|
|
|
Implementations must not enumerate every loop in the drawing:
|
|
``edgeminer.find_all_loops`` is O(n!) and was measured at 63.9 s for 40
|
|
edges and a timeout at 60. The seed point picks a starting edge and one
|
|
loop is walked from it.
|
|
|
|
A seed with no enclosing loop is refused. Returning an empty boundary
|
|
would be a boundary that bounds nothing, reported as success.
|
|
"""
|
|
...
|
|
|
|
@capability( # noqa: B027 — @capability supplies the body
|
|
"boundary_trace",
|
|
reason=(
|
|
"Chaining arbitrary entities into a loop needs the same edge graph BOUNDARY "
|
|
"does, which ActiveX does not expose. Use the headless backend "
|
|
"(AUTOCAD_MCP_BACKEND=ezdxf)."
|
|
),
|
|
)
|
|
async def boundary_from_entities(self, handles: list[str], tolerance: float = 1e-9) -> dict:
|
|
"""Chain the given entities into one closed polyline.
|
|
|
|
Returns ``{ok, handle, vertices, area, closed}``. Refuses a chain that
|
|
does not close, naming the coordinates of the endpoint that dangles —
|
|
"these do not form a loop" is not actionable without the gap.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
async def analysis_list_properties(self, handle: str) -> dict:
|
|
"""AutoCAD's LIST: the full DXF attribute set for one handle.
|
|
|
|
Returns ``{ok, handle, type, layer, properties, dxf_attributes}``.
|
|
``properties`` mirrors what ``entity_get`` reports; ``dxf_attributes``
|
|
is the raw attribute set that ``entity_get`` deliberately does not
|
|
carry.
|
|
|
|
Two things the raw dump cannot be handed over as-is. It holds ``Vec3``
|
|
values, so it is not JSON-serialisable and would die at the wire
|
|
boundary; and its coordinates are stored in the entity's own frame, so
|
|
for anything with an extrusion they would contradict every other
|
|
coordinate this server reports. Both are converted here, and
|
|
``extrusion`` stays in the dump so the original frame is still visible.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
async def analysis_stats(self) -> dict: ...
|
|
|
|
@abstractmethod
|
|
async def analysis_entities_in_region(
|
|
self,
|
|
x1: float,
|
|
y1: float,
|
|
x2: float,
|
|
y2: float,
|
|
) -> list[EntityInfo]: ...
|
|
|
|
@abstractmethod
|
|
async def analysis_measure_distance(
|
|
self,
|
|
x1: float,
|
|
y1: float,
|
|
x2: float,
|
|
y2: float,
|
|
) -> float: ...
|
|
|
|
@abstractmethod
|
|
async def analysis_measure_area(self, points: list[list[float]]) -> float: ...
|
|
|
|
@abstractmethod
|
|
async def entity_measure(self, handle: str, flatten_tolerance: float = 0.001) -> dict:
|
|
"""Area and perimeter of ONE existing entity, addressed by handle.
|
|
|
|
Returns ``{"handle", "type", "area", "perimeter", "closed",
|
|
"assumed_closed", "method", "exact", "flatten_tolerance", "backend",
|
|
"self_intersecting", "perimeter_exact", "loop_count"}``.
|
|
|
|
A HATCH is measured as the area it *fills* — outer loops minus the
|
|
islands inside them — and the headless engine adds ``hatch_style``
|
|
(``normal``/``outer``/``ignore``) so the number can be read against the
|
|
drawing's own island setting. The live backend does not carry that key:
|
|
it asks AutoCAD for ``.Area``, which has already applied the style, so
|
|
there is no house rule left to disclose.
|
|
|
|
``exact`` and
|
|
``flatten_tolerance`` are the accuracy disclosure: when one engine can
|
|
answer in closed form and the other has to flatten, the payload says so
|
|
rather than leaving two numbers to quietly disagree.
|
|
|
|
Two different refusals, and the difference matters. A type that bounds no
|
|
area at all (LINE, TEXT, a 3D polyline) raises a plain ``RuntimeError``:
|
|
no engine can measure it, so tagging a capability would falsely suggest
|
|
switching backends helps. A type this *engine* cannot evaluate (ACIS
|
|
solids headlessly) raises ``UnsupportedCapabilityError``, which names the
|
|
engine that can.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
async def analysis_bounding_box(self) -> dict: ...
|
|
|
|
@abstractmethod
|
|
async def analysis_select_by_layer(self, layer_name: str) -> list[EntityInfo]: ...
|
|
|
|
@abstractmethod
|
|
async def analysis_select_by_type(self, entity_type: str) -> list[EntityInfo]: ...
|
|
|
|
@abstractmethod
|
|
async def selection_get(self) -> dict:
|
|
"""Read the live viewport's implied ("pickfirst") selection set.
|
|
|
|
COM-only / meaningful only with live AutoCAD. Returns a dict::
|
|
|
|
{
|
|
"ok": bool, # True on COM even for an empty pick
|
|
"count": int,
|
|
"handles": list[str], # entity handles to act on
|
|
"entities": list[EntityInfo], # _dc()-converted by the server
|
|
"pickfirst": bool | None, # state of the PICKFIRST sysvar
|
|
"message" / "error": str, # optional guidance / failure reason
|
|
}
|
|
|
|
The ezdxf headless backend has no viewport, so it returns ``ok=False``
|
|
with an empty ``handles`` list (same shape, never raises).
|
|
"""
|
|
...
|