fix: fix ClassVar usage in bl_states

Author: cappel89

bec_lib/bec_lib/bl_states.py

@@ -7,7 +7,7 @@
 import traceback
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Annotated, Any, Callable, Generic, Literal, Type, TypeVar, cast
+from typing import Annotated, Any, Callable, ClassVar, Generic, Literal, Type, TypeVar, cast
 
 import yaml
 from pydantic import BaseModel, field_validator, model_validator
@@ -59,7 +59,7 @@ class BeamlineStateConfig(BaseModel):
     Base Configuration for a beamline state.
     """
 
-    state_type: str | None = "BeamlineState"
+    state_type: ClassVar[str] = "BeamlineState"
 
     name: Annotated[
         str,
@@ -92,7 +92,7 @@ class DeviceStateConfig(BeamlineStateConfig):
     Configuration for a device-based beamline state.
     """
 
-    state_type: str | None = "DeviceBeamlineState"
+    state_type: ClassVar[str] = "DeviceBeamlineState"
 
     device: Annotated[
         DeviceBase | str,
@@ -157,7 +157,7 @@ class DeviceWithinLimitsStateConfig(DeviceStateConfig):
     Configuration for a device within limits beamline state.
     """
 
-    state_type: str | None = "DeviceWithinLimitsState"
+    state_type: ClassVar[str] = "DeviceWithinLimitsState"
 
     low_limit: Annotated[
         float | None,
@@ -248,7 +248,7 @@ class AggregatedStateConfig(BeamlineStateConfig):
     Keys of the states dictionary are the labels of the different states.
     """
 
-    state_type: str | None = "AggregatedState"
+    state_type: ClassVar[str] = "AggregatedState"
 
     states: dict[str, SubDeviceStateConfig]
 

bec_lib/tests/test_beamline_states.py

@@ -208,28 +208,6 @@ def aggregated_state_config(self):
             },
         )
 
-    def test_shutter_state_open_and_closed(self, connected_connector, dm_with_devices):
-        state = bl_states.ShutterState(
-            name="shutter_open",
-            device="samx",
-            signal="samx",
-            low_limit=0.0,
-            high_limit=10.0,
-            redis_connector=connected_connector,
-            device_manager=dm_with_devices,
-        )
-        state.start()
-
-        valid_msg = messages.DeviceMessage(
-            signals={"samx": {"value": 5.0, "timestamp": 1.0}}, metadata={"stream": "primary"}
-        )
-        invalid_msg = messages.DeviceMessage(
-            signals={"samx": {"value": 11.0, "timestamp": 2.0}}, metadata={"stream": "primary"}
-        )
-
-        assert state.evaluate(valid_msg).status == "valid"
-        assert state.evaluate(invalid_msg).status == "invalid"
-
     def test_device_within_limits_state_valid_and_invalid(
         self, connected_connector, dm_with_devices
     ):
@@ -294,7 +272,10 @@ def test_device_within_limits_state_accepts_signal_backed_device(
             low_limit=-1.0,
             high_limit=10.0,
             tolerance=0.1,
+            redis_connector=connected_connector,
+            device_manager=dm_with_devices,
         )
+        state.start()
 
         msg = messages.DeviceMessage(
             signals={"bpm4i": {"value": 5.0, "timestamp": 1.0}}, metadata={"stream": "primary"}