bec-server 3.150.2__tar.gz → 3.151.0__tar.gz

{bec_server-3.150.2 → bec_server-3.151.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec-server
-Version: 3.150.2
+Version: 3.151.0
 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.150.2 → bec_server-3.151.0}/bec_server/scan_server/beamline_state_manager.py

@@ -4,6 +4,7 @@ import traceback
 
 from bec_lib import bl_states, messages
 from bec_lib.alarm_handler import Alarms
+from bec_lib.bl_state_manager import _state_class_for_state_type
 from bec_lib.devicemanager import DeviceManagerBase
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.messages import ErrorInfo
@@ -75,9 +76,7 @@ class BeamlineStateManager:
                     self.connector.raise_alarm(severity=Alarms.WARNING, info=info)
 
         for state_name, state in added_states.items():
-            state_class = getattr(bl_states, state.state_type)
-            if not issubclass(state_class, bl_states.BeamlineState):
-                raise ValueError(f"State type {state.state_type} not found in beamline states.")
+            state_class = _state_class_for_state_type(state.state_type)
             model_cls = state_class.CONFIG_CLASS
             model_instance = model_cls(**state.parameters)
             state_instance = state_class(

{bec_server-3.150.2 → bec_server-3.151.0}/pyproject.toml

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

{bec_server-3.150.2 → bec_server-3.151.0}/tests/tests_file_writer/test_file_writer_manager.py

@@ -317,8 +317,13 @@ def test_file_writer_manager_update_available_beamline_states(file_writer_manage
         states=[
             messages.BeamlineStateConfig(
                 name="State1",
-                state_type="ShutterState",
-                parameters={"name": "State1", "device": "shutter1"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State1",
+                    "device": "samx",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             )
         ]
     )
@@ -330,8 +335,13 @@ def test_file_writer_manager_update_available_beamline_states(file_writer_manage
         states=[
             messages.BeamlineStateConfig(
                 name="State2",
-                state_type="ShutterState",
-                parameters={"name": "State2", "device": "shutter1"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State2",
+                    "device": "samx",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             )
         ]
     )
@@ -349,7 +359,7 @@ def test_file_writer_manager_updates_scan_storage_with_state(file_writer_manager
     scan_storage.metadata["status"] = "open"
     file_manager.scan_storage["scan_id"] = scan_storage
 
-    state_msg = messages.BeamlineStateMessage(name="State1", status="valid", label="Shutter")
+    state_msg = messages.BeamlineStateMessage(name="State1", status="valid", label="Within limits")
 
     file_manager.update_beamline_state(state_msg)
     assert file_manager.scan_storage["scan_id"].beamline_states["State1"] == [state_msg]
@@ -357,7 +367,7 @@ def test_file_writer_manager_updates_scan_storage_with_state(file_writer_manager
     # verify that the latest state is kept in the file writer manager
     assert file_manager.beamline_states["State1"] == state_msg
 
-    state_msg2 = messages.BeamlineStateMessage(name="State1", status="valid", label="Shutter")
+    state_msg2 = messages.BeamlineStateMessage(name="State1", status="valid", label="Within limits")
     file_manager.update_beamline_state(state_msg2)
     assert file_manager.scan_storage["scan_id"].beamline_states["State1"] == [state_msg, state_msg2]
     assert file_manager.beamline_states["State1"] == state_msg2
@@ -375,15 +385,20 @@ def test_file_writer_manager_removes_beamline_state_subscription(file_writer_man
         states=[
             messages.BeamlineStateConfig(
                 name="State1",
-                state_type="ShutterState",
-                parameters={"name": "State1", "device": "shutter1"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State1",
+                    "device": "samx",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             )
         ]
     )
     file_manager._update_available_beamline_states({"data": msg})
     assert "State1" in file_manager.beamline_state_subscriptions
 
-    state_msg = messages.BeamlineStateMessage(name="State1", status="valid", label="Shutter")
+    state_msg = messages.BeamlineStateMessage(name="State1", status="valid", label="Within limits")
 
     file_manager.update_beamline_state(state_msg)
     assert file_manager.scan_storage["scan_id"].beamline_states["State1"] == [state_msg]

{bec_server-3.150.2 → bec_server-3.151.0}/tests/tests_scan_server/test_beamline_state_manager.py

@@ -18,8 +18,8 @@ def state_manager(connected_connector, dm_with_devices):
 
 @pytest.fixture
 def fake_bl_states(monkeypatch):
-    class FakeState(bl_states.BeamlineState[bl_states.DeviceStateConfig]):
-        CONFIG_CLASS = bl_states.DeviceStateConfig
+    class FakeState(bl_states.BeamlineState[bl_states.DeviceWithinLimitsStateConfig]):
+        CONFIG_CLASS = bl_states.DeviceWithinLimitsStateConfig
 
         def __init__(self, config=None, redis_connector=None, **kwargs):
             super().__init__(config=config, redis_connector=redis_connector, **kwargs)
@@ -35,7 +35,7 @@ def fake_bl_states(monkeypatch):
         def restart(self):
             self.restart_count += 1
 
-    monkeypatch.setattr(beamline_state_manager.bl_states, "ShutterState", FakeState)
+    monkeypatch.setattr(beamline_state_manager.bl_states, "DeviceWithinLimitsState", FakeState)
     return FakeState
 
 
@@ -71,8 +71,13 @@ def test_state_manager_updates_states(state_manager, connected_connector, fake_b
         states=[
             messages.BeamlineStateConfig(
                 name="State1",
-                state_type="ShutterState",
-                parameters={"name": "State1", "device": "shutter1"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State1",
+                    "device": "samx",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             )
         ]
     )
@@ -89,13 +94,23 @@ def test_state_manager_updates_states(state_manager, connected_connector, fake_b
         states=[
             messages.BeamlineStateConfig(
                 name="State1",
-                state_type="ShutterState",
-                parameters={"name": "State1", "device": "shutter1"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State1",
+                    "device": "samx",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             ),
             messages.BeamlineStateConfig(
                 name="State2",
-                state_type="ShutterState",
-                parameters={"name": "State2", "device": "shutter2"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State2",
+                    "device": "samy",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             ),
         ]
     )
@@ -112,8 +127,13 @@ def test_state_manager_updates_states(state_manager, connected_connector, fake_b
         states=[
             messages.BeamlineStateConfig(
                 name="State2",
-                state_type="ShutterState",
-                parameters={"name": "State2", "device": "shutter2"},
+                state_type="DeviceWithinLimitsState",
+                parameters={
+                    "name": "State2",
+                    "device": "samy",
+                    "low_limit": 0.0,
+                    "high_limit": 10.0,
+                },
             )
         ]
     )
@@ -128,6 +148,21 @@ def test_state_manager_updates_states(state_manager, connected_connector, fake_b
     assert "State2" in state_manager._states
 
 
+def test_state_manager_rejects_abstract_state_type(state_manager):
+    msg = messages.AvailableBeamlineStatesMessage(
+        states=[
+            messages.BeamlineStateConfig(
+                name="State1",
+                state_type="DeviceBeamlineState",
+                parameters={"name": "State1", "device": "samx"},
+            )
+        ]
+    )
+
+    with pytest.raises(ValueError, match="not a concrete beamline state"):
+        state_manager.update_states(msg)
+
+
 @pytest.mark.timeout(5)
 def test_states_restarted_when_device_config_updated(
     state_manager, connected_connector, fake_bl_states