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>
140 lines
4.7 KiB
Python
140 lines
4.7 KiB
Python
"""Friendly facade over system variables.
|
|
|
|
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 typing import Any
|
|
|
|
|
|
class SettingsContract:
|
|
# A user-facing wrapper over system_get_variable / system_set_variable that
|
|
# maps memorable names ("units", "dimscale", …) to AutoCAD system variables.
|
|
# Concrete + backend-agnostic: both engines accept the bare sysvar name, so
|
|
# the same call reads/writes on live COM and headless ezdxf alike.
|
|
|
|
async def drawing_settings(self, settings: dict | None = None) -> dict:
|
|
"""Read (no args) or apply (with args) common drawing settings.
|
|
|
|
With ``settings=None`` returns a snapshot of every known setting. With a
|
|
dict, applies each provided key and returns ``{applied, errors, current}``.
|
|
Friendly keys: units, linear_precision, angular_precision, ltscale,
|
|
dimscale, text_size, point_mode, point_size, osmode, fillet_radius.
|
|
`units` accepts mm/cm/m/inch/feet (mapped to the INSUNITS code)."""
|
|
if not settings:
|
|
snapshot: dict = {}
|
|
for key, (var, kind) in _SETTING_MAP.items():
|
|
try:
|
|
raw = await self.system_get_variable(var)
|
|
except Exception as exc:
|
|
snapshot[key] = {"error": str(exc)}
|
|
continue
|
|
snapshot[key] = _decode_setting(key, kind, raw)
|
|
return {"ok": True, "settings": snapshot}
|
|
|
|
applied: dict = {}
|
|
errors: dict = {}
|
|
for key, value in settings.items():
|
|
spec = _SETTING_MAP.get(key)
|
|
if spec is None:
|
|
errors[key] = f"unknown setting (valid: {sorted(_SETTING_MAP)})"
|
|
continue
|
|
var, kind = spec
|
|
try:
|
|
encoded = _encode_setting(key, kind, value)
|
|
await self.system_set_variable(var, encoded)
|
|
applied[key] = value
|
|
except Exception as exc:
|
|
errors[key] = str(exc)
|
|
|
|
result = {"ok": not errors, "applied": applied}
|
|
if errors:
|
|
result["errors"] = errors
|
|
return result
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Friendly setting name -> (AutoCAD system variable, value kind).
|
|
_SETTING_MAP: dict[str, tuple[str, str]] = {
|
|
"units": ("INSUNITS", "units"),
|
|
"linear_precision": ("LUPREC", "int"),
|
|
"angular_precision": ("AUPREC", "int"),
|
|
"ltscale": ("LTSCALE", "float"),
|
|
"dimscale": ("DIMSCALE", "float"),
|
|
"text_size": ("TEXTSIZE", "float"),
|
|
"point_mode": ("PDMODE", "int"),
|
|
"point_size": ("PDSIZE", "float"),
|
|
"osmode": ("OSMODE", "int"),
|
|
"fillet_radius": ("FILLETRAD", "float"),
|
|
}
|
|
|
|
# INSUNITS code table (AutoCAD $INSUNITS): friendly name <-> integer code.
|
|
_UNIT_TO_CODE: dict[str, int] = {
|
|
"unitless": 0,
|
|
"inch": 1,
|
|
"inches": 1,
|
|
"in": 1,
|
|
"feet": 2,
|
|
"ft": 2,
|
|
"foot": 2,
|
|
"mm": 4,
|
|
"millimeter": 4,
|
|
"millimeters": 4,
|
|
"cm": 5,
|
|
"centimeter": 5,
|
|
"centimeters": 5,
|
|
"m": 6,
|
|
"meter": 6,
|
|
"meters": 6,
|
|
}
|
|
_CODE_TO_UNIT: dict[int, str] = {0: "unitless", 1: "inch", 2: "feet", 4: "mm", 5: "cm", 6: "m"}
|
|
|
|
|
|
def _encode_setting(key: str, kind: str, value: Any) -> Any:
|
|
"""Coerce a friendly value into the raw system-variable value."""
|
|
if kind == "units":
|
|
if isinstance(value, (int, float)) and not isinstance(value, bool):
|
|
return int(value)
|
|
code = _UNIT_TO_CODE.get(str(value).strip().lower())
|
|
if code is None:
|
|
raise ValueError(
|
|
f"units: unknown value {value!r}. Use one of "
|
|
f"{sorted(set(_UNIT_TO_CODE))} or an INSUNITS integer."
|
|
)
|
|
return code
|
|
if kind == "int":
|
|
return int(float(value))
|
|
if kind == "float":
|
|
return float(value)
|
|
return value
|
|
|
|
|
|
def _decode_setting(key: str, kind: str, raw: Any) -> Any:
|
|
"""Present a raw system-variable value in friendly form."""
|
|
if raw is None:
|
|
return None
|
|
if kind == "units":
|
|
try:
|
|
code = int(raw)
|
|
except (TypeError, ValueError):
|
|
return raw
|
|
return {"code": code, "name": _CODE_TO_UNIT.get(code, "unknown")}
|
|
if kind == "int":
|
|
try:
|
|
return int(raw)
|
|
except (TypeError, ValueError):
|
|
return raw
|
|
if kind == "float":
|
|
try:
|
|
return float(raw)
|
|
except (TypeError, ValueError):
|
|
return raw
|
|
return raw
|