Make asset pack material imports idempotent

这个提交存在于:
YokiiroBW 2026-07-05 21:29:59 +08:00
父节点 74ef6a9070
当前提交 c7c8ba8358
共有 3 个文件被更改,包括 40 次插入 和 3 次删除

查看文件

@ -3,6 +3,7 @@
from __future__ import annotations
import json
import hashlib
from pathlib import Path
from typing import Any
@ -45,7 +46,7 @@ class AssetImportService:
files, total_bytes = _path_file_stats(package_path)
manifest_candidates = _manifest_candidates(root, relative, package_path)
manifest_summary = _manifest_summary(package_path, manifest_candidates)
applied = {"materials": 0, "styles": 0, "material_ids": []}
applied = {"materials": 0, "styles": 0, "material_ids": [], "created": 0, "updated": 0}
if not dry_run and not manifest_summary["valid"]:
raise ApiError(
ErrorCode.VALIDATION_FAILED,
@ -84,6 +85,8 @@ class AssetImportService:
) -> dict[str, Any]:
payload = _load_manifest_payload(manifest["path"])
material_ids: list[str] = []
created_count = 0
updated_count = 0
base_relative = relative if package_path.is_dir() else relative.parent
for index, item in enumerate(payload.get("materials") or []):
if not isinstance(item, dict):
@ -103,12 +106,20 @@ class AssetImportService:
self.storage.ensure_file(material_payload["image_uri"])
if material_payload.get("thumbnail_uri"):
self.storage.ensure_file(material_payload["thumbnail_uri"])
created = self.material_service.create_material(material_payload, ctx)
material_ids.append(created.material_id)
existing = self.material_service.repository.get_material(material_payload["material_id"])
if existing is None:
material = self.material_service.create_material(material_payload, ctx)
created_count += 1
else:
material = self.material_service.update_material(material_payload["material_id"], material_payload, ctx)
updated_count += 1
material_ids.append(material.material_id)
return {
"materials": len(material_ids),
"styles": _list_count(payload.get("styles")),
"material_ids": material_ids,
"created": created_count,
"updated": updated_count,
}
@ -213,7 +224,9 @@ def _material_payload_from_manifest_item(
thumbnail_uri = _asset_uri(item.get("thumbnail_uri") or item.get("thumbnail"), root, base_relative)
display_name = _optional_text(item.get("display_name") or item.get("name") or item.get("title")) or Path(image_uri).stem
metadata = item.get("metadata") if isinstance(item.get("metadata"), dict) else {}
material_id = _material_id(item, package_uri, manifest_uri, index, image_uri)
return {
"material_id": material_id,
"category_id": _optional_text(item.get("category_id")),
"display_name": display_name,
"image_uri": image_uri,
@ -242,6 +255,14 @@ def _asset_uri(value: Any, root: str, base_relative: Path) -> str | None:
return _storage_uri(root, base_relative / text)
def _material_id(item: dict[str, Any], package_uri: str, manifest_uri: str, index: int, image_uri: str) -> str:
explicit = _optional_text(item.get("material_id") or item.get("id"))
if explicit:
return explicit
digest = hashlib.sha1(f"{package_uri}|{manifest_uri}|{index}|{image_uri}".encode("utf-8")).hexdigest()
return f"mat_pack_{digest[:24]}"
def _storage_uri(root: str, relative: Path) -> str:
return f"storage://{root}/{relative.as_posix()}"

查看文件

@ -27,5 +27,7 @@ export interface AssetImportPlan {
materials: number
styles: number
material_ids: string[]
created: number
updated: number
}
}

查看文件

@ -727,6 +727,8 @@ database:
self.assertEqual(planned["data"]["applied"]["materials"], 0)
self.assertEqual(planned["data"]["applied"]["styles"], 0)
self.assertEqual(planned["data"]["applied"]["material_ids"], [])
self.assertEqual(planned["data"]["applied"]["created"], 0)
self.assertEqual(planned["data"]["applied"]["updated"], 0)
self.assertNotIn(str(self.root), str(planned["data"]))
execution = import_asset_pack(
@ -740,12 +742,24 @@ database:
self.assertEqual(execution["data"]["applied"]["materials"], 1)
self.assertEqual(execution["data"]["applied"]["styles"], 1)
self.assertEqual(len(execution["data"]["applied"]["material_ids"]), 1)
self.assertEqual(execution["data"]["applied"]["created"], 1)
self.assertEqual(execution["data"]["applied"]["updated"], 0)
self.assertNotIn(str(self.root), str(execution["data"]))
imported = self.material_service.get_material(execution["data"]["applied"]["material_ids"][0])
self.assertEqual(imported.display_name, "hat")
self.assertEqual(imported.image_uri, "storage://materials/pack/image.bin")
self.assertEqual(imported.recognition_status, "pending_recognition")
self.assertIn("daily", imported.tags)
second_execution = import_asset_pack(
self.ctx,
{"package_uri": "storage://materials/pack", "dry_run": False},
self.asset_import_service,
)
self.assertTrue(second_execution["ok"])
self.assertEqual(second_execution["data"]["applied"]["material_ids"], execution["data"]["applied"]["material_ids"])
self.assertEqual(second_execution["data"]["applied"]["created"], 0)
self.assertEqual(second_execution["data"]["applied"]["updated"], 1)
self.assertEqual(self.material_service.list_materials(keyword="hat").total, 1)
unsafe = import_asset_pack(
self.ctx,