3c0424b90c
- What:
1. **设备侧自己说几何**(新增 `shared/.../acquisition/geometry.py`):`describe_sensor_geometry()`
从运行时真正加载的文件推导——`manifest.json` 的 `assets_dir`、`sensor.json` 的
`camera.resolution_stitch`/`source_scale`、以及据此命名的 unroll map(`unroll_map_uv_s0.4.npz`)。
产出 `DeviceGeometry(expected, verified, detail)`:`field_domain_id` + `shape_hw`(映射身份,含
flip/scale/映射内容摘要)与 **无单位** 的 `source_geometry_id`(地图里 `world_xyz` 的内容摘要)。
米制 `geometry_id` 需要"1 源单位 = N 米"这句只有人能做的声明,设备侧**故意留空**。两类失败区分对待:
定位不到 bundle / 没写 `assets_dir` → `verified=False`(可显示,但不声明已校验);bundle 变了
(map 缺失、与 `resolution_stitch` 不符)→ 直接拒绝并指名两个形状/文件。
2. **契约**:`ExpectedGeometry += source_geometry_id`;`SceneAssets += source_geometry_id,
compatible_sensor_model, compatible_hardware_revisions`;诊断码 `geometry_unverified`(info);
`digest.source_geometry_digest(world_xyz)`;`legacy.convert()` 写入 `source_geometry_id`;
`package.py` 的 manifest 增 `source_geometry` 块(数组名与单位写明),读取时把 `compatible` 与
`source_geometry` 一并还原(旧包读到空串)。`validate_assets()` 的 expected 段重写:**只比较已声明的
字段**,`source_geometry_id` 不符即拒绝,包内未记录该身份 → 返回 `geometry_unverified` 警告而不是
静默通过;顺带修掉 `expected.sensor_model != assets.parts[0].role` 这行毫无意义的比较,改成真正的
型号/硬件版本比对(`*` = 任意版本)。
3. **接线**:`app_window._sync_3d_source()` 传 `expected_provider=`(一个闭包,指向当前传感器配置);
`SceneAssetLoader` 在**工作线程**上解析它(`_resolve_and_load`);`view.use_scene(assets, source_id,
expected)` 改为 `validate_assets(assets, expected)` 并把警告送到面板,同时记录 `device_verified`;
`_make_snapshot()` 用**设备**的身份构造 adapter(设备没声明的字段才回退资产),使
"帧与场景匹配" 第一次成为独立检查而不是自证;`describe()` 记录 `scene.device_verified` 与设备身份。
4. **资产加载请求身份(R7-a)**:`SceneAssetLoader` 增请求号与 pending 槽——忙时不再丢弃新请求,而是
保留最新一个并在前一个结束后启动;完成信号带请求号(`loaded(assets, 描述, id, device)` /
`failed(diag, id)`),`Mesh3dPanel` 丢弃过期完成(否则旧文件的场景会落回新选择上)。失败后可重试。
5. **工具与包**:`compile_scene.py`/`validate_scene.py` 报告 `geometry_id`/`field_domain_id`/
`source_geometry_id`/兼容信息;README 写明无单位身份是什么、为什么设备侧用它;**重编发布包**
`apps/studio/config/sensors/finger/scene/finger-display-1.0.0.oryscene`(geometry_id 仍为
`1a2e0e92…`、1032 顶点 / 1974 三角形,新增 `source_geometry_id=46a03a5f…`,因此 asset_hash 变为 `ea4beab6…`)。
- Why: 审查报告 P1/R3:主窗口只传 sensor_type 与 package_override,`Mesh3dPanel._expected` 永远是 None,
`validate_assets(assets, None)` 跳过全部设备比对,而 adapter 的 geometry_id/field_domain_id/shape_hw
全部来自**已选中的资产**——于是收到的数据被贴上"资产自己期望的身份"。结果:shape 相同但 UV 映射、
flip_v、source_scale 或相机配置不同时无法区分。P1/R7:`SceneAssetLoader.load()` 在忙时直接 return,
既没保留最新请求也没有 generation,`_on_loaded` 又用当前 `_source` 标记已加载路径,快速切换配置时旧
文件的任务会回到新选择上。
- Verification:
· 证据探针 `.repro/probe_stage6_device.py` → `probe_stage6_device.json`(真实 bundle + 真实包):
设备描述 `verified=true`、domain `feb7f71e…`、source geometry `46a03a5f…`、shape 300x280、
米制 id 未声明、map = `unroll_map_uv_s0.4.npz`;发布包通过该描述;**同尺寸不同映射**(只改 map 一个
像素的坐标)→ domain 变化、shape 不变、包被 `field_domain_mismatch` 拒绝;设备什么都不声明 →
接受 + `geometry_unverified`。
· 新增 `shared/tests/test_scene3d_device_geometry.py` 9 项:描述来源、发布包通过、同尺寸不同映射拒绝、
同 map 不同表面拒绝、定位不到 bundle → unverified、`resolution_stitch` 与 map 不符拒绝、map 缺失
指名文件、无 `assets_dir` → unverified、map 命名规则。
· `test_scene3d_contracts.py` +4(未声明身份 → 警告而非匹配、source geometry 不符拒绝/缺记录 → 警告、
型号与硬件版本、`source_geometry_digest` 的稳定性与形状校验);`test_scene3d_package.py` +2
(`source_geometry` 往返、旧包读成"未声明");`test_scene3d_view.py` +6(adapter 身份来自设备、
设备 domain 不符 → 拒绝且不上屏、无描述 → `geometry_unverified` 且 `device_verified=false`、
**最新请求才运行**、面板丢弃过期完成、失败后可重试)。
· 全量:apps/studio 0 失败(`--junitxml`:231→236 项);shared 0 失败(含 device_geometry 9 项);
`validate_scene.py` 对重编包全项 ok。
- Not in this change: 生产侧仍不声明米制 `geometry_id`(那句单位声明只有人能写;要设备端复算它需要把
`meters_per_source_unit` 与刚体变换记进配置,属可选加强项,已在本提交的 `DeviceGeometry.detail` 里留位);
`ExpectedGeometry.mapping_digest` 未加——`field_domain_id` 本身就是由映射内容摘要派生的,再加一个字段
只是同一个事实的第二个名字;`docs/architecture/studio-3d-contracts.pyi` 与本阶段新契约的同步放在阶段 6
的文档提交里;保护包密钥注入(R4)、限速与真实统计、二维后端统一均未动。
263 lines
11 KiB
Python
263 lines
11 KiB
Python
"""Compile a legacy export into a runtime package (stages 2 and 5 of the 3D plan).
|
|
|
|
Offline only: this is the tool that bakes the coordinate transform, the unit
|
|
scale, the UV sampling table and the identity hashes into one file, so the runtime
|
|
never repeats that work. Stage 5 adds the three release protections the design
|
|
document asks for, and each is optional:
|
|
|
|
* ``--sign-key``: sign the package with an Ed25519 private key that stays on the
|
|
build machine. The client carries only the matching public key.
|
|
* ``--encrypt-key-id`` + ``--key-file``: additionally seal the content with
|
|
AES-256-GCM. Encryption never replaces signing; it is added to it.
|
|
* ``--lock-*`` (or ``--lock-from-probe``): record where the package may be
|
|
displayed. A release compiled for a GPU must not silently render on llvmpipe.
|
|
|
|
Units are an argument, never a default. The legacy mesh is 15.8 x 15.0 x 7.5 source
|
|
units; whether one of those is a millimetre is a physical claim about the sensor,
|
|
and ``validate_scene.py`` prints the measured candidates so a person can decide.
|
|
|
|
Examples::
|
|
|
|
# an engineering package: plain, unsigned, unlocked
|
|
python tools/scene_assets/compile_scene.py \\
|
|
--legacy-dir sensors/finger/assets/30fps-0703 \\
|
|
--map sensors/finger/assets/30fps-0703/unroll_map_uv_s0.4.npz \\
|
|
--meters-per-source-unit 0.001 \\
|
|
--output build/finger-display-1.0.0.oryscene
|
|
|
|
# a release package: signed, sealed, locked to the machine we probed
|
|
python tools/scene_assets/compile_scene.py \\
|
|
--legacy-dir sensors/finger/assets/30fps-0703 \\
|
|
--map sensors/finger/assets/30fps-0703/unroll_map_uv_s0.4.npz \\
|
|
--meters-per-source-unit 0.001 \\
|
|
--sign-key keys/build-ed25519.pem --sign-key-id build-2024 \\
|
|
--encrypt-key-id finger-display --key-file keys/finger-display.key \\
|
|
--lock-from-probe docs/architecture/gl-report-windows-dev.json \\
|
|
--output build/finger-display-1.0.0.oryscene
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
|
|
def _bootstrap_paths() -> None:
|
|
here = Path(__file__).resolve()
|
|
repo = here.parents[2]
|
|
for path in (repo / "apps" / "studio" / "src", repo / "shared" / "src"):
|
|
if path.is_dir() and str(path) not in sys.path:
|
|
sys.path.insert(0, str(path))
|
|
|
|
|
|
def _platform_lock_from_args(args):
|
|
"""The lock the command line describes, from a probe report or from flags."""
|
|
from orisys_app_shared.scene3d.contracts import PlatformLock
|
|
|
|
if args.lock_from_probe is not None:
|
|
report = json.loads(Path(args.lock_from_probe).read_text(encoding="utf-8"))
|
|
context = report.get("context") or {}
|
|
host = report.get("host") or {}
|
|
os_family = host.get("os_family") or host.get("system") or ""
|
|
machine = host.get("machine") or ""
|
|
return PlatformLock(
|
|
os_family=(str(os_family).lower(),) if os_family else (),
|
|
machine=(str(machine).lower(),) if machine else (),
|
|
gl_profile=(
|
|
str(context.get("profile_used")) if context.get("profile_used") else None
|
|
),
|
|
allowed_vendors=(str(context["vendor"]),) if context.get("vendor") else (),
|
|
allowed_renderers=(str(context["renderer"]),) if context.get("renderer") else (),
|
|
forbid_software_renderer=not args.allow_software_renderer,
|
|
min_texture_size=int(context.get("max_texture_size") or 0),
|
|
note=str(args.lock_note or f"qualified from {Path(args.lock_from_probe).name}"),
|
|
)
|
|
lock = PlatformLock(
|
|
os_family=tuple(v.lower() for v in (args.lock_os or ())),
|
|
machine=tuple(v.lower() for v in (args.lock_machine or ())),
|
|
gl_profile=args.lock_gl_profile,
|
|
allowed_vendors=tuple(args.lock_vendor or ()),
|
|
allowed_renderers=tuple(args.lock_renderer or ()),
|
|
forbid_software_renderer=not args.allow_software_renderer,
|
|
min_texture_size=int(args.lock_min_texture or 0),
|
|
note=str(args.lock_note or ""),
|
|
)
|
|
return None if lock.is_unrestricted() and not args.lock_note else lock
|
|
|
|
|
|
def _sealing_from_args(args):
|
|
"""The key material the command line points at, or ``None`` for a plain package."""
|
|
from orisys_app_shared.scene3d.contracts import Sealing
|
|
from orisys_app_shared.scene3d import protect
|
|
|
|
signing_pem = None
|
|
if args.sign_key is not None:
|
|
path = Path(args.sign_key)
|
|
if not path.is_file():
|
|
raise SystemExit(f"the signing key is missing: {path}")
|
|
signing_pem = path.read_bytes()
|
|
# Prove the key is usable before spending a compile on it.
|
|
protect.public_key_pem(signing_pem)
|
|
provider = None
|
|
if args.encrypt_key_id:
|
|
if args.key_file is None:
|
|
raise SystemExit("--encrypt-key-id also needs --key-file")
|
|
provider = protect.load_key_file(Path(args.key_file), key_id=args.encrypt_key_id)
|
|
if signing_pem is None and provider is None:
|
|
return None
|
|
verify = protect.public_key_pem(signing_pem) if signing_pem is not None else None
|
|
if verify is not None and args.write_verify_key is not None:
|
|
# The client's half of the pair. Publishing it is part of the release, and
|
|
# writing it here keeps it from being re-derived differently somewhere else.
|
|
target = Path(args.write_verify_key)
|
|
target.parent.mkdir(parents=True, exist_ok=True)
|
|
target.write_bytes(verify)
|
|
return Sealing(
|
|
key_id=str(args.encrypt_key_id or ""),
|
|
provider=provider,
|
|
signing_key_pem=signing_pem,
|
|
signing_key_reference=str(args.sign_key_id or "build-key"),
|
|
verify_key_pem=verify,
|
|
)
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
|
|
parser.add_argument("--legacy-dir", type=Path, required=True, help="legacy NPZ export")
|
|
parser.add_argument("--map", type=Path, required=True, help="field map (npz)")
|
|
parser.add_argument(
|
|
"--meters-per-source-unit",
|
|
type=float,
|
|
required=True,
|
|
help="stated unit scale (the importer never guesses it)",
|
|
)
|
|
parser.add_argument("--output", type=Path, required=True, help="package to write")
|
|
parser.add_argument("--asset-id", default="finger-display")
|
|
parser.add_argument("--version", default="1.0.0")
|
|
parser.add_argument("--lod-id", default="lod0")
|
|
parser.add_argument("--sensor-model", default="finger")
|
|
parser.add_argument(
|
|
"--transform",
|
|
type=Path,
|
|
default=None,
|
|
help="optional 4x4 rigid transform (npy) from source to sensor coordinates",
|
|
)
|
|
protection = parser.add_argument_group(
|
|
"release protection (stage 5)", "all optional; a plain package is the default"
|
|
)
|
|
protection.add_argument("--sign-key", type=Path, default=None, help="Ed25519 private key (PEM)")
|
|
protection.add_argument("--sign-key-id", default="", help="name recorded in the envelope")
|
|
protection.add_argument(
|
|
"--write-verify-key",
|
|
type=Path,
|
|
default=None,
|
|
help="write the public half of --sign-key here (this is what the client ships)",
|
|
)
|
|
protection.add_argument("--encrypt-key-id", default="", help="content key id to seal with")
|
|
protection.add_argument("--key-file", type=Path, default=None, help="key for --encrypt-key-id")
|
|
protection.add_argument(
|
|
"--lock-from-probe",
|
|
type=Path,
|
|
default=None,
|
|
help="take the platform lock from a probe_gl.py report",
|
|
)
|
|
protection.add_argument("--lock-os", action="append", default=None, help="repeatable")
|
|
protection.add_argument("--lock-machine", action="append", default=None, help="repeatable")
|
|
protection.add_argument("--lock-gl-profile", default=None, choices=(None, "desktop33", "gles30"))
|
|
protection.add_argument("--lock-vendor", action="append", default=None, help="repeatable")
|
|
protection.add_argument("--lock-renderer", action="append", default=None, help="repeatable")
|
|
protection.add_argument("--lock-min-texture", type=int, default=0)
|
|
protection.add_argument("--lock-note", default="")
|
|
protection.add_argument(
|
|
"--allow-software-renderer",
|
|
action="store_true",
|
|
help="do not forbid a software rasteriser (the design document says do)",
|
|
)
|
|
parser.add_argument("--json", action="store_true")
|
|
args = parser.parse_args(argv)
|
|
|
|
_bootstrap_paths()
|
|
import numpy as np
|
|
|
|
from orisys_app_shared.scene3d.contracts import ThreeDError
|
|
from orisys_app_shared.scene3d.legacy import LegacyFingerImporter
|
|
from orisys_app_shared.scene3d.package import describe_envelope, write_package
|
|
|
|
transform = (
|
|
np.load(args.transform, allow_pickle=False)
|
|
if args.transform is not None
|
|
else np.eye(4)
|
|
)
|
|
try:
|
|
sealing = _sealing_from_args(args)
|
|
lock = _platform_lock_from_args(args)
|
|
except ThreeDError as exc:
|
|
print(f"rejected: {exc.diagnostic.code}: {exc.diagnostic.message}", file=sys.stderr)
|
|
return 2
|
|
try:
|
|
assets = LegacyFingerImporter().convert(
|
|
args.legacy_dir,
|
|
args.map,
|
|
transform_sensor_from_source=transform,
|
|
meters_per_source_unit=args.meters_per_source_unit,
|
|
asset_id=args.asset_id,
|
|
asset_version=args.version,
|
|
lod_id=args.lod_id,
|
|
)
|
|
if lock is not None:
|
|
from dataclasses import replace
|
|
|
|
# Part of the asset, so it travels into the manifest and the signature.
|
|
assets = replace(assets, platform_lock=lock)
|
|
report = write_package(
|
|
assets, args.output,
|
|
sensor_model=args.sensor_model,
|
|
hardware_revisions=("*",),
|
|
sealing=sealing,
|
|
)
|
|
except ThreeDError as exc:
|
|
print(f"rejected: {exc.diagnostic.code}: {exc.diagnostic.message}", file=sys.stderr)
|
|
return 2
|
|
envelope = describe_envelope(report.output)
|
|
summary = {
|
|
"status": "ok",
|
|
"output": str(report.output),
|
|
"asset_hash": report.asset_hash,
|
|
"vertices": report.part_vertex_counts,
|
|
"triangles": report.part_triangle_counts,
|
|
"geometry_id": assets.geometry_id,
|
|
"field_domain_id": assets.field_domain_id,
|
|
"source_geometry_id": assets.source_geometry_id,
|
|
"envelope": envelope,
|
|
"platform_lock": (
|
|
assets.platform_lock.to_dict() if assets.platform_lock is not None else None
|
|
),
|
|
}
|
|
if args.json:
|
|
print(json.dumps(summary, indent=2, ensure_ascii=False))
|
|
else:
|
|
print(
|
|
f"wrote {report.output} vertices={report.part_vertex_counts} "
|
|
f"triangles={report.part_triangle_counts}"
|
|
)
|
|
print(f" geometry_id={assets.geometry_id}")
|
|
print(
|
|
" source_geometry_id="
|
|
+ (assets.source_geometry_id or "(none: no world_xyz in the map)")
|
|
)
|
|
print(f" asset_hash={report.asset_hash}")
|
|
print(
|
|
f" envelope=v{envelope['envelope_version']} {envelope['payload']}"
|
|
f"{' signed(' + str(envelope['signing_key']) + ')' if envelope['signed'] else ' unsigned'}"
|
|
+ (f" sealed for key {envelope['key_id']}" if envelope["sealed"] else "")
|
|
)
|
|
if summary["platform_lock"]:
|
|
print(f" platform_lock={json.dumps(summary['platform_lock'], ensure_ascii=False)}")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|