fix: isolate scene asset revisions
This commit is contained in:
parent
3c79cfffa7
commit
d3747e71f5
@ -127,6 +127,11 @@ def add_asset_revision(
|
||||
run.check(f"{name} 在 MotrixSim 中具有真实自由关节", int((runtime.get("motrixsim") or {}).get("nq") or 0) >= 7, runtime)
|
||||
revision_id = str(result.get("scene_id") or "")
|
||||
run.check(f"{name} 生成独立场景版本", bool(revision_id) and revision_id != scene_id, result)
|
||||
run.check(
|
||||
f"{name} 使用修订包内独立运行时文件",
|
||||
"/scene_asset_compose/" in str(result.get("scene_path") or ""),
|
||||
result.get("scene_path"),
|
||||
)
|
||||
manifest = run.client.get(f"/api/scenes/{revision_id}/manifest")
|
||||
added = [item for item in manifest.get("assets", []) if item.get("role") == "added_asset"]
|
||||
run.check(f"{name} 已写入场景清单", any(item.get("name") == name for item in added), added)
|
||||
@ -232,6 +237,12 @@ def run_acceptance(args: argparse.Namespace) -> int:
|
||||
if item.get("role") == "added_asset"
|
||||
}
|
||||
run.check("连续场景修订保留全部数字资产", {"动态抓取方块", "静态放置目标"}.issubset(added_names), sorted(added_names))
|
||||
parent_after = run.client.get(f"/api/scenes/{imported['scene_id']}/manifest")
|
||||
parent_added = [item.get("name") for item in parent_after.get("assets", []) if item.get("role") == "added_asset"]
|
||||
first_after = run.client.get(f"/api/scenes/{cube['scene_id']}/manifest")
|
||||
first_added = [item.get("name") for item in first_after.get("assets", []) if item.get("role") == "added_asset"]
|
||||
run.check("父场景未被资产修订污染", not parent_added, parent_added)
|
||||
run.check("第一版修订只包含首个新增资产", first_added == ["动态抓取方块"], first_added)
|
||||
run.report["browser"]["target_scene_id"] = marker["scene_id"]
|
||||
run.report["browser"]["viewer_url"] = f"/static/scene-viewer.html?scene_id={marker['scene_id']}"
|
||||
return finalize(run)
|
||||
|
||||
@ -814,7 +814,8 @@ def run_scene_asset_compose(config: PlatformConfig, store: PlatformStore, task:
|
||||
run_dir = Path(task["run_dir"])
|
||||
revision_dir = run_dir / "scene_revision"
|
||||
_task_progress(store, task, 18, "创建场景版本", "正在复制父场景并保留原版本不变")
|
||||
_copy_tree_hardlink(source_package, revision_dir)
|
||||
_copy_tree_isolated(source_package, revision_dir)
|
||||
_rebase_package_metadata(revision_dir, source_package)
|
||||
source_path = _resolve_asset_source(config, store, params.get("source") or {}, params.get("path"))
|
||||
asset_spec = {
|
||||
"name": params.get("name"),
|
||||
@ -2987,15 +2988,28 @@ def _find_scene_json(package_dir: Path) -> Path | None:
|
||||
return matches[0] if matches else None
|
||||
|
||||
|
||||
def _copy_tree_hardlink(source: Path, target: Path) -> None:
|
||||
def link_or_copy(src: str, dst: str) -> str:
|
||||
try:
|
||||
os.link(src, dst)
|
||||
return dst
|
||||
except OSError:
|
||||
return shutil.copy2(src, dst)
|
||||
def _copy_tree_isolated(source: Path, target: Path) -> None:
|
||||
shutil.copytree(source, target, copy_function=shutil.copy2)
|
||||
|
||||
shutil.copytree(source, target, copy_function=link_or_copy)
|
||||
|
||||
def _rebase_package_metadata(package_dir: Path, source_package: Path) -> None:
|
||||
old_root = str(source_package.resolve())
|
||||
new_root = str(package_dir.resolve())
|
||||
|
||||
def rebase(value: Any) -> Any:
|
||||
if isinstance(value, dict):
|
||||
return {key: rebase(item) for key, item in value.items()}
|
||||
if isinstance(value, list):
|
||||
return [rebase(item) for item in value]
|
||||
if isinstance(value, str) and (value == old_root or value.startswith(old_root + os.sep)):
|
||||
return new_root + value[len(old_root) :]
|
||||
return value
|
||||
|
||||
for metadata_path in (package_dir / "scene_manifest.json", package_dir / "motrix_import.json"):
|
||||
if not metadata_path.is_file():
|
||||
continue
|
||||
payload = json.loads(metadata_path.read_text(encoding="utf-8"))
|
||||
metadata_path.write_text(json.dumps(rebase(payload), ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||
|
||||
|
||||
def _resolve_asset_source(config: PlatformConfig, store: PlatformStore, source: dict[str, Any], legacy_path: Any) -> Path | None:
|
||||
|
||||
@ -574,14 +574,17 @@ def _primitive_geom(primitive: str, dimensions: list[float]) -> dict[str, str]:
|
||||
|
||||
|
||||
def _runtime_scene_from_manifest(package_dir: Path, manifest: dict[str, Any]) -> Path:
|
||||
motrix = (manifest.get("simulator_artifacts") or {}).get("motrixsim") or {}
|
||||
candidate = Path(str(motrix.get("runtime_scene") or ""))
|
||||
if candidate.is_file():
|
||||
return candidate
|
||||
for relative in ("simulator_assets/scene.xml", "scene.xml", "scene_mujoco.xml"):
|
||||
path = package_dir / relative
|
||||
if path.is_file():
|
||||
return path
|
||||
motrix = (manifest.get("simulator_artifacts") or {}).get("motrixsim") or {}
|
||||
candidate = Path(str(motrix.get("runtime_scene") or ""))
|
||||
package_root = package_dir.resolve()
|
||||
if candidate.is_file():
|
||||
resolved = candidate.resolve()
|
||||
if resolved == package_root or package_root in resolved.parents:
|
||||
return resolved
|
||||
return package_dir / "simulator_assets" / "scene.xml"
|
||||
|
||||
|
||||
|
||||
@ -12,7 +12,13 @@ import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from real2sim_platform.config import PlatformConfig
|
||||
from real2sim_platform.adapters import _act_task_config_source, _inspect_act_dataset, index_artifacts_for_task
|
||||
from real2sim_platform.adapters import (
|
||||
_act_task_config_source,
|
||||
_copy_tree_isolated,
|
||||
_inspect_act_dataset,
|
||||
_rebase_package_metadata,
|
||||
index_artifacts_for_task,
|
||||
)
|
||||
from real2sim_platform.motrix_scene import (
|
||||
compose_scene_asset,
|
||||
convert_asset_to_obj,
|
||||
@ -167,6 +173,39 @@ def test_primitive_asset_scale_is_applied_to_runtime_geometry(
|
||||
assert [float(value) for value in geom.attrib["size"].split()] == pytest.approx([1.0, 3.0, 6.0])
|
||||
|
||||
|
||||
def test_scene_revision_copy_is_isolated_and_rebases_package_paths(tmp_path: Path) -> None:
|
||||
source = tmp_path / "source-package"
|
||||
runtime = source / "simulator_assets" / "scene.xml"
|
||||
viewer = source / "viewer" / "environment.glb"
|
||||
runtime.parent.mkdir(parents=True)
|
||||
viewer.parent.mkdir(parents=True)
|
||||
runtime.write_text("<mujoco><worldbody/></mujoco>\n", encoding="utf-8")
|
||||
viewer.write_bytes(b"real-viewer-asset")
|
||||
manifest = {
|
||||
"assets": [{"path": str(viewer)}],
|
||||
"simulator_artifacts": {"motrixsim": {"runtime_scene": str(runtime)}},
|
||||
}
|
||||
(source / "scene_manifest.json").write_text(json.dumps(manifest), encoding="utf-8")
|
||||
(source / "motrix_import.json").write_text(
|
||||
json.dumps({"runtime_scene": str(runtime), "layers": {"visual": str(viewer)}}),
|
||||
encoding="utf-8",
|
||||
)
|
||||
source_runtime_before = runtime.read_bytes()
|
||||
source_manifest_before = (source / "scene_manifest.json").read_bytes()
|
||||
|
||||
revision = tmp_path / "revision-package"
|
||||
_copy_tree_isolated(source, revision)
|
||||
_rebase_package_metadata(revision, source)
|
||||
revision_manifest = json.loads((revision / "scene_manifest.json").read_text(encoding="utf-8"))
|
||||
assert revision_manifest["assets"][0]["path"] == str(revision / "viewer" / "environment.glb")
|
||||
assert revision_manifest["simulator_artifacts"]["motrixsim"]["runtime_scene"] == str(revision / "simulator_assets" / "scene.xml")
|
||||
|
||||
(revision / "simulator_assets" / "scene.xml").write_text("<mujoco model='revision'/>\n", encoding="utf-8")
|
||||
(revision / "scene_manifest.json").write_text("{}\n", encoding="utf-8")
|
||||
assert runtime.read_bytes() == source_runtime_before
|
||||
assert (source / "scene_manifest.json").read_bytes() == source_manifest_before
|
||||
|
||||
|
||||
def test_ascii_3dgs_spz_exporter_uses_real_spark_writer(tmp_path: Path) -> None:
|
||||
config = PlatformConfig(app_root=ROOT, workspace_dir=tmp_path / "workspace")
|
||||
probe = _spz_exporter_probe(config)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user