bec-server 2.12.2__tar.gz → 2.12.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.12.2 → bec_server-2.12.3}/PKG-INFO +1 -1
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_worker.py +3 -3
- {bec_server-2.12.2 → bec_server-2.12.3}/pyproject.toml +1 -1
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scan_worker.py +1 -1
- {bec_server-2.12.2 → bec_server-2.12.3}/.gitignore +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/README.md +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/bec_server_utils/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/bec_server_utils/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/bec_server_utils/service_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/bec_server_utils/subprocess_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/bec_server_utils/tmux_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/dap_server.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/dap_service.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/dap_service_manager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/data_processing/lmfit1d_service.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/device_server.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/config_update_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/device_serializer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/devicemanager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/rpc_mixin.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/tests/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/tests/utils.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/default_writer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/file_writer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/file_writer_manager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer/merged_dicts.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer_plugins/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/file_writer_plugins/cSAXS.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/bec_emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/bluesky_emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_bundler/scan_bundler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/device_validation.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/errors.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/path_optimization.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_assembler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_guard.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_manager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_plugins/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_plugins/otf_scan.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_queue.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_server.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scan_stubs.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/scans.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/tests/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/tests/fixtures.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scan_server/tests/utils.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/cli/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/cli/launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/repeated_timer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scibec/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scibec/config_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scibec/scibec_connector.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scibec/scibec_metadata_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scihub.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scilog/__init__.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/bec_server/scihub/scilog/scilog.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_bec_server_utils/test_main.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_bec_server_utils/test_service_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_bec_server_utils/test_tmux_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_data_processing/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_data_processing/test_dap_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_data_processing/test_dap_server.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_data_processing/test_dap_service_manager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_data_processing/test_lmfit1d_service.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_config_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_device_manager_ds.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_device_serializer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_device_server.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_device_server_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_device_server/test_rpc_mixin.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_file_writer/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_file_writer/test_file_writer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_file_writer/test_file_writer_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_file_writer/test_file_writer_manager.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/test_bec_emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/test_bluesky_emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/test_emitter.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/test_scan_bundler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_bundler/test_scan_bundler_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_path_optimization.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scan_guard.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scan_server_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scan_server_queue.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scan_stubs.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scan_server/test_scans.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/conftest.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_repeated_timer.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_scibec_config_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_scibec_connector.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_scibec_metadata_handler.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_scihub_cli_launch.py +0 -0
- {bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_scihub/test_scilog_connector.py +0 -0
|
@@ -74,11 +74,11 @@ class ScanWorker(threading.Thread):
|
|
|
74
74
|
|
|
75
75
|
self._initialize_scan_info(active_rb, instr, num_points)
|
|
76
76
|
|
|
77
|
-
# only append the
|
|
77
|
+
# only append the scan_progress if the scan is not using device_progress
|
|
78
78
|
if not self.scan_report_instructions or not self.scan_report_instructions[-1].get(
|
|
79
|
-
"
|
|
79
|
+
"device_progress"
|
|
80
80
|
):
|
|
81
|
-
self.scan_report_instructions.append({"
|
|
81
|
+
self.scan_report_instructions.append({"scan_progress": num_points})
|
|
82
82
|
self.current_instruction_queue_item.parent.queue_manager.send_queue_status()
|
|
83
83
|
|
|
84
84
|
self._send_scan_status("open")
|
|
@@ -1072,7 +1072,7 @@ def test_open_scan(scan_worker_mock, instr, corr_num_points, scan_id):
|
|
|
1072
1072
|
assert worker.scan_motors == ["bpm4i"]
|
|
1073
1073
|
init_mock.assert_called_once_with(active_rb, instr, corr_num_points)
|
|
1074
1074
|
assert active_rb.scan_report_instructions == [
|
|
1075
|
-
{"
|
|
1075
|
+
{"scan_progress": corr_num_points}
|
|
1076
1076
|
]
|
|
1077
1077
|
queue_status_mock.assert_called_once()
|
|
1078
1078
|
send_mock.assert_called_once_with("open")
|
|
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.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/config_update_handler.py
RENAMED
|
File without changes
|
{bec_server-2.12.2 → bec_server-2.12.3}/bec_server/device_server/devices/device_serializer.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
|
{bec_server-2.12.2 → bec_server-2.12.3}/tests/tests_bec_server_utils/test_service_handler.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_server-2.12.2 → bec_server-2.12.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
|
|
File without changes
|
{bec_server-2.12.2 → bec_server-2.12.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.12.2 → bec_server-2.12.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.12.2 → bec_server-2.12.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.12.2 → bec_server-2.12.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
|