From 0889addc25d7324742ebef8b3ac16c3b5b08c6fb Mon Sep 17 00:00:00 2001 From: wyzula-jan Date: Mon, 9 Nov 2026 13:56:00 +0100 Subject: [PATCH] refactor(bec_status_box): convert service info without changing the status messages --- .../services/bec_status_box/bec_status_box.py | 15 ++++++++------- tests/unit_tests/test_bec_status_box.py | 8 ++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py index f168a5ab..f9e39ece 100644 --- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py +++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py @@ -248,17 +248,22 @@ class BECStatusBox(BECWidget, QWidget): self._refresh_model() def _update_status_container( - self, service_name: str, status: BECStatus | str, info: dict, metrics: dict = None + self, + service_name: str, + status: BECStatus | str, + info: BaseModel | dict, + metrics: dict = None, ) -> None: """Store the newest status and metrics of a BEC service. Args: service_name (str): The name of the service. status (BECStatus | str): The status of the service. - info (dict): The information about the service. + info (BaseModel | dict): The information about the service. The container keeps a dict. metrics (dict): The metrics of the service. """ status = status.name if isinstance(status, BECStatus) else status + info = info.model_dump() if isinstance(info, BaseModel) else info container = self.status_container.get(service_name) if container: container.status = status @@ -285,9 +290,6 @@ class BECStatusBox(BECWidget, QWidget): """ services_info = dict(services_info) checked = list(self.CORE_SERVICES) - # 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, refresh=False) for service_name, msg in sorted(services_info.items()): @@ -323,8 +325,7 @@ class BECStatusBox(BECWidget, QWidget): self._update_status_container(service_name, "NOTCONNECTED", {}, metrics) core_state = None continue - info = msg.info.model_dump() if isinstance(msg.info, BaseModel) else msg.info - self._update_status_container(service_name, msg.status, info, metrics) + self._update_status_container(service_name, msg.status, msg.info, metrics) if core_state and msg.status.value < core_state.value: core_state = msg.status diff --git a/tests/unit_tests/test_bec_status_box.py b/tests/unit_tests/test_bec_status_box.py index f90e337a..f5cf4c4f 100644 --- a/tests/unit_tests/test_bec_status_box.py +++ b/tests/unit_tests/test_bec_status_box.py @@ -109,6 +109,14 @@ def test_all_core_running(status_box): assert rows[5].subtitle == "e12345@console ยท #abcdef" +def test_service_info_is_stored_as_dict_without_changing_the_message(status_box): + services_info, services_metric = _all_services(extra=["CLIBECClient/abcdef123"]) + status_box.update_service_status(services_info, services_metric) + for name, msg in services_info.items(): + assert isinstance(msg.info, ServiceInfo) + assert status_box.status_container[name].info == msg.info.model_dump() + + def test_core_service_missing(status_box): status_box.update_service_status(*_all_services(skip=["ScanBundler"])) model = status_box.model