Files
autocad-mcp-pro/backends/contracts/entity_query.py
T
Umut CANandClaude Opus 5 b03a7615b1 release: v1.5.0 — discovery layer, honesty debt closed, Wave A
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>
2026-08-06 09:45:20 +03:00

159 lines
5.4 KiB
Python

"""Reading entities back.
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
if TYPE_CHECKING:
from backends.base import EntityInfo
class EntityQueryContract(ABC):
# ── selection filters (M8 / F1) ──────────────────────────────────────────
@abstractmethod
async def selection_window(
self,
x1: float,
y1: float,
x2: float,
y2: float,
mode: str = "window",
entity_type: str = "",
layer: str = "",
) -> dict:
"""AutoCAD's ssget window/crossing. ``{ok, handles, count, mode}``.
``window`` returns only entities wholly inside the box; ``crossing``
also returns the ones that straddle its edge. Getting those backwards
is silent and wrong, so ``mode`` is reported back and defaults to the
narrower one. A zero-area box is refused rather than answered with an
empty list, which would read as "nothing there".
Selection is by *drawn* position: an entity in a mirrored frame is
found where ``entity_get`` reports it, not where the file stores it.
"""
...
@abstractmethod
async def selection_polygon(
self,
points: list[list[float]],
mode: str = "window",
entity_type: str = "",
layer: str = "",
) -> dict:
"""Window/crossing selection against an arbitrary polygon.
A polygon is not its bounding box — the difference is the whole point
of the tool, so the implementation must test against the shape itself.
"""
...
@abstractmethod
async def selection_filter(
self,
entity_type: str = "",
layer: str = "",
color: int | None = None,
linetype: str = "",
min_area: float | None = None,
) -> dict:
"""Property filter. Returns ``{ok, handles, count, filtered_by}``.
Named parameters rather than a query string, deliberately: ezdxf's
query language answers an unknown attribute with an empty result, so a
typo is indistinguishable from "no matches". Here a typo is a
``TypeError`` at the boundary, and ``filtered_by`` tells the caller
which filters actually ran — "I filtered by layer and found none" and
"I never filtered by layer" are different answers.
"""
...
@abstractmethod
async def entity_get(self, handle: str) -> EntityInfo: ...
@abstractmethod
async def entity_set_properties(
self,
handle: str,
layer: str | None = None,
color: int | None = None,
linetype: str | None = None,
lineweight: float | None = None,
visible: bool | None = None,
) -> dict: ...
@abstractmethod
async def entity_edit_text(
self,
handle: str,
text: str | None = None,
height: float | None = None,
rotation: float | None = None,
) -> EntityInfo:
"""Edit an existing TEXT or MTEXT entity in place. Any argument left
None is unchanged. Returns the updated EntityInfo. Raises if the handle
is not a TEXT/MTEXT entity."""
...
@abstractmethod
async def entity_edit_geometry(
self,
handle: str,
cx: float | None = None,
cy: float | None = None,
radius: float | None = None,
x1: float | None = None,
y1: float | None = None,
x2: float | None = None,
y2: float | None = None,
start_angle: float | None = None,
end_angle: float | None = None,
) -> EntityInfo:
"""Edit the defining geometry of an existing entity in place.
- CIRCLE: cx / cy / radius
- LINE: x1 / y1 (start), x2 / y2 (end)
- ARC: cx / cy / radius / start_angle / end_angle (degrees)
Any argument left None is unchanged. Raises for unsupported types."""
...
@abstractmethod
async def entity_list(
self,
type_filter: str | None = None,
layer_filter: str | None = None,
limit: int = 200,
offset: int = 0,
) -> list[EntityInfo]: ...
@abstractmethod
async def entity_count(
self,
type_filter: str | None = None,
layer_filter: str | None = None,
) -> int:
"""How many entities ``entity_list`` would match, ignoring limit/offset.
Exists so a *paged* listing can report an honest total without paying
for the rows it is not going to return. ``entity_list`` stops building
``EntityInfo`` objects the moment it has ``limit`` of them, so it can
never tell a caller whether anything followed the page — and a
truncated list read as complete is a correctness bug, not a token one.
Two obligations, both load-bearing:
* apply **exactly** the filter semantics of ``entity_list`` (same
case-insensitive type/layer comparison), or ``truncated`` would be
computed against a different set than the one that was paged;
* do not build ``EntityInfo`` rows. A count implemented by listing
would cost more than the listing it is meant to make cheap.
"""
...