fix: adapt to bec_lib changes (no more submodules in __init__.py)

bec_widgets/cli/client_utils.py

@@ -12,9 +12,11 @@ import uuid
 from functools import wraps
 from typing import TYPE_CHECKING
 
-from bec_lib import MessageEndpoints, ServiceConfig, messages
+from bec_lib import messages
-from bec_lib.connector import MessageObject
 from bec_lib.device import DeviceBase
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.service_config import ServiceConfig
+from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from qtpy.QtCore import QCoreApplication
 
 import bec_widgets.cli.client as client

bec_widgets/cli/server.py

@@ -3,7 +3,8 @@ import threading
 import time
 from typing import Literal, Union
 
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import QTimer
 
 from bec_widgets.cli.rpc_register import RPCRegister

bec_widgets/examples/mca_readout/mca_plot.py

@@ -1,7 +1,8 @@
 # import simulation_progress as SP
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
@@ -140,7 +141,7 @@ class StreamApp(QWidget):
 if __name__ == "__main__":
     import argparse
 
-    from bec_lib import RedisConnector
+    from bec_lib.redis_connector import RedisConnector
 
     parser = argparse.ArgumentParser(description="Stream App.")
     parser.add_argument("--port", type=str, default="pc15543:6379", help="Port for RedisConnector")

bec_widgets/examples/mca_readout/mca_sim.py

@@ -1,6 +1,8 @@
 import time
 
-from bec_lib import MessageEndpoints, RedisConnector, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.redis_connector import RedisConnector
 
 connector = RedisConnector("localhost:6379")
 metadata = {}

bec_widgets/examples/motor_movement/motor_example.py

@@ -5,7 +5,8 @@ from functools import partial
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from pyqtgraph.Qt import QtCore, QtWidgets, uic
 from qtpy import QtGui
 from qtpy.QtCore import Qt, QThread

bec_widgets/examples/stream_plot/stream_plot.py

@@ -5,7 +5,8 @@ import time
 import numpy as np
 import pyqtgraph
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.redis_connector import RedisConnector
 from pyqtgraph import mkBrush, mkPen
 from pyqtgraph.Qt import QtCore, QtWidgets, uic

bec_widgets/utils/bec_dispatcher.py

@@ -6,8 +6,9 @@ from collections.abc import Callable
 from typing import TYPE_CHECKING, Union
 
 import redis
-from bec_lib import BECClient, ServiceConfig
+from bec_lib.client import BECClient
 from bec_lib.redis_connector import MessageObject, RedisConnector
+from bec_lib.service_config import ServiceConfig
 from qtpy.QtCore import QObject
 from qtpy.QtCore import Signal as pyqtSignal
 

bec_widgets/widgets/monitor/monitor.py

@@ -2,7 +2,7 @@
 import time
 
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from pydantic import ValidationError
 from pyqtgraph import mkBrush, mkPen
 from qtpy import QtCore

bec_widgets/widgets/motor_map/motor_map.py

@@ -6,7 +6,7 @@ from typing import Any, Union
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot

bec_widgets/widgets/plots/image.py

@@ -5,7 +5,7 @@ from typing import Any, Literal, Optional
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from pydantic import BaseModel, Field, ValidationError
 from qtpy.QtCore import QObject, QThread
 from qtpy.QtCore import Signal as pyqtSignal

bec_widgets/widgets/plots/motor_map.py

@@ -5,7 +5,7 @@ from typing import Optional, Union
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from pydantic import Field
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal

bec_widgets/widgets/plots/waveform.py

@@ -5,7 +5,7 @@ from typing import Any, Literal, Optional
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.scan_data import ScanData
 from pydantic import BaseModel, Field, ValidationError
 from pyqtgraph import mkBrush

bec_widgets/widgets/scan_control/scan_control.py

@@ -1,5 +1,4 @@
-import msgpack
+from bec_lib.endpoints import MessageEndpoints
-from bec_lib import MessageEndpoints
 from qtpy.QtWidgets import (
     QApplication,
     QCheckBox,

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pytest
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 
 from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
 

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pytest
-from bec_lib import MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 

tests/unit_tests/client_mocks.py

@@ -3,9 +3,10 @@ from unittest.mock import MagicMock, patch
 
 import fakeredis
 import pytest
-from bec_lib import BECClient, RedisConnector
+from bec_lib.client import BECClient
 from bec_lib.device import Positioner
 from bec_lib.devicemanager import DeviceContainer
+from bec_lib.redis_connector import RedisConnector
 
 
 class FakeDevice:

tests/unit_tests/test_stream_plot.py

@@ -4,7 +4,8 @@ from unittest import mock
 
 import numpy as np
 import pytest
-from bec_lib import RedisConnector, messages
+from bec_lib import messages
+from bec_lib.redis_connector import RedisConnector
 from pytestqt import qtbot
 
 from bec_widgets.examples.stream_plot.stream_plot import StreamPlot