fix: fixed bec_lib imports

bin/cbf_converter/cbf_converter.py

@@ -28,7 +28,7 @@ class PilatusConverter:
             message (MessageObject): Message object
             parent (PilatusConverter): Parent object
         """
-        msg = messages.MessageReader.loads(message.value)
+        msg = message.value
         print(msg)
         if not msg:
             return

csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py

@@ -1,9 +1,10 @@
 import os
 import time
 
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
-from ophyd import Device, DeviceStatus, EpicsSignal, EpicsSignalRO, Signal
+from ophyd import Device, EpicsSignal, EpicsSignalRO, Signal
 
 logger = bec_logger.logger
 

csaxs_bec/devices/epics/devices/mcs_csaxs.py

@@ -3,7 +3,8 @@ import threading
 from collections import defaultdict
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages, threadlocked
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
 from ophyd import Device, EpicsSignal, EpicsSignalRO
 from ophyd_devices.interfaces.base_classes.psi_detector_base import (
@@ -112,17 +113,17 @@ class MCSSetup(CustomDetectorMixin):
             done=bool(max_value == value),  # == self.counter),
         )
 
-    @threadlocked
     def _on_mca_data(self, *args, obj=None, value=None, **kwargs) -> None:
         """Callback function for scan progress"""
-        if not isinstance(value, (list, np.ndarray)):
-            return
-        self.mca_data[obj.attr_name] = value
-        if len(self.mca_names) != len(self.mca_data):
-            return
-        self.acquisition_done = True
-        self._send_data_to_bec()
-        self.mca_data = defaultdict(lambda: [])
+        with self._lock:
+            if not isinstance(value, (list, np.ndarray)):
+                return
+            self.mca_data[obj.attr_name] = value
+            if len(self.mca_names) != len(self.mca_data):
+                return
+            self.acquisition_done = True
+            self._send_data_to_bec()
+            self.mca_data = defaultdict(lambda: [])
 
     def _send_data_to_bec(self) -> None:
         """Sends bundled data to BEC"""

csaxs_bec/devices/epics/devices/pilatus_csaxs.py

@@ -5,7 +5,8 @@ import time
 
 import numpy as np
 import requests
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import ADComponent as ADCpt
 from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Staged
 from ophyd_devices.interfaces.base_classes.psi_detector_base import (

csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py

@@ -3,7 +3,8 @@ import time
 from typing import List
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
 from ophyd import Device, PositionerBase, Signal
 from ophyd.status import wait as status_wait

csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py

@@ -3,7 +3,8 @@ import threading
 import time
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
 from ophyd import Device, PositionerBase, Signal
 from ophyd.status import wait as status_wait

csaxs_bec/devices/rt_lamni/rt_ophyd.py

@@ -4,7 +4,8 @@ import time
 from typing import List
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
 from ophyd import Device, PositionerBase, Signal
 from ophyd.status import wait as status_wait

csaxs_bec/scans/LamNIFermatScan.py

@@ -23,7 +23,8 @@ but they are executed in a specific order:
 import time
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger
+from bec_lib import bec_logger
+from bec_lib.endpoints import MessageEndpoints
 from bec_server.scan_server.errors import ScanAbortion
 from bec_server.scan_server.scans import RequestBase, ScanArgType, ScanBase
 

csaxs_bec/scans/flomni_fermat_scan.py

@@ -23,7 +23,8 @@ but they are executed in a specific order:
 import time
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.endpoints import MessageEndpoints
 from bec_server.scan_server.errors import ScanAbortion
 from bec_server.scan_server.scans import SyncFlyScanBase
 

csaxs_bec/scans/owis_grid.py

@@ -22,7 +22,8 @@ but they are executed in a specific order:
 
 import time
 
-from bec_lib import MessageEndpoints, bec_logger
+from bec_lib import bec_logger
+from bec_lib.endpoints import MessageEndpoints
 from bec_server.scan_server.scans import AsyncFlyScanBase, ScanAbortion
 
 logger = bec_logger.logger

csaxs_bec/scans/scan_plugin_template.py

@@ -25,7 +25,8 @@ but they are executed in a specific order:
 
 # import numpy as np
 
-# from bec_lib import MessageEndpoints, bec_logger, messages
+# from bec_lib import bec_logger, messages
+# from bec_lib.endpoints import MessageEndpoints
 # from bec_server.scan_server.errors import ScanAbortion
 # from bec_server.scan_server.scans import FlyScanBase, RequestBase, ScanArgType, ScanBase
 

csaxs_bec/scans/sgalil_grid.py

@@ -22,7 +22,8 @@ but they are executed in a specific order:
 
 import time
 
-from bec_lib import MessageEndpoints, bec_logger
+from bec_lib import bec_logger
+from bec_lib.endpoints import MessageEndpoints
 from bec_server.scan_server.scans import AsyncFlyScanBase
 
 logger = bec_logger.logger