"CLI-Anything: Making ALL Software Agent-Native" -- CLI-Hub: https://clianything.cc/
Python
fix: normalize unreal insights export paths
aimidi8b88204f57ca
diff --git a/unrealinsights/agent-harness/cli_anything/unrealinsights/core/export.py b/unrealinsights/agent-harness/cli_anything/unrealinsights/core/export.pyindex c587ab5dc..92fd5979a 100644--- a/unrealinsights/agent-harness/cli_anything/unrealinsights/core/export.py+++ b/unrealinsights/agent-harness/cli_anything/unrealinsights/core/export.py@@ -6,7 +6,9 @@ from __future__ import annotationsimport ctypesimport os+import reimport shlex+import tempfilefrom pathlib import Pathfrom cli_anything.unrealinsights.utils import unrealinsights_backend as backend@@ -59,6 +61,32 @@ def _legacy_filename_arg(output_path: str) -> str:return str(Path(short_parent) / path.name)+def _modern_filename_arg(output_path: str) -> str:+ """Build a filename token compatible with modern UnrealInsights builds."""+ path = Path(output_path).expanduser().resolve()+ path_str = str(path)+ if os.name != "nt":+ return _quote(path_str)+ if " " not in path_str:+ return path_str++ short_path = _windows_short_path(path)+ if short_path:+ return short_path++ raise RuntimeError(+ "UnrealInsights export requires a path without spaces or a resolvable short path on Windows: "+ f"{path}"+ )+++def _filename_arg(output_path: str, insights_version: str | None = None) -> str:+ output_abs = str(Path(output_path).expanduser().resolve())+ if _is_legacy_unrealinsights(insights_version):+ return _legacy_filename_arg(output_abs)+ return _modern_filename_arg(output_abs)++def build_export_exec_command(exporter: str,output_path: str,@@ -77,10 +105,7 @@ def build_export_exec_command(raise RuntimeError(f"Unsupported exporter: {exporter}")output_abs = str(Path(output_path).expanduser().resolve())- if _is_legacy_unrealinsights(insights_version):- filename_token = _legacy_filename_arg(output_abs)- else:- filename_token = _quote(output_abs)+ filename_token = _filename_arg(output_abs, insights_version=insights_version)parts = [EXPORTER_COMMANDS[exporter], filename_token]@@ -107,6 +132,25 @@ def build_rsp_exec_command(rsp_path: str) -> str:return f"@={Path(rsp_path).expanduser().resolve()}"+def _normalize_rsp_line(line: str, insights_version: str | None = None) -> tuple[str, str | None]:+ stripped = line.strip()+ if not stripped or stripped.startswith("#"):+ return line, None++ match = re.match(r'^(?P<indent>\s*)(?P<command>\S+)\s+(?P<output>"[^"]*"|\S+)(?P<rest>.*)$', line)+ if not match:+ return line, None++ command = match.group("command")+ if command not in EXPORTER_COMMANDS.values():+ return line, None++ output_path = match.group("output").strip('"')+ normalized_output = _filename_arg(output_path, insights_version=insights_version)+ normalized_line = f"{match.group('indent')}{command} {normalized_output}{match.group('rest')}"+ return normalized_line, str(Path(output_path).expanduser().resolve())++def _path_contains_placeholders(path: Path) -> bool:return "{counter}" in path.name or "{region}" in path.name@@ -245,15 +289,40 @@ def execute_response_file(trace_path: str,rsp_path: str,*,+ insights_version: str | None = None,log_path: str | None = None,) -> dict[str, object]:"""Execute a response file batch export."""rsp_abs = str(Path(rsp_path).expanduser().resolve())resolved_log_path = log_path or default_log_path(rsp_abs)- return _execute_insights(- insights_exe,- trace_path,- exec_command=build_rsp_exec_command(rsp_abs),- expected_outputs=expected_outputs_from_rsp(rsp_abs),- log_path=resolved_log_path,- )+ lines = Path(rsp_abs).read_text(encoding="utf-8", errors="replace").splitlines()++ normalized_lines: list[str] = []+ expected_outputs: list[str] = []+ for line in lines:+ normalized_line, normalized_output = _normalize_rsp_line(line, insights_version=insights_version)+ normalized_lines.append(normalized_line)+ if normalized_output:+ expected_outputs.append(normalized_output)++ if not expected_outputs:+ expected_outputs = expected_outputs_from_rsp(rsp_abs)++ temp_rsp_path = None+ try:+ with tempfile.NamedTemporaryFile("w", suffix=".rsp", delete=False, encoding="utf-8", newline="\n") as handle:+ temp_rsp_path = handle.name+ handle.write("\n".join(normalized_lines))+ return _execute_insights(+ insights_exe,+ trace_path,+ exec_command=build_rsp_exec_command(temp_rsp_path),+ expected_outputs=expected_outputs,+ log_path=resolved_log_path,+ )+ finally:+ if temp_rsp_path:+ try:+ Path(temp_rsp_path).unlink()+ except OSError:+ passdiff --git a/unrealinsights/agent-harness/cli_anything/unrealinsights/tests/test_core.py b/unrealinsights/agent-harness/cli_anything/unrealinsights/tests/test_core.pyindex f10a3aea7..7501854c2 100644--- a/unrealinsights/agent-harness/cli_anything/unrealinsights/tests/test_core.py+++ b/unrealinsights/agent-harness/cli_anything/unrealinsights/tests/test_core.py@@ -5,6 +5,7 @@ Unit tests for Unreal Insights harness modules.from __future__ import annotationsimport json+import osfrom pathlib import Pathfrom unittest.mock import patch@@ -373,6 +374,19 @@ class TestExportCore:command = build_rsp_exec_command(str(tmp_path / "exports.rsp"))assert command.startswith("@=")+ @pytest.mark.skipif(os.name != "nt", reason="Windows quoting behavior")+ def test_normalize_rsp_line_modern_windows_avoids_nested_quotes(self, tmp_path):+ from cli_anything.unrealinsights.core.export import _normalize_rsp_line++ line, output = _normalize_rsp_line(+ f'TimingInsights.ExportThreads "{tmp_path / "threads.csv"}"',+ insights_version="5.5.4",+ )+ resolved = str((tmp_path / "threads.csv").resolve())+ assert f'"{resolved}"' not in line+ assert resolved in line+ assert output == resolved+def test_build_export_exec_command_legacy_53_unquoted_filename(self, tmp_path):from cli_anything.unrealinsights.core.export import build_export_exec_command@@ -384,6 +398,19 @@ class TestExportCore:assert '"{}"'.format(str((tmp_path / "threads.csv").resolve())) not in commandassert str((tmp_path / "threads.csv").resolve()) in command+ @pytest.mark.skipif(os.name != "nt", reason="Windows quoting behavior")+ def test_build_export_exec_command_modern_windows_avoids_nested_quotes(self, tmp_path):+ from cli_anything.unrealinsights.core.export import build_export_exec_command++ command = build_export_exec_command(+ "threads",+ str(tmp_path / "threads.csv"),+ insights_version="5.5.4",+ )+ resolved = str((tmp_path / "threads.csv").resolve())+ assert f'"{resolved}"' not in command+ assert resolved in command+def test_expected_outputs_from_rsp(self, tmp_path):from cli_anything.unrealinsights.core.export import expected_outputs_from_rspdiff --git a/unrealinsights/agent-harness/cli_anything/unrealinsights/unrealinsights_cli.py b/unrealinsights/agent-harness/cli_anything/unrealinsights/unrealinsights_cli.pyindex c5e7d415e..909b446d7 100644--- a/unrealinsights/agent-harness/cli_anything/unrealinsights/unrealinsights_cli.py+++ b/unrealinsights/agent-harness/cli_anything/unrealinsights/unrealinsights_cli.py@@ -645,7 +645,12 @@ def batch_run_rsp(ctx, rsp_path):try:trace_path = _require_trace(ctx)insights = _resolve_insights(ctx)- data = execute_response_file(insights["path"], trace_path, rsp_path)+ data = execute_response_file(+ insights["path"],+ trace_path,+ rsp_path,+ insights_version=insights.get("version"),+ )_output(ctx, data, _human_export_result)except Exception as exc:_handle_exc(ctx, exc)