Merge branch 'fix-imports' into 'master'

fix: update imports

See merge request bec/csaxs-bec!2

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

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
 

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
 

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}/<path_to_my_config_file.yaml>"

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:

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
 
 

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:

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()
-
-
-
-
-