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 `