refactor: cleanup

Author: cappel89

ophyd_devices/sim/sim_monitor.py

@@ -1,5 +1,7 @@
 """Module for simulated monitor devices."""
 
+from dataclasses import dataclass
+
 import numpy as np
 from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
@@ -15,6 +17,13 @@
 logger = bec_logger.logger
 
 
+@dataclass
+class RegisteredCallback:
+
+    motor: str
+    callback_id: int
+
+
 class SimMonitor(ReadOnlySignal):
     """
     A simulated device mimic any 1D Axis (position, temperature, beam).
@@ -62,10 +71,7 @@ def __init__(
         self.sim_init = sim_init
         self.device_manager = device_manager
         self._registered_proxies = {}
-        self._callback_id = (
-            None,
-            None,
-        )  # Tuple to store motor_name and callback_id for unregistration
+        self._registered_callback: RegisteredCallback | None = None
         self.sim = self.sim_cls(parent=self, **kwargs)
 
         super().__init__(
@@ -81,7 +87,7 @@ def __init__(
             self.sim.set_init(self.sim_init)
 
     @property
-    def registered_proxies(self) -> None:
+    def registered_proxies(self) -> dict:
         """Dictionary of registered signal_names and proxies."""
         return self._registered_proxies
 
@@ -93,20 +99,20 @@ def setup_readback_monitor(self, motor_name: str) -> None:
             motor_name (str): The name of the motor to monitor.
         """
 
-        if self._callback_id[0] == motor_name:
-            if self._callback_id[1] is not None:  # Already registered callback
+        if self._registered_callback:
+            if self._registered_callback.motor == motor_name:
+                # Already registered callback
                 return
-        else:  # Unregister callback from previous motor if necessary
-            if self._callback_id[1] is not None:
-                motor = self.device_manager.devices.get(self._callback_id[0], None)
+            else:  # Unregister callback from previous motor if necessary
+                motor = self.device_manager.devices.get(self._registered_callback.motor, None)
                 if motor:
-                    motor.unsubscribe(self._callback_id[1])
+                    motor.unsubscribe(self._registered_callback.callback_id)
 
         # Register new callback
         motor = self.device_manager.devices.get(motor_name, None)
         if motor:
             cb_id = motor.subscribe(self._update_readback, run=True)
-            self._callback_id = (motor_name, cb_id)
+            self._registered_callback = RegisteredCallback(motor=motor_name, callback_id=cb_id)
 
     def _update_readback(self, value, **kwargs):
         """Callback function to update the readback value."""