bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-13 11:11:49 +02:00
Code Activity

fix: validate some config data

Browse Source
This commit is contained in:
perl_d
2025-07-10 14:48:13 +02:00
parent b697f45f97
commit d1f923a8b1
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bec_widgets/utils/forms_from_types/items.py
View File

@ -390,17 +390,29 @@ class ListFormItem(DynamicFormItem):
def _add_buttons(self): def _add_buttons(self):
self._button_holder = QWidget() self._button_holder = QWidget()
self._button_holder.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
self._buttons = QVBoxLayout() self._buttons = QVBoxLayout()
self._buttons.setContentsMargins(0, 0, 0, 0)
self._button_holder.setLayout(self._buttons) self._button_holder.setLayout(self._buttons)
self._layout.addWidget(self._button_holder) self._layout.addWidget(self._button_holder)
self._add_remove_button_holder = QWidget()
self._add_remove_button_layout = QHBoxLayout()
self._add_remove_button_layout.setContentsMargins(0, 0, 0, 0)
self._add_remove_button_holder.setLayout(self._add_remove_button_layout)
self._add_button = QPushButton("+") self._add_button = QPushButton("+")
self._add_button.setMinimumHeight(15)
self._add_button.setToolTip("add a new row") self._add_button.setToolTip("add a new row")
self._remove_button = QPushButton("-") self._remove_button = QPushButton("-")
self._remove_button.setMinimumHeight(15)
self._remove_button.setToolTip("delete the focused row (if any)") self._remove_button.setToolTip("delete the focused row (if any)")
self._add_button.clicked.connect(self._add_row) self._add_button.clicked.connect(self._add_row)
self._remove_button.clicked.connect(self._delete_row) self._remove_button.clicked.connect(self._delete_row)
self._buttons.addWidget(self._add_button)
self._buttons.addWidget(self._remove_button) self._buttons.addWidget(self._add_remove_button_holder)
self._add_remove_button_layout.addWidget(self._add_button)
self._add_remove_button_layout.addWidget(self._remove_button)
def _set_pretty_display(self): def _set_pretty_display(self):
super()._set_pretty_display() super()._set_pretty_display()

19
bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py
View File

@ -30,6 +30,15 @@ from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
logger = bec_logger.logger logger = bec_logger.logger
def _try_literal_eval(value: str):
if value == "":
return ""
try:
return literal_eval(value)
except SyntaxError as e:
raise ValueError(f"Entered config value {value} is not a valid python value!") from e
class DeviceConfigDialog(BECWidget, QDialog): class DeviceConfigDialog(BECWidget, QDialog):
RPC = False RPC = False
applied = Signal() applied = Signal()
@ -93,6 +102,10 @@ class DeviceConfigDialog(BECWidget, QDialog):
@field_validator("name") @field_validator("name")
@staticmethod @staticmethod
def _validate_name(value: str, *_): def _validate_name(value: str, *_):
if not value.isidentifier():
raise ValueError(
f"Invalid device name: {value}. Device names must be valid Python identifiers."
)
if value in self.dev: if value in self.dev:
raise ValueError(f"A device with name {value} already exists!") raise ValueError(f"A device with name {value} already exists!")
return value return value
@ -160,7 +173,7 @@ class DeviceConfigDialog(BECWidget, QDialog):
diff["deviceConfig"].pop("device_access", None) diff["deviceConfig"].pop("device_access", None)
# TODO: replace when https://github.com/bec-project/bec/issues/528 is resolved # TODO: replace when https://github.com/bec-project/bec/issues/528 is resolved
diff["deviceConfig"] = { diff["deviceConfig"] = {
k: literal_eval(str(v)) for k, v in diff["deviceConfig"].items() k: _try_literal_eval(str(v)) for k, v in diff["deviceConfig"].items() if k != ""
} }
return diff return diff
@ -213,6 +226,10 @@ class DeviceConfigDialog(BECWidget, QDialog):
@SafeSlot(Exception, popup_error=True) @SafeSlot(Exception, popup_error=True)
def update_error(self, e: Exception): def update_error(self, e: Exception):
self._stop_waiting_display()
if self._action == "update":
self._fetch_config()
self._fill_form()
raise RuntimeError("Failed to update device configuration") from e raise RuntimeError("Failed to update device configuration") from e
def _start_waiting_display(self): def _start_waiting_display(self):