From 12bcdfbdf1664896394d32ec83a3c468129ad6ea Mon Sep 17 00:00:00 2001
From: Xiaoya Chong <150726549+xiaoyachong@users.noreply.github.com>
Date: Tue, 16 Jun 2026 17:14:19 -0700
Subject: [PATCH 1/3] fix publish event in bluesky

---
 src/arroyosas/tiled/tiled_websocket_bluesky.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/arroyosas/tiled/tiled_websocket_bluesky.py b/src/arroyosas/tiled/tiled_websocket_bluesky.py
index 43af98c..dc8014e 100644
--- a/src/arroyosas/tiled/tiled_websocket_bluesky.py
+++ b/src/arroyosas/tiled/tiled_websocket_bluesky.py
@@ -16,6 +16,7 @@
     RawFrameEvent,
     SASMessage,
     SASStart,
+    SerializableNumpyArrayModel,  # ← added
 )
 
 logger = logging.getLogger(__name__)
@@ -130,7 +131,7 @@ def on_node_in_stream(self, sub, data):
         # stream_sub.add_callback(print)
         stream_sub.add_callback(self.on_event)
         stream_sub.start()
-        self.publish_event(data)
+        self.publish_event(sub, data)  # ← pass sub
 
     async def start(self) -> None:
         """Start the listener by calling _start method."""
@@ -161,12 +162,13 @@ def publish_start(self, data: Dict[str, Any]) -> None:
         )
         self.send_to_operator(start)
 
-    def publish_event(self, data: Dict[str, Any]) -> None:
+    def publish_event(self, sub: Subscription, data: Dict[str, Any]) -> None:  # ← add sub
         """
         Publish an event to the operator.
         """
+        data_node = self.tiled_client["/".join(sub.segments + [data["key"]])]  # ← read from tiled
         event = RawFrameEvent(
-            image=None,
+            image=SerializableNumpyArrayModel(array=data_node[:]),  # ← was None
             frame_number=data.get("sequence", 0),
             tiled_url="",  # Placeholder for actual URL if needed
         )

From 6115fb3adf8bd927bb5a01771c421246eb05d936 Mon Sep 17 00:00:00 2001
From: Xiaoya Chong <150726549+xiaoyachong@users.noreply.github.com>
Date: Tue, 16 Jun 2026 17:25:49 -0700
Subject: [PATCH 2/3] update bluesky test

---
 src/_test/test_tiled_websocket_bluesky.py | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/_test/test_tiled_websocket_bluesky.py b/src/_test/test_tiled_websocket_bluesky.py
index d38edaa..9eb7c4f 100644
--- a/src/_test/test_tiled_websocket_bluesky.py
+++ b/src/_test/test_tiled_websocket_bluesky.py
@@ -5,6 +5,7 @@
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+import numpy as np
 import pytest
 
 from arroyosas.tiled.tiled_websocket_bluesky import TiledClientListener, tiled_ws_listener_factory
@@ -137,7 +138,7 @@ def test_on_node_in_stream_matching_target(self, listener):
             mock_sub = MagicMock()
             mock_sub_cls.return_value = mock_sub
             listener.on_node_in_stream(sub, data)
-            mock_pub.assert_called_once_with(data)
+            mock_pub.assert_called_once_with(sub, data)  # ← was publish_event(data)
 
     def test_on_node_in_stream_non_matching_target(self, listener):
         sub = MagicMock()
@@ -174,17 +175,22 @@ def test_publish_start(self, listener):
             # send_to_operator is called with whatever SASStart produces (or raises)
             # The important thing is publish_start calls send_to_operator
 
-    def test_publish_event(self, listener):
-        # publish_event in bluesky uses image=None which fails pydantic validation.
-        # The ValidationError propagates from RawFrameEvent construction.
-        data = {"key": "frame_0", "sequence": 7}
-        with patch.object(listener, "send_to_operator"):
-            try:
-                listener.publish_event(data)
-            except Exception:
-                pass
-            # Whether or not it raises, verify the data.get("sequence") is used
-            # (the method passes frame_number=data.get("sequence", 0))
+    def test_publish_event(self, listener, mock_tiled_client):  # ← add mock_tiled_client
+        sub = MagicMock()
+        sub.segments = ["run_uid", "streams", "primary"]
+        data = {"key": "img", "sequence": 7}
+
+        data_node = MagicMock()
+        data_node.__getitem__ = MagicMock(return_value=np.zeros((5, 5)))
+        mock_tiled_client.__getitem__ = MagicMock(return_value=data_node)
+
+        with patch.object(listener, "send_to_operator") as mock_send:
+            listener.publish_event(sub, data)  # ← pass sub
+            mock_send.assert_called_once()
+            from arroyosas.schemas import RawFrameEvent
+            msg = mock_send.call_args[0][0]
+            assert isinstance(msg, RawFrameEvent)
+            assert msg.frame_number == 7
 
     def test_print_event(self, listener, capsys):
         listener.print_event("test_event", {"data": "value"})

From 4b470f66d6898ccfab3d7aea1974970c0daad252 Mon Sep 17 00:00:00 2001
From: Xiaoya Chong <150726549+xiaoyachong@users.noreply.github.com>
Date: Tue, 16 Jun 2026 17:30:26 -0700
Subject: [PATCH 3/3] use ruff format

---
 src/_test/test_tiled_websocket_bluesky.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/_test/test_tiled_websocket_bluesky.py b/src/_test/test_tiled_websocket_bluesky.py
index 9eb7c4f..4509b0f 100644
--- a/src/_test/test_tiled_websocket_bluesky.py
+++ b/src/_test/test_tiled_websocket_bluesky.py
@@ -188,6 +188,7 @@ def test_publish_event(self, listener, mock_tiled_client):  # ← add mock_tiled
             listener.publish_event(sub, data)  # ← pass sub
             mock_send.assert_called_once()
             from arroyosas.schemas import RawFrameEvent
+
             msg = mock_send.call_args[0][0]
             assert isinstance(msg, RawFrameEvent)
             assert msg.frame_number == 7