diff --git a/backend/services/asset_import_service.py b/backend/services/asset_import_service.py index 4720976..6e47fe8 100644 --- a/backend/services/asset_import_service.py +++ b/backend/services/asset_import_service.py @@ -190,15 +190,16 @@ def _manifest_summary(package_path: Path, candidates: list[dict[str, Any]]) -> d "errors": [{"code": "MANIFEST_NOT_OBJECT", "message": "asset pack manifest must be a JSON object"}], } + errors = _manifest_entry_errors(payload) return { "present": True, - "valid": True, + "valid": not errors, "uri": selected["uri"], "name": _optional_text(payload.get("name")), "version": _optional_text(payload.get("version")), "materials": _list_count(payload.get("materials")), "styles": _list_count(payload.get("styles")), - "errors": [], + "errors": errors, } @@ -209,6 +210,40 @@ def _load_manifest_payload(path: Path) -> dict[str, Any]: return payload +def _manifest_entry_errors(payload: dict[str, Any]) -> list[dict[str, Any]]: + errors: list[dict[str, Any]] = [] + materials = payload.get("materials") + if materials is not None and not isinstance(materials, list): + errors.append( + { + "code": "MATERIALS_NOT_LIST", + "message": "asset pack materials must be a list", + "field": "materials", + } + ) + return errors + for index, item in enumerate(materials or []): + field = f"materials[{index}]" + if not isinstance(item, dict): + errors.append( + { + "code": "MATERIAL_ENTRY_NOT_OBJECT", + "message": "asset pack material entries must be objects", + "field": field, + } + ) + continue + if not _optional_text(item.get("image_uri") or item.get("uri") or item.get("image") or item.get("file")): + errors.append( + { + "code": "MATERIAL_IMAGE_MISSING", + "message": "asset pack material entry must include image_uri, uri, image, or file", + "field": f"{field}.image_uri", + } + ) + return errors + + def _material_payload_from_manifest_item( item: dict[str, Any], *, diff --git a/tests/test_s2_routes.py b/tests/test_s2_routes.py index 7a46e9f..4026307 100644 --- a/tests/test_s2_routes.py +++ b/tests/test_s2_routes.py @@ -790,6 +790,28 @@ database: self.assertFalse(invalid_execution["ok"]) self.assertEqual(invalid_execution["error_code"], "VALIDATION_FAILED") + missing_image_pack = self.root / "materials" / "missing-image-pack" + missing_image_pack.mkdir(parents=True, exist_ok=True) + (missing_image_pack / "manifest.json").write_text( + '{"name":"missing image","materials":[{"name":"hat"}]}', + encoding="utf-8", + ) + missing_image = import_asset_pack( + self.ctx, + {"package_uri": "storage://materials/missing-image-pack", "dry_run": True}, + self.asset_import_service, + ) + self.assertTrue(missing_image["ok"]) + self.assertFalse(missing_image["data"]["manifest"]["valid"]) + self.assertEqual(missing_image["data"]["manifest"]["errors"][0]["code"], "MATERIAL_IMAGE_MISSING") + missing_image_execution = import_asset_pack( + self.ctx, + {"package_uri": "storage://materials/missing-image-pack", "dry_run": False}, + self.asset_import_service, + ) + self.assertFalse(missing_image_execution["ok"]) + self.assertEqual(missing_image_execution["error_code"], "VALIDATION_FAILED") + def test_media_signing_rejects_unsafe_or_missing_uri(self): unsafe = sign_media( self.ctx,