diff --git a/bec_plugins/bec_client/hli/spec_hli.py b/bec_plugins/bec_client/hli/spec_hli.py index 5d699c2..79700b2 100644 --- a/bec_plugins/bec_client/hli/spec_hli.py +++ b/bec_plugins/bec_client/hli/spec_hli.py @@ -1,5 +1,5 @@ -from bec_client.scan_manager import ScanReport -from bec_utils.devicemanager import Device +from bec_lib.devicemanager import Device +from bec_lib.scan_report import ScanReport # pylint:disable=undefined-variable # pylint: disable=too-many-arguments diff --git a/bec_plugins/bec_client/startup/post_startup.py b/bec_plugins/bec_client/startup/post_startup.py index 8335378..c7778dd 100644 --- a/bec_plugins/bec_client/startup/post_startup.py +++ b/bec_plugins/bec_client/startup/post_startup.py @@ -24,7 +24,7 @@ parse the --session argument, add the following lines to the script: # pylint: disable=invalid-name, unused-import, import-error, undefined-variable, unused-variable, unused-argument, no-name-in-module -from bec_lib.core import bec_logger +from bec_lib import bec_logger logger = bec_logger.logger diff --git a/bec_plugins/bec_client/startup/pre_startup.py b/bec_plugins/bec_client/startup/pre_startup.py index 2f643ed..48d274d 100644 --- a/bec_plugins/bec_client/startup/pre_startup.py +++ b/bec_plugins/bec_client/startup/pre_startup.py @@ -8,7 +8,7 @@ To set up the BEC client configuration, use the ServiceConfig class. For example to set the configuration file path, add the following lines to the script: import pathlib - from bec_lib.core import ServiceConfig + from bec_lib import ServiceConfig current_path = pathlib.Path(__file__).parent.resolve() CONFIG_PATH = f"{current_path}/" @@ -18,7 +18,7 @@ to set the configuration file path, add the following lines to the script: If this startup script defined a ServiceConfig object, the BEC client will use it to configure itself. Otherwise, the BEC client will use the default config. """ - +from bec_lib import ServiceConfig CONFIG_PATH = "/sls/X07MA/data/x07maop/SW/bec/bec/bec_client_config.yaml" config = ServiceConfig(CONFIG_PATH) diff --git a/bec_plugins/scan_server/scan_plugins/otf_scan.py b/bec_plugins/scan_server/scan_plugins/otf_scan.py index 3550bd8..38c1ed6 100644 --- a/bec_plugins/scan_server/scan_plugins/otf_scan.py +++ b/bec_plugins/scan_server/scan_plugins/otf_scan.py @@ -1,8 +1,7 @@ import time import numpy as np - -from bec_lib.core import bec_logger +from bec_lib import bec_logger from scan_server.scans import FlyScanBase, ScanArgType, ScanBase logger = bec_logger.logger