2.45.14

Automatically generated by python-semantic-release

.github/scripts/pr_issue_sync/pr_issue_sync.py

@@ -3,7 +3,7 @@ import os
 from typing import Literal
 
 import requests
-from github import Github
+from github import Auth, Github
 from pydantic import BaseModel
 
 
@@ -24,7 +24,7 @@ class ProjectItemHandler:
 
     def __init__(self, gh_config: GHConfig):
         self.gh_config = gh_config
-        self.gh = Github(gh_config.token)
+        self.gh = Github(auth=Auth.Token(gh_config.token))
         self.repo = self.gh.get_repo(f"{gh_config.organization}/{gh_config.repository}")
         self.project_node_id = self.get_project_node_id()
 

CHANGELOG.md

@@ -1,6 +1,35 @@
 # CHANGELOG
 
 
+## v2.45.14 (2026-01-23)
+
+### Bug Fixes
+
+- **bec_status**: Adjust bec status widget to info and version signature
+  ([`709ffd6`](https://github.com/bec-project/bec_widgets/commit/709ffd6927dceb903cbd0797fc162e56aef378c1))
+
+### Continuous Integration
+
+- Use auth.token instead of login_or_token
+  ([`0349c87`](https://github.com/bec-project/bec_widgets/commit/0349c872612ab0506e5662b813e78200a76d7590))
+
+### Testing
+
+- **device config**: Validate against pydantic
+  ([`de8fe3b`](https://github.com/bec-project/bec_widgets/commit/de8fe3b5f503ace17b0064d2ce9f54662b0fb77e))
+
+- **scan control**: Avoid strict length comparisons
+  ([`d577fac`](https://github.com/bec-project/bec_widgets/commit/d577fac02fed11b2b1c44704c04fd111c2fed1d3))
+
+
+## v2.45.13 (2025-12-17)
+
+### Bug Fixes
+
+- **scan queue**: Adjustments for changes to the pydantic model of the scan queue
+  ([`01c6e09`](https://github.com/bec-project/bec_widgets/commit/01c6e092b9cd46ae056c43e8c6576f7a570cce80))
+
+
 ## v2.45.12 (2025-12-16)
 
 ### Bug Fixes

bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py

@@ -6,6 +6,7 @@ import time
 from typing import Literal
 
 import numpy as np
+from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QObject, QTimer, Signal
@@ -264,22 +265,28 @@ class ScanProgressBar(BECWidget, QWidget):
         """
         if not "queue" in msg_content:
             return
-        primary_queue_info = msg_content["queue"].get("primary", {}).get("info", [])
+        if "primary" not in msg_content["queue"]:
+            return
+        if (primary_queue := msg_content.get("queue").get("primary")) is None:
+            return
+        if not isinstance(primary_queue, messages.ScanQueueStatus):
+            return
+        primary_queue_info = primary_queue.info
         if len(primary_queue_info) == 0:
             return
         scan_info = primary_queue_info[0]
         if scan_info is None:
             return
-        if scan_info.get("status").lower() == "running" and self.task is None:
+        if scan_info.status.lower() == "running" and self.task is None:
             self.task = ProgressTask(parent=self)
             self.progress_started.emit()
 
-        active_request_block = scan_info.get("active_request_block", {})
+        active_request_block = scan_info.active_request_block
         if active_request_block is None:
             return
 
-        self.scan_number = active_request_block.get("scan_number")
-        report_instructions = active_request_block.get("report_instructions", [])
+        self.scan_number = active_request_block.scan_number
+        report_instructions = active_request_block.report_instructions
         if not report_instructions:
             return
 

bec_widgets/widgets/services/bec_queue/bec_queue.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_qthemes import material_icon
 from qtpy.QtCore import Property, Qt, Signal, Slot
@@ -145,7 +146,16 @@ class BECQueue(BECWidget, CompactPopupWidget):
             _metadata (dict): The metadata.
         """
         # only show the primary queue for now
-        queue_info = content.get("queue", {}).get("primary", {}).get("info", [])
+        queues = content.get("queue", {})
+        if not queues:
+            self.reset_content()
+            return
+        primary_queue: messages.ScanQueueStatus | None = queues.get("primary")
+        if not primary_queue:
+            self.reset_content()
+            return
+        queue_info = primary_queue.info
+
         self.table.setRowCount(len(queue_info))
         self.table.clearContents()
 
@@ -154,19 +164,19 @@ class BECQueue(BECWidget, CompactPopupWidget):
             return
 
         for index, item in enumerate(queue_info):
-            blocks = item.get("request_blocks", [])
+            blocks = item.request_blocks
             scan_types = []
             scan_numbers = []
             scan_ids = []
-            status = item.get("status", "")
+            status = item.status
             for request_block in blocks:
-                scan_type = request_block.get("content", {}).get("scan_type", "")
+                scan_type = request_block.msg.scan_type
                 if scan_type:
                     scan_types.append(scan_type)
-                scan_number = request_block.get("scan_number", "")
+                scan_number = request_block.scan_number
                 if scan_number:
                     scan_numbers.append(str(scan_number))
-                scan_id = request_block.get("scan_id", "")
+                scan_id = request_block.scan_id
                 if scan_id:
                     scan_ids.append(scan_id)
             if scan_types:
@@ -178,7 +188,7 @@ class BECQueue(BECWidget, CompactPopupWidget):
             self.set_row(index, scan_numbers, scan_types, status, scan_ids)
         busy = (
             False
-            if all(item.get("status") in ("STOPPED", "COMPLETED", "IDLE") for item in queue_info)
+            if all(item.status in ("STOPPED", "COMPLETED", "IDLE") for item in queue_info)
             else True
         )
         self.set_global_state("warning" if busy else "default")

bec_widgets/widgets/services/bec_status_box/bec_status_box.py

@@ -9,6 +9,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from bec_lib.utils.import_utils import lazy_import_from
+from pydantic import BaseModel
 from qtpy.QtCore import QObject, QTimer, Signal, Slot
 from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem
 
@@ -18,9 +19,10 @@ from bec_widgets.widgets.services.bec_status_box.status_item import StatusItem
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_lib.client import BECClient
-
-# TODO : Put normal imports back when Pydantic gets faster
-BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
+    from bec_lib.messages import BECStatus, ServiceMetricMessage, StatusMessage
+else:
+    # TODO : Put normal imports back when Pydantic gets faster
+    BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
 
 
 @dataclass
@@ -200,7 +202,11 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
         self.status_container[service_name].update({"info": service_info_item})
 
     @Slot(dict, dict)
-    def update_service_status(self, services_info: dict, services_metric: dict) -> None:
+    def update_service_status(
+        self,
+        services_info: dict[str, StatusMessage],
+        services_metric: dict[str, ServiceMetricMessage],
+    ) -> None:
         """Callback function services_metric from BECServiceStatusMixin.
         It updates the status of all services.
 
@@ -209,6 +215,9 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
             services_metric (dict): A dictionary containing the service metrics for all running BEC services.
         """
         checked = [self.box_name]
+        # FIXME: We simply replace the pydantic message with dict for now until we refactor the widget
+        for val in services_info.values():
+            val.info = val.info.model_dump() if isinstance(val.info, BaseModel) else val.info
         services_info = self.update_core_services(services_info, services_metric)
         checked.extend(self.CORE_SERVICES)
 

bec_widgets/widgets/services/bec_status_box/status_item.py

@@ -141,7 +141,11 @@ class StatusItem(QWidget):
         metrics_text = (
             f"<b>SERVICE:</b> {self.config.service_name}<br><b>STATUS:</b> {self.config.status}<br>"
         )
-        metrics_text += f"<b>BEC_LIB VERSION:</b> {self.config.info['version']}<br>"
+        if "version" in self.config.info:
+            metrics_text += f"<b>BEC_LIB VERSION:</b> {self.config.info['version']}<br>"
+        if "versions" in self.config.info:
+            for component, version in self.config.info["versions"].items():
+                metrics_text += f"<b>{component.upper()} VERSION:</b> {version}<br>"
         if self.config.metrics:
             for key, value in self.config.metrics.items():
                 if key == "create_time":

pyproject.toml

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

tests/end-2-end/test_scan_control_e2e.py

@@ -1,7 +1,5 @@
 import time
 
-import pytest
-
 from bec_widgets.utils.widget_io import WidgetIO
 
 
@@ -24,8 +22,10 @@ def test_scan_control_populate_scans_e2e(scan_control):
         scan_control.comboBox_scan_selection.itemText(i)
         for i in range(scan_control.comboBox_scan_selection.count())
     ]
-    assert scan_control.comboBox_scan_selection.count() == len(expected_scans)
-    assert sorted(items) == sorted(expected_scans)
+    # Verify that we have at least the expected scans.
+    # There may be more scans if additional scans are added to the test plugin.
+    assert scan_control.comboBox_scan_selection.count() >= len(expected_scans)
+    assert all(scan in items for scan in expected_scans)
 
 
 def test_run_line_scan_with_parameters_e2e(scan_control, bec_client_lib, qtbot):

tests/unit_tests/test_bec_status_box.py

@@ -2,7 +2,7 @@
 from unittest import mock
 
 import pytest
-from bec_lib.messages import BECStatus, ServiceMetricMessage, StatusMessage
+from bec_lib.messages import BECStatus, ServiceInfo, ServiceMetricMessage, StatusMessage
 
 from bec_widgets.widgets.services.bec_status_box.bec_status_box import (
     BECServiceInfoContainer,
@@ -75,13 +75,17 @@ def test_update_service_status(status_box):
     """Also checks check redundant tree items"""
     name = "test_service"
     status = BECStatus.IDLE
-    info = {"test": "test"}
+    info = StatusMessage(name=name, status=status, info=ServiceInfo(user="test", hostname="host"))
     metrics = {"metric": "test_metric"}
     status_box.add_tree_item(name, status, info, {})
     not_connected_name = "invalid_service"
     status_box.add_tree_item(not_connected_name, status, info, metrics)
 
-    services_status = {name: StatusMessage(name=name, status=status, info=info)}
+    services_status = {
+        name: StatusMessage(
+            name=name, status=status, info=ServiceInfo(user="test", hostname="host")
+        )
+    }
     services_metrics = {name: ServiceMetricMessage(name=name, metrics=metrics)}
 
     with mock.patch.object(status_box, "update_core_services", return_value=services_status):
@@ -95,7 +99,7 @@ def test_update_core_services(status_box):
     status_box.CORE_SERVICES = ["test_service"]
     name = "test_service"
     status = BECStatus.RUNNING
-    info = {"test": "test"}
+    info = ServiceInfo(user="test", hostname="host")
     metrics = {"metric": "test_metric"}
     services_status = {name: StatusMessage(name=name, status=status, info=info)}
     services_metrics = {name: ServiceMetricMessage(name=name, metrics=metrics)}
@@ -115,7 +119,7 @@ def test_update_core_services(status_box):
 def test_double_click_item(status_box):
     name = "test_service"
     status = BECStatus.IDLE
-    info = {"test": "test"}
+    info = ServiceInfo(user="test", hostname="host")
     metrics = {"MyData": "This should be shown nicely"}
     status_box.add_tree_item(name, status, info, metrics)
     container = status_box.status_container[name]

tests/unit_tests/test_device_config_form_dialog.py

@@ -129,19 +129,13 @@ def test_update_cycle(update_dialog, qtbot):
         ({"readOnly": True, "description": "test"}, {"readOnly": True, "description": "test"}),
         (
             {"deviceConfig": {"param1": "'val1'"}},
-            {
-                "enabled": True,
-                "deviceClass": "TestDevice",
-                "deviceConfig": {"param1": "val1"},
-                "readoutPriority": "monitored",
-                "description": "",
-                "readOnly": False,
-                "softwareTrigger": False,
-                "onFailure": "retry",
-                "deviceTags": set(),
-                "userParameter": {},
-                "name": "test_device",
-            },
+            DeviceConfigModel(
+                enabled=True,
+                deviceClass="TestDevice",
+                deviceConfig={"param1": "val1"},
+                readoutPriority="monitored",
+                name="test_device",
+            ).model_dump(),
         ),
         ({"deviceConfig": {}}, {}),
     ],

tests/unit_tests/test_scan_progress_bar.py

@@ -25,6 +25,30 @@ def scan_progressbar(qtbot, mocked_client):
     yield widget
 
 
+@pytest.fixture
+def scan_message():
+    return messages.ScanQueueMessage(
+        metadata={
+            "file_suffix": None,
+            "file_directory": None,
+            "user_metadata": {"sample_name": ""},
+            "RID": "94949c6e-d5f2-4f01-837e-a5d36257dd5d",
+        },
+        scan_type="line_scan",
+        parameter={
+            "args": {"samx": [-10.0, 10.0]},
+            "kwargs": {
+                "steps": 20,
+                "relative": False,
+                "exp_time": 0.1,
+                "burst_at_each_point": 1,
+                "system_config": {"file_suffix": None, "file_directory": None},
+            },
+        },
+        queue="primary",
+    )
+
+
 def test_progress_task_basic():
     """percentage, remaining, and formatted time helpers behave as expected."""
     task = ProgressTask(parent=None, value=50, max_value=100, done=False)
@@ -167,7 +191,9 @@ def test_progressbar_queue_update(scan_progressbar):
     """
     Test that an empty queue update does not change the progress source.
     """
-    msg = messages.ScanQueueStatusMessage(queue={"primary": {"info": [], "status": "RUNNING"}})
+    msg = messages.ScanQueueStatusMessage(
+        queue={"primary": messages.ScanQueueStatus(info=[], status="RUNNING")}
+    )
     with mock.patch.object(scan_progressbar, "set_progress_source") as mock_set_source:
         scan_progressbar.on_queue_update(
             msg.content, msg.metadata, _override_slot_params={"verify_sender": False}
@@ -175,50 +201,37 @@ def test_progressbar_queue_update(scan_progressbar):
         mock_set_source.assert_not_called()
 
 
-def test_progressbar_queue_update_with_scan(scan_progressbar):
+def test_progressbar_queue_update_with_scan(scan_progressbar, scan_message):
     """
     Test that a queue update with a scan changes the progress source to SCAN_PROGRESS.
     """
+    request_block = messages.RequestBlock(
+        msg=scan_message,
+        RID="some-rid",
+        scan_motors=["samx"],
+        readout_priority={"monitored": ["samx"]},
+        is_scan=True,
+        scan_number=1,
+        scan_id="e3f50794-852c-4bb1-965e-41c585ab0aa9",
+        report_instructions=[{"scan_progress": 20}],
+    )
     msg = messages.ScanQueueStatusMessage(
         metadata={},
         queue={
-            "primary": {
-                "info": [
-                    {
-                        "queue_id": "40831e2c-fbd1-4432-8072-ad168a7ad964",
-                        "scan_id": ["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
-                        "status": "RUNNING",
-                        "active_request_block": {
-                            "msg": messages.ScanQueueMessage(
-                                metadata={
-                                    "file_suffix": None,
-                                    "file_directory": None,
-                                    "user_metadata": {"sample_name": ""},
-                                    "RID": "94949c6e-d5f2-4f01-837e-a5d36257dd5d",
-                                },
-                                scan_type="line_scan",
-                                parameter={
-                                    "args": {"samx": [-10.0, 10.0]},
-                                    "kwargs": {
-                                        "steps": 20,
-                                        "relative": False,
-                                        "exp_time": 0.1,
-                                        "burst_at_each_point": 1,
-                                        "system_config": {
-                                            "file_suffix": None,
-                                            "file_directory": None,
-                                        },
-                                    },
-                                },
-                                queue="primary",
-                            ),
-                            "scan_number": 1,
-                            "report_instructions": [{"scan_progress": 20}],
-                        },
-                    }
+            "primary": messages.ScanQueueStatus(
+                info=[
+                    messages.QueueInfoEntry(
+                        queue_id="40831e2c-fbd1-4432-8072-ad168a7ad964",
+                        scan_id=["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
+                        status="RUNNING",
+                        active_request_block=request_block,
+                        is_scan=[True],
+                        request_blocks=[request_block],
+                        scan_number=[1],
+                    )
                 ],
-                "status": "RUNNING",
-            }
+                status="RUNNING",
+            )
         },
     )
 
@@ -229,50 +242,37 @@ def test_progressbar_queue_update_with_scan(scan_progressbar):
         mock_set_source.assert_called_once_with(ProgressSource.SCAN_PROGRESS)
 
 
-def test_progressbar_queue_update_with_device(scan_progressbar):
+def test_progressbar_queue_update_with_device(scan_progressbar, scan_message):
     """
     Test that a queue update with a device changes the progress source to DEVICE_PROGRESS.
     """
+    request_block = messages.RequestBlock(
+        msg=scan_message,
+        RID="some-rid",
+        scan_motors=["samx"],
+        readout_priority={"monitored": ["samx"]},
+        is_scan=True,
+        scan_number=1,
+        scan_id="e3f50794-852c-4bb1-965e-41c585ab0aa9",
+        report_instructions=[{"device_progress": ["samx"]}],
+    )
     msg = messages.ScanQueueStatusMessage(
         metadata={},
         queue={
-            "primary": {
-                "info": [
-                    {
-                        "queue_id": "40831e2c-fbd1-4432-8072-ad168a7ad964",
-                        "scan_id": ["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
-                        "status": "RUNNING",
-                        "active_request_block": {
-                            "msg": messages.ScanQueueMessage(
-                                metadata={
-                                    "file_suffix": None,
-                                    "file_directory": None,
-                                    "user_metadata": {"sample_name": ""},
-                                    "RID": "94949c6e-d5f2-4f01-837e-a5d36257dd5d",
-                                },
-                                scan_type="line_scan",
-                                parameter={
-                                    "args": {"samx": [-10.0, 10.0]},
-                                    "kwargs": {
-                                        "steps": 20,
-                                        "relative": False,
-                                        "exp_time": 0.1,
-                                        "burst_at_each_point": 1,
-                                        "system_config": {
-                                            "file_suffix": None,
-                                            "file_directory": None,
-                                        },
-                                    },
-                                },
-                                queue="primary",
-                            ),
-                            "scan_number": 1,
-                            "report_instructions": [{"device_progress": ["samx"]}],
-                        },
-                    }
+            "primary": messages.ScanQueueStatus(
+                info=[
+                    messages.QueueInfoEntry(
+                        queue_id="40831e2c-fbd1-4432-8072-ad168a7ad964",
+                        scan_id=["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
+                        status="RUNNING",
+                        active_request_block=request_block,
+                        is_scan=[True],
+                        request_blocks=[request_block],
+                        scan_number=[1],
+                    )
                 ],
-                "status": "RUNNING",
-            }
+                status="RUNNING",
+            )
         },
     )
 
@@ -283,49 +283,36 @@ def test_progressbar_queue_update_with_device(scan_progressbar):
         mock_set_source.assert_called_once_with(ProgressSource.DEVICE_PROGRESS, device="samx")
 
 
-def test_progressbar_queue_update_with_no_scan_or_device(scan_progressbar):
+def test_progressbar_queue_update_with_no_scan_or_device(scan_progressbar, scan_message):
     """
     Test that a queue update with neither scan nor device does not change the progress source.
     """
+    request_block = messages.RequestBlock(
+        msg=scan_message,
+        RID="some-rid",
+        scan_motors=["samx"],
+        readout_priority={"monitored": ["samx"]},
+        is_scan=True,
+        scan_number=1,
+        scan_id="e3f50794-852c-4bb1-965e-41c585ab0aa9",
+    )
     msg = messages.ScanQueueStatusMessage(
         metadata={},
         queue={
-            "primary": {
-                "info": [
-                    {
-                        "queue_id": "40831e2c-fbd1-4432-8072-ad168a7ad964",
-                        "scan_id": ["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
-                        "status": "RUNNING",
-                        "active_request_block": {
-                            "msg": messages.ScanQueueMessage(
-                                metadata={
-                                    "file_suffix": None,
-                                    "file_directory": None,
-                                    "user_metadata": {"sample_name": ""},
-                                    "RID": "94949c6e-d5f2-4f01-837e-a5d36257dd5d",
-                                },
-                                scan_type="line_scan",
-                                parameter={
-                                    "args": {"samx": [-10.0, 10.0]},
-                                    "kwargs": {
-                                        "steps": 20,
-                                        "relative": False,
-                                        "exp_time": 0.1,
-                                        "burst_at_each_point": 1,
-                                        "system_config": {
-                                            "file_suffix": None,
-                                            "file_directory": None,
-                                        },
-                                    },
-                                },
-                                queue="primary",
-                            ),
-                            "scan_number": 1,
-                        },
-                    }
+            "primary": messages.ScanQueueStatus(
+                info=[
+                    messages.QueueInfoEntry(
+                        queue_id="40831e2c-fbd1-4432-8072-ad168a7ad964",
+                        scan_id=["e3f50794-852c-4bb1-965e-41c585ab0aa9"],
+                        status="RUNNING",
+                        active_request_block=request_block,
+                        is_scan=[True],
+                        request_blocks=[request_block],
+                        scan_number=[1],
+                    )
                 ],
-                "status": "RUNNING",
-            }
+                status="RUNNING",
+            )
         },
     )