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.
Files changed (114) hide show
  1. {bec_server-2.7.2 → bec_server-2.7.3}/PKG-INFO +1 -1
  2. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/devicemanager.py +1 -1
  3. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_queue.py +4 -1
  4. {bec_server-2.7.2 → bec_server-2.7.3}/pyproject.toml +1 -1
  5. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_manager_ds.py +1 -1
  6. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_server_queue.py +6 -2
  7. {bec_server-2.7.2 → bec_server-2.7.3}/.gitignore +0 -0
  8. {bec_server-2.7.2 → bec_server-2.7.3}/README.md +0 -0
  9. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/__init__.py +0 -0
  10. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/__init__.py +0 -0
  11. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/launch.py +0 -0
  12. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/service_handler.py +0 -0
  13. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/subprocess_launch.py +0 -0
  14. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/bec_server_utils/tmux_launch.py +0 -0
  15. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/__init__.py +0 -0
  16. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/cli/__init__.py +0 -0
  17. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/cli/launch.py +0 -0
  18. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_server.py +0 -0
  19. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_service.py +0 -0
  20. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/dap_service_manager.py +0 -0
  21. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/data_processing/lmfit1d_service.py +0 -0
  22. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/__init__.py +0 -0
  23. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/cli/__init__.py +0 -0
  24. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/cli/launch.py +0 -0
  25. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/device_server.py +0 -0
  26. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/__init__.py +0 -0
  27. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/config_update_handler.py +0 -0
  28. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/devices/device_serializer.py +0 -0
  29. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/rpc_mixin.py +0 -0
  30. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/tests/__init__.py +0 -0
  31. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/device_server/tests/utils.py +0 -0
  32. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/__init__.py +0 -0
  33. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/cli/__init__.py +0 -0
  34. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/cli/launch.py +0 -0
  35. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/default_writer.py +0 -0
  36. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/file_writer.py +0 -0
  37. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/file_writer_manager.py +0 -0
  38. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer/merged_dicts.py +0 -0
  39. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer_plugins/__init__.py +0 -0
  40. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/file_writer_plugins/cSAXS.py +0 -0
  41. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/__init__.py +0 -0
  42. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/bec_emitter.py +0 -0
  43. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/bluesky_emitter.py +0 -0
  44. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/cli/__init__.py +0 -0
  45. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/cli/launch.py +0 -0
  46. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/emitter.py +0 -0
  47. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_bundler/scan_bundler.py +0 -0
  48. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/__init__.py +0 -0
  49. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/cli/__init__.py +0 -0
  50. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/cli/launch.py +0 -0
  51. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/device_validation.py +0 -0
  52. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/errors.py +0 -0
  53. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/path_optimization.py +0 -0
  54. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_assembler.py +0 -0
  55. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_guard.py +0 -0
  56. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_manager.py +0 -0
  57. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_plugins/__init__.py +0 -0
  58. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_plugins/otf_scan.py +0 -0
  59. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_server.py +0 -0
  60. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_stubs.py +0 -0
  61. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scan_worker.py +0 -0
  62. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/scans.py +0 -0
  63. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/__init__.py +0 -0
  64. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/fixtures.py +0 -0
  65. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scan_server/tests/utils.py +0 -0
  66. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/__init__.py +0 -0
  67. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/cli/__init__.py +0 -0
  68. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/cli/launch.py +0 -0
  69. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/repeated_timer.py +0 -0
  70. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/__init__.py +0 -0
  71. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/config_handler.py +0 -0
  72. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/scibec_connector.py +0 -0
  73. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scibec/scibec_metadata_handler.py +0 -0
  74. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scihub.py +0 -0
  75. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scilog/__init__.py +0 -0
  76. {bec_server-2.7.2 → bec_server-2.7.3}/bec_server/scihub/scilog/scilog.py +0 -0
  77. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_main.py +0 -0
  78. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_service_handler.py +0 -0
  79. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_bec_server_utils/test_tmux_launch.py +0 -0
  80. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/conftest.py +0 -0
  81. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_cli_launch.py +0 -0
  82. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_server.py +0 -0
  83. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_dap_service_manager.py +0 -0
  84. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_data_processing/test_lmfit1d_service.py +0 -0
  85. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/conftest.py +0 -0
  86. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_config_handler.py +0 -0
  87. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_serializer.py +0 -0
  88. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_server.py +0 -0
  89. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_device_server_cli_launch.py +0 -0
  90. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_device_server/test_rpc_mixin.py +0 -0
  91. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/conftest.py +0 -0
  92. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer.py +0 -0
  93. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer_cli_launch.py +0 -0
  94. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_file_writer/test_file_writer_manager.py +0 -0
  95. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/conftest.py +0 -0
  96. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_bec_emitter.py +0 -0
  97. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_bluesky_emitter.py +0 -0
  98. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_emitter.py +0 -0
  99. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_scan_bundler.py +0 -0
  100. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_bundler/test_scan_bundler_cli_launch.py +0 -0
  101. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/conftest.py +0 -0
  102. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_path_optimization.py +0 -0
  103. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_guard.py +0 -0
  104. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_server_cli_launch.py +0 -0
  105. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_stubs.py +0 -0
  106. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scan_worker.py +0 -0
  107. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scan_server/test_scans.py +0 -0
  108. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/conftest.py +0 -0
  109. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_repeated_timer.py +0 -0
  110. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_config_handler.py +0 -0
  111. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_connector.py +0 -0
  112. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scibec_metadata_handler.py +0 -0
  113. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scihub_cli_launch.py +0 -0
  114. {bec_server-2.7.2 → bec_server-2.7.3}/tests/tests_scihub/test_scilog_connector.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: bec-server
3
- Version: 2.7.2
3
+ Version: 2.7.3
4
4
  Summary: BEC server
5
5
  Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
6
6
  Project-URL: Homepage, https://gitlab.psi.ch/bec/bec
@@ -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 = 100
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
- getattr(self, f"set_{action}")(scan_id=scan_mod_msg.content["scan_id"], parameter=parameter)
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:
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "bec-server"
7
- version = "2.7.2"
7
+ version = "2.7.3"
8
8
  description = "BEC server"
9
9
  requires-python = ">=3.10"
10
10
  classifiers = [
@@ -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 = 100
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", action="halt", parameter={}, metadata={"RID": "something"}
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