diff --git a/src/real2sim_platform/adapters.py b/src/real2sim_platform/adapters.py index 0d782b3..51bc8ca 100644 --- a/src/real2sim_platform/adapters.py +++ b/src/real2sim_platform/adapters.py @@ -17,7 +17,7 @@ from urllib.parse import quote, unquote, urlparse from urllib.request import urlopen from .config import PlatformConfig, is_path_allowed -from .motrix_scene import COMPOSITION_ASSET_RECIPES, build_scene_composition, build_spatial_scene_package, compose_scene_asset +from .motrix_scene import COMPOSITION_ASSET_RECIPES, build_scene_composition, build_spatial_scene_package, compose_scene_asset, revise_scene_asset, validate_runtime_scene from .source_revision import read_source_revision from .storage import ALLOWED_AREAS, BosStorage, normalize_relative_path from .store import PlatformStore @@ -194,6 +194,12 @@ def execute_task(config: PlatformConfig, store: PlatformStore, task: dict[str, A return run_motrixsim_scene_import(config, store, task, emit) if task_type == "scene_asset_compose": return run_scene_asset_compose(config, store, task, emit) + if task_type == "scene_asset_update": + return run_scene_asset_revision(config, store, task, emit, delete=False) + if task_type == "scene_asset_delete": + return run_scene_asset_revision(config, store, task, emit, delete=True) + if task_type == "scene_clone": + return run_scene_clone(config, store, task, emit) if task_type == "scene_composition": return run_scene_composition(config, store, task, emit) if task_type == "simulator_validation": @@ -883,6 +889,123 @@ def run_scene_asset_compose(config: PlatformConfig, store: PlatformStore, task: } +def run_scene_asset_revision(config: PlatformConfig, store: PlatformStore, task: dict[str, Any], emit: Callable[[str], None], *, delete: bool) -> dict[str, Any]: + params = task["params"] + parent = store.get_scene(str(params["scene_id"])) + source_package = Path(str((parent.get("metadata") or {}).get("package") or "")) + if not source_package.is_dir(): + scene_path = Path(parent["path"]) + source_package = scene_path if scene_path.is_dir() else scene_path.parent + if not (source_package / "scene_manifest.json").is_file(): + raise ValueError("selected scene is not an editable MotrixSim scene package") + asset_id = str(params.get("asset_id") or "").strip() + if not asset_id: + raise ValueError("scene asset revision requires asset_id") + + run_dir = Path(task["run_dir"]) + revision_dir = run_dir / "scene_revision" + _task_progress(store, task, 18, "创建场景版本", "正在复制父场景,原版本保持不变") + _copy_tree_isolated(source_package, revision_dir) + _rebase_package_metadata(revision_dir, source_package) + operation = "asset_deleted" if delete else "asset_updated" + _task_progress(store, task, 42, "更新场景资产", "正在修改资产位置、物理属性或从场景中移除资产") + revised = revise_scene_asset( + revision_dir, + asset_id=asset_id, + asset_spec=params.get("asset_spec") or {}, + delete=delete, + validation_steps=int(params.get("validation_steps", 60)), + emit=emit, + ) + _task_progress(store, task, 82, "登记场景修订", "真实运行时校验通过,正在登记新场景版本") + artifacts = _index_artifacts(store, task["id"], revision_dir) + manifest_path = Path(revised["manifest_path"]) + manifest = json.loads(manifest_path.read_text(encoding="utf-8")) + revision_id = uuid.uuid4().hex + manifest["revision"] = {"id": revision_id, "parent_scene_id": parent["id"], "reason": operation, "task_id": task["id"]} + _attach_artifact_urls(manifest, artifacts) + manifest_path.write_text(json.dumps(enrich_scene_manifest_assets(manifest), ensure_ascii=False, indent=2) + "\n", encoding="utf-8") + validation = revised["validation"] + metadata = dict(parent.get("metadata") or {}) + metadata.update({ + "package": str(revision_dir), + "parent_scene_id": parent["id"], + "revision_reason": operation, + "runtime_validation": {"mujoco": bool(validation["mujoco"]["ok"]), "motrixsim": bool(validation["motrixsim"]["ok"])}, + "editable": True, + }) + asset_name = str((revised.get("asset") or {}).get("name") or asset_id) + scene = store.create_scene( + item_id=revision_id, + name=str(params.get("revision_name") or f"{parent['name']} · {'移除' if delete else '调整'} {asset_name}"), + path=Path(revised["runtime_scene"]), + metadata=metadata, + source_type="scene_revision", + source_uri=parent.get("storage_uri") or parent.get("source_uri") or parent["path"], + version=_next_scene_revision(str(parent.get("version") or "v1")), + parent_task_id=task["id"], + manifest_path=manifest_path, + metrics={**(parent.get("metrics") or {}), "added_asset_count": len([item for item in manifest.get("assets", []) if item.get("role") == "added_asset"])}, + tags=list(dict.fromkeys([*(parent.get("tags") or []), "scene-revision", "asset-edited", "runtime-validated"])), + cache_state="local", + ) + _task_progress(store, task, 94, "新版本可用", "资产修订已保存为新版本,可继续编辑、仿真和采集") + return {"scene_id": scene["id"], "parent_scene_id": parent["id"], "scene_path": scene["path"], "manifest_path": str(manifest_path), "asset": revised["asset"], "runtime_validation": validation, "operation": operation} + + +def run_scene_clone(config: PlatformConfig, store: PlatformStore, task: dict[str, Any], emit: Callable[[str], None]) -> dict[str, Any]: + params = task["params"] + parent = store.get_scene(str(params["scene_id"])) + source_package = Path(str((parent.get("metadata") or {}).get("package") or "")) + if not source_package.is_dir(): + scene_path = Path(parent["path"]) + source_package = scene_path if scene_path.is_dir() else scene_path.parent + if not (source_package / "scene_manifest.json").is_file(): + raise ValueError("selected scene is not an editable MotrixSim scene package") + run_dir = Path(task["run_dir"]) + clone_dir = run_dir / "scene_clone" + _task_progress(store, task, 20, "复制场景版本", "正在创建独立场景包,父场景不会被覆盖") + _copy_tree_isolated(source_package, clone_dir) + _rebase_package_metadata(clone_dir, source_package) + manifest_path = clone_dir / "scene_manifest.json" + manifest = json.loads(manifest_path.read_text(encoding="utf-8")) + runtime_scene = Path(str((manifest.get("simulator_artifacts") or {}).get("motrixsim", {}).get("runtime_scene") or clone_dir / "simulator_assets" / "scene.xml")) + if not runtime_scene.is_file(): + runtime_scene = clone_dir / "simulator_assets" / "scene.xml" + _task_progress(store, task, 52, "校验复制版本", "正在用 MuJoCo 和 MotrixSim 真实加载复制后的场景") + validation = validate_runtime_scene(runtime_scene, steps=int(params.get("validation_steps", 60))) + report_path = clone_dir / "reports" / "scene_clone_validation.json" + report_path.parent.mkdir(parents=True, exist_ok=True) + report_path.write_text(json.dumps(validation, ensure_ascii=False, indent=2) + "\n", encoding="utf-8") + if not validation["ok"]: + failed = [name for name in ("mujoco", "motrixsim") if not validation[name]["ok"]] + raise RuntimeError("Cloned scene failed runtime validation: " + "; ".join(f"{name}: {validation[name].get('error', 'unknown error')}" for name in failed)) + artifacts = _index_artifacts(store, task["id"], clone_dir) + revision_id = uuid.uuid4().hex + manifest["revision"] = {"id": revision_id, "parent_scene_id": parent["id"], "reason": "scene_cloned", "task_id": task["id"]} + manifest["updated_at"] = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()) + _attach_artifact_urls(manifest, artifacts) + manifest_path.write_text(json.dumps(enrich_scene_manifest_assets(manifest), ensure_ascii=False, indent=2) + "\n", encoding="utf-8") + metadata = dict(parent.get("metadata") or {}) + metadata.update({"package": str(clone_dir), "parent_scene_id": parent["id"], "revision_reason": "scene_cloned", "runtime_validation": {"mujoco": True, "motrixsim": True}, "editable": True}) + scene = store.create_scene( + item_id=revision_id, + name=str(params.get("name") or f"{parent['name']} · 新版本"), + path=runtime_scene, + metadata=metadata, + source_type="scene_revision", + source_uri=parent.get("storage_uri") or parent.get("source_uri") or parent["path"], + version=_next_scene_revision(str(parent.get("version") or "v1")), + parent_task_id=task["id"], + manifest_path=manifest_path, + metrics=dict(parent.get("metrics") or {}), + tags=list(dict.fromkeys([*(parent.get("tags") or []), "scene-revision", "scene-clone", "runtime-validated"])), + cache_state="local", + ) + _task_progress(store, task, 94, "新场景已加入场景库", "复制版本已可预览、编辑资产并用于后续仿真流程") + return {"scene_id": scene["id"], "parent_scene_id": parent["id"], "scene_path": scene["path"], "manifest_path": str(manifest_path), "runtime_validation": validation, "operation": "scene_cloned"} + + def run_scene_composition(config: PlatformConfig, store: PlatformStore, task: dict[str, Any], emit: Callable[[str], None]) -> dict[str, Any]: params = task["params"] parent = store.get_scene(str(params["scene_id"])) diff --git a/src/real2sim_platform/motrix_scene.py b/src/real2sim_platform/motrix_scene.py index b590e51..7b2e88e 100644 --- a/src/real2sim_platform/motrix_scene.py +++ b/src/real2sim_platform/motrix_scene.py @@ -414,6 +414,132 @@ def compose_scene_asset( } +def revise_scene_asset( + package_dir: Path, + *, + asset_id: str, + asset_spec: dict[str, Any] | None = None, + delete: bool = False, + validation_steps: int, + emit: Callable[[str], None] | None = None, +) -> dict[str, Any]: + """Edit one scene-instance asset in a copied package and validate the revision. + + Asset instances are identified by their runtime MJCF body name. Only assets + explicitly added to a scene are mutable; robot and reconstructed environment + entries remain protected so a user cannot accidentally invalidate the base + scene through the asset editor. + """ + emit = emit or (lambda _message: None) + manifest_path = package_dir / "scene_manifest.json" + manifest = _read_json(manifest_path) + runtime_scene = _runtime_scene_from_manifest(package_dir, manifest) + if not runtime_scene.is_file(): + raise FileNotFoundError(f"MotrixSim runtime scene not found: {runtime_scene}") + + assets = manifest.get("assets") or [] + target_index = next( + ( + index + for index, item in enumerate(assets) + if isinstance(item, dict) + and str((item.get("runtime") or {}).get("body") or "") == str(asset_id) + ), + None, + ) + if target_index is None: + raise ValueError(f"scene asset not found: {asset_id}") + target = assets[target_index] + if str(target.get("role") or "") != "added_asset": + raise ValueError("只有场景中添加的数字资产可以编辑或删除,机器人和重建环境受保护") + + tree = ET.parse(runtime_scene) + root = tree.getroot() + worldbody = root.find("worldbody") + if worldbody is None: + raise ValueError("scene runtime file is missing ") + body = next((node for node in worldbody.iter("body") if str(node.get("name") or "") == str(asset_id)), None) + if body is None: + raise ValueError(f"scene runtime body not found: {asset_id}") + + if delete: + emit(f"Removing asset {target.get('name') or asset_id} from the scene revision") + parent = next((node for node in worldbody.iter() if body in list(node)), None) + if parent is None: + raise ValueError(f"scene asset body is not removable: {asset_id}") + parent.remove(body) + mesh_names = { + str(geom.get("mesh") or "") + for geom in body.iter("geom") + if str(geom.get("mesh") or "") + } + asset_node = root.find("asset") + if asset_node is not None: + for mesh in list(asset_node.findall("mesh")): + if str(mesh.get("name") or "") in mesh_names or str(mesh.get("name") or "").startswith(f"{asset_id}_"): + asset_node.remove(mesh) + manifest["assets"] = [item for index, item in enumerate(assets) if index != target_index] + changed_asset = {"id": asset_id, "name": target.get("name"), "deleted": True} + operation = "deleted" + else: + spec = asset_spec or {} + transform = normalize_transform(spec.get("transform") or target.get("transform") or {}) + physics = normalize_physics(spec.get("physics") or target.get("physics") or {}) + name = str(spec.get("name") or target.get("name") or asset_id).strip() + compiler = root.find("compiler") + compiler_angle = str(compiler.attrib.get("angle", "degree") if compiler is not None else "degree").lower() + euler = transform["rotation_euler_degrees"] + if compiler_angle.startswith("rad"): + euler = [math.radians(value) for value in euler] + body.set("pos", _numbers(transform["translation"])) + body.set("euler", _numbers(euler)) + freejoint = body.find("freejoint") + if physics["dynamic"] and freejoint is None: + ET.SubElement(body, "freejoint", {"name": f"{asset_id}_joint"}) + elif not physics["dynamic"] and freejoint is not None: + body.remove(freejoint) + for geom in body.iter("geom"): + geom.set("friction", _numbers(physics["friction"])) + geom.set("contype", "0" if physics["collision_mode"] == "visual_only" else "1") + geom.set("conaffinity", "0" if physics["collision_mode"] == "visual_only" else "1") + geom.set("group", "2" if physics["collision_mode"] == "visual_only" else "3") + geom.set("rgba", _numbers(physics["rgba"])) + if physics["dynamic"]: + geom.set("mass", f"{physics['mass']:.9g}") + else: + geom.attrib.pop("mass", None) + primitive = str(geom.get("type") or "") + if primitive in SUPPORTED_PRIMITIVES: + geom.attrib.update(_primitive_geom(primitive, [dimension * scale for dimension, scale in zip(physics["dimensions"], transform["scale"], strict=True)])) + target.update({"name": name, "transform": transform, "physics": physics, "updated_at": _utc_now()}) + changed_asset = {"id": asset_id, "name": name, "deleted": False, "transform": transform, "physics": physics} + operation = "updated" + + _indent_xml(root) + tree.write(runtime_scene, encoding="utf-8", xml_declaration=True) + emit("Validating the revised scene with MuJoCo and MotrixSim") + validation = validate_runtime_scene(runtime_scene, steps=validation_steps) + validation_path = package_dir / "reports" / f"asset_{_safe_name(asset_id)}_{operation}_validation.json" + _write_json(validation_path, validation) + if not validation["ok"]: + failed = [name for name in ("mujoco", "motrixsim") if not validation[name]["ok"]] + raise RuntimeError("Scene asset revision failed runtime validation: " + "; ".join(f"{name}: {validation[name].get('error', 'unknown error')}" for name in failed)) + + manifest["updated_at"] = _utc_now() + manifest["asset_editing"] = {**(manifest.get("asset_editing") or {}), "enabled": True, "revisioned": True, "last_operation": operation, "last_asset_id": asset_id} + manifest.setdefault("simulator_artifacts", {}).setdefault("motrixsim", {})["validated"] = validation["motrixsim"]["ok"] + manifest.setdefault("simulator_artifacts", {}).setdefault("mujoco", {})["validated"] = validation["mujoco"]["ok"] + _write_json(manifest_path, manifest) + return { + "manifest_path": str(manifest_path), + "runtime_scene": str(runtime_scene), + "validation_path": str(validation_path), + "validation": validation, + "asset": changed_asset, + "operation": operation, + } + + def composition_asset_catalog() -> list[dict[str, Any]]: return [deepcopy(COMPOSITION_ASSET_RECIPES[key]) for key in sorted(COMPOSITION_ASSET_RECIPES)] diff --git a/src/real2sim_platform/server.py b/src/real2sim_platform/server.py index 8880c27..cded683 100644 --- a/src/real2sim_platform/server.py +++ b/src/real2sim_platform/server.py @@ -58,6 +58,11 @@ class SceneAssetRequest(BaseModel): revision_name: str | None = None +class SceneCloneRequest(BaseModel): + name: str | None = None + validation_steps: int = 60 + + class SceneCompositionRobotRequest(BaseModel): robot_id: str transform: dict[str, Any] = Field(default_factory=dict) @@ -678,6 +683,44 @@ def create_app(config: PlatformConfig | None = None) -> FastAPI: "message": "数字资产合成任务已创建;通过 MotrixSim 与 MuJoCo 校验后会生成新场景版本", } + @app.patch("/api/scenes/{scene_id}/assets/{asset_id}") + def update_scene_asset(scene_id: str, asset_id: str, payload: SceneAssetRequest) -> dict[str, Any]: + try: + store.get_scene(scene_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="scene not found") from exc + params = { + "scene_id": scene_id, + "asset_id": asset_id, + "asset_spec": { + "name": payload.name, + "transform": payload.transform, + "physics": payload.physics, + }, + "validation_steps": payload.validation_steps, + "revision_name": payload.revision_name, + } + task = _queue_task("scene_asset_update", params) + return {"ok": True, "scene_id": scene_id, "asset_id": asset_id, "task": _with_task_view_model(task), "message": "资产位置和属性修订任务已创建;校验通过后会生成新场景版本"} + + @app.delete("/api/scenes/{scene_id}/assets/{asset_id}") + def delete_scene_asset(scene_id: str, asset_id: str) -> dict[str, Any]: + try: + store.get_scene(scene_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="scene not found") from exc + task = _queue_task("scene_asset_delete", {"scene_id": scene_id, "asset_id": asset_id, "validation_steps": 60}) + return {"ok": True, "scene_id": scene_id, "asset_id": asset_id, "task": _with_task_view_model(task), "message": "资产删除任务已创建;原场景保留,新版本校验通过后进入场景库"} + + @app.post("/api/scenes/{scene_id}/clone") + def clone_scene(scene_id: str, payload: SceneCloneRequest) -> dict[str, Any]: + try: + store.get_scene(scene_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="scene not found") from exc + task = _queue_task("scene_clone", {"scene_id": scene_id, "name": payload.name, "validation_steps": payload.validation_steps}) + return {"ok": True, "scene_id": scene_id, "task": _with_task_view_model(task), "message": "场景复制任务已创建;完成后会进入场景库并可继续编辑"} + @app.post("/api/scenes/{scene_id}/compose") def compose_scene(scene_id: str, payload: SceneCompositionRequest) -> dict[str, Any]: try: @@ -747,7 +790,7 @@ def create_app(config: PlatformConfig | None = None) -> FastAPI: payload = CreateTaskRequest(type=task_type, params=params) _validate_task_payload(payload, cfg) _validate_task_resources(store, payload) - if payload.type not in {"scene_reconstruction", "reconstruction_preflight", "media_prepare", "expert_collection", "training", "inference", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize", "hf_import", "bos_import", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "scene_composition", "simulator_validation"}: + if payload.type not in {"scene_reconstruction", "reconstruction_preflight", "media_prepare", "expert_collection", "training", "inference", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize", "hf_import", "bos_import", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "scene_asset_update", "scene_asset_delete", "scene_clone", "scene_composition", "simulator_validation"}: raise ValueError(f"unknown task type: {payload.type}") run_dir = cfg.runs_dir / payload.type / _next_run_name(cfg.runs_dir / payload.type, payload.type) return store.create_task(task_type=payload.type, params=payload.params, run_dir=run_dir) @@ -1238,6 +1281,9 @@ def _task_type_label(task_type: str) -> str: "motrixsim_asset_import": "MotrixSim 资产导入", "motrixsim_scene_import": "MotrixSim 场景包导入", "scene_asset_compose": "数字资产合成", + "scene_asset_update": "资产位置与属性编辑", + "scene_asset_delete": "资产删除", + "scene_clone": "场景复制", "scene_composition": "场景组合", "simulator_validation": "仿真校验", "expert_collection": "专家采集", @@ -1286,6 +1332,22 @@ def _validate_task_payload(payload: CreateTaskRequest, cfg: PlatformConfig) -> N raise HTTPException(status_code=400, detail="asset file not found") if not is_path_allowed(path, cfg): raise HTTPException(status_code=403, detail="asset path is outside configured import roots") + if payload.type in {"scene_asset_update", "scene_asset_delete"}: + if not params.get("scene_id") or not params.get("asset_id"): + raise HTTPException(status_code=400, detail=f"{payload.type} requires scene_id and asset_id") + if not 1 <= int(params.get("validation_steps", 60)) <= 5000: + raise HTTPException(status_code=400, detail="validation_steps must be between 1 and 5000") + if payload.type == "scene_asset_update": + spec = params.get("asset_spec") or {} + if spec.get("transform") is not None and not isinstance(spec.get("transform"), dict): + raise HTTPException(status_code=400, detail="asset_spec.transform must be an object") + if spec.get("physics") is not None and not isinstance(spec.get("physics"), dict): + raise HTTPException(status_code=400, detail="asset_spec.physics must be an object") + if payload.type == "scene_clone": + if not params.get("scene_id"): + raise HTTPException(status_code=400, detail="scene_clone requires scene_id") + if not 1 <= int(params.get("validation_steps", 60)) <= 5000: + raise HTTPException(status_code=400, detail="validation_steps must be between 1 and 5000") if payload.type == "scene_composition": if not params.get("scene_id"): raise HTTPException(status_code=400, detail="scene_composition requires scene_id") @@ -1397,6 +1459,18 @@ def _validate_task_resources(store: PlatformStore, payload: CreateTaskRequest) - raise HTTPException(status_code=400, detail="资产路径越出所选数据集") if not candidate.is_file() or candidate.suffix.lower() not in SUPPORTED_MESH_SUFFIXES: raise HTTPException(status_code=400, detail="所选数据集文件不是可导入 MotrixSim 的网格资产") + if payload.type in {"scene_asset_update", "scene_asset_delete", "scene_clone"}: + scene = store.get_scene(str(params["scene_id"])) + package = Path(str((scene.get("metadata") or {}).get("package") or "")) + if not package.is_dir() or not (package / "scene_manifest.json").is_file(): + raise HTTPException(status_code=400, detail="所选场景不是可编辑的 MotrixSim 场景包") + if payload.type in {"scene_asset_update", "scene_asset_delete"}: + manifest = _entity_manifest(scene, fallback_kind="scene") + target = next((item for item in manifest.get("assets", []) if isinstance(item, dict) and str((item.get("runtime") or {}).get("body") or "") == str(params["asset_id"])), None) + if target is None: + raise HTTPException(status_code=404, detail="scene asset not found") + if target.get("role") != "added_asset": + raise HTTPException(status_code=400, detail="机器人和重建环境资产受保护,只能编辑场景中添加的数字资产") if payload.type == "scene_composition": scene = store.get_scene(str(params["scene_id"])) package = Path(str((scene.get("metadata") or {}).get("package") or "")) diff --git a/src/real2sim_platform/static/app.js b/src/real2sim_platform/static/app.js index a9851b4..30bd0e7 100644 --- a/src/real2sim_platform/static/app.js +++ b/src/real2sim_platform/static/app.js @@ -1,4 +1,4 @@ -const STATIC_VERSION = "20260713-scene-composition-performance-v6"; +const STATIC_VERSION = "20260713-scene-library-assets-v7"; const state = { datasets: [], @@ -10,6 +10,7 @@ const state = { currentImport: "hf", editing: null, assetLibrary: [], + currentSceneManifest: null, digitalAssets: [], robots: [], refreshTimer: null, @@ -46,7 +47,7 @@ const $ = (id) => document.getElementById(id); const taskScopes = { dataTaskList: ["hf_import", "media_prepare"], - sceneTaskList: ["scene_reconstruction", "reconstruction_preflight", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "simulator_validation", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize"], + sceneTaskList: ["scene_reconstruction", "reconstruction_preflight", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "scene_asset_update", "scene_asset_delete", "scene_clone", "simulator_validation", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize"], compositionTaskList: ["scene_composition", "simulator_validation"], collectTaskList: ["expert_collection"], trainTaskList: ["training"], @@ -219,6 +220,7 @@ function updateActionAvailability() { setActionAvailability("createTrainTask", writable && collectionDatasets().length > 0 && Boolean($("trainRecipe")?.value), "请先完成真实专家采集并确认 ACT 运行时"); setActionAvailability("createInferTask", writable && state.models.length > 0 && state.scenes.length > 0, state.models.length ? "请先完成场景重建" : "请先训练模型"); setActionAvailability("addSceneAsset", writable && state.scenes.length > 0, "请先完成场景重建"); + setActionAvailability("createSceneLibrary", writable && (state.scenes.length > 0 || preparedDatasets().length > 0), "请先导入或准备数据"); setActionAvailability("saveSceneComposition", writable && Boolean(state.composition.baseSceneId && state.composition.robotId), "请先选择基础场景和机器人"); } @@ -248,12 +250,15 @@ function renderSelectors() { fillSelect("inferModel", state.models, "暂无模型,请先训练"); fillSelect("assetScene", state.scenes, "暂无场景,请先重建"); fillSelect("composeBaseScene", baseCompositionScenes(), "暂无可编辑场景,请先导入或重建"); + fillSelect("sceneCloneSource", state.scenes, "暂无可复制场景"); + fillSelect("sceneCreateDataset", preparedDatasets(), "暂无已准备帧数据"); if ($("composeBaseScene") && state.composition.baseSceneId) $("composeBaseScene").value = state.composition.baseSceneId; const assetScene = $("assetScene"); if (assetScene && state.activeSceneId && state.scenes.some((scene) => scene.id === state.activeSceneId)) { assetScene.value = state.activeSceneId; } fillAssetPreset(); + updateSceneCreateMode(); } function fillSelect(id, items, emptyText) { @@ -990,12 +995,32 @@ function renderSceneViewerShell() { async function renderSceneAssets(sceneId) { const manifest = await api(`/api/scenes/${sceneId}/manifest`); - const assets = Array.isArray(manifest.assets) ? prioritizeAssets(manifest.assets).slice(0, 18) : []; - state.assetLibrary = Array.isArray(manifest.assets) ? prioritizeAssets(manifest.assets).filter((asset) => asset.path) : []; + state.currentSceneManifest = manifest; + const allAssets = Array.isArray(manifest.assets) ? manifest.assets : []; + const assets = prioritizeAssets(allAssets).slice(0, 18); + state.assetLibrary = prioritizeAssets(allAssets).filter((asset) => asset.path); fillAssetPreset(); + renderSceneAssetInstances(allAssets, sceneId); setHtml("assetRail", assets.map(assetCard).join("") || emptyState("该场景清单里还没有可展示产物。")); } +function renderSceneAssetInstances(assets, sceneId) { + const editable = assets.filter((asset) => asset && asset.role === "added_asset" && asset.runtime?.body); + setHtml("sceneAssetInstances", editable.map((asset) => { + const transform = asset.transform || {}; + const position = Array.isArray(transform.translation) ? transform.translation.map((value) => Number(value).toFixed(2)).join(" / ") : "未设置"; + const rotation = Array.isArray(transform.rotation_euler_degrees) ? transform.rotation_euler_degrees.map((value) => Number(value).toFixed(0)).join(" / ") : "0 / 0 / 0"; + const physics = asset.physics || {}; + return `
+
物
+
${escapeHtml(asset.name || asset.runtime.body)}${escapeHtml(asset.kind || asset.format || "数字资产")} · ${escapeHtml(asset.runtime.body)}
+
位置 ${escapeHtml(position)} · 旋转 ${escapeHtml(rotation)}
+
${physics.dynamic ? "可运动" : "静态"} · ${physics.collision_mode === "visual_only" ? "仅可见" : "参与碰撞"}
+
+
`; + }).join("") || emptyState("当前场景还没有添加的数字资产。请点击“添加新资产”或从资产库选择后保存。")); +} + function fillAssetPreset() { const select = $("assetPreset"); if (!select) return; @@ -1463,9 +1488,104 @@ function openAssetEditor(sceneId) { switchTab("scenes"); renderSceneList(); renderSceneViewerShell(); + resetAssetEditor(); scrollIntoViewIfPossible(".asset-editor-panel"); } +function resetAssetEditor() { + const instance = $("assetInstanceId"); + if (instance) instance.value = ""; + const button = $("addSceneAsset"); + if (button) button.textContent = "保存为新版本"; + const fields = { + assetName: "", + assetMass: "0.25", + assetSizeX: "0.10", + assetSizeY: "0.10", + assetSizeZ: "0.10", + assetScaleX: "1", + assetScaleY: "1", + assetScaleZ: "1", + assetPosX: "0", + assetPosY: "0", + assetPosZ: "0", + assetRotX: "0", + assetRotY: "0", + assetRotZ: "0", + }; + for (const [id, value] of Object.entries(fields)) if ($(id)) $(id).value = value; + if ($("assetDynamic")) $("assetDynamic").checked = false; + if ($("assetCollisionMode")) $("assetCollisionMode").value = "visual_and_collision"; + if ($("assetPreset") && state.digitalAssets.length) $("assetPreset").value = state.digitalAssets[0].id; + updateDigitalAssetHint(); +} + +function openAssetInstanceEditor(sceneId, assetId) { + const asset = (state.currentSceneManifest?.assets || []).find((item) => item?.runtime?.body === assetId); + if (!asset) return toast("资产清单已更新,请重新选择场景。"); + state.activeSceneId = sceneId; + if ($("assetScene")) $("assetScene").value = sceneId; + if ($("assetInstanceId")) $("assetInstanceId").value = assetId; + if ($("assetName")) $("assetName").value = asset.name || ""; + const transform = asset.transform || {}; + const translation = transform.translation || [0, 0, 0]; + const rotation = transform.rotation_euler_degrees || [0, 0, 0]; + const scale = transform.scale || [1, 1, 1]; + [["assetPosX", translation[0]], ["assetPosY", translation[1]], ["assetPosZ", translation[2]], ["assetRotX", rotation[0]], ["assetRotY", rotation[1]], ["assetRotZ", rotation[2]], ["assetScaleX", scale[0]], ["assetScaleY", scale[1]], ["assetScaleZ", scale[2]]].forEach(([id, value]) => { if ($(id)) $(id).value = value; }); + const physics = asset.physics || {}; + if ($("assetDynamic")) $("assetDynamic").checked = Boolean(physics.dynamic); + if ($("assetMass")) $("assetMass").value = physics.mass ?? 0.25; + if ($("assetCollisionMode")) $("assetCollisionMode").value = physics.collision_mode || "visual_and_collision"; + const dimensions = physics.dimensions || [0.1, 0.1, 0.1]; + [["assetSizeX", dimensions[0]], ["assetSizeY", dimensions[1]], ["assetSizeZ", dimensions[2]]].forEach(([id, value]) => { if ($(id)) $(id).value = value; }); + if ($("addSceneAsset")) $("addSceneAsset").textContent = "保存资产修订"; + switchTab("scenes"); + renderSceneList(); + scrollIntoViewIfPossible(".asset-editor-panel"); + toast(`正在编辑“${asset.name || assetId}”,保存后会生成新场景版本`); +} + +function openSceneCreateDialog() { + if (!state.scenes.length && !preparedDatasets().length) return toast("请先导入数据或完成一次场景重建。"); + if ($("sceneCreateName")) $("sceneCreateName").value = state.scenes[0] ? `${resourceDisplayName(state.scenes[0])} · 新版本` : "新建场景"; + updateSceneCreateMode(); + $("sceneCreateDialog")?.showModal(); +} + +function updateSceneCreateMode() { + const mode = $("sceneCreateMode")?.value || "clone"; + const cloneField = $("sceneCloneSourceField"); + const reconstructField = $("sceneReconstructSourceField"); + if (cloneField) cloneField.hidden = mode !== "clone"; + if (reconstructField) reconstructField.hidden = mode !== "reconstruct"; + setText("sceneCreateHint", mode === "clone" ? "复制会产生独立场景版本,随后可在资产管理中添加和调整物体。" : "重建会创建真实非 dry-run 任务,完成后新场景会自动加入场景库并可预览。 "); +} + +async function submitSceneCreate(event) { + event.preventDefault(); + const mode = $("sceneCreateMode")?.value || "clone"; + const name = $("sceneCreateName")?.value.trim(); + const validationSteps = Number($("sceneCreateValidationSteps")?.value || 60); + if (!name) return toast("请输入场景名称。"); + if (mode === "reconstruct") { + const datasetId = $("sceneCreateDataset")?.value; + if (!datasetId) return toast("请先选择已准备数据集。"); + $("sceneCreateDialog")?.close(); + await createTask("scene_reconstruction", { dataset_id: datasetId, scene_name: name, renderer: "auto", simulators: ["mujoco", "motrixsim"], dry_run: false, preflight_required: true, min_frames: 30, quality_preset: "discoverse-high" }); + switchTab("reconstruct"); + return; + } + const sceneId = $("sceneCloneSource")?.value; + if (!sceneId) return toast("请先选择基础场景。"); + const result = await api(`/api/scenes/${sceneId}/clone`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ name, validation_steps: validationSteps }) }); + $("sceneCreateDialog")?.close(); + const task = result.task; + if (task) state.selectedTaskId = task.id; + toast("新场景任务已创建,完成后会进入场景库。"); + await refresh({ quiet: true }); + if (task) showTask(task.id).catch((error) => toast(error.message)); +} + async function openJsonDetails(title, path) { const payload = await api(path); setText("drawerTitle", title); @@ -1629,7 +1749,7 @@ function collectionDatasets() { } function sceneIdFromTask(task) { - return ["scene_reconstruction", "motrixsim_scene_import", "scene_asset_compose", "scene_composition"].includes(task?.type) ? task.result?.scene_id || "" : ""; + return ["scene_reconstruction", "motrixsim_scene_import", "scene_asset_compose", "scene_asset_update", "scene_asset_delete", "scene_clone", "scene_composition"].includes(task?.type) ? task.result?.scene_id || "" : ""; } function resourceView(kind, item) { @@ -1743,6 +1863,9 @@ function taskTypeLabel(type) { motrixsim_asset_import: "MotrixSim 资产导入", motrixsim_scene_import: "MotrixSim 场景包导入", scene_asset_compose: "数字资产合成", + scene_asset_update: "资产位置与属性编辑", + scene_asset_delete: "资产删除", + scene_clone: "场景复制", scene_composition: "场景组合", simulator_validation: "仿真校验", renderer_benchmark: "渲染器对比", @@ -1939,7 +2062,7 @@ function exportSummary(payload = {}) { function switchTaskPage(type) { if (["hf_import", "media_prepare"].includes(type)) switchTab("data"); else if (type === "scene_composition") switchTab("compose"); - else if (["scene_reconstruction", "reconstruction_preflight", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "simulator_validation", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize"].includes(type)) switchTab("reconstruct"); + else if (["scene_reconstruction", "reconstruction_preflight", "motrixsim_asset_import", "motrixsim_scene_import", "scene_asset_compose", "scene_asset_update", "scene_asset_delete", "scene_clone", "simulator_validation", "renderer_benchmark", "scene_cover_render", "scene_splat_optimize"].includes(type)) switchTab("reconstruct"); else if (type === "expert_collection") switchTab("collect"); else if (type === "training") switchTab("train"); else if (type === "inference") switchTab("infer"); @@ -2124,6 +2247,10 @@ function bindEvents() { $("closeDrawer")?.addEventListener("click", closeDrawer); $("importForm")?.addEventListener("submit", submitImport); $("editForm")?.addEventListener("submit", saveEdit); + $("createSceneLibrary")?.addEventListener("click", openSceneCreateDialog); + $("sceneCreateForm")?.addEventListener("submit", submitSceneCreate); + $("sceneCreateMode")?.addEventListener("change", updateSceneCreateMode); + $("resetAssetEditor")?.addEventListener("click", resetAssetEditor); $("datasetFilter")?.addEventListener("change", renderDatasetList); $("datasetSearch")?.addEventListener("input", renderDatasetList); ["reconstructInput", "sceneMinFrames", "acceptanceLevel", "qualityPreset", "cameraModel", "matcherSelect"].forEach((id) => { @@ -2135,6 +2262,7 @@ function bindEvents() { }); $("assetScene")?.addEventListener("change", () => { state.activeSceneId = $("assetScene").value; + resetAssetEditor(); renderSceneList(); renderSceneViewerShell(); }); @@ -2208,9 +2336,10 @@ function bindEvents() { const sceneId = $("assetScene")?.value || state.activeSceneId || state.scenes[0]?.id; if (!sceneId) return toast("请先选择一个场景。"); const payload = sceneAssetPayload(); - if (!payload.primitive && !payload.source?.type) return toast("请先从数字资产库选择一个资产。"); - const result = await api(`/api/scenes/${sceneId}/assets`, { - method: "POST", + const assetId = $("assetInstanceId")?.value || ""; + if (!assetId && !payload.primitive && !payload.source?.type) return toast("请先从数字资产库选择一个资产。"); + const result = await api(assetId ? `/api/scenes/${sceneId}/assets/${assetId}` : `/api/scenes/${sceneId}/assets`, { + method: assetId ? "PATCH" : "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(payload), }); @@ -2219,9 +2348,10 @@ function bindEvents() { state.selectedTaskId = task.id; state.tasks.unshift(task); } - toast("资产合成任务已创建;双运行时校验通过后生成新版本"); + toast(assetId ? "资产修订任务已创建;校验通过后生成新版本" : "资产合成任务已创建;校验通过后生成新版本"); await refresh({ quiet: true }); if (task) showTask(task.id).catch((error) => toast(error.message)); + resetAssetEditor(); }); $("createCollectTask")?.addEventListener("click", async () => { @@ -2485,6 +2615,20 @@ async function handleBodyClick(event) { const sceneAdd = event.target.closest("[data-scene-add]"); if (sceneAdd) openAssetEditor(sceneAdd.dataset.sceneAdd); + const assetEdit = event.target.closest("[data-asset-edit]"); + if (assetEdit) openAssetInstanceEditor(assetEdit.dataset.assetScene, assetEdit.dataset.assetEdit); + + const assetDelete = event.target.closest("[data-asset-delete]"); + if (assetDelete) { + if (!confirm("删除资产会生成一个新的场景 revision,原场景和磁盘文件都会保留。确认继续?")) return; + const result = await api(`/api/scenes/${assetDelete.dataset.assetScene}/assets/${assetDelete.dataset.assetDelete}`, { method: "DELETE" }); + const task = result.task; + if (task) state.selectedTaskId = task.id; + toast("资产删除任务已创建,校验通过后进入新场景版本"); + await refresh({ quiet: true }); + if (task) showTask(task.id).catch((error) => toast(error.message)); + } + const sceneCover = event.target.closest("[data-scene-cover]"); if (sceneCover) await createTask("scene_cover_render", { scene_id: sceneCover.dataset.sceneCover }); diff --git a/src/real2sim_platform/static/index.html b/src/real2sim_platform/static/index.html index a32a7b0..bb01686 100644 --- a/src/real2sim_platform/static/index.html +++ b/src/real2sim_platform/static/index.html @@ -311,7 +311,10 @@

场景管理

场景管理用于查看重建结果、添加资产、仿真校验、导出,并绑定后续采集和推理。

- +
+ + +
@@ -354,6 +357,7 @@
+
基础形状可直接加入,上传的网格会自动出现在资产库
@@ -376,6 +380,17 @@
+
+
+
+

场景资产管理

+

管理当前场景中已添加的资产;编辑位置、旋转、缩放和物理属性会生成新 revision,原场景保留。

+
+ +
+
+
+
@@ -719,6 +734,35 @@ + +
+
+
+

新建场景

+

场景库中的每一条记录都来自真实任务或场景 revision,不会覆盖原场景。

+
+ +
+
+ + + + + +
复制会产生独立场景版本,随后可在右侧资产管理中添加和调整物体。
+
+ + + + +
+
+
@@ -753,6 +797,6 @@
- + diff --git a/src/real2sim_platform/static/styles.css b/src/real2sim_platform/static/styles.css index 70d2a99..bcc7214 100644 --- a/src/real2sim_platform/static/styles.css +++ b/src/real2sim_platform/static/styles.css @@ -118,6 +118,7 @@ a { color: var(--accent); text-decoration: none; } .page-head { min-height: 52px; display: flex; align-items: center; justify-content: space-between; gap: 18px; margin-bottom: 11px; } .page-head h1 { margin: 0; font-size: 24px; line-height: 1.1; } .page-head p { max-width: 760px; margin: 5px 0 0; color: var(--muted); font-size: 12px; line-height: 1.45; } +.page-actions { padding-top: 0; justify-content: flex-end; } .panel { min-width: 0; overflow: hidden; border: 1px solid var(--line); border-radius: var(--radius); background: var(--surface); box-shadow: 0 10px 28px rgba(0, 0, 0, .18); } .panel + .panel, .source-grid + .panel, .two-column + .panel, .reconstruct-grid + .panel, .scene-workbench + .panel { margin-top: 11px; } .panel-head { min-height: 52px; display: flex; align-items: center; justify-content: space-between; gap: 14px; padding: 10px 13px; border-bottom: 1px solid var(--line-soft); } @@ -223,6 +224,17 @@ body.viewer-maximized { overflow: hidden; } .asset-source-actions { min-height: 42px; display: flex; align-items: center; justify-content: space-between; gap: 10px; padding: 7px 9px; border: 1px solid var(--line-soft); border-radius: 5px; background: var(--surface-3); } .asset-source-actions span { min-width: 0; color: var(--muted); font-size: 10px; line-height: 1.45; } .asset-source-actions button { flex: 0 0 auto; } +.scene-assets-panel { margin-bottom: 11px; } +.asset-instance-list { display: grid; gap: 0; padding-top: 2px; } +.asset-instance-row { min-height: 62px; display: grid; grid-template-columns: 28px minmax(160px, 1fr) minmax(150px, .9fr) minmax(150px, .9fr) auto; align-items: center; gap: 10px; padding: 8px 0; border-bottom: 1px solid var(--line-soft); } +.asset-instance-row:last-child { border-bottom: 0; } +.asset-instance-mark { width: 28px; height: 28px; display: grid; place-items: center; border: 1px solid var(--line); border-radius: 5px; background: #0b2029; color: var(--accent); font-size: 10px; font-weight: 800; } +.asset-instance-title { min-width: 0; display: grid; gap: 3px; } +.asset-instance-title strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; } +.asset-instance-title span, .asset-instance-meta { overflow: hidden; color: var(--muted); font-size: 10px; text-overflow: ellipsis; white-space: nowrap; } +.asset-instance-actions { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 6px; } +.asset-instance-actions button { min-height: 26px; padding: 4px 7px; font-size: 10px; } +.form-hint { align-self: center; color: var(--muted); font-size: 10px; line-height: 1.5; } .toggle-field { min-height: 42px; display: flex !important; grid-template-columns: auto 1fr !important; align-items: center; justify-content: start; gap: 8px !important; padding: 0 2px; } .toggle-field input { width: 16px; height: 16px; margin: 0; } .model-card { min-height: 160px; align-content: start; } @@ -368,6 +380,8 @@ body.composition-dragging .composition-drop-overlay { display: grid; pointer-eve .row-actions { justify-content: flex-start; } .resource-preview, .scene-preview-card .resource-preview { width: 100%; height: 112px; } .scene-preview-card { grid-template-columns: 1fr; } + .asset-instance-row { grid-template-columns: 28px minmax(0, 1fr); align-items: start; } + .asset-instance-meta, .asset-instance-actions { grid-column: 2; justify-content: flex-start; white-space: normal; } .viewer-panel iframe, #scenePreview { width: calc(100% - 26px); min-height: 390px; } .task-facts { grid-template-columns: 1fr; } .task-drawer { width: 100vw; } diff --git a/tests/test_platform.py b/tests/test_platform.py index 8026e1e..689ce40 100644 --- a/tests/test_platform.py +++ b/tests/test_platform.py @@ -4,6 +4,7 @@ import shutil import struct import subprocess import time +import json from pathlib import Path import pytest @@ -227,6 +228,55 @@ def test_scene_asset_request_queues_real_revision_task_from_catalog(tmp_path: Pa assert len(client.get("/api/scenes").json()) == 1 +def test_scene_library_clone_and_asset_revision_requests_are_real_tasks(tmp_path: Path) -> None: + package = tmp_path / "editable_package" + runtime_dir = package / "simulator_assets" + runtime_dir.mkdir(parents=True) + runtime = runtime_dir / "scene.xml" + runtime.write_text( + '', + encoding="utf-8", + ) + manifest = package / "scene_manifest.json" + manifest.write_text( + json.dumps( + { + "schema": "real2sim.scene_manifest.v3", + "assets": [ + { + "name": "测试物体", + "role": "added_asset", + "kind": "primitive", + "runtime": {"body": "added_box"}, + "transform": {"translation": [0, 0, 0], "rotation_euler_degrees": [0, 0, 0], "scale": [1, 1, 1]}, + "physics": {"dynamic": False, "mass": 1, "collision_mode": "visual_and_collision", "dimensions": [0.1, 0.1, 0.1]}, + } + ], + "simulator_artifacts": {"motrixsim": {"runtime_scene": str(runtime)}}, + } + ), + encoding="utf-8", + ) + cfg = PlatformConfig(app_root=ROOT, workspace_dir=tmp_path / "workspace", allowed_path_roots=(tmp_path,)) + client = TestClient(create_app(cfg)) + scene = client.post( + "/api/scenes/import", + json={"path": str(runtime), "name": "可编辑场景", "metadata": {"package": str(package), "manifest_path": str(manifest)}}, + ).json() + update = client.patch( + f"/api/scenes/{scene['id']}/assets/added_box", + json={"name": "新位置物体", "transform": {"translation": [1, 2, 3]}, "physics": {"dynamic": False}, "validation_steps": 1}, + ) + assert update.status_code == 200, update.text + assert update.json()["task"]["type"] == "scene_asset_update" + clone = client.post(f"/api/scenes/{scene['id']}/clone", json={"name": "可编辑场景副本", "validation_steps": 1}) + assert clone.status_code == 200, clone.text + assert clone.json()["task"]["type"] == "scene_clone" + delete = client.delete(f"/api/scenes/{scene['id']}/assets/added_box") + assert delete.status_code == 200, delete.text + assert delete.json()["task"]["type"] == "scene_asset_delete" + + def test_scene_runtime_metadata_update(tmp_path: Path) -> None: store = PlatformStore(tmp_path / "state.db") scene_file = tmp_path / "scene.xml"