bec-server 2.7.2__tar.gz → 2.9.3__tar.gz

{bec_server-2.7.2 → bec_server-2.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec-server
-Version: 2.7.2
+Version: 2.9.3
 Summary: BEC server
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec

{bec_server-2.7.2 → bec_server-2.9.3}/bec_server/device_server/device_server.py

@@ -274,7 +274,7 @@ class DeviceServer(RPCMixin, BECService):
             dev_msg = messages.DeviceReqStatusMessage(
                 device=dev, success=True, metadata=instr.metadata
             )
-            self.connector.set_and_publish(MessageEndpoints.device_req_status(dev), dev_msg, pipe)
+            self.connector.set(MessageEndpoints.device_req_status(dev), dev_msg, pipe)
         pipe.execute()
 
     def _status_callback(self, status):
@@ -288,9 +288,7 @@ class DeviceServer(RPCMixin, BECService):
             device=device_name, success=status.success, metadata=status.instruction.metadata
         )
         logger.debug(f"req status for device {device_name}: {status.success}")
-        self.connector.set_and_publish(
-            MessageEndpoints.device_req_status(device_name), dev_msg, pipe
-        )
+        self.connector.set(MessageEndpoints.device_req_status(device_name), dev_msg, pipe)
         response = status.instruction.metadata.get("response")
         if response:
             self.connector.lpush(

{bec_server-2.7.2 → bec_server-2.9.3}/bec_server/device_server/devices/devicemanager.py

@@ -470,7 +470,7 @@ class DeviceManagerDS(DeviceManagerBase):
         """
         # Convert sizes from bytes to MB
         dsize = len(value.tobytes()) / 1e6
-        max_size = 100
+        max_size = 1000
         if dsize > max_size:
             logger.warning(
                 f"Data size of single message is too large to send, current max_size {max_size}."

{bec_server-2.7.2 → bec_server-2.9.3}/bec_server/scan_server/scan_queue.py

@@ -136,7 +136,10 @@ class QueueManager:
         logger.info(f"Scan interception: {scan_mod_msg}")
         action = scan_mod_msg.content["action"]
         parameter = scan_mod_msg.content["parameter"]
-        getattr(self, f"set_{action}")(scan_id=scan_mod_msg.content["scan_id"], parameter=parameter)
+        queue = scan_mod_msg.content.get("queue", "primary")
+        getattr(self, f"set_{action}")(
+            scan_id=scan_mod_msg.content["scan_id"], queue=queue, parameter=parameter
+        )
 
     @requires_queue
     def set_pause(self, scan_id=None, queue="primary", parameter: dict = None) -> None:

{bec_server-2.7.2 → bec_server-2.9.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec-server"
-version = "2.7.2"
+version = "2.9.3"
 description = "BEC server"
 requires-python = ">=3.10"
 classifiers = [

{bec_server-2.7.2 → bec_server-2.9.3}/tests/tests_device_server/test_device_manager_ds.py

@@ -160,7 +160,7 @@ def test_obj_monitor_callback(dm_with_devices, value):
     eiger = device_manager.devices.eiger
     eiger.metadata = {"scan_id": "12345"}
     value_size = len(value.tobytes()) / 1e6  # MB
-    max_size = 100
+    max_size = 1000
     with mock.patch.object(device_manager, "connector") as mock_connector:
         device_manager._obj_callback_monitor(obj=eiger.obj, value=value)
         mock_connector.xadd.assert_called_once_with(

{bec_server-2.7.2 → bec_server-2.9.3}/tests/tests_scan_server/test_scan_server_queue.py

@@ -158,11 +158,15 @@ def test_scan_queue_modification_callback(queuemanager_mock):
 def test_scan_interception_halt(queuemanager_mock):
     queue_manager = queuemanager_mock()
     msg = messages.ScanQueueModificationMessage(
-        scan_id="dummy", action="halt", parameter={}, metadata={"RID": "something"}
+        scan_id="dummy",
+        action="halt",
+        queue="secondary",
+        parameter={},
+        metadata={"RID": "something"},
     )
     with mock.patch.object(queue_manager, "set_halt") as set_halt:
         queue_manager.scan_interception(msg)
-        set_halt.assert_called_once_with(scan_id="dummy", parameter={})
+        set_halt.assert_called_once_with(scan_id="dummy", queue="secondary", parameter={})
 
 
 def test_set_halt(queuemanager_mock):