bec-widgets 0.53.0__tar.gz → 0.53.2__tar.gz

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/.gitlab-ci.yml

@@ -7,7 +7,7 @@ variables:
   DOCKER_TLS_CERTDIR: ""
   BEC_CORE_BRANCH: "main"
   OPHYD_DEVICES_BRANCH: "main"
-  CHILD_PIPELINE_BRANCH: "main"
+  CHILD_PIPELINE_BRANCH: $CI_DEFAULT_BRANCH
 
 workflow:
   rules:
@@ -34,6 +34,7 @@ stages:
 
 before_script:
   - if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then 
+    echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of BEC Widgets \033[0;m";
     test -d bec_widgets || git clone --branch $CHILD_PIPELINE_BRANCH https://gitlab.psi.ch/bec/bec_widgets.git; cd bec_widgets;
     fi
 
@@ -222,4 +223,4 @@ pages:
         TARGET_BRANCH: $CI_COMMIT_TAG
     - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PROJECT_PATH == "bec/bec_widgets"'
   script:
-    - curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/bec_widgets/253243/
+    - curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/bec-widgets/253243/

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 
 
+## v0.53.2 (2024-05-15)
+
+### Ci
+
+* ci: added echo to highlight the current branch ([`0490e80`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0490e80c48563e4fb486bce903b3ce1f08863e83))
+
+### Fix
+
+* fix: check device class without importing to speed up initial import time ([`9f8fbdd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9f8fbdd5fc13cf2be10eacb41e10cf742864cd92))
+
+* fix: speed up initial import times using lazy import (from bec_lib) ([`d1e6cd3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d1e6cd388c6c9f345f52d6096d8a75a1fa7e6934))
+
+* fix: adapt to bec_lib changes (no more submodules in `__init__.py`) ([`5d09a13`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d09a13d8820a8bdb900733c97593b723a2fce1d))
+
+
+## v0.53.1 (2024-05-09)
+
+### Ci
+
+* ci: fixed rtd pages url ([`8ff3610`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ff36105d1e637c429915b4bfc2852d54a3c6f19))
+
+### Fix
+
+* fix: docs config ([`0f6a5e5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0f6a5e5fa9530969c98a9266c9ca7b89a378ff70))
+
+
 ## v0.53.0 (2024-05-09)
 
 ### Ci
@@ -145,32 +171,3 @@
 ### Feature
 
 * feat(utils/thread_checker): util class to check the thread leakage for closeEvent in qt ([`71cb80d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/71cb80d544c5f4ef499379a431ce0c17907c7ce8))
-
-### Refactor
-
-* refactor(utils/container_utils): part of the logic regarding locating widgets moved from BECFigure to utility class ([`77ff796`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/77ff7962cc91bce15d1c91b67b75b66fbea612c3))
-
-
-## v0.46.7 (2024-04-21)
-
-### Fix
-
-* fix(plot/image): monitors are now validated with current bec session ([`67a99a1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/67a99a1a19c261f9a1f09635f274cd9fbfe53639))
-
-
-## v0.46.6 (2024-04-19)
-
-### Ci
-
-* ci: changed ophyd default branch to main ([`81484e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/81484e8160a4a09907313ed747c27ab3b6cbfdc4))
-
-### Fix
-
-* fix(cli): fixed support for devices as cli input ([`1111610`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1111610f3206c5c46db6b4bd1e8827f1a4cd9e3f))
-
-
-## v0.46.5 (2024-04-19)
-
-### Test
-
-* test(rpc/bec_figure): test_rpc_plotting_shortcuts_init_configs extended by testing scatter z gradient for BECWaveform through RPC ([`a156803`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a1568033899bbcdbd457e697d6c8d478df26ba54))

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.53.0
+Version: 0.53.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

bec_widgets-0.53.2/bec_widgets/cli/__init__.py

@@ -0,0 +1,8 @@
+from bec_lib.utils.import_utils import lazy_import_from
+
+# from .auto_updates import AutoUpdates, ScanInfo
+# TODO: put back when Pydantic gets faster
+AutoUpdates, ScanInfo = lazy_import_from(
+    "bec_widgets.cli.auto_updates", ("AutoUpdates", "ScanInfo")
+)
+from .client import BECDockArea, BECFigure

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/bec_widgets/cli/client_utils.py

@@ -12,18 +12,23 @@ import uuid
 from functools import wraps
 from typing import TYPE_CHECKING
 
-from bec_lib import MessageEndpoints, ServiceConfig, 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 isinstance_based_on_class_name, lazy_import, lazy_import_from
 from qtpy.QtCore import QCoreApplication
 
 import bec_widgets.cli.client as client
-from bec_widgets.cli.auto_updates import AutoUpdates
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
 
 if TYPE_CHECKING:
+    from bec_lib.device import DeviceBase
+
     from bec_widgets.cli.client import BECDockArea, BECFigure
 
+messages = lazy_import("bec_lib.messages")
+# from bec_lib.connector import MessageObject
+MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
+BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
+
 
 def rpc_call(func):
     """
@@ -81,7 +86,7 @@ class BECGuiClientMixin:
 
     @selected_device.setter
     def selected_device(self, device: str | DeviceBase):
-        if isinstance(device, DeviceBase):
+        if isinstance_based_on_class_name(device, "bec_lib.device.DeviceBase"):
             self._selected_device = device.name
         elif isinstance(device, str):
             self._selected_device = device

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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.endpoints import MessageEndpoints
+from bec_lib.utils.import_utils import lazy_import
 from qtpy.QtCore import QTimer
 
 from bec_widgets.cli.rpc_register import RPCRegister
@@ -13,6 +14,8 @@ from bec_widgets.widgets.dock.dock_area import BECDockArea
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.plots import BECCurve, BECImageShow, BECWaveform
 
+messages = lazy_import("bec_lib.messages")
+
 
 class BECWidgetsCLIServer:
     WIDGETS = [BECWaveform, BECFigure, BECCurve, BECImageShow]

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/bec_widgets/utils/bec_connector.py

@@ -4,11 +4,13 @@ from __future__ import annotations
 import time
 from typing import Optional, Type
 
+from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import Slot as pyqtSlot
 
 from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
 
 class ConnectionConfig(BaseModel):

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/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-0.53.0 → bec_widgets-0.53.2}/bec_widgets/widgets/scan_control/scan_control.py

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

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/docs/conf.py

@@ -18,7 +18,7 @@ author = "Paul Scherrer Institute"
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 
-current_path = pathlib.Path(__file__).parent.parent.parent.resolve()
+current_path = pathlib.Path(__file__).parent.parent.resolve()
 version_path = f"{current_path}/pyproject.toml"
 
 

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.53.0"
+version = "0.53.2"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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
 

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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
 

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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:

{bec_widgets-0.53.0 → bec_widgets-0.53.2}/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

bec_widgets-0.53.0/bec_widgets/cli/__init__.py

@@ -1,2 +0,0 @@
-from .auto_updates import AutoUpdates, ScanInfo
-from .client import BECDockArea, BECFigure