From b8ae1a668c25fff3fe6146b1b97f6532e682dddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=27=C3=A9lectron=20rare?=
 <108685187+electron-rare@users.noreply.github.com>
Date: Thu, 2 Jul 2026 10:14:17 +0200
Subject: [PATCH] fix(pose): read real smplx person dataclass

_read_sources used .get("pid")/.get("v3d") (dict API) but
multi_hmr_worker emits SMPLXPerson dataclasses (field: vertices_3d).
AttributeError was swallowed by LOG.exception at 30 Hz.

- Dual-read via isinstance check: dataclass path uses p.pid /
  p.vertices_3d / p.expression; dict path keeps p.get() unchanged
- 3 new tests: real SMPLXPerson emits OSC, expression field accepted,
  legacy dict format still works
---
 data_only_viz/action_head_pub.py            | 12 +++--
 data_only_viz/tests/test_action_head_pub.py | 59 +++++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/data_only_viz/action_head_pub.py b/data_only_viz/action_head_pub.py
index 00b945f..40a1cf0 100644
--- a/data_only_viz/action_head_pub.py
+++ b/data_only_viz/action_head_pub.py
@@ -274,8 +274,12 @@ class ActionHeadPublisher(threading.Thread):
         if t_smplx > self._last_smplx_t:
             out: list[tuple[int, np.ndarray, np.ndarray, float, np.ndarray]] = []
             for i, p in enumerate(persons_smplx or []):
-                pid = int(p.get("pid", i))
-                v3d = p.get("v3d")
+                # Support both SMPLXPerson dataclass (multi_hmr_worker, field
+                # names: pid / vertices_3d / expression) and legacy dict format
+                # (keys: "pid" / "v3d" / "expression").
+                _is_dict = isinstance(p, dict)
+                pid = int(p.get("pid", i) if _is_dict else p.pid)
+                v3d = p.get("v3d") if _is_dict else p.vertices_3d
                 if v3d is None:
                     continue
                 # CoreMLArray wraps a numpy array but has no __array__
@@ -286,8 +290,8 @@ class ActionHeadPublisher(threading.Thread):
                 if v3d_np.shape[0] < max(SMPLX_JOINT_ANCHOR_VERTS) + 1:
                     continue
                 j3d32 = v3d_np[list(SMPLX_JOINT_ANCHOR_VERTS)].astype(np.float32)
-                # expression
-                expr = p.get("expression")
+                # expression — field name matches in both dict and dataclass
+                expr = p.get("expression") if _is_dict else p.expression
                 if expr is not None:
                     if hasattr(expr, "numpy") and not isinstance(expr, np.ndarray):
                         expr = expr.numpy()
diff --git a/data_only_viz/tests/test_action_head_pub.py b/data_only_viz/tests/test_action_head_pub.py
index 1b33b12..bc20d21 100644
--- a/data_only_viz/tests/test_action_head_pub.py
+++ b/data_only_viz/tests/test_action_head_pub.py
@@ -28,10 +28,22 @@ class _FakeState:
 
 
 def _make_smplx_person(pid: int, seed: int = 0) -> dict:
+    """Build a legacy dict-format person (backward-compat test fixture)."""
     rng = np.random.default_rng(seed)
     return {"pid": pid, "v3d": rng.normal(size=(10475, 3)).astype(np.float32)}
 
 
+def _make_real_smplx_person(pid: int, seed: int = 0):
+    """Build a real SMPLXPerson dataclass (as emitted by multi_hmr_worker)."""
+    from data_only_viz.state import SMPLXPerson
+    rng = np.random.default_rng(seed)
+    return SMPLXPerson(
+        pid=pid,
+        vertices_3d=rng.normal(size=(10475, 3)).astype(np.float32),
+        expression=np.zeros(10, dtype=np.float32),
+    )
+
+
 def test_publisher_smplx_source_emits_osc() -> None:
     from data_only_viz.action_head_pub import ActionHeadPublisher
     state = _FakeState()
@@ -240,3 +252,50 @@ def test_emit_hands_once_for_two_pids() -> None:
     pub._tick(t_now=0.0)
 
     assert bridge.send_hands.call_count == 1
+
+
+# ---------------------------------------------------------------------------
+# B3 contract: real SMPLXPerson dataclass (multi_hmr_worker output)
+# ---------------------------------------------------------------------------
+
+def test_publisher_smplx_real_dataclass_emits_osc() -> None:
+    """SMPLXPerson dataclass (vertices_3d, not v3d) must not raise AttributeError."""
+    from data_only_viz.action_head_pub import ActionHeadPublisher
+    state = _FakeState()
+    bridge = MagicMock()
+    pub = ActionHeadPublisher(state, bridge, ckpt_path=None)
+    state.persons_smplx = [_make_real_smplx_person(7)]
+    state.smplx_last_t = 1.0
+    pub._tick(t_now=0.0)
+    actions = bridge.send_action.call_args_list
+    assert len(actions) == 1
+    assert actions[0].kwargs.get("pid", actions[0].args[0]) == 7
+    bridge.send_enter.assert_called_with(pid=7)
+
+
+def test_publisher_smplx_real_dataclass_expression_used() -> None:
+    """Expression from SMPLXPerson.expression (ndarray) must not crash."""
+    from data_only_viz.action_head_pub import ActionHeadPublisher
+    state = _FakeState()
+    bridge = MagicMock()
+    pub = ActionHeadPublisher(state, bridge, ckpt_path=None)
+    p = _make_real_smplx_person(0)
+    p.expression = np.ones(10, dtype=np.float32) * 0.5
+    state.persons_smplx = [p]
+    state.smplx_last_t = 1.0
+    pub._tick(t_now=0.0)
+    bridge.send_action.assert_called_once()
+
+
+def test_publisher_dict_format_still_works() -> None:
+    """Legacy dict format {"pid": ..., "v3d": ...} must remain supported."""
+    from data_only_viz.action_head_pub import ActionHeadPublisher
+    state = _FakeState()
+    bridge = MagicMock()
+    pub = ActionHeadPublisher(state, bridge, ckpt_path=None)
+    state.persons_smplx = [_make_smplx_person(99)]
+    state.smplx_last_t = 1.0
+    pub._tick(t_now=0.0)
+    actions = bridge.send_action.call_args_list
+    assert len(actions) == 1
+    assert actions[0].kwargs.get("pid", actions[0].args[0]) == 99