diff --git a/src/real2sim_platform/adapters.py b/src/real2sim_platform/adapters.py index 51bc8ca..fcf8f10 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, revise_scene_asset, validate_runtime_scene +from .motrix_scene import COMPOSITION_ASSET_RECIPES, SUPPORTED_MESH_SUFFIXES, 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 @@ -770,10 +770,17 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas validation_steps=validation_steps, emit=emit, ) - _task_progress(store, task, 84, "登记场景", "MotrixSim 已真实加载并步进,正在登记场景资产与清单") + _task_progress(store, task, 84, "登记基础场景与独立资产", "MotrixSim 已真实加载并步进;机器人和任务物体不会在导入阶段自动加入") artifacts = _index_artifacts(store, task["id"], package_dir) manifest_path = Path(result["manifest_path"]) manifest = json.loads(manifest_path.read_text(encoding="utf-8")) + manifest["scene_role"] = "base_scene" + manifest["composition"] = { + "status": "empty", + "robot": None, + "assets": [], + "next_step": "进入情景预制添加机器人、数字资产并配置物理属性", + } _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") report = result["report"] @@ -788,6 +795,9 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas "runtime_validation": {"mujoco": bool(validation["mujoco"]["ok"]), "motrixsim": bool(validation["motrixsim"]["ok"])}, "source_dataset_id": dataset["id"], "editable": True, + "scene_role": "base_scene", + "composition_asset_count": 0, + "robot_id": None, }, source_type="motrixsim_spatial_bundle", source_uri=dataset.get("storage_uri") or dataset.get("source_uri") or str(input_root), @@ -798,7 +808,27 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas tags=["motrixsim", "spatial-bundle", "usdz", "3dgs", "runtime-validated", "editable"], cache_state="local", ) - _task_progress(store, task, 94, "场景可用", "空间包已成为可预览、可添加数字资产的 MotrixSim 场景") + standalone_assets = _register_imported_scene_assets(store, scene_id=scene["id"], package_dir=package_dir, manifest=manifest, manifest_path=manifest_path) + manifest["asset_registry"] = { + "mode": "standalone", + "note": "导入阶段只登记基础场景和独立资产;机器人、任务物体和物理属性必须在情景预制中添加", + "asset_ids": [item["id"] for item in standalone_assets], + } + for asset in manifest.get("assets", []): + if not isinstance(asset, dict): + continue + registered = next( + ( + item + for item in standalone_assets + if Path(str(item.get("path") or "")).resolve() == Path(str(asset.get("path") or "")).resolve() + ), + None, + ) + if registered: + asset["standalone_asset_id"] = registered["id"] + manifest_path.write_text(json.dumps(enrich_scene_manifest_assets(manifest), ensure_ascii=False, indent=2) + "\n", encoding="utf-8") + _task_progress(store, task, 94, "场景可用", "基础场景与独立资产已登记;请进入情景预制添加机器人、物体和物理属性") return { "scene_id": scene["id"], "scene_path": scene["path"], @@ -806,9 +836,55 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas "package_dir": str(package_dir), "runtime_validation": validation, "source_dataset_id": dataset["id"], + "standalone_asset_ids": [item["id"] for item in standalone_assets], } +def _register_imported_scene_assets( + store: PlatformStore, + *, + scene_id: str, + package_dir: Path, + manifest: dict[str, Any], + manifest_path: Path, +) -> list[dict[str, Any]]: + """Register imported files as independent catalog items without composing them into the scene.""" + registered: list[dict[str, Any]] = [] + ignored_roles = {"motrixsim_runtime", "runtime_report", "source_controller", "controller"} + for entry in manifest.get("assets", []): + if not isinstance(entry, dict) or not entry.get("path") or entry.get("role") in ignored_roles: + continue + source_path = Path(str(entry["path"])).resolve() + package_root = package_dir.resolve() + if source_path == package_root or package_root not in source_path.parents or not source_path.is_file(): + continue + relative_path = source_path.relative_to(package_root).as_posix() + asset_id = hashlib.sha256(f"scene:{scene_id}:{relative_path}".encode("utf-8")).hexdigest()[:24] + suffix = source_path.suffix.lower() + composition_supported = bool(entry.get("composition_supported")) or entry.get("role") == "catalog_asset" + item = store.upsert_digital_asset( + item_id=asset_id, + name=str(entry.get("name") or source_path.stem), + path=source_path, + source_type="scene_asset", + source_uri=str(manifest_path), + scene_id=scene_id, + relative_path=relative_path, + asset_format=suffix.lstrip("."), + preview_path=source_path, + metadata={ + "role": entry.get("role"), + "kind": entry.get("kind"), + "autoload": entry.get("autoload", False), + "composition_supported": composition_supported, + "source_manifest": str(manifest_path), + }, + tags=["imported", "standalone", str(entry.get("role") or "asset")], + ) + registered.append(item) + return registered + + def run_scene_asset_compose(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/server.py b/src/real2sim_platform/server.py index cded683..6dd94f3 100644 --- a/src/real2sim_platform/server.py +++ b/src/real2sim_platform/server.py @@ -97,6 +97,18 @@ class UpdateEntityRequest(BaseModel): version: str | None = None +class CreateDigitalAssetRequest(BaseModel): + dataset_id: str + relative_path: str + name: str | None = None + tags: list[str] = Field(default_factory=list) + + +class UpdateDigitalAssetRequest(BaseModel): + name: str | None = None + tags: list[str] | None = None + + class UpdateTaskRequest(BaseModel): params: dict[str, Any] @@ -623,6 +635,74 @@ def create_app(config: PlatformConfig | None = None) -> FastAPI: def list_digital_assets() -> list[dict[str, Any]]: return _digital_asset_catalog(store) + @app.post("/api/assets") + def create_digital_asset(payload: CreateDigitalAssetRequest) -> dict[str, Any]: + try: + dataset = store.get_dataset(payload.dataset_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="dataset not found") from exc + root = Path(dataset["path"]).resolve() + candidate = (root / payload.relative_path).resolve() + if candidate == root or root not in candidate.parents: + raise HTTPException(status_code=400, detail="资产路径越出所选数据集") + if not candidate.is_file() or candidate.suffix.lower() not in _SUPPORTED_DIGITAL_ASSET_SUFFIXES: + raise HTTPException(status_code=400, detail="所选文件不是可登记的数字资产") + item_id = hashlib.sha256(f"dataset:{dataset['id']}:{candidate.relative_to(root).as_posix()}".encode("utf-8")).hexdigest()[:24] + item = store.upsert_digital_asset( + item_id=item_id, + name=payload.name or candidate.stem.replace("_", " "), + path=candidate, + source_type="dataset_asset", + source_uri=dataset.get("storage_uri") or dataset.get("source_uri") or str(root), + dataset_id=dataset["id"], + relative_path=candidate.relative_to(root).as_posix(), + asset_format=candidate.suffix.lower().lstrip("."), + preview_path=candidate if candidate.suffix.lower() in _SUPPORTED_BROWSER_ASSET_SUFFIXES else None, + metadata={"registered_manually": True, "composition_supported": candidate.suffix.lower() in SUPPORTED_MESH_SUFFIXES}, + tags=payload.tags, + ) + return _digital_asset_view_model(item) + + @app.get("/api/assets/{asset_id}") + def get_digital_asset(asset_id: str) -> dict[str, Any]: + try: + item = store.get_digital_asset(asset_id) + except KeyError: + item = next((candidate for candidate in _digital_asset_catalog(store) if candidate.get("id") == asset_id), None) + if item is None: + raise HTTPException(status_code=404, detail="asset not found") + return item + return _digital_asset_view_model(item) + + @app.patch("/api/assets/{asset_id}") + def update_digital_asset(asset_id: str, payload: UpdateDigitalAssetRequest) -> dict[str, Any]: + try: + item = store.get_digital_asset(asset_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="asset is not managed") from exc + if payload.name is None and payload.tags is None: + return _digital_asset_view_model(item) + return _digital_asset_view_model(store.update_digital_asset(asset_id, name=payload.name, tags=payload.tags)) + + @app.delete("/api/assets/{asset_id}") + def delete_digital_asset(asset_id: str) -> dict[str, Any]: + try: + store.delete_digital_asset(asset_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="asset is not managed") from exc + return {"ok": True, "message": "已删除资产索引,不删除源文件或场景包文件"} + + @app.get("/api/assets/{asset_id}/preview") + def preview_digital_asset(asset_id: str): + try: + item = store.get_digital_asset(asset_id) + except KeyError as exc: + raise HTTPException(status_code=404, detail="asset not found") from exc + path = Path(item["path"]).resolve() + if not path.is_file() or not is_path_allowed(path, cfg): + raise HTTPException(status_code=404, detail="asset preview is unavailable") + return FileResponse(path, filename=path.name) + @app.get("/api/robots") def list_robots() -> list[dict[str, Any]]: return _robot_catalog(cfg) @@ -1525,6 +1605,10 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]: } for primitive in sorted(SUPPORTED_PRIMITIVES) ] + all_managed_records = store.list_digital_assets(include_deleted=True) + managed = [_digital_asset_view_model(item) for item in all_managed_records if not item.get("deleted_at")] + items.extend(managed) + managed_paths = {str(Path(item.get("path") or "").resolve()) for item in all_managed_records} for dataset in store.list_datasets(): root = Path(dataset["path"]) if not root.is_dir(): @@ -1541,6 +1625,8 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]: suffix = candidate.suffix.lower() if suffix not in SUPPORTED_MESH_SUFFIXES: continue + if str(candidate) in managed_paths: + continue identifier = hashlib.sha256(f"dataset:{dataset['id']}:{relative.as_posix()}".encode("utf-8")).hexdigest()[:24] items.append( { @@ -1560,11 +1646,49 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]: "dynamic": True, "collision": True, }, + "managed": False, + "editable": False, } ) return items +_SUPPORTED_BROWSER_ASSET_SUFFIXES = {".obj", ".glb", ".gltf", ".ply", ".spz", ".splat", ".ksplat", ".sog", ".png", ".jpg", ".jpeg", ".webp"} +_SUPPORTED_DIGITAL_ASSET_SUFFIXES = SUPPORTED_MESH_SUFFIXES | {".spz", ".splat", ".ksplat", ".sog"} + + +def _digital_asset_view_model(item: dict[str, Any]) -> dict[str, Any]: + path = Path(str(item.get("path") or "")) + suffix = path.suffix.lower() + metadata = dict(item.get("metadata") or {}) + preview_path = Path(str(item.get("preview_path") or "")) + preview_url = _workspace_public_url(preview_path if preview_path.is_file() else path) if suffix in _SUPPORTED_BROWSER_ASSET_SUFFIXES else "" + if not preview_url and suffix in _SUPPORTED_BROWSER_ASSET_SUFFIXES and item.get("id"): + preview_url = f"/api/assets/{item['id']}/preview" + return { + **item, + "managed": True, + "editable": True, + "size_bytes": path.stat().st_size if path.is_file() else 0, + "preview_url": preview_url, + "url": preview_url, + "source": { + "type": item.get("source_type"), + "dataset_id": item.get("dataset_id"), + "scene_id": item.get("scene_id"), + "relative_path": item.get("relative_path") or path.name, + "asset_id": item.get("id"), + }, + "capabilities": { + "browser_preview": suffix in _SUPPORTED_BROWSER_ASSET_SUFFIXES, + "motrixsim_physics": bool(metadata.get("composition_supported", False)), + "composition_supported": bool(metadata.get("composition_supported", False)), + "dynamic": True, + "collision": bool(metadata.get("composition_supported", False)), + }, + } + + def _robot_catalog(cfg: PlatformConfig) -> list[dict[str, Any]]: return [ { diff --git a/src/real2sim_platform/static/app.js b/src/real2sim_platform/static/app.js index 5a47b50..95544bb 100644 --- a/src/real2sim_platform/static/app.js +++ b/src/real2sim_platform/static/app.js @@ -1,4 +1,4 @@ -const STATIC_VERSION = "20260713-asset-delete-routes-v8"; +const STATIC_VERSION = "20260713-standalone-assets-v1"; const state = { datasets: [], @@ -73,7 +73,7 @@ const TAB_TITLES = Object.freeze({ data: "数据管理", reconstruct: "场景重建", scenes: "场景管理", - compose: "场景组合", + compose: "情景预制", collect: "数据采集", train: "模型训练", infer: "在线推理", @@ -237,6 +237,7 @@ function renderAll() { renderDatasetList(); renderReconstructDatasetCards(); renderSceneList(); + renderStandaloneAssetList(); if (activePageId() === "compose") renderComposition(); renderPreflightSummary(); renderCollectionDatasets(); @@ -415,13 +416,40 @@ function renderSceneList() { ["预览", `data-scene-viewer="${item.id}"`], ["生成封面", `data-scene-cover="${item.id}"`], ["优化3DGS", `data-scene-splat-optimize="${item.id}"`], - ["加资产", `data-scene-add="${item.id}"`], + ["进入情景预制", `data-scene-compose="${item.id}"`], ["清单", `data-view-json="/api/scenes/${item.id}/manifest"`], ], })).join(""); setHtml("sceneList", rows || emptyState("暂无场景,请先在“场景重建”中创建。")); } +function renderStandaloneAssetList() { + const node = $("standaloneAssetList"); + if (!node) return; + const assets = state.digitalAssets.filter((asset) => asset.managed || asset.source_type === "recipe" || asset.source_type === "primitive"); + const rows = assets.map((asset) => { + const suffix = String(asset.format || "").toUpperCase(); + const source = asset.source_type === "scene_asset" ? "导入场景资产" : asset.source_type === "dataset_asset" ? "数据集资产" : asset.source_type === "recipe" ? "平台资产配方" : "基础形状"; + const preview = asset.preview_url + ? `` + : ``; + const compose = asset.capabilities?.composition_supported + ? `` + : ""; + const manage = asset.managed + ? `` + : ""; + return `
+
${escapeHtml(suffix || "资产")}
+
${escapeHtml(asset.name || "未命名资产")}${escapeHtml(source)}${asset.scene_id ? " · 当前场景来源" : ""}
+
${escapeHtml(suffix || "未知格式")} · ${asset.size_bytes ? formatBytes(asset.size_bytes) : "内置"}
+
${asset.capabilities?.browser_preview ? "可预览" : "仿真资源"} · ${asset.capabilities?.composition_supported ? "可拖入情景" : "仅独立管理"}
+
${preview}${compose}${manage}
+
`; + }).join(""); + setHtml("standaloneAssetList", rows || emptyState("导入空间包后,系统会在这里登记可独立管理的场景资产。")); +} + function baseCompositionScenes() { return state.scenes.filter((scene) => scene?.metadata?.editable !== false); } @@ -556,7 +584,11 @@ function renderComposition() { ${escapeHtml(robot.name)}${escapeHtml(robot.description || "MotrixSim 机器人")}${robot.id === draft.robotId ? "已加入场景" : "拖入场景"} `).join("") || emptyState("暂无已注册机器人。")); - const visibleAssets = state.digitalAssets.filter((asset) => asset.source_type === "recipe" || asset.source_type === "primitive" || asset.capabilities?.browser_preview).slice(0, 30); + const visibleAssets = state.digitalAssets.filter((asset) => { + if (asset.source_type === "recipe" || asset.source_type === "primitive") return true; + if (asset.managed) return asset.capabilities?.composition_supported === true; + return asset.capabilities?.browser_preview === true; + }).slice(0, 30); setHtml("composeAssetList", visibleAssets.map((asset) => { const inScene = draft.assets.some((item) => item.catalog_id === asset.id); return ` +
`; }).join("") || emptyState("当前场景还没有添加的数字资产。请点击“添加新资产”或从资产库选择后保存。")); } @@ -2654,9 +2686,64 @@ async function handleBodyClick(event) { const fullViewer = event.target.closest("#openSceneViewerFull"); if (fullViewer) openViewerFullscreen(fullViewer.dataset.viewerUrl); + const goComposeFromScene = event.target.closest("#goComposeFromScene"); + if (goComposeFromScene) { + if (!state.activeSceneId) return toast("请先选择基础场景"); + resetCompositionForScene(state.activeSceneId); + switchTab("compose"); + } + const sceneAdd = event.target.closest("[data-scene-add]"); if (sceneAdd) openAssetEditor(sceneAdd.dataset.sceneAdd); + const sceneCompose = event.target.closest("[data-scene-compose]"); + if (sceneCompose) { + resetCompositionForScene(sceneCompose.dataset.sceneCompose); + switchTab("compose"); + toast("已进入情景预制:请从左侧拖入机器人和数字资产"); + } + + const assetPreview = event.target.closest("[data-asset-preview]"); + if (assetPreview) { + const url = `/static/asset-viewer.html?v=${STATIC_VERSION}&asset_id=${encodeURIComponent(assetPreview.dataset.assetPreview)}`; + window.open(url, "_blank", "noopener"); + } + + const assetDetails = event.target.closest("[data-asset-details]"); + if (assetDetails) await openJsonDetails("独立资产清单", `/api/assets/${encodeURIComponent(assetDetails.dataset.assetDetails)}`); + + const assetCompose = event.target.closest("[data-asset-compose]"); + if (assetCompose) { + if (!state.composition.baseSceneId) resetCompositionForScene(state.activeSceneId || baseCompositionScenes()[0]?.id || ""); + switchTab("compose"); + addCompositionAsset(assetCompose.dataset.assetCompose); + toast("资产已加入情景预制,可在右侧设置位姿和物理属性"); + } + + const assetLibraryEdit = event.target.closest("[data-library-asset-edit]"); + if (assetLibraryEdit) { + const asset = state.digitalAssets.find((item) => item.id === assetLibraryEdit.dataset.libraryAssetEdit); + if (!asset) return toast("资产已不存在,请刷新资产库"); + const name = window.prompt("修改资产显示名称", asset.name || ""); + if (name === null || !name.trim()) return; + await api(`/api/assets/${encodeURIComponent(asset.id)}`, { + method: "PATCH", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ name: name.trim() }), + }); + toast("资产名称已更新"); + await refresh({ quiet: true }); + } + + const assetLibraryDelete = event.target.closest("[data-library-asset-delete]"); + if (assetLibraryDelete) { + const asset = state.digitalAssets.find((item) => item.id === assetLibraryDelete.dataset.libraryAssetDelete); + if (!asset || !confirm("只删除资产索引,不删除源场景包、数据集或磁盘文件。确认继续?")) return; + await api(`/api/assets/${encodeURIComponent(asset.id)}`, { method: "DELETE" }); + toast("资产索引已删除"); + await refresh({ quiet: true }); + } + const assetEdit = event.target.closest("[data-asset-edit]"); if (assetEdit) openAssetInstanceEditor(assetEdit.dataset.assetScene, assetEdit.dataset.assetEdit); diff --git a/src/real2sim_platform/static/asset-viewer.html b/src/real2sim_platform/static/asset-viewer.html new file mode 100644 index 0000000..6e9e983 --- /dev/null +++ b/src/real2sim_platform/static/asset-viewer.html @@ -0,0 +1,144 @@ + + + + + + Real2Sim 资产预览 + + + + + +
+ 资产预览 +
正在读取资产清单
+
加载中
+ +
+ + + diff --git a/src/real2sim_platform/static/index.html b/src/real2sim_platform/static/index.html index 6b9166e..fa5a5e1 100644 --- a/src/real2sim_platform/static/index.html +++ b/src/real2sim_platform/static/index.html @@ -52,7 +52,7 @@ - + @@ -309,7 +309,7 @@

场景管理

-

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

+

场景管理只负责基础场景、导入产物和独立资产的查看与治理;机器人、物体布置和物理属性请在“情景预制”中完成。

@@ -349,34 +349,12 @@
-

数字资产编辑

-

从资产库选择物体或基础形状,保存后生成通过仿真校验的新版本

+

独立资产库

+

导入空间包后自动登记;这里的重命名和删除只影响资产索引,不会改动基础场景文件。

- -
-
- - - -
基础形状可直接加入,上传的网格会自动出现在资产库
- - - - - - - - - - - - - - - - - +
+
@@ -384,9 +362,9 @@

场景资产管理

-

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

+

组合场景中的实例只读展示;要修改位置、旋转、缩放和物理属性,请进入“情景预制”生成新版本。

- +
@@ -395,7 +373,7 @@

资产清单

-

点云、网格、纹理、相机和仿真产物

+

当前基础场景的原始点云、网格、碰撞体和运行时报告

@@ -405,8 +383,8 @@
-

场景组合

-

选择基础场景与机器人,将真实数字资产拖入三维画布;保存后生成可测试、可采集的 MotrixSim 场景版本。

+

情景预制

+

选择基础场景,拖入机器人和独立资产,设置位姿与物理属性;保存后生成可测试、可采集的 MotrixSim 场景版本。

diff --git a/src/real2sim_platform/store.py b/src/real2sim_platform/store.py index 15c0f9a..b56474a 100644 --- a/src/real2sim_platform/store.py +++ b/src/real2sim_platform/store.py @@ -157,6 +157,96 @@ class PlatformStore: def delete_model(self, item_id: str) -> None: self._delete("models", item_id) + def create_digital_asset( + self, + *, + name: str, + path: Path, + source_type: str, + source_uri: str = "", + dataset_id: str | None = None, + scene_id: str | None = None, + relative_path: str = "", + asset_format: str = "", + preview_path: Path | None = None, + metadata: dict[str, Any] | None = None, + tags: list[str] | None = None, + item_id: str | None = None, + ) -> dict[str, Any]: + item_id = item_id or uuid.uuid4().hex + now = _now() + with self._connect() as db: + db.execute( + "insert into digital_assets(id,name,path,source_type,source_uri,dataset_id,scene_id,relative_path,format,preview_path,metadata_json,tags_json,created_at,updated_at) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)", + (item_id, name, str(path), source_type, source_uri, dataset_id, scene_id, relative_path, asset_format, str(preview_path or ""), _json(metadata or {}), _json(tags or []), now, now), + ) + return self.get_digital_asset(item_id) + + def upsert_digital_asset(self, *, item_id: str, **kwargs: Any) -> dict[str, Any]: + with self._connect() as db: + existing = db.execute("select id from digital_assets where id=?", (item_id,)).fetchone() + if existing: + fields = { + "name": kwargs.get("name"), + "path": str(kwargs.get("path") or ""), + "source_type": kwargs.get("source_type"), + "source_uri": kwargs.get("source_uri", ""), + "dataset_id": kwargs.get("dataset_id"), + "scene_id": kwargs.get("scene_id"), + "relative_path": kwargs.get("relative_path", ""), + "format": kwargs.get("asset_format", ""), + "preview_path": str(kwargs.get("preview_path") or ""), + "metadata_json": _json(kwargs.get("metadata") or {}), + "tags_json": _json(kwargs.get("tags") or []), + "deleted_at": None, + "updated_at": _now(), + } + with self._connect() as db: + db.execute( + "update digital_assets set name=?,path=?,source_type=?,source_uri=?,dataset_id=?,scene_id=?,relative_path=?,format=?,preview_path=?,metadata_json=?,tags_json=?,deleted_at=?,updated_at=? where id=?", + (*fields.values(), item_id), + ) + return self.get_digital_asset(item_id) + return self.create_digital_asset(item_id=item_id, **kwargs) + + def list_digital_assets(self, *, include_deleted: bool = False) -> list[dict[str, Any]]: + where = "" if include_deleted else " where deleted_at is null" + with self._connect() as db: + rows = db.execute(f"select * from digital_assets{where} order by created_at desc").fetchall() + return [self._digital_asset_row(row) for row in rows] + + def get_digital_asset(self, item_id: str) -> dict[str, Any]: + with self._connect() as db: + row = db.execute("select * from digital_assets where id=? and deleted_at is null", (item_id,)).fetchone() + if row is None: + raise KeyError(item_id) + return self._digital_asset_row(row) + + def update_digital_asset(self, item_id: str, *, name: str | None = None, tags: list[str] | None = None, metadata: dict[str, Any] | None = None) -> dict[str, Any]: + self.get_digital_asset(item_id) + fields: list[str] = [] + values: list[Any] = [] + if name is not None: + fields.append("name=?") + values.append(name) + if tags is not None: + fields.append("tags_json=?") + values.append(_json(tags)) + if metadata is not None: + fields.append("metadata_json=?") + values.append(_json(metadata)) + if fields: + fields.append("updated_at=?") + values.extend([_now(), item_id]) + with self._connect() as db: + db.execute(f"update digital_assets set {','.join(fields)} where id=?", values) + return self.get_digital_asset(item_id) + + def delete_digital_asset(self, item_id: str) -> None: + self.get_digital_asset(item_id) + with self._connect() as db: + db.execute("update digital_assets set deleted_at=?,updated_at=? where id=?", (_now(), _now(), item_id)) + def update_entity_storage(self, table: str, item_id: str, *, storage_uri: str, checksum: str = "", cache_state: str = "local") -> dict[str, Any]: if table not in {"datasets", "scenes", "models"}: raise ValueError("unsupported entity table") @@ -467,6 +557,13 @@ class PlatformStore: db.execute("create table if not exists datasets(id text primary key,name text,path text,scan_json text,created_at real,updated_at real)") db.execute("create table if not exists scenes(id text primary key,name text,path text,metadata_json text,created_at real,updated_at real)") db.execute("create table if not exists models(id text primary key,name text,path text,metadata_json text,created_at real,updated_at real)") + db.execute( + "create table if not exists digital_assets(" + "id text primary key,name text not null,path text not null,source_type text not null,source_uri text not null default ''," + "dataset_id text,scene_id text,relative_path text not null default '',format text not null default '',preview_path text not null default ''," + "metadata_json text not null default '{}',tags_json text not null default '[]',created_at real,updated_at real)" + ) + self._ensure_column(db, "digital_assets", "deleted_at", "real") db.execute( "create table if not exists tasks(" "id text primary key,type text,status text,params_json text,result_json text not null default '{}'," @@ -563,6 +660,25 @@ class PlatformStore: def _model_row(self, row: sqlite3.Row) -> dict[str, Any]: return {**self._entity_common(row), "metadata": json.loads(row["metadata_json"])} + def _digital_asset_row(self, row: sqlite3.Row) -> dict[str, Any]: + return { + "id": row["id"], + "name": row["name"], + "path": row["path"], + "source_type": row["source_type"], + "source_uri": row["source_uri"], + "dataset_id": row["dataset_id"], + "scene_id": row["scene_id"], + "relative_path": row["relative_path"], + "format": row["format"], + "preview_path": row["preview_path"], + "metadata": json.loads(row["metadata_json"] or "{}"), + "tags": json.loads(row["tags_json"] or "[]"), + "created_at": row["created_at"], + "updated_at": row["updated_at"], + "deleted_at": row["deleted_at"] if "deleted_at" in row.keys() else None, + } + def _entity_common(self, row: sqlite3.Row) -> dict[str, Any]: return { "id": row["id"], diff --git a/tests/test_platform.py b/tests/test_platform.py index 9f8b539..69c8e85 100644 --- a/tests/test_platform.py +++ b/tests/test_platform.py @@ -11,7 +11,7 @@ import pytest from fastapi.testclient import TestClient from PIL import Image -from real2sim_platform.adapters import _export_3dgs_rgb_fallback, collect_task_reports +from real2sim_platform.adapters import _export_3dgs_rgb_fallback, _register_imported_scene_assets, collect_task_reports from real2sim_platform.config import PlatformConfig from real2sim_platform import motrix_scene from real2sim_platform.server import create_app @@ -229,6 +229,56 @@ def test_scene_asset_request_queues_real_revision_task_from_catalog(tmp_path: Pa assert len(client.get("/api/scenes").json()) == 1 +def test_imported_scene_assets_are_standalone_crud_items(tmp_path: Path) -> None: + package = tmp_path / "runs" / "import_task" / "scene_package" + package.mkdir(parents=True) + visual = package / "viewer" / "environment_visual.glb" + visual.parent.mkdir() + visual.write_bytes(b"glb fixture") + runtime = package / "simulator_assets" / "scene.xml" + runtime.parent.mkdir() + runtime.write_text("", encoding="utf-8") + manifest = { + "assets": [ + {"name": "环境视觉", "path": str(visual), "role": "visual_fallback", "kind": "mesh", "autoload": False}, + {"name": "运行时场景", "path": str(runtime), "role": "motrixsim_runtime", "kind": "simulator", "autoload": False}, + ] + } + store = PlatformStore(tmp_path / "workspace" / "state.db") + registered = _register_imported_scene_assets(store, scene_id="scene-1", package_dir=package, manifest=manifest, manifest_path=package / "scene_manifest.json") + assert len(registered) == 1 + assert registered[0]["source_type"] == "scene_asset" + assert registered[0]["scene_id"] == "scene-1" + assert store.list_digital_assets()[0]["path"] == str(visual) + renamed = store.update_digital_asset(registered[0]["id"], name="环境视觉层") + assert renamed["name"] == "环境视觉层" + store.delete_digital_asset(registered[0]["id"]) + assert visual.is_file() + assert store.list_digital_assets() == [] + + +def test_digital_asset_api_registers_dataset_file_and_deletes_only_index(tmp_path: Path) -> None: + dataset_root = tmp_path / "asset_dataset" + dataset_root.mkdir() + mesh = dataset_root / "table.obj" + mesh.write_text("v 0 0 0\nv .1 0 0\nv 0 .1 0\nf 1 2 3\n", encoding="utf-8") + cfg = PlatformConfig(app_root=ROOT, workspace_dir=tmp_path / "workspace", allowed_path_roots=(tmp_path,)) + client = TestClient(create_app(cfg)) + dataset = client.post("/api/datasets/import-path", json={"path": str(dataset_root), "name": "asset source"}).json() + created = client.post("/api/assets", json={"dataset_id": dataset["id"], "relative_path": "table.obj", "name": "茶几资产"}) + assert created.status_code == 200, created.text + asset = created.json() + assert asset["managed"] is True + assert asset["capabilities"]["composition_supported"] is True + assert client.get(f"/api/assets/{asset['id']}").json()["name"] == "茶几资产" + renamed = client.patch(f"/api/assets/{asset['id']}", json={"name": "茶几资产 v2"}) + assert renamed.json()["name"] == "茶几资产 v2" + assert client.get(f"/api/assets/{asset['id']}/preview").status_code == 200 + assert client.delete(f"/api/assets/{asset['id']}").json()["ok"] is True + assert mesh.is_file() + assert client.get(f"/api/assets/{asset['id']}").status_code == 404 + + 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"