Umut CANandClaude Opus 5
b03a7615b1
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>
143 lines
5.1 KiB
Python
143 lines
5.1 KiB
Python
"""M5 — drawing into the layout you selected.
|
|
|
|
`layout_set_current("A3-Sheet")` answered `{"ok": true, "current": "A3-Sheet"}`
|
|
and then every entity created afterwards went into **model space** anyway,
|
|
because `_msp()` returned `doc.modelspace()` unconditionally on both engines.
|
|
The tool reported a state change that changed nothing about where geometry
|
|
landed — proven: a line drawn straight after selecting the layout was in
|
|
modelspace and not in the layout.
|
|
|
|
That is also why the title block could not go on a sheet: it draws through the
|
|
same `entity_create_*` calls, so `apply_iso_a3_titleblock` could only ever
|
|
produce a border around model-space geometry.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
pytestmark = pytest.mark.asyncio
|
|
|
|
SHEET = "A3-Sheet"
|
|
|
|
|
|
async def _handles_in(backend, layout_name: str) -> set[str]:
|
|
doc = backend._doc
|
|
space = doc.modelspace() if layout_name == "Model" else doc.layouts.get(layout_name)
|
|
return {e.dxf.handle for e in space}
|
|
|
|
|
|
# ── the current space is where geometry goes ────────────────────────────────
|
|
|
|
|
|
async def test_entities_land_in_the_layout_that_was_selected(backend):
|
|
await backend.layout_create(SHEET)
|
|
await backend.layout_set_current(SHEET)
|
|
|
|
line = await backend.entity_create_line(0, 0, 100, 0)
|
|
|
|
assert line.handle in await _handles_in(backend, SHEET)
|
|
assert line.handle not in await _handles_in(backend, "Model")
|
|
|
|
|
|
async def test_switching_back_to_model_puts_geometry_back_in_model_space(backend):
|
|
await backend.layout_create(SHEET)
|
|
await backend.layout_set_current(SHEET)
|
|
on_sheet = await backend.entity_create_circle(10, 10, 5)
|
|
await backend.layout_set_current("Model")
|
|
|
|
in_model = await backend.entity_create_circle(20, 20, 5)
|
|
|
|
assert on_sheet.handle in await _handles_in(backend, SHEET)
|
|
assert in_model.handle in await _handles_in(backend, "Model")
|
|
|
|
|
|
async def test_a_new_drawing_starts_in_model_space(backend):
|
|
await backend.layout_create(SHEET)
|
|
await backend.layout_set_current(SHEET)
|
|
await backend.drawing_new()
|
|
|
|
line = await backend.entity_create_line(0, 0, 10, 0)
|
|
assert line.handle in await _handles_in(backend, "Model")
|
|
|
|
|
|
async def test_selecting_a_missing_layout_does_not_move_the_current_space(backend):
|
|
"""A refused switch must leave the caller where they were, not in limbo."""
|
|
result = await backend.layout_set_current("NOSUCH")
|
|
assert result["ok"] is False
|
|
|
|
line = await backend.entity_create_line(0, 0, 10, 0)
|
|
assert line.handle in await _handles_in(backend, "Model")
|
|
|
|
|
|
async def test_entity_get_finds_an_entity_drawn_on_a_layout(backend):
|
|
"""Lookups must follow the geometry, or the handle becomes unusable."""
|
|
await backend.layout_create(SHEET)
|
|
await backend.layout_set_current(SHEET)
|
|
line = await backend.entity_create_line(0, 0, 100, 0)
|
|
|
|
info = await backend.entity_get(line.handle)
|
|
assert info.handle == line.handle
|
|
assert info.type == "LINE"
|
|
|
|
|
|
# ── the title block, on a sheet ─────────────────────────────────────────────
|
|
|
|
|
|
async def test_titleblock_can_be_drawn_on_a_paper_space_layout(backend):
|
|
from engineering import TitleBlockMetadata, apply_iso_a3_titleblock
|
|
|
|
await backend.layout_create(SHEET)
|
|
before_model = await _handles_in(backend, "Model")
|
|
|
|
result = await apply_iso_a3_titleblock(
|
|
backend,
|
|
metadata=TitleBlockMetadata(title="BRACKET", drawing_no="D-001"),
|
|
layout=SHEET,
|
|
)
|
|
|
|
assert result["ok"] is True
|
|
assert result["layout"] == SHEET
|
|
on_sheet = await _handles_in(backend, SHEET)
|
|
assert len(on_sheet) > 5, "border, inner frame and the block's text all belong here"
|
|
assert await _handles_in(backend, "Model") == before_model, "model space untouched"
|
|
|
|
|
|
async def test_titleblock_restores_the_space_the_caller_was_in(backend):
|
|
from engineering import TitleBlockMetadata, apply_iso_a3_titleblock
|
|
|
|
await backend.layout_create(SHEET)
|
|
await apply_iso_a3_titleblock(
|
|
backend,
|
|
metadata=TitleBlockMetadata(title="X", drawing_no="1"),
|
|
layout=SHEET,
|
|
)
|
|
|
|
line = await backend.entity_create_line(0, 0, 10, 0)
|
|
assert line.handle in await _handles_in(backend, "Model"), (
|
|
"drawing a sheet border must not silently move the caller onto the sheet"
|
|
)
|
|
|
|
|
|
async def test_titleblock_without_a_layout_still_draws_in_model_space(backend):
|
|
"""The pre-1.5.0 behaviour stays the default."""
|
|
from engineering import TitleBlockMetadata, apply_iso_a3_titleblock
|
|
|
|
result = await apply_iso_a3_titleblock(
|
|
backend, metadata=TitleBlockMetadata(title="X", drawing_no="1")
|
|
)
|
|
assert result["ok"] is True
|
|
assert result["layout"] == "Model"
|
|
assert len(await _handles_in(backend, "Model")) > 5
|
|
|
|
|
|
async def test_titleblock_on_a_missing_layout_refuses(backend):
|
|
from engineering import TitleBlockMetadata, apply_iso_a3_titleblock
|
|
|
|
with pytest.raises(Exception, match="NOSUCH"):
|
|
await apply_iso_a3_titleblock(
|
|
backend,
|
|
metadata=TitleBlockMetadata(title="X", drawing_no="1"),
|
|
layout="NOSUCH",
|
|
)
|