From 38f3036a945239a9083e819350880fc8974bdebc Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Sat, 10 Sep 2022 11:59:00 +0200 Subject: [PATCH] minor changes to config handler --- bec_utils/bec_utils/devicemanager.py | 7 ++++++- device_server/device_server/devices/config_handler.py | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bec_utils/bec_utils/devicemanager.py b/bec_utils/bec_utils/devicemanager.py index 3c1fbe08..c7dc7c60 100644 --- a/bec_utils/bec_utils/devicemanager.py +++ b/bec_utils/bec_utils/devicemanager.py @@ -218,6 +218,11 @@ class DeviceManagerBase: self._start_connectors(bootstrap_server) self._get_config_from_DB() + @property + def scibec(self): + """SciBec instance""" + return self._scibec + def load_config_from_disk(self, config_path) -> dict: """ load config from disk and send request @@ -435,7 +440,7 @@ class DeviceManagerBase: # pylint: disable=protected-access self.devices._add_device(dev.get("name"), obj) - def _check_request_validity(self, msg: DeviceConfigMessage) -> None: + def check_request_validity(self, msg: DeviceConfigMessage) -> None: if msg.content["action"] not in ["update", "add", "remove", "reload"]: raise DeviceConfigError("Action must be either add, remove, update, or reload.") if msg.content["action"] in ["update", "add", "remove"] and not msg.content["config"]: diff --git a/device_server/device_server/devices/config_handler.py b/device_server/device_server/devices/config_handler.py index fc15d41c..68f574bc 100644 --- a/device_server/device_server/devices/config_handler.py +++ b/device_server/device_server/devices/config_handler.py @@ -27,7 +27,7 @@ class ConfigHandler: """ try: - self.device_manager._check_request_validity(msg) + self.device_manager.check_request_validity(msg) if msg.content["action"] != "update": return updated = False @@ -74,7 +74,7 @@ class ConfigHandler: DeviceConfigError: Raised if the db update fails. """ logger.debug("updating in DB") - success = self.device_manager._scibec.patch_device_config( + success = self.device_manager.scibec.patch_device_config( self.device_manager.devices[device_name].config["id"], {"enabled": self.device_manager.devices[device_name].enabled}, ) @@ -91,7 +91,7 @@ class ConfigHandler: DeviceConfigError: Raised if the db update fails. """ logger.debug("updating in DB") - success = self.device_manager._scibec.patch_device_config( + success = self.device_manager.scibec.patch_device_config( self.device_manager.devices[device_name].config["id"], {"deviceConfig": self.device_manager.devices[device_name].config["deviceConfig"]}, )