feat(studio-3d): 设备几何身份接入 —— 同尺寸不同映射/不同表面被拒绝,资产加载只采用最新请求
- 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)、限速与真实统计、二维后端统一均未动。
This commit is contained in:
@@ -293,6 +293,75 @@ def test_the_device_description_decides_whether_an_asset_fits():
|
||||
assert excinfo.value.diagnostic.code == code
|
||||
|
||||
|
||||
def test_an_unstated_device_identity_is_reported_not_matched():
|
||||
"""An empty field is "the device cannot say", never "it matches"."""
|
||||
device = c.ExpectedGeometry("finger", "", "", "domain-xyz", (3, 4), source_geometry_id="")
|
||||
warnings = c.validate_assets(_assets(), device)
|
||||
assert [item.code for item in warnings] == ["geometry_unverified"]
|
||||
assert device.source_geometry_id == ""
|
||||
|
||||
|
||||
def test_the_source_geometry_must_match_too():
|
||||
"""Same size, same mapping, different surface: still not the same geometry."""
|
||||
device = c.ExpectedGeometry(
|
||||
"finger", "", "", "domain-xyz", (3, 4), source_geometry_id="src-1"
|
||||
)
|
||||
assert c.validate_assets(_assets(source_geometry_id="src-1"), device) == ()
|
||||
with pytest.raises(c.ThreeDError) as excinfo:
|
||||
c.validate_assets(_assets(source_geometry_id="src-2"), device)
|
||||
assert excinfo.value.diagnostic.code == "geometry_mismatch"
|
||||
assert excinfo.value.diagnostic.details["device"] == "src-1"
|
||||
|
||||
# A package that predates the record: unverified, and said so.
|
||||
warnings = c.validate_assets(_assets(), device)
|
||||
assert [item.code for item in warnings] == ["geometry_unverified"]
|
||||
|
||||
|
||||
def test_a_package_released_for_another_sensor_or_revision_is_refused():
|
||||
device = c.ExpectedGeometry("finger", "rev-b", "geom-abc", "domain-xyz", (3, 4))
|
||||
with pytest.raises(c.ThreeDError) as excinfo:
|
||||
c.validate_assets(_assets(compatible_sensor_model="box"), device)
|
||||
assert excinfo.value.diagnostic.code == "geometry_mismatch"
|
||||
|
||||
with pytest.raises(c.ThreeDError) as excinfo:
|
||||
c.validate_assets(
|
||||
_assets(
|
||||
compatible_sensor_model="finger",
|
||||
compatible_hardware_revisions=("rev-a",),
|
||||
),
|
||||
device,
|
||||
)
|
||||
assert excinfo.value.diagnostic.code == "geometry_mismatch"
|
||||
# ``*`` is "any revision", so it never refuses.
|
||||
assert c.validate_assets(
|
||||
_assets(
|
||||
compatible_sensor_model="finger",
|
||||
compatible_hardware_revisions=("*",),
|
||||
),
|
||||
device,
|
||||
) == ()
|
||||
# An unstated revision on the device side is not a mismatch either.
|
||||
assert c.validate_assets(
|
||||
_assets(
|
||||
compatible_sensor_model="finger",
|
||||
compatible_hardware_revisions=("rev-a",),
|
||||
),
|
||||
c.ExpectedGeometry("finger", "", "geom-abc", "domain-xyz", (3, 4)),
|
||||
) == ()
|
||||
|
||||
|
||||
def test_the_source_geometry_digest_is_stable_and_shape_checked():
|
||||
from orisys_app_shared.scene3d.digest import source_geometry_digest
|
||||
|
||||
world = np.arange(3 * 4 * 3, dtype=np.float32).reshape(3, 4, 3)
|
||||
assert source_geometry_digest(world) == source_geometry_digest(world.copy())
|
||||
moved = world + 1.0
|
||||
assert source_geometry_digest(moved) != source_geometry_digest(world)
|
||||
with pytest.raises(c.ThreeDError) as excinfo:
|
||||
source_geometry_digest(np.zeros((3, 4), dtype=np.float32))
|
||||
assert excinfo.value.diagnostic.code == "geometry_mismatch"
|
||||
|
||||
|
||||
def test_only_four_vertex_lod_counts_as_the_same_binding():
|
||||
"""A new topology needs a new binding: 1032 and 1005 are not interchangeable."""
|
||||
binding = _binding(vertices=3)
|
||||
|
||||
Reference in New Issue
Block a user