Automate optional, attempt to get MoleculeAndAxisWidget working

Author: oerc0122

MDANSE/Src/MDANSE/Framework/Parameters/Choices.py

@@ -162,7 +162,10 @@ def choices(self) -> set[T]:
     def choices(self, value: Any) -> None:
         self._choices = set()
 
-    def get_choices(self, deps) -> set[T]:
+    def get_choices(self, deps: Depends) -> set[T]:
+        if not deps:
+            raise ConfigError("Misconfigured deps")
+
         choices = set(get_deep_attr(deps["choices"], self.getter))
         if not choices:
             raise ConfigError(f"No valid choices at deps['choices'].{self.getter}")

MDANSE/Src/MDANSE/Framework/Parameters/Molecules.py

@@ -79,19 +79,15 @@ def __set__(
     ) -> None:
         self.last_deps = self._get_deps(owner)
 
-        if isinstance(value, tuple):
-            self.set(*value)
-            return
-
-        if isinstance(value, dict):
-            self.configuration = value
-            return
-
-        if isinstance(value, str):
-            self.molecule = value
-            return
-
-        super().__set__(owner, value)
+        match value:
+            case [*args]:
+                self.set(*args)
+            case dict():
+                self.configuration = value
+            case str():
+                self.molecule = value
+            case _:
+                super().__set__(owner, value)
 
     @property
     def details(self) -> str:

MDANSE/Src/MDANSE/Framework/Parameters/Parameters.py

@@ -160,9 +160,11 @@ def raw_values(self) -> dict[DescID, Any]:
             Mapping of descriptor name to Values before validation.
         """
         return {
-            name: desc.raw_values
-            if isinstance(desc, Configurable)
-            else getattr(self, desc.raw_name)
+            name: (
+                desc.raw_values
+                if isinstance(desc, Configurable)
+                else getattr(self, desc.raw_name)
+            )
             for name, desc in self.descriptors.items()
         }
 
@@ -449,26 +451,28 @@ def _get_deps(
         ConfigError
             Dependencies are invalid.
         """
-        deps = depends if depends is not None else self.depends
+        dependencies = depends if depends is not None else self.depends
 
-        if any(self._bad_deps(owner, deps)):
+        if any(self._bad_deps(owner, dependencies)):
             raise ConfigError(
-                f"Dependencies ({cjoin(compress(deps, self._bad_deps(owner)))}) "
+                f"Dependencies ({cjoin(compress(dependencies, self._bad_deps(owner)))}) "
                 "are not correctly defined."
             )
 
-        deps = {
-            dep: getattr(owner, key) for dep, key in deps.items() if key != "parent"
+        dep_values = {
+            dep: getattr(owner, key)
+            for dep, key in dependencies.items()
+            if key != "parent"
         }
 
-        if "parent" in deps.values() and isinstance(owner, CustomConfig):
-            deps |= {
-                key: owner.last_deps[key]
-                for key, val in deps.items()
-                if val == "parent"
+        if "parent" in dependencies.values() and isinstance(owner, CustomConfig):
+            dep_values |= {
+                dep: owner.last_deps[dep]
+                for dep, key in dependencies.items()
+                if key == "parent"
             }
 
-        return cast("Depends", deps)
+        return cast("Depends", dep_values)
 
     def required_deps(self) -> set[DescID]:
         return set()
@@ -496,7 +500,6 @@ class CustomConfig(Parameter, HasDependencies, Configurable):
 
     def __get__(self, owner: Configurable, objtype: type | None = None):
         self.last_deps = self._get_deps(owner)
-
         return self
 
     def __set__(self, owner: Configurable, value):
@@ -627,7 +630,7 @@ def __get__(
         return out
 
     def __set__(self, owner: Configurable, value: P) -> None:
-        setattr(owner, self.configured_var, False)
+        setattr(owner, self.configured_var, self.has_default)
         setattr(owner, self.private_name, SENTINEL)
         raw = value
 
@@ -650,7 +653,6 @@ def _verify_on_set(self: Self, owner: Configurable, value: P) -> T | CB:
             )
 
         deps = self._get_deps(owner)
-
         proc = self.validate(value, deps)
 
         # For grouped config descriptors

MDANSE_GUI/Src/MDANSE_GUI/InputWidgets/ArrayWidget.py

@@ -55,7 +55,7 @@ def __init__(self, *args, parameter: Array | Vector, **kwargs):
             self._model.appendRow(items)
 
         self._layout.addWidget(self._view)
-        self._apply_box.setChecked(True)
+        self.toggle_widgets()
         self._model.itemChanged.connect(self.updateValue)
 
     @Slot()

MDANSE_GUI/Src/MDANSE_GUI/InputWidgets/AseInputFileWidget.py

@@ -31,19 +31,18 @@ def __init__(self, *args, parameter: Boolean, **kwargs):
         super().__init__(*args, parameter=parameter, **kwargs)
         default_option = self.parameter.default
 
-        field = QCheckBox(self._base)
-        field.setTristate(False)
-        field.setChecked(default_option)
-        field.stateChanged.connect(self.updateValue)
+        self._field = QCheckBox(self._base)
+        self._field.setTristate(False)
+        self._field.setChecked(default_option)
+        self._field.stateChanged.connect(self.updateValue)
 
         if self._tooltip:
             tooltip_text = self._tooltip
         else:
             tooltip_text = "A single logical value that can be True of False"
-        field.setToolTip(tooltip_text)
+        self._field.setToolTip(tooltip_text)
 
-        self._field = field
-        self._layout.addWidget(field)
+        self._layout.addWidget(self._field)
 
         self.default_labels()
         self.update_labels()
@@ -59,3 +58,6 @@ def default_labels(self):
         if not self._tooltip:
             self._tooltip = "A single logical value that can be True of False"
         self._field.setToolTip(self._tooltip)
+
+    def get_widget_value(self):
+        return self._field.checkState() == Qt.CheckState.Checked

MDANSE_GUI/Src/MDANSE_GUI/InputWidgets/BackupWidget.py

@@ -47,20 +47,20 @@ def __init__(self, *args, parameter: Choice, choices: Sequence = (), **kwargs):
 
         self._field = QComboBox(self._base)
 
+        self._field.currentTextChanged.connect(self.updateValue)
+        self._field.setToolTip(tooltip_text)
+        self._layout.addWidget(self._field)
+
         if option_list:
             self._field.addItems(sorted(map(str, option_list)))
             self._field.setCurrentText(str(default))
             highlight_default_value(self._field)
         else:
             self.get_choices()
 
-        self._field.currentTextChanged.connect(self.updateValue)
-        self._field.setToolTip(tooltip_text)
-        self._layout.addWidget(self._field)
-
         self.default_labels()
         self.update_labels()
-        self.updateValue()
+        self.toggle_widgets()
 
     def get_choices(self):
         self._field.clear()