bec-server 3.124.2__tar.gz → 3.124.4__tar.gz

{bec_server-3.124.2 → bec_server-3.124.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec-server
-Version: 3.124.2
+Version: 3.124.4
 Summary: BEC server
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_server-3.124.2 → bec_server-3.124.4}/bec_server/device_server/device_server.py

@@ -216,10 +216,12 @@ class RequestHandler:
         if len(request_info["status_objects"]) != request_info["num_status_objects"]:
             return
 
-        if all(status_obj.done for status_obj in self._storage[instr_id]["status_objects"]):
+        status_objects = request_info["status_objects"]
+
+        if all(status_obj.done for status_obj in status_objects):
             exceptions = [
                 (status_obj.exception(), status_obj)
-                for status_obj in self._storage[instr_id]["status_objects"]
+                for status_obj in status_objects
                 if isinstance(status_obj, StatusBase)
             ]
             if any(val for val, _ in exceptions):
@@ -777,6 +779,11 @@ class DeviceServer(BECService):
             # if the user requested a response on a single status object, we need to send it
             # to the device_req_status_container
             request_id = status.instruction.metadata["RID"]
+            metadata["error_info"] = (
+                self.requests_handler.get_error_info(status.exception(), status)
+                if status.exception()
+                else None
+            )
             dev_msg = messages.DeviceReqStatusMessage(
                 device=device_name, success=status.success, request_id=request_id, metadata=metadata
             )
@@ -786,7 +793,7 @@ class DeviceServer(BECService):
                 MessageEndpoints.device_req_status(request_id),
                 {"data": dev_msg},
                 pipe=pipe,
-                expire=60,
+                expire=3600,
             )
         pipe.execute()
 

{bec_server-3.124.2 → bec_server-3.124.4}/bec_server/scihub/atlas/atlas_metadata_handler.py

@@ -147,15 +147,19 @@ class AtlasMetadataHandler:
         if self._account is None:
             return
         info = self._deployment_info
-        if info is None:
-            return
-        if info.active_session is None:
-            return
-        if info.active_session.experiment is None:
-            return
-        if info.active_session.experiment.pgroup == self._account:
-            return
-        self.send_atlas_update({"account": self._account})
+
+        def is_account_same(info: messages.DeploymentInfoMessage | None) -> bool:
+            if info is None:
+                return False
+            if info.active_session is None:
+                return False
+            if info.active_session.experiment is None:
+                return False
+            return info.active_session.experiment.pgroup == self._account
+
+        if not is_account_same(info):
+            msg = messages.VariableMessage(value=self._account)
+            self.send_atlas_update({"account": msg})
 
     def _handle_account_info(self, msg, emit_update=True, **_kwargs) -> None:
         """

{bec_server-3.124.2 → bec_server-3.124.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec-server"
-version = "3.124.2"
+version = "3.124.4"
 description = "BEC server"
 requires-python = ">=3.11"
 classifiers = [
@@ -72,6 +72,8 @@ Homepage = "https://github.com/bec-project/bec"
 
 
 
+
+
 
 [tool.hatch.build.targets.wheel]
 include = ["*"]

{bec_server-3.124.2 → bec_server-3.124.4}/tests/tests_device_server/test_device_server.py

@@ -130,6 +130,49 @@ def test_device_server_status_callback(
             logger.remove(sink_id)
 
 
+@pytest.mark.parametrize("status_success", [True, False])
+def test_device_server_status_callback_response_includes_error_info(
+    device_server_mock, ophyd_device_mock, status_success
+):
+    device_server = device_server_mock
+    dev = ophyd_device_mock
+    dev._kind = Kind.normal
+    instr = messages.DeviceInstructionMessage(
+        device=dev.name,
+        action="set",
+        parameter={},
+        metadata={
+            "stream": "primary",
+            "device_instr_id": "diid",
+            "RID": "request-id",
+            "response": True,
+        },
+    )
+
+    status = DeviceStatus(dev)
+    device_server._add_status_object_info(status, instruction=instr, device=dev)
+    if status_success:
+        status.set_finished()
+    else:
+        status.set_exception(RuntimeError("motor failed"))
+
+    with mock.patch.object(device_server, "_read_device") as mock_read_device:
+        with mock.patch.object(device_server.connector, "xadd") as xadd_mock:
+            device_server.status_callback(status)
+
+    mock_read_device.assert_called_once_with(instr)
+    xadd_mock.assert_called_once()
+    dev_msg = xadd_mock.call_args.args[1]["data"]
+    assert isinstance(dev_msg, messages.DeviceReqStatusMessage)
+    assert dev_msg.success is status_success
+    if status_success:
+        assert dev_msg.metadata["error_info"] is None
+    else:
+        assert dev_msg.metadata["error_info"] is not None
+        assert dev_msg.metadata["error_info"].exception_type == "RuntimeError"
+        assert "motor failed" in dev_msg.metadata["error_info"].error_message
+
+
 @pytest.mark.parametrize(
     "instr",
     [
@@ -1064,3 +1107,29 @@ def test_request_handler_ignores_response_if_stop_id(device_server_mock, stop_id
             stop_mock.assert_called()
         status.set_exception(RuntimeError("Test exception"))
         send_mock.assert_not_called()
+
+
+def test_request_handler_update_instruction_uses_snapshot_when_request_removed(device_server_mock):
+    device_server = device_server_mock
+    request = messages.DeviceInstructionMessage(
+        device="test_device", action="complete", parameter={}, metadata={"device_instr_id": "diid"}
+    )
+
+    status = StatusBase()
+    status.set_finished()
+    request_info = {
+        "instr": request,
+        "status_objects": [status],
+        "num_status_objects": 1,
+        "done": False,
+        "is_status_obj": True,
+    }
+
+    with mock.patch.object(
+        device_server.requests_handler, "get_request", return_value=request_info
+    ):
+        with mock.patch.object(device_server.requests_handler, "set_finished") as set_finished_mock:
+            device_server.requests_handler._storage.clear()
+            device_server.requests_handler._update_instruction("diid", is_status_obj=True)
+
+    set_finished_mock.assert_called_once_with("diid", success=True)

{bec_server-3.124.2 → bec_server-3.124.4}/tests/tests_scihub/test_atlas_metadata_handler.py

@@ -298,7 +298,9 @@ def test_update_account_if_needed_different_account_forwards(atlas_connector):
     with mock.patch.object(handler, "send_atlas_update") as mock_send_update:
         handler._update_account_if_needed()
 
-    mock_send_update.assert_called_once_with({"account": "local-account"})
+    mock_send_update.assert_called_once_with(
+        {"account": messages.VariableMessage(value="local-account")}
+    )
 
 
 def test_handle_deployment_info_valid(atlas_connector):