From cdb370d6f5115fa5e10b17c0b8c3dd4f60c261be Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 8 Dec 2023 12:21:26 +0100 Subject: [PATCH] fix: update imports --- bec_plugins/bec_client/hli/spec_hli.py | 4 ++-- .../bec_client/plugins/LamNI/x_ray_eye_align.py | 9 ++++----- bec_plugins/bec_client/startup/post_startup.py | 2 +- bec_plugins/bec_client/startup/pre_startup.py | 2 +- .../scan_server/scan_plugins/LamNIFermatScan.py | 4 ++-- bec_plugins/scibec/lamni_config.py | 2 ++ bec_plugins/utils/csaxs_post_archive.py | 10 +++++----- bin/cbf_converter/cbf_converter.py | 13 ++++--------- 8 files changed, 21 insertions(+), 25 deletions(-) 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/plugins/LamNI/x_ray_eye_align.py b/bec_plugins/bec_client/plugins/LamNI/x_ray_eye_align.py index 6e1d2bb..17a6f25 100644 --- a/bec_plugins/bec_client/plugins/LamNI/x_ray_eye_align.py +++ b/bec_plugins/bec_client/plugins/LamNI/x_ray_eye_align.py @@ -9,12 +9,11 @@ from pathlib import Path import h5py import numpy as np -from bec_lib.alarm_handler import AlarmBase -from bec_lib.core import bec_logger -from bec_lib.core.pdf_writer import PDFWriter -from typeguard import typechecked - from bec_client.plugins.cSAXS import epics_get, epics_put, fshclose, fshopen +from bec_lib import bec_logger +from bec_lib.alarm_handler import AlarmBase +from bec_lib.pdf_writer import PDFWriter +from typeguard import typechecked from .lamni_optics_mixin import LamNIOpticsMixin diff --git a/bec_plugins/bec_client/startup/post_startup.py b/bec_plugins/bec_client/startup/post_startup.py index bdf5c34..bbcf0eb 100644 --- a/bec_plugins/bec_client/startup/post_startup.py +++ b/bec_plugins/bec_client/startup/post_startup.py @@ -25,7 +25,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 import argparse -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 dcfa194..b39c6eb 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}/" diff --git a/bec_plugins/scan_server/scan_plugins/LamNIFermatScan.py b/bec_plugins/scan_server/scan_plugins/LamNIFermatScan.py index b2223a6..b4eb8dd 100644 --- a/bec_plugins/scan_server/scan_plugins/LamNIFermatScan.py +++ b/bec_plugins/scan_server/scan_plugins/LamNIFermatScan.py @@ -23,7 +23,7 @@ but they are executed in a specific order: import time import numpy as np -from bec_lib.core import BECMessage, MessageEndpoints, bec_logger +from bec_lib import MessageEndpoints, bec_logger, messages from scan_server.errors import ScanAbortion from scan_server.scans import RequestBase, ScanArgType, ScanBase @@ -450,7 +450,7 @@ class LamNIFermatScan(ScanBase, LamNIMixin): yield from self.stubs.read_and_wait(group="primary", wait_group="readout_primary") msg = self.device_manager.producer.get(MessageEndpoints.device_status("rt_scan")) if msg: - status = BECMessage.DeviceStatusMessage.loads(msg) + status = messages.DeviceStatusMessage.loads(msg) status_id = status.content.get("status", 1) request_id = status.metadata.get("RID") if status_id == 0 and self.metadata.get("RID") == request_id: diff --git a/bec_plugins/scibec/lamni_config.py b/bec_plugins/scibec/lamni_config.py index a19fa50..4335e48 100644 --- a/bec_plugins/scibec/lamni_config.py +++ b/bec_plugins/scibec/lamni_config.py @@ -1,5 +1,7 @@ import yaml +# TODO: fix imports, those classes are located in .../bec/scibec/init_scibec/configs/config.py +# (see also lamni_config.py in bec repository) from .config import DemoConfig, X12SAConfig diff --git a/bec_plugins/utils/csaxs_post_archive.py b/bec_plugins/utils/csaxs_post_archive.py index 57d5b1d..03226b4 100755 --- a/bec_plugins/utils/csaxs_post_archive.py +++ b/bec_plugins/utils/csaxs_post_archive.py @@ -3,8 +3,8 @@ import json import subprocess import requests -from bec_lib.core.file_utils import FileWriterMixin -#from bec_lib.core.bec_service import SERVICE_CONFIG +from bec_lib.file_utils import FileWriterMixin +#from bec_lib.bec_service import SERVICE_CONFIG class csaxs_archiver: @@ -41,14 +41,14 @@ class csaxs_archiver: self.overwrite = overwrite self.online = online - #from bec_lib.core.bec_service import SERVICE_CONFIG + #from bec_lib.bec_service import SERVICE_CONFIG #SERVICE_CONFIG.config["service_config"]["file_writer"] self._load_datacatalogue_module() self._create_directory(base_path) self._disable_mail_confirmation() self.service_cfg = {'base_path' : f'{self.base_path}'} - + self.file_writer = FileWriterMixin(self.service_cfg) def _disable_mail_confirmation(self): @@ -78,7 +78,7 @@ class csaxs_archiver: print(response.json()) else: print("Request failed with status code:", response.status_code) - print(response.text) + print(response.text) def _create_directory(self, base_path: str) -> None: if self.online: diff --git a/bin/cbf_converter/cbf_converter.py b/bin/cbf_converter/cbf_converter.py index 215c4b9..00870b6 100644 --- a/bin/cbf_converter/cbf_converter.py +++ b/bin/cbf_converter/cbf_converter.py @@ -3,8 +3,8 @@ from __future__ import annotations import os import subprocess -from bec_lib.core import BECMessage, MessageEndpoints, RedisConnector, bec_logger -from bec_lib.core.redis_connector import MessageObject +from bec_lib import MessageEndpoints, RedisConnector, bec_logger, messages +from bec_lib.redis_connector import MessageObject logger = bec_logger.logger @@ -27,13 +27,13 @@ class PilatusConverter: message (MessageObject): Message object parent (PilatusConverter): Parent object """ - msg = BECMessage.MessageReader.loads(message.value) + msg = messages.MessageReader.loads(message.value) print(msg) if not msg: return parent.process_msg(msg) - def process_msg(self, message: BECMessage.FileMessage) -> None: + def process_msg(self, message: messages.FileMessage) -> None: """ Callback function for new file messages. """ @@ -69,8 +69,3 @@ if __name__ == "__main__": pilatus_converter.start() threading.Event().wait() - - - - -