bec-server 2.7.2__tar.gz → 2.7.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bec_server-2.7.2 → bec_server-2.7.3}/PKG-INFO +1 -1
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/devicemanager.py +1 -1
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_queue.py +4 -1
- {bec_server-2.7.2 → bec_server-2.7.3}/pyproject.toml +1 -1
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_manager_ds.py +1 -1
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_server_queue.py +6 -2
- {bec_server-2.7.2 → bec_server-2.7.3}/.gitignore +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/README.md +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/service_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/subprocess_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/tmux_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_server.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_service.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_service_manager.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/lmfit1d_service.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/device_server.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/config_update_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/device_serializer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/rpc_mixin.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/tests/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/tests/utils.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/default_writer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/file_writer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/file_writer_manager.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/merged_dicts.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer_plugins/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer_plugins/cSAXS.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/bec_emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/bluesky_emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/scan_bundler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/device_validation.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/errors.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/path_optimization.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_assembler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_guard.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_manager.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_plugins/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_plugins/otf_scan.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_server.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_stubs.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_worker.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scans.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/fixtures.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/utils.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/cli/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/cli/launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/repeated_timer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/config_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/scibec_connector.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/scibec_metadata_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scihub.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scilog/__init__.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scilog/scilog.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_main.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_service_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_tmux_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_server.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_service_manager.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_lmfit1d_service.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_config_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_serializer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_server.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_server_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_rpc_mixin.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer_manager.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_bec_emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_bluesky_emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_emitter.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_scan_bundler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_scan_bundler_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_path_optimization.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_guard.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_server_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_stubs.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_worker.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scans.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/conftest.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_repeated_timer.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_config_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_connector.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_metadata_handler.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scihub_cli_launch.py +0 -0
- {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scilog_connector.py +0 -0
|
@@ -470,7 +470,7 @@ class DeviceManagerDS(DeviceManagerBase):
|
|
|
470
470
|
"""
|
|
471
471
|
# Convert sizes from bytes to MB
|
|
472
472
|
dsize = len(value.tobytes()) / 1e6
|
|
473
|
-
max_size =
|
|
473
|
+
max_size = 1000
|
|
474
474
|
if dsize > max_size:
|
|
475
475
|
logger.warning(
|
|
476
476
|
f"Data size of single message is too large to send, current max_size {max_size}."
|
|
@@ -136,7 +136,10 @@ class QueueManager:
|
|
|
136
136
|
logger.info(f"Scan interception: {scan_mod_msg}")
|
|
137
137
|
action = scan_mod_msg.content["action"]
|
|
138
138
|
parameter = scan_mod_msg.content["parameter"]
|
|
139
|
-
|
|
139
|
+
queue = scan_mod_msg.content.get("queue", "primary")
|
|
140
|
+
getattr(self, f"set_{action}")(
|
|
141
|
+
scan_id=scan_mod_msg.content["scan_id"], queue=queue, parameter=parameter
|
|
142
|
+
)
|
|
140
143
|
|
|
141
144
|
@requires_queue
|
|
142
145
|
def set_pause(self, scan_id=None, queue="primary", parameter: dict = None) -> None:
|
|
@@ -160,7 +160,7 @@ def test_obj_monitor_callback(dm_with_devices, value):
|
|
|
160
160
|
eiger = device_manager.devices.eiger
|
|
161
161
|
eiger.metadata = {"scan_id": "12345"}
|
|
162
162
|
value_size = len(value.tobytes()) / 1e6 # MB
|
|
163
|
-
max_size =
|
|
163
|
+
max_size = 1000
|
|
164
164
|
with mock.patch.object(device_manager, "connector") as mock_connector:
|
|
165
165
|
device_manager._obj_callback_monitor(obj=eiger.obj, value=value)
|
|
166
166
|
mock_connector.xadd.assert_called_once_with(
|
|
@@ -158,11 +158,15 @@ def test_scan_queue_modification_callback(queuemanager_mock):
|
|
|
158
158
|
def test_scan_interception_halt(queuemanager_mock):
|
|
159
159
|
queue_manager = queuemanager_mock()
|
|
160
160
|
msg = messages.ScanQueueModificationMessage(
|
|
161
|
-
scan_id="dummy",
|
|
161
|
+
scan_id="dummy",
|
|
162
|
+
action="halt",
|
|
163
|
+
queue="secondary",
|
|
164
|
+
parameter={},
|
|
165
|
+
metadata={"RID": "something"},
|
|
162
166
|
)
|
|
163
167
|
with mock.patch.object(queue_manager, "set_halt") as set_halt:
|
|
164
168
|
queue_manager.scan_interception(msg)
|
|
165
|
-
set_halt.assert_called_once_with(scan_id="dummy", parameter={})
|
|
169
|
+
set_halt.assert_called_once_with(scan_id="dummy", queue="secondary", parameter={})
|
|
166
170
|
|
|
167
171
|
|
|
168
172
|
def test_set_halt(queuemanager_mock):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/config_update_handler.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_service_manager.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_server_cli_launch.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer_cli_launch.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_scan_bundler_cli_launch.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_server_cli_launch.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|