fix: resolve CAD paths from task workdir
Some checks failed
ci / test (macos-latest, 3.10) (push) Has been cancelled
ci / test (macos-latest, 3.12) (push) Has been cancelled
ci / test (ubuntu-latest, 3.10) (push) Has been cancelled
ci / test (ubuntu-latest, 3.12) (push) Has been cancelled
ci / test (windows-latest, 3.10) (push) Has been cancelled
ci / test (windows-latest, 3.12) (push) Has been cancelled
ci / browser-smoke (push) Has been cancelled
Some checks failed
ci / test (macos-latest, 3.10) (push) Has been cancelled
ci / test (macos-latest, 3.12) (push) Has been cancelled
ci / test (ubuntu-latest, 3.10) (push) Has been cancelled
ci / test (ubuntu-latest, 3.12) (push) Has been cancelled
ci / test (windows-latest, 3.10) (push) Has been cancelled
ci / test (windows-latest, 3.12) (push) Has been cancelled
ci / browser-smoke (push) Has been cancelled
This commit is contained in:
@@ -470,16 +470,24 @@ def doctor() -> int:
|
|||||||
|
|
||||||
|
|
||||||
def inspect_command(args: argparse.Namespace) -> int:
|
def inspect_command(args: argparse.Namespace) -> int:
|
||||||
|
# Internal pipeline scripts run from ROOT so their bundled assets and
|
||||||
|
# schemas have a stable base. User-provided paths, however, are relative
|
||||||
|
# to the directory where cad_showcase.py was invoked (the Task workdir),
|
||||||
|
# not to this repository. Resolve them before crossing that cwd boundary.
|
||||||
|
input_dir = Path(args.input).resolve()
|
||||||
|
work_dir = Path(args.work).resolve()
|
||||||
|
output_dir = Path(args.output).resolve()
|
||||||
|
vendor_dir = Path(args.vendor_dir).resolve()
|
||||||
command = python_script(
|
command = python_script(
|
||||||
"cad_dxf_report.py",
|
"cad_dxf_report.py",
|
||||||
"--input",
|
"--input",
|
||||||
args.input,
|
str(input_dir),
|
||||||
"--work",
|
"--work",
|
||||||
args.work,
|
str(work_dir),
|
||||||
"--output",
|
"--output",
|
||||||
args.output,
|
str(output_dir),
|
||||||
"--vendor-dir",
|
"--vendor-dir",
|
||||||
args.vendor_dir,
|
str(vendor_dir),
|
||||||
"--converter",
|
"--converter",
|
||||||
args.converter,
|
args.converter,
|
||||||
)
|
)
|
||||||
@@ -529,6 +537,7 @@ def run_pipeline(args: argparse.Namespace) -> int:
|
|||||||
source_report = Path(args.source_report).resolve()
|
source_report = Path(args.source_report).resolve()
|
||||||
scope_manifest = Path(args.scope_manifest).resolve()
|
scope_manifest = Path(args.scope_manifest).resolve()
|
||||||
frame_inputs = tuple(Path(path).resolve() for path in args.frames)
|
frame_inputs = tuple(Path(path).resolve() for path in args.frames)
|
||||||
|
vendor_dir = Path(args.vendor_dir).resolve()
|
||||||
try:
|
try:
|
||||||
waivers = parse_waivers(args.waiver)
|
waivers = parse_waivers(args.waiver)
|
||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
@@ -600,7 +609,7 @@ def run_pipeline(args: argparse.Namespace) -> int:
|
|||||||
"--out",
|
"--out",
|
||||||
str(spec),
|
str(spec),
|
||||||
"--vendor-dir",
|
"--vendor-dir",
|
||||||
args.vendor_dir,
|
str(vendor_dir),
|
||||||
),
|
),
|
||||||
[spec],
|
[spec],
|
||||||
forbidden_stderr=DERIVE_FORBIDDEN_WARNINGS,
|
forbidden_stderr=DERIVE_FORBIDDEN_WARNINGS,
|
||||||
@@ -616,10 +625,10 @@ def run_pipeline(args: argparse.Namespace) -> int:
|
|||||||
"--out",
|
"--out",
|
||||||
str(audit),
|
str(audit),
|
||||||
"--vendor-dir",
|
"--vendor-dir",
|
||||||
args.vendor_dir,
|
str(vendor_dir),
|
||||||
)
|
)
|
||||||
if args.frames:
|
if frame_inputs:
|
||||||
audit_cmd.extend(["--frames", *args.frames])
|
audit_cmd.extend(["--frames", *[str(path) for path in frame_inputs]])
|
||||||
pipeline.run("audit", audit_cmd, [audit, audit_md])
|
pipeline.run("audit", audit_cmd, [audit, audit_md])
|
||||||
audit_report = json.loads(audit.read_text(encoding="utf-8"))
|
audit_report = json.loads(audit.read_text(encoding="utf-8"))
|
||||||
invalid_waivers = preflight_waiver_targets(args, report, audit_report, scope_manifest, waivers)
|
invalid_waivers = preflight_waiver_targets(args, report, audit_report, scope_manifest, waivers)
|
||||||
@@ -645,7 +654,7 @@ def run_pipeline(args: argparse.Namespace) -> int:
|
|||||||
"--out-dir",
|
"--out-dir",
|
||||||
str(overlays),
|
str(overlays),
|
||||||
"--vendor-dir",
|
"--vendor-dir",
|
||||||
args.vendor_dir,
|
str(vendor_dir),
|
||||||
),
|
),
|
||||||
[overlays],
|
[overlays],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -501,6 +501,37 @@ def test_report_empty_input_is_a_hard_failure(tmp_path: Path) -> None:
|
|||||||
assert "all_sources_converted_and_readable" in proc.stderr
|
assert "all_sources_converted_and_readable" in proc.stderr
|
||||||
|
|
||||||
|
|
||||||
|
def test_inspect_resolves_relative_paths_from_invocation_directory(tmp_path: Path) -> None:
|
||||||
|
source_dir = tmp_path / "in" / "cad"
|
||||||
|
source_dir.mkdir(parents=True)
|
||||||
|
doc = ezdxf.new("R2010")
|
||||||
|
doc.modelspace().add_line((0, 0), (1000, 0), dxfattribs={"layer": "WALL"})
|
||||||
|
doc.saveas(source_dir / "plan.dxf")
|
||||||
|
|
||||||
|
proc = subprocess.run(
|
||||||
|
[
|
||||||
|
sys.executable,
|
||||||
|
str(ROOT / "scripts" / "cad_showcase.py"),
|
||||||
|
"inspect",
|
||||||
|
"--input",
|
||||||
|
"in/cad",
|
||||||
|
"--work",
|
||||||
|
"out/work",
|
||||||
|
"--output",
|
||||||
|
"out/report",
|
||||||
|
"--no-convert",
|
||||||
|
],
|
||||||
|
cwd=tmp_path,
|
||||||
|
text=True,
|
||||||
|
capture_output=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
assert proc.returncode == 0, proc.stderr
|
||||||
|
report = json.loads((tmp_path / "out" / "report" / "cad_read_report.json").read_text(encoding="utf-8"))
|
||||||
|
assert report["gate"]["status"] == "PASS"
|
||||||
|
assert (tmp_path / "out" / "work" / "dxf_sanitized" / "plan.dxf").is_file()
|
||||||
|
|
||||||
|
|
||||||
def test_partial_report_requires_and_records_a_reason(tmp_path: Path) -> None:
|
def test_partial_report_requires_and_records_a_reason(tmp_path: Path) -> None:
|
||||||
proc = subprocess.run(
|
proc = subprocess.run(
|
||||||
[
|
[
|
||||||
|
|||||||
Reference in New Issue
Block a user