bec-server 2.12.0__tar.gz → 2.12.2__tar.gz

{bec_server-2.12.0 → bec_server-2.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec-server
-Version: 2.12.0
+Version: 2.12.2
 Summary: BEC server
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/data_processing/cli/launch.py

@@ -5,7 +5,9 @@ import argparse
 import threading
 
 import bec_server.data_processing as data_processing
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib.logger import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server.data_processing.lmfit1d_service import LmfitService1D
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/data_processing/dap_server.py

@@ -1,5 +1,7 @@
-from bec_lib import BECClient, ServiceConfig, bec_logger
+from bec_lib.client import BECClient
 from bec_lib.connector import ConnectorBase
+from bec_lib.logger import bec_logger
+from bec_lib.service_config import ServiceConfig
 
 from .dap_service_manager import DAPServiceManager
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/data_processing/dap_service.py

@@ -4,11 +4,11 @@ import abc
 from typing import TYPE_CHECKING
 
 # import numpy as np
-from bec_lib import bec_logger
+from bec_lib.logger import bec_logger
 from bec_lib.signature_serializer import signature_to_dict
 
 if TYPE_CHECKING:
-    from bec_lib import BECClient
+    from bec_lib.client import BECClient
 
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/data_processing/dap_service_manager.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
-from bec_lib import BECClient, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.client import BECClient
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_lib.redis_connector import MessageObject
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/data_processing/lmfit1d_service.py

@@ -8,8 +8,11 @@ from typing import TYPE_CHECKING
 import lmfit
 import numpy as np
 
-from bec_lib import DeviceBase, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.device import DeviceBase
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.lmfit_serializer import deserialize_param_object, serialize_lmfit_params
+from bec_lib.logger import bec_logger
 from bec_lib.serialization import MsgpackSerialization
 from bec_server.data_processing.dap_service import DAPError, DAPServiceBase
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-from bec_lib import DeviceManagerBase
+from bec_lib.devicemanager import DeviceManagerBase
 
 from . import devices
 from .cli.launch import main

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/cli/launch.py

@@ -16,7 +16,9 @@ for entry_point in entry_points:
 import argparse
 import threading
 
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib.logger import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server import device_server
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/device_server.py

@@ -8,9 +8,13 @@ import ophyd
 from ophyd import Kind, OphydObject, Staged
 from ophyd.utils import errors as ophyd_errors
 
-from bec_lib import Alarms, BECService, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.alarm_handler import Alarms
+from bec_lib.bec_service import BECService
 from bec_lib.connector import ConnectorBase
 from bec_lib.device import OnFailure
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_lib.messages import BECStatus
 from bec_server.device_server.devices.devicemanager import DeviceManagerDS
 from bec_server.device_server.rpc_mixin import RPCMixin

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/devices/config_update_handler.py

@@ -4,7 +4,10 @@ import copy
 import traceback
 from typing import TYPE_CHECKING
 
-from bec_lib import DeviceConfigError, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.devicemanager import DeviceConfigError
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 if TYPE_CHECKING:
     from devicemanager import DeviceManagerDS

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/devices/devicemanager.py

@@ -18,16 +18,13 @@ from ophyd.ophydobj import OphydObject
 from ophyd.signal import EpicsSignalBase
 from typeguard import typechecked
 
-from bec_lib import (
-    BECService,
-    DeviceBase,
-    DeviceConfigError,
-    DeviceManagerBase,
-    MessageEndpoints,
-    bec_logger,
-    messages,
-    plugin_helper,
-)
+from bec_lib import messages, plugin_helper
+from bec_lib.bec_errors import DeviceConfigError
+from bec_lib.bec_service import BECService
+from bec_lib.device import DeviceBase
+from bec_lib.devicemanager import DeviceManagerBase
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_server.device_server.devices.config_update_handler import ConfigUpdateHandler
 from bec_server.device_server.devices.device_serializer import get_device_info
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/device_server/rpc_mixin.py

@@ -5,7 +5,10 @@ from typing import Any
 
 import ophyd
 
-from bec_lib import Alarms, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.alarm_handler import Alarms
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_server.device_server.devices import is_serializable, rgetattr
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/file_writer/cli/launch.py

@@ -4,7 +4,9 @@ import argparse
 import os
 import threading
 
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib.logger import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server import file_writer
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/file_writer/default_writer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from bec_lib import DeviceManagerBase
+    from bec_lib.devicemanager import DeviceManagerBase
     from bec_server.file_writer.file_writer import HDF5Storage
 
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/file_writer/file_writer.py

@@ -9,7 +9,9 @@ import typing
 
 import h5py
 
-from bec_lib import MessageEndpoints, bec_logger, messages, plugin_helper
+from bec_lib import messages, plugin_helper
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .default_writer import NeXus_format as default_NeXus_format
 from .merged_dicts import merge_dicts

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/file_writer/file_writer_manager.py

@@ -3,19 +3,16 @@ from __future__ import annotations
 import threading
 import traceback
 
-from bec_lib import (
-    BECService,
-    DeviceManagerBase,
-    MessageEndpoints,
-    ServiceConfig,
-    bec_logger,
-    messages,
-    threadlocked,
-)
+from bec_lib import messages
 from bec_lib.alarm_handler import Alarms
 from bec_lib.async_data import AsyncDataHandler
+from bec_lib.bec_service import BECService
+from bec_lib.devicemanager import DeviceManagerBase
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.file_utils import FileWriter
+from bec_lib.logger import bec_logger
 from bec_lib.redis_connector import MessageObject, RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server.file_writer.file_writer import NexusFileWriter
 
 logger = bec_logger.logger
@@ -254,7 +251,6 @@ class FileWriterManager(BECService):
             msgs
         )
 
-    @threadlocked
     def check_storage_status(self, scan_id: str) -> None:
         """
         Check if the scan storage is ready to be written to file and write it if it is.
@@ -262,13 +258,14 @@ class FileWriterManager(BECService):
         Args:
             scan_id (str): Scan ID
         """
-        if not self.scan_storage.get(scan_id):
-            return
-        self.update_baseline_reading(scan_id)
-        self.update_file_references(scan_id)
-        if self.scan_storage[scan_id].ready_to_write():
-            self.update_async_data(scan_id)
-            self.write_file(scan_id)
+        with self._lock:
+            if not self.scan_storage.get(scan_id):
+                return
+            self.update_baseline_reading(scan_id)
+            self.update_file_references(scan_id)
+            if self.scan_storage[scan_id].ready_to_write():
+                self.update_async_data(scan_id)
+                self.write_file(scan_id)
 
     def write_file(self, scan_id: str) -> None:
         """

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/file_writer_plugins/cSAXS.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any
 import numpy as np
 
 if TYPE_CHECKING:
-    from bec_lib import DeviceManagerBase
+    from bec_lib.devicemanager import DeviceManagerBase
     from bec_server.file_writer.file_writer import HDF5Storage
 
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_bundler/bec_emitter.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .emitter import EmitterBase
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_bundler/bluesky_emitter.py

@@ -6,7 +6,8 @@ from typing import TYPE_CHECKING
 
 import msgpack
 
-from bec_lib import MessageEndpoints, bec_logger
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .emitter import EmitterBase
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_bundler/cli/launch.py

@@ -4,7 +4,9 @@
 import argparse
 import threading
 
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib.logger import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server import scan_bundler
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_bundler/scan_bundler.py

@@ -5,8 +5,12 @@ import traceback
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor
 
-from bec_lib import BECService, BECStatus, DeviceManagerBase, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.bec_service import BECService
 from bec_lib.connector import ConnectorBase
+from bec_lib.devicemanager import DeviceManagerBase
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .bec_emitter import BECEmitter
 from .bluesky_emitter import BlueskyEmitter
@@ -52,7 +56,7 @@ class ScanBundler(BECService):
         self._lock = threading.Lock()
         self._emitter = []
         self._initialize_emitters()
-        self.status = BECStatus.RUNNING
+        self.status = messages.BECStatus.RUNNING
 
     def _initialize_emitters(self):
         self._emitter = [BECEmitter(self), BlueskyEmitter(self)]

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/cli/launch.py

@@ -4,7 +4,9 @@
 import argparse
 import threading
 
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib.logger import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 from bec_server import scan_server
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/device_validation.py

@@ -1,6 +1,9 @@
 from collections.abc import Callable
 
-from bec_lib import DeviceStatus, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.device import DeviceStatus
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 logger = bec_logger.logger
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_assembler.py

@@ -1,6 +1,7 @@
 import traceback
 
-from bec_lib import bec_logger, messages
+from bec_lib import messages
+from bec_lib.logger import bec_logger
 
 from .errors import ScanAbortion
 from .scans import RequestBase, unpack_scan_args

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_guard.py

@@ -1,6 +1,8 @@
 import traceback
 
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 logger = bec_logger.logger
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_manager.py

@@ -1,6 +1,8 @@
 import inspect
 
-from bec_lib import MessageEndpoints, bec_logger, plugin_helper
+from bec_lib import plugin_helper
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_lib.messages import AvailableResourceMessage
 from bec_lib.signature_serializer import signature_to_dict
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_plugins/otf_scan.py

@@ -1,6 +1,6 @@
 import time
 
-from bec_lib import bec_logger
+from bec_lib.logger import bec_logger
 from bec_server.scan_server.scans import ScanArgType, ScanBase, SyncFlyScanBase
 
 logger = bec_logger.logger

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_queue.py

@@ -11,7 +11,10 @@ from enum import Enum
 from rich.console import Console
 from rich.table import Table
 
-from bec_lib import Alarms, MessageEndpoints, bec_logger, messages, threadlocked
+from bec_lib import messages
+from bec_lib.alarm_handler import Alarms
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .errors import LimitError, ScanAbortion
 from .scan_assembler import ScanAssembler
@@ -84,19 +87,19 @@ class QueueManager:
                 metadata=msg.metadata,
             )
 
-    @threadlocked
     def add_queue(self, queue_name: str) -> None:
         """add a new queue to the queue manager"""
-        if queue_name in self.queues:
-            queue = self.queues[queue_name]
-            if not queue.scan_worker.is_alive():
-                logger.info(f"Restarting worker for queue {queue_name}")
-                queue.clear()
-                self.queues[queue_name] = ScanQueue(self, queue_name=queue_name)
-                self.queues[queue_name].start_worker()
-            return
-        self.queues[queue_name] = ScanQueue(self, queue_name=queue_name)
-        self.queues[queue_name].start_worker()
+        with self._lock:
+            if queue_name in self.queues:
+                queue = self.queues[queue_name]
+                if not queue.scan_worker.is_alive():
+                    logger.info(f"Restarting worker for queue {queue_name}")
+                    queue.clear()
+                    self.queues[queue_name] = ScanQueue(self, queue_name=queue_name)
+                    self.queues[queue_name].start_worker()
+                return
+            self.queues[queue_name] = ScanQueue(self, queue_name=queue_name)
+            self.queues[queue_name].start_worker()
 
     def _start_scan_queue_register(self) -> None:
         self.connector.register(
@@ -125,7 +128,6 @@ class QueueManager:
             parent.scan_interception(scan_mod_msg)
             parent.send_queue_status()
 
-    @threadlocked
     def scan_interception(self, scan_mod_msg: messages.ScanQueueModificationMessage) -> None:
         """handle a scan interception by compiling the requested method name and forwarding the request.
 
@@ -133,13 +135,14 @@ class QueueManager:
             scan_mod_msg (messages.ScanQueueModificationMessage): ScanQueueModificationMessage
 
         """
-        logger.info(f"Scan interception: {scan_mod_msg}")
-        action = scan_mod_msg.content["action"]
-        parameter = scan_mod_msg.content["parameter"]
-        queue = scan_mod_msg.content.get("queue", "primary")
-        getattr(self, f"set_{action}")(
-            scan_id=scan_mod_msg.content["scan_id"], queue=queue, parameter=parameter
-        )
+        with self._lock:
+            logger.info(f"Scan interception: {scan_mod_msg}")
+            action = scan_mod_msg.content["action"]
+            parameter = scan_mod_msg.content["parameter"]
+            queue = scan_mod_msg.content.get("queue", "primary")
+            getattr(self, f"set_{action}")(
+                scan_id=scan_mod_msg.content["scan_id"], queue=queue, parameter=parameter
+            )
 
     @requires_queue
     def set_pause(self, scan_id=None, queue="primary", parameter: dict = None) -> None:
@@ -246,19 +249,19 @@ class QueueManager:
                 continue
             return history[-1]
 
-    @threadlocked
     def send_queue_status(self) -> None:
         """send the current queue to redis"""
-        queue_export = self.export_queue()
-        if not queue_export:
-            return
-        logger.info("New scan queue:")
-        for queue in self.describe_queue():
-            logger.info(f"\n {queue}")
-        self.connector.set_and_publish(
-            MessageEndpoints.scan_queue_status(),
-            messages.ScanQueueStatusMessage(queue=queue_export),
-        )
+        with self._lock:
+            queue_export = self.export_queue()
+            if not queue_export:
+                return
+            logger.info("New scan queue:")
+            for queue in self.describe_queue():
+                logger.info(f"\n {queue}")
+            self.connector.set_and_publish(
+                MessageEndpoints.scan_queue_status(),
+                messages.ScanQueueStatusMessage(queue=queue_export),
+            )
 
     def describe_queue(self) -> list:
         """create a rich.table description of the current scan queue"""
@@ -411,46 +414,46 @@ class ScanQueue:
             if updated:
                 return self.active_instruction_queue
 
-    @threadlocked
     def _next_instruction_queue(self) -> bool:
         """get the next instruction queue from the queue. If no update is available, it will return False."""
-        try:
-            aiq = self.active_instruction_queue
-            if (
-                aiq is not None
-                and len(self.queue) > 0
-                and self.queue[0].status != InstructionQueueStatus.PENDING
-            ):
-                logger.info(f"Removing queue item {self.queue[0].describe()} from queue")
-                self.queue.popleft()
-                self.queue_manager.send_queue_status()
-
-            if self.status != ScanQueueStatus.PAUSED:
-                if len(self.queue) == 0:
-                    if aiq is None:
-                        time.sleep(0.1)
+        with self._lock:
+            try:
+                aiq = self.active_instruction_queue
+                if (
+                    aiq is not None
+                    and len(self.queue) > 0
+                    and self.queue[0].status != InstructionQueueStatus.PENDING
+                ):
+                    logger.info(f"Removing queue item {self.queue[0].describe()} from queue")
+                    self.queue.popleft()
+                    self.queue_manager.send_queue_status()
+
+                if self.status != ScanQueueStatus.PAUSED:
+                    if len(self.queue) == 0:
+                        if aiq is None:
+                            time.sleep(0.1)
+                            return False
+                        self.active_instruction_queue = None
+                        time.sleep(0.01)
                         return False
-                    self.active_instruction_queue = None
-                    time.sleep(0.01)
-                    return False
+
+                    self.active_instruction_queue = self.queue[0]
+                    self.history_queue.append(self.active_instruction_queue)
+                    return True
+
+                while self.status == ScanQueueStatus.PAUSED and not self.signal_event.is_set():
+                    if len(self.queue) == 0 and self.auto_reset_enabled:
+                        # we don't need to pause if there is no scan enqueued
+                        self.status = ScanQueueStatus.RUNNING
+                        logger.info("resetting queue status to running")
+                    time.sleep(0.1)
 
                 self.active_instruction_queue = self.queue[0]
                 self.history_queue.append(self.active_instruction_queue)
                 return True
-
-            while self.status == ScanQueueStatus.PAUSED and not self.signal_event.is_set():
-                if len(self.queue) == 0 and self.auto_reset_enabled:
-                    # we don't need to pause if there is no scan enqueued
-                    self.status = ScanQueueStatus.RUNNING
-                    logger.info("resetting queue status to running")
-                time.sleep(0.1)
-
-            self.active_instruction_queue = self.queue[0]
-            self.history_queue.append(self.active_instruction_queue)
-            return True
-        except IndexError:
-            time.sleep(0.01)
-        return False
+            except IndexError:
+                time.sleep(0.01)
+            return False
 
     def insert(self, msg: messages.ScanQueueMessage, position=-1, **_kwargs):
         """insert a new message to the queue"""

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_server.py

@@ -1,9 +1,13 @@
 from __future__ import annotations
 
-from bec_lib import Alarms, BECService, BECStatus
-from bec_lib import DeviceManagerBase as DeviceManager
-from bec_lib import MessageEndpoints, ServiceConfig, bec_logger, messages
+from bec_lib import messages
+from bec_lib.alarm_handler import Alarms
+from bec_lib.bec_service import BECService
 from bec_lib.connector import ConnectorBase
+from bec_lib.devicemanager import DeviceManagerBase as DeviceManager
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
+from bec_lib.service_config import ServiceConfig
 
 from .scan_assembler import ScanAssembler
 from .scan_guard import ScanGuard
@@ -31,7 +35,7 @@ class ScanServer(BECService):
         # self._start_scan_server()
         self._start_alarm_handler()
         self._reset_scan_number()
-        self.status = BECStatus.RUNNING
+        self.status = messages.BECStatus.RUNNING
 
     def _start_device_manager(self):
         self.wait_for_service("DeviceServer")

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_stubs.py

@@ -8,8 +8,11 @@ from typing import Generator, Literal
 
 import numpy as np
 
-from bec_lib import MessageEndpoints, Status, bec_logger, messages
+from bec_lib import messages
 from bec_lib.connector import ConnectorBase
+from bec_lib.device import Status
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .errors import DeviceMessageError, ScanAbortion
 

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scan_worker.py

@@ -3,7 +3,11 @@ import threading
 import time
 import traceback
 
-from bec_lib import Alarms, DeviceBase, MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.alarm_handler import Alarms
+from bec_lib.device import DeviceBase
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .device_validation import DeviceValidation
 from .errors import DeviceMessageError, ScanAbortion

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/scans.py

@@ -7,7 +7,9 @@ from typing import Any, Literal
 
 import numpy as np
 
-from bec_lib import DeviceManagerBase, MessageEndpoints, bec_logger
+from bec_lib.devicemanager import DeviceManagerBase
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 
 from .errors import LimitError, ScanAbortion
 from .path_optimization import PathOptimizerMixin

{bec_server-2.12.0 → bec_server-2.12.2}/bec_server/scan_server/tests/utils.py

@@ -1,5 +1,5 @@
-from bec_lib import ServiceConfig
 from bec_lib.messages import BECStatus
+from bec_lib.service_config import ServiceConfig
 from bec_lib.tests.utils import ConnectorMock
 from bec_server.scan_server.scan_server import ScanServer
 from bec_server.scan_server.scan_worker import InstructionQueueStatus