feat: add asset viewer and component validation
This commit is contained in:
parent
a5d43db570
commit
b4449a7a9d
@ -17,7 +17,7 @@ from urllib.parse import quote, unquote, urlparse
|
|||||||
from urllib.request import urlopen
|
from urllib.request import urlopen
|
||||||
|
|
||||||
from .config import PlatformConfig, is_path_allowed
|
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 .source_revision import read_source_revision
|
||||||
from .storage import ALLOWED_AREAS, BosStorage, normalize_relative_path
|
from .storage import ALLOWED_AREAS, BosStorage, normalize_relative_path
|
||||||
from .store import PlatformStore
|
from .store import PlatformStore
|
||||||
@ -770,10 +770,17 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas
|
|||||||
validation_steps=validation_steps,
|
validation_steps=validation_steps,
|
||||||
emit=emit,
|
emit=emit,
|
||||||
)
|
)
|
||||||
_task_progress(store, task, 84, "登记场景", "MotrixSim 已真实加载并步进,正在登记场景资产与清单")
|
_task_progress(store, task, 84, "登记基础场景与独立资产", "MotrixSim 已真实加载并步进;机器人和任务物体不会在导入阶段自动加入")
|
||||||
artifacts = _index_artifacts(store, task["id"], package_dir)
|
artifacts = _index_artifacts(store, task["id"], package_dir)
|
||||||
manifest_path = Path(result["manifest_path"])
|
manifest_path = Path(result["manifest_path"])
|
||||||
manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
|
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)
|
_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")
|
manifest_path.write_text(json.dumps(enrich_scene_manifest_assets(manifest), ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
|
||||||
report = result["report"]
|
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"])},
|
"runtime_validation": {"mujoco": bool(validation["mujoco"]["ok"]), "motrixsim": bool(validation["motrixsim"]["ok"])},
|
||||||
"source_dataset_id": dataset["id"],
|
"source_dataset_id": dataset["id"],
|
||||||
"editable": True,
|
"editable": True,
|
||||||
|
"scene_role": "base_scene",
|
||||||
|
"composition_asset_count": 0,
|
||||||
|
"robot_id": None,
|
||||||
},
|
},
|
||||||
source_type="motrixsim_spatial_bundle",
|
source_type="motrixsim_spatial_bundle",
|
||||||
source_uri=dataset.get("storage_uri") or dataset.get("source_uri") or str(input_root),
|
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"],
|
tags=["motrixsim", "spatial-bundle", "usdz", "3dgs", "runtime-validated", "editable"],
|
||||||
cache_state="local",
|
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 {
|
return {
|
||||||
"scene_id": scene["id"],
|
"scene_id": scene["id"],
|
||||||
"scene_path": scene["path"],
|
"scene_path": scene["path"],
|
||||||
@ -806,9 +836,55 @@ def run_motrixsim_scene_import(config: PlatformConfig, store: PlatformStore, tas
|
|||||||
"package_dir": str(package_dir),
|
"package_dir": str(package_dir),
|
||||||
"runtime_validation": validation,
|
"runtime_validation": validation,
|
||||||
"source_dataset_id": dataset["id"],
|
"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]:
|
def run_scene_asset_compose(config: PlatformConfig, store: PlatformStore, task: dict[str, Any], emit: Callable[[str], None]) -> dict[str, Any]:
|
||||||
params = task["params"]
|
params = task["params"]
|
||||||
parent = store.get_scene(str(params["scene_id"]))
|
parent = store.get_scene(str(params["scene_id"]))
|
||||||
|
|||||||
@ -97,6 +97,18 @@ class UpdateEntityRequest(BaseModel):
|
|||||||
version: str | None = None
|
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):
|
class UpdateTaskRequest(BaseModel):
|
||||||
params: dict[str, Any]
|
params: dict[str, Any]
|
||||||
|
|
||||||
@ -623,6 +635,74 @@ def create_app(config: PlatformConfig | None = None) -> FastAPI:
|
|||||||
def list_digital_assets() -> list[dict[str, Any]]:
|
def list_digital_assets() -> list[dict[str, Any]]:
|
||||||
return _digital_asset_catalog(store)
|
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")
|
@app.get("/api/robots")
|
||||||
def list_robots() -> list[dict[str, Any]]:
|
def list_robots() -> list[dict[str, Any]]:
|
||||||
return _robot_catalog(cfg)
|
return _robot_catalog(cfg)
|
||||||
@ -1525,6 +1605,10 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]:
|
|||||||
}
|
}
|
||||||
for primitive in sorted(SUPPORTED_PRIMITIVES)
|
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():
|
for dataset in store.list_datasets():
|
||||||
root = Path(dataset["path"])
|
root = Path(dataset["path"])
|
||||||
if not root.is_dir():
|
if not root.is_dir():
|
||||||
@ -1541,6 +1625,8 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]:
|
|||||||
suffix = candidate.suffix.lower()
|
suffix = candidate.suffix.lower()
|
||||||
if suffix not in SUPPORTED_MESH_SUFFIXES:
|
if suffix not in SUPPORTED_MESH_SUFFIXES:
|
||||||
continue
|
continue
|
||||||
|
if str(candidate) in managed_paths:
|
||||||
|
continue
|
||||||
identifier = hashlib.sha256(f"dataset:{dataset['id']}:{relative.as_posix()}".encode("utf-8")).hexdigest()[:24]
|
identifier = hashlib.sha256(f"dataset:{dataset['id']}:{relative.as_posix()}".encode("utf-8")).hexdigest()[:24]
|
||||||
items.append(
|
items.append(
|
||||||
{
|
{
|
||||||
@ -1560,11 +1646,49 @@ def _digital_asset_catalog(store: PlatformStore) -> list[dict[str, Any]]:
|
|||||||
"dynamic": True,
|
"dynamic": True,
|
||||||
"collision": True,
|
"collision": True,
|
||||||
},
|
},
|
||||||
|
"managed": False,
|
||||||
|
"editable": False,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return items
|
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]]:
|
def _robot_catalog(cfg: PlatformConfig) -> list[dict[str, Any]]:
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
const STATIC_VERSION = "20260713-asset-delete-routes-v8";
|
const STATIC_VERSION = "20260713-standalone-assets-v1";
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
datasets: [],
|
datasets: [],
|
||||||
@ -73,7 +73,7 @@ const TAB_TITLES = Object.freeze({
|
|||||||
data: "数据管理",
|
data: "数据管理",
|
||||||
reconstruct: "场景重建",
|
reconstruct: "场景重建",
|
||||||
scenes: "场景管理",
|
scenes: "场景管理",
|
||||||
compose: "场景组合",
|
compose: "情景预制",
|
||||||
collect: "数据采集",
|
collect: "数据采集",
|
||||||
train: "模型训练",
|
train: "模型训练",
|
||||||
infer: "在线推理",
|
infer: "在线推理",
|
||||||
@ -237,6 +237,7 @@ function renderAll() {
|
|||||||
renderDatasetList();
|
renderDatasetList();
|
||||||
renderReconstructDatasetCards();
|
renderReconstructDatasetCards();
|
||||||
renderSceneList();
|
renderSceneList();
|
||||||
|
renderStandaloneAssetList();
|
||||||
if (activePageId() === "compose") renderComposition();
|
if (activePageId() === "compose") renderComposition();
|
||||||
renderPreflightSummary();
|
renderPreflightSummary();
|
||||||
renderCollectionDatasets();
|
renderCollectionDatasets();
|
||||||
@ -415,13 +416,40 @@ function renderSceneList() {
|
|||||||
["预览", `data-scene-viewer="${item.id}"`],
|
["预览", `data-scene-viewer="${item.id}"`],
|
||||||
["生成封面", `data-scene-cover="${item.id}"`],
|
["生成封面", `data-scene-cover="${item.id}"`],
|
||||||
["优化3DGS", `data-scene-splat-optimize="${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"`],
|
["清单", `data-view-json="/api/scenes/${item.id}/manifest"`],
|
||||||
],
|
],
|
||||||
})).join("");
|
})).join("");
|
||||||
setHtml("sceneList", rows || emptyState("暂无场景,请先在“场景重建”中创建。"));
|
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
|
||||||
|
? `<button data-asset-preview="${escapeAttr(asset.id)}">预览</button>`
|
||||||
|
: `<button disabled title="该格式需要在仿真器或场景查看器中打开">仅仿真资源</button>`;
|
||||||
|
const compose = asset.capabilities?.composition_supported
|
||||||
|
? `<button data-asset-compose="${escapeAttr(asset.id)}">用于情景</button>`
|
||||||
|
: "";
|
||||||
|
const manage = asset.managed
|
||||||
|
? `<button data-library-asset-edit="${escapeAttr(asset.id)}">重命名</button><button class="danger-button" data-library-asset-delete="${escapeAttr(asset.id)}">删除</button>`
|
||||||
|
: "";
|
||||||
|
return `<div class="resource-row asset-library-row" data-asset-id="${escapeAttr(asset.id)}">
|
||||||
|
<div class="resource-preview asset"><span>${escapeHtml(suffix || "资产")}</span></div>
|
||||||
|
<div class="row-title"><strong>${escapeHtml(asset.name || "未命名资产")}</strong><span>${escapeHtml(source)}${asset.scene_id ? " · 当前场景来源" : ""}</span></div>
|
||||||
|
<div class="row-meta">${escapeHtml(suffix || "未知格式")} · ${asset.size_bytes ? formatBytes(asset.size_bytes) : "内置"}</div>
|
||||||
|
<div class="row-meta">${asset.capabilities?.browser_preview ? "可预览" : "仿真资源"} · ${asset.capabilities?.composition_supported ? "可拖入情景" : "仅独立管理"}</div>
|
||||||
|
<div class="row-actions">${preview}${compose}${manage}<button data-asset-details="${escapeAttr(asset.id)}">清单</button></div>
|
||||||
|
</div>`;
|
||||||
|
}).join("");
|
||||||
|
setHtml("standaloneAssetList", rows || emptyState("导入空间包后,系统会在这里登记可独立管理的场景资产。"));
|
||||||
|
}
|
||||||
|
|
||||||
function baseCompositionScenes() {
|
function baseCompositionScenes() {
|
||||||
return state.scenes.filter((scene) => scene?.metadata?.editable !== false);
|
return state.scenes.filter((scene) => scene?.metadata?.editable !== false);
|
||||||
}
|
}
|
||||||
@ -556,7 +584,11 @@ function renderComposition() {
|
|||||||
<span><strong>${escapeHtml(robot.name)}</strong><span>${escapeHtml(robot.description || "MotrixSim 机器人")}</span><em>${robot.id === draft.robotId ? "已加入场景" : "拖入场景"}</em></span>
|
<span><strong>${escapeHtml(robot.name)}</strong><span>${escapeHtml(robot.description || "MotrixSim 机器人")}</span><em>${robot.id === draft.robotId ? "已加入场景" : "拖入场景"}</em></span>
|
||||||
</button>`).join("") || emptyState("暂无已注册机器人。"));
|
</button>`).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) => {
|
setHtml("composeAssetList", visibleAssets.map((asset) => {
|
||||||
const inScene = draft.assets.some((item) => item.catalog_id === asset.id);
|
const inScene = draft.assets.some((item) => item.catalog_id === asset.id);
|
||||||
return `<button class="composition-asset-card" type="button" draggable="true" data-compose-catalog="${escapeAttr(asset.id)}" data-in-scene="${inScene}">
|
return `<button class="composition-asset-card" type="button" draggable="true" data-compose-catalog="${escapeAttr(asset.id)}" data-in-scene="${inScene}">
|
||||||
@ -1057,7 +1089,7 @@ function renderSceneAssetInstances(assets, sceneId) {
|
|||||||
<div class="asset-instance-title"><strong>${escapeHtml(asset.name || asset.runtime.body)}</strong><span>${escapeHtml(asset.kind || asset.format || "数字资产")} · ${escapeHtml(asset.runtime.body)}</span></div>
|
<div class="asset-instance-title"><strong>${escapeHtml(asset.name || asset.runtime.body)}</strong><span>${escapeHtml(asset.kind || asset.format || "数字资产")} · ${escapeHtml(asset.runtime.body)}</span></div>
|
||||||
<div class="asset-instance-meta">位置 ${escapeHtml(position)} · 旋转 ${escapeHtml(rotation)}</div>
|
<div class="asset-instance-meta">位置 ${escapeHtml(position)} · 旋转 ${escapeHtml(rotation)}</div>
|
||||||
<div class="asset-instance-meta">${physics.dynamic ? "可运动" : "静态"} · ${physics.collision_mode === "visual_only" ? "仅可见" : "参与碰撞"}</div>
|
<div class="asset-instance-meta">${physics.dynamic ? "可运动" : "静态"} · ${physics.collision_mode === "visual_only" ? "仅可见" : "参与碰撞"}</div>
|
||||||
<div class="asset-instance-actions"><button data-asset-edit="${escapeAttr(asset.runtime.body)}" data-asset-scene="${escapeAttr(sceneId)}">编辑位置</button><button class="danger-button" data-asset-delete="${escapeAttr(asset.runtime.body)}" data-asset-scene="${escapeAttr(sceneId)}">删除</button></div>
|
<div class="asset-instance-actions"><button data-scene-compose="${escapeAttr(sceneId)}">进入情景预制</button></div>
|
||||||
</div>`;
|
</div>`;
|
||||||
}).join("") || emptyState("当前场景还没有添加的数字资产。请点击“添加新资产”或从资产库选择后保存。"));
|
}).join("") || emptyState("当前场景还没有添加的数字资产。请点击“添加新资产”或从资产库选择后保存。"));
|
||||||
}
|
}
|
||||||
@ -2654,9 +2686,64 @@ async function handleBodyClick(event) {
|
|||||||
const fullViewer = event.target.closest("#openSceneViewerFull");
|
const fullViewer = event.target.closest("#openSceneViewerFull");
|
||||||
if (fullViewer) openViewerFullscreen(fullViewer.dataset.viewerUrl);
|
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]");
|
const sceneAdd = event.target.closest("[data-scene-add]");
|
||||||
if (sceneAdd) openAssetEditor(sceneAdd.dataset.sceneAdd);
|
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]");
|
const assetEdit = event.target.closest("[data-asset-edit]");
|
||||||
if (assetEdit) openAssetInstanceEditor(assetEdit.dataset.assetScene, assetEdit.dataset.assetEdit);
|
if (assetEdit) openAssetInstanceEditor(assetEdit.dataset.assetScene, assetEdit.dataset.assetEdit);
|
||||||
|
|
||||||
|
|||||||
144
src/real2sim_platform/static/asset-viewer.html
Normal file
144
src/real2sim_platform/static/asset-viewer.html
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="zh-CN">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Real2Sim 资产预览</title>
|
||||||
|
<link rel="icon" href="data:,">
|
||||||
|
<style>
|
||||||
|
* { box-sizing: border-box; }
|
||||||
|
body { margin: 0; overflow: hidden; background: #081014; color: #e8f2f1; font: 14px/1.45 system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
|
||||||
|
canvas { display: block; width: 100vw; height: 100vh; }
|
||||||
|
#panel { position: fixed; z-index: 5; left: 16px; top: 16px; width: min(420px, calc(100vw - 32px)); padding: 14px 16px; border: 1px solid #2b5b5f; border-radius: 10px; background: rgba(8, 17, 22, .92); box-shadow: 0 16px 40px rgba(0,0,0,.3); }
|
||||||
|
#panel strong { display: block; font-size: 16px; }
|
||||||
|
#meta, #status { margin-top: 6px; color: #a8c2c2; overflow-wrap: anywhere; }
|
||||||
|
#status { color: #46ddc2; }
|
||||||
|
#status.error { color: #ff8277; }
|
||||||
|
#back { margin-top: 12px; border: 1px solid #3a7774; border-radius: 6px; padding: 7px 10px; background: #123237; color: #e8f2f1; cursor: pointer; }
|
||||||
|
@media (max-width: 640px) { #panel { left: 8px; top: 8px; width: calc(100vw - 16px); } }
|
||||||
|
</style>
|
||||||
|
<script type="importmap">
|
||||||
|
{ "imports": { "three": "/static/vendor/three/three.module.js", "three/addons/": "/static/vendor/three/addons/" } }
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<section id="panel" aria-live="polite">
|
||||||
|
<strong id="title">资产预览</strong>
|
||||||
|
<div id="meta">正在读取资产清单</div>
|
||||||
|
<div id="status">加载中</div>
|
||||||
|
<button id="back" type="button">返回平台</button>
|
||||||
|
</section>
|
||||||
|
<script type="module">
|
||||||
|
import * as THREE from "three";
|
||||||
|
import { OrbitControls } from "three/addons/controls/OrbitControls.js";
|
||||||
|
import { OBJLoader } from "three/addons/loaders/OBJLoader.js";
|
||||||
|
import { PLYLoader } from "three/addons/loaders/PLYLoader.js";
|
||||||
|
|
||||||
|
const title = document.getElementById("title");
|
||||||
|
const meta = document.getElementById("meta");
|
||||||
|
const status = document.getElementById("status");
|
||||||
|
const params = new URLSearchParams(location.search);
|
||||||
|
const assetId = params.get("asset_id");
|
||||||
|
const renderer = new THREE.WebGLRenderer({ antialias: true, preserveDrawingBuffer: true });
|
||||||
|
renderer.setPixelRatio(Math.min(devicePixelRatio, 2));
|
||||||
|
renderer.setSize(innerWidth, innerHeight);
|
||||||
|
renderer.setClearColor(0x081014, 1);
|
||||||
|
document.body.appendChild(renderer.domElement);
|
||||||
|
const scene = new THREE.Scene();
|
||||||
|
const camera = new THREE.PerspectiveCamera(55, innerWidth / innerHeight, .01, 1000);
|
||||||
|
camera.position.set(2.2, 1.6, 2.2);
|
||||||
|
const controls = new OrbitControls(camera, renderer.domElement);
|
||||||
|
controls.enableDamping = true;
|
||||||
|
controls.target.set(0, 0, 0);
|
||||||
|
scene.add(new THREE.GridHelper(4, 16, 0x2f6d68, 0x24313a));
|
||||||
|
scene.add(new THREE.AxesHelper(1.1));
|
||||||
|
const lights = new THREE.Group();
|
||||||
|
const key = new THREE.DirectionalLight(0xffffff, 1.7);
|
||||||
|
key.position.set(3, 4, 2);
|
||||||
|
lights.add(key, new THREE.AmbientLight(0x9fb6c8, .8));
|
||||||
|
scene.add(lights);
|
||||||
|
let object = null;
|
||||||
|
|
||||||
|
document.getElementById("back").addEventListener("click", () => window.close() || (location.href = "/scenes"));
|
||||||
|
addEventListener("resize", () => {
|
||||||
|
camera.aspect = innerWidth / innerHeight;
|
||||||
|
camera.updateProjectionMatrix();
|
||||||
|
renderer.setSize(innerWidth, innerHeight);
|
||||||
|
});
|
||||||
|
|
||||||
|
function fail(message) {
|
||||||
|
status.textContent = message;
|
||||||
|
status.classList.add("error");
|
||||||
|
}
|
||||||
|
|
||||||
|
function fit(target) {
|
||||||
|
const box = new THREE.Box3().setFromObject(target);
|
||||||
|
if (box.isEmpty()) return;
|
||||||
|
const center = box.getCenter(new THREE.Vector3());
|
||||||
|
const size = box.getSize(new THREE.Vector3());
|
||||||
|
const radius = Math.max(size.length() * .65, .2);
|
||||||
|
target.position.sub(center);
|
||||||
|
camera.position.set(radius * 1.7, radius * 1.1, radius * 1.7);
|
||||||
|
camera.near = Math.max(radius / 1000, .001);
|
||||||
|
camera.far = Math.max(radius * 100, 100);
|
||||||
|
camera.updateProjectionMatrix();
|
||||||
|
controls.target.set(0, 0, 0);
|
||||||
|
controls.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadAsset(asset) {
|
||||||
|
const url = asset.preview_url || asset.url;
|
||||||
|
if (!url) throw new Error("该资产没有可访问的预览文件");
|
||||||
|
const suffix = String(asset.format || asset.name || "").toLowerCase().split(".").pop();
|
||||||
|
if (["spz", "splat", "ksplat", "sog"].includes(suffix)) {
|
||||||
|
const spark = await import("/static/vendor/spark.module.min.js");
|
||||||
|
if (!spark.SparkRenderer || !spark.SplatMesh) throw new Error("Spark bundle 未提供 SplatMesh");
|
||||||
|
const sparkRenderer = new spark.SparkRenderer({ renderer });
|
||||||
|
scene.add(sparkRenderer);
|
||||||
|
const splat = new spark.SplatMesh({ url });
|
||||||
|
scene.add(splat);
|
||||||
|
await splat.initialized;
|
||||||
|
status.textContent = "Spark 已加载 · 可拖动鼠标旋转、滚轮缩放";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (suffix === "glb" || suffix === "gltf") {
|
||||||
|
const { GLTFLoader } = await import("three/addons/loaders/GLTFLoader.js");
|
||||||
|
object = (await new GLTFLoader().loadAsync(url)).scene;
|
||||||
|
} else if (suffix === "obj") {
|
||||||
|
object = await new OBJLoader().loadAsync(url);
|
||||||
|
} else if (suffix === "ply") {
|
||||||
|
const geometry = await new PLYLoader().loadAsync(url);
|
||||||
|
geometry.computeVertexNormals();
|
||||||
|
object = new THREE.Points(geometry, new THREE.PointsMaterial({ size: .012, vertexColors: Boolean(geometry.getAttribute("color")), color: 0x9fe7d9 }));
|
||||||
|
} else {
|
||||||
|
throw new Error(`浏览器暂不支持 .${suffix} 独立预览`);
|
||||||
|
}
|
||||||
|
scene.add(object);
|
||||||
|
fit(object);
|
||||||
|
status.textContent = "Three.js 已加载 · 可拖动鼠标旋转、滚轮缩放";
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
if (!assetId) return fail("缺少资产标识");
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/assets/${encodeURIComponent(assetId)}`);
|
||||||
|
if (!response.ok) throw new Error("资产不存在或已删除");
|
||||||
|
const asset = await response.json();
|
||||||
|
title.textContent = asset.name || "资产预览";
|
||||||
|
meta.textContent = `${String(asset.format || "未知格式").toUpperCase()} · ${asset.source_type || "资产"} · ${asset.size_bytes ? Math.round(asset.size_bytes / 1024 / 1024 * 10) / 10 + " MB" : "内置"}`;
|
||||||
|
await loadAsset(asset);
|
||||||
|
} catch (error) {
|
||||||
|
fail(error.message || String(error));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function animate() {
|
||||||
|
requestAnimationFrame(animate);
|
||||||
|
controls.update();
|
||||||
|
renderer.render(scene, camera);
|
||||||
|
}
|
||||||
|
animate();
|
||||||
|
main();
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -52,7 +52,7 @@
|
|||||||
<button class="tab" data-tab="data">数据管理</button>
|
<button class="tab" data-tab="data">数据管理</button>
|
||||||
<button class="tab" data-tab="reconstruct">场景重建</button>
|
<button class="tab" data-tab="reconstruct">场景重建</button>
|
||||||
<button class="tab" data-tab="scenes">场景管理</button>
|
<button class="tab" data-tab="scenes">场景管理</button>
|
||||||
<button class="tab" data-tab="compose">场景组合</button>
|
<button class="tab" data-tab="compose">情景预制</button>
|
||||||
<button class="tab" data-tab="collect">数据采集</button>
|
<button class="tab" data-tab="collect">数据采集</button>
|
||||||
<button class="tab" data-tab="train">模型训练</button>
|
<button class="tab" data-tab="train">模型训练</button>
|
||||||
<button class="tab" data-tab="infer">在线推理</button>
|
<button class="tab" data-tab="infer">在线推理</button>
|
||||||
@ -309,7 +309,7 @@
|
|||||||
<div class="page-head">
|
<div class="page-head">
|
||||||
<div>
|
<div>
|
||||||
<h1>场景管理</h1>
|
<h1>场景管理</h1>
|
||||||
<p>场景管理用于查看重建结果、添加资产、仿真校验、导出,并绑定后续采集和推理。</p>
|
<p>场景管理只负责基础场景、导入产物和独立资产的查看与治理;机器人、物体布置和物理属性请在“情景预制”中完成。</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="button-row page-actions">
|
<div class="button-row page-actions">
|
||||||
<button id="createSceneLibrary" class="primary-button" type="button">新建场景</button>
|
<button id="createSceneLibrary" class="primary-button" type="button">新建场景</button>
|
||||||
@ -349,34 +349,12 @@
|
|||||||
<section class="panel asset-editor-panel">
|
<section class="panel asset-editor-panel">
|
||||||
<div class="panel-head">
|
<div class="panel-head">
|
||||||
<div>
|
<div>
|
||||||
<h2>数字资产编辑</h2>
|
<h2>独立资产库</h2>
|
||||||
<p>从资产库选择物体或基础形状,保存后生成通过仿真校验的新版本</p>
|
<p>导入空间包后自动登记;这里的重命名和删除只影响资产索引,不会改动基础场景文件。</p>
|
||||||
</div>
|
</div>
|
||||||
<button id="addSceneAsset" class="primary-button">保存为新版本</button>
|
<button type="button" data-open-import="upload">导入资产数据</button>
|
||||||
</div>
|
|
||||||
<div class="form-grid">
|
|
||||||
<label class="span-2">目标场景<select id="assetScene"></select></label>
|
|
||||||
<label class="span-2">数字资产<select id="assetPreset"></select></label>
|
|
||||||
<input id="assetInstanceId" type="hidden" value="">
|
|
||||||
<div class="span-2 asset-source-actions"><span id="assetSourceHint">基础形状可直接加入,上传的网格会自动出现在资产库</span><button type="button" data-open-import="upload">上传新资产</button></div>
|
|
||||||
<label>显示名称<input id="assetName" placeholder="例如茶几上的收纳盒"></label>
|
|
||||||
<label>碰撞模式<select id="assetCollisionMode"><option value="visual_and_collision">可见并参与碰撞</option><option value="visual_only">仅可见</option><option value="collision_only">仅碰撞</option></select></label>
|
|
||||||
<label class="toggle-field"><input id="assetDynamic" type="checkbox"> 可运动物体</label>
|
|
||||||
<label>质量(kg)<input id="assetMass" type="number" min="0.001" step="0.01" value="0.25"></label>
|
|
||||||
<label>长度(m)<input id="assetSizeX" type="number" min="0.001" step="0.01" value="0.10"></label>
|
|
||||||
<label>宽度(m)<input id="assetSizeY" type="number" min="0.001" step="0.01" value="0.10"></label>
|
|
||||||
<label>高度(m)<input id="assetSizeZ" type="number" min="0.001" step="0.01" value="0.10"></label>
|
|
||||||
<label>缩放 X<input id="assetScaleX" type="number" min="0.001" step="0.01" value="1"></label>
|
|
||||||
<label>缩放 Y<input id="assetScaleY" type="number" min="0.001" step="0.01" value="1"></label>
|
|
||||||
<label>缩放 Z<input id="assetScaleZ" type="number" min="0.001" step="0.01" value="1"></label>
|
|
||||||
<label>位置 X<input id="assetPosX" type="number" step="0.01" value="0"></label>
|
|
||||||
<label>位置 Y<input id="assetPosY" type="number" step="0.01" value="0"></label>
|
|
||||||
<label>位置 Z<input id="assetPosZ" type="number" step="0.01" value="0"></label>
|
|
||||||
<label>旋转 X(度)<input id="assetRotX" type="number" step="1" value="0"></label>
|
|
||||||
<label>旋转 Y(度)<input id="assetRotY" type="number" step="1" value="0"></label>
|
|
||||||
<label>旋转 Z(度)<input id="assetRotZ" type="number" step="1" value="0"></label>
|
|
||||||
<label>仿真校验步数<input id="assetValidationSteps" type="number" min="1" max="5000" value="60"></label>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div id="standaloneAssetList" class="resource-table compact-table"></div>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -384,9 +362,9 @@
|
|||||||
<div class="panel-head">
|
<div class="panel-head">
|
||||||
<div>
|
<div>
|
||||||
<h2>场景资产管理</h2>
|
<h2>场景资产管理</h2>
|
||||||
<p>管理当前场景中已添加的资产;编辑位置、旋转、缩放和物理属性会生成新 revision,原场景保留。</p>
|
<p>组合场景中的实例只读展示;要修改位置、旋转、缩放和物理属性,请进入“情景预制”生成新版本。</p>
|
||||||
</div>
|
</div>
|
||||||
<button id="resetAssetEditor" type="button">添加新资产</button>
|
<button id="goComposeFromScene" type="button">进入情景预制</button>
|
||||||
</div>
|
</div>
|
||||||
<div id="sceneAssetInstances" class="asset-instance-list"></div>
|
<div id="sceneAssetInstances" class="asset-instance-list"></div>
|
||||||
</section>
|
</section>
|
||||||
@ -395,7 +373,7 @@
|
|||||||
<div class="panel-head">
|
<div class="panel-head">
|
||||||
<div>
|
<div>
|
||||||
<h2>资产清单</h2>
|
<h2>资产清单</h2>
|
||||||
<p>点云、网格、纹理、相机和仿真产物</p>
|
<p>当前基础场景的原始点云、网格、碰撞体和运行时报告</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="assetRail" class="asset-grid"></div>
|
<div id="assetRail" class="asset-grid"></div>
|
||||||
@ -405,8 +383,8 @@
|
|||||||
<section id="compose" class="page">
|
<section id="compose" class="page">
|
||||||
<div class="page-head">
|
<div class="page-head">
|
||||||
<div>
|
<div>
|
||||||
<h1>场景组合</h1>
|
<h1>情景预制</h1>
|
||||||
<p>选择基础场景与机器人,将真实数字资产拖入三维画布;保存后生成可测试、可采集的 MotrixSim 场景版本。</p>
|
<p>选择基础场景,拖入机器人和独立资产,设置位姿与物理属性;保存后生成可测试、可采集的 MotrixSim 场景版本。</p>
|
||||||
</div>
|
</div>
|
||||||
<button id="loadPickPlacePreset" type="button">加载 Pick-Place 预设</button>
|
<button id="loadPickPlacePreset" type="button">加载 Pick-Place 预设</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -157,6 +157,96 @@ class PlatformStore:
|
|||||||
def delete_model(self, item_id: str) -> None:
|
def delete_model(self, item_id: str) -> None:
|
||||||
self._delete("models", item_id)
|
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]:
|
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"}:
|
if table not in {"datasets", "scenes", "models"}:
|
||||||
raise ValueError("unsupported entity table")
|
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 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 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 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(
|
db.execute(
|
||||||
"create table if not exists tasks("
|
"create table if not exists tasks("
|
||||||
"id text primary key,type text,status text,params_json text,result_json text not null default '{}',"
|
"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]:
|
def _model_row(self, row: sqlite3.Row) -> dict[str, Any]:
|
||||||
return {**self._entity_common(row), "metadata": json.loads(row["metadata_json"])}
|
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]:
|
def _entity_common(self, row: sqlite3.Row) -> dict[str, Any]:
|
||||||
return {
|
return {
|
||||||
"id": row["id"],
|
"id": row["id"],
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import pytest
|
|||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
from PIL import Image
|
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.config import PlatformConfig
|
||||||
from real2sim_platform import motrix_scene
|
from real2sim_platform import motrix_scene
|
||||||
from real2sim_platform.server import create_app
|
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
|
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("<mujoco/>", 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:
|
def test_scene_library_clone_and_asset_revision_requests_are_real_tasks(tmp_path: Path) -> None:
|
||||||
package = tmp_path / "editable_package"
|
package = tmp_path / "editable_package"
|
||||||
runtime_dir = package / "simulator_assets"
|
runtime_dir = package / "simulator_assets"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user