Remove the form dependencies for old parameters

Author: stephen-riggs

src/murfey/client/analyser.py

@@ -21,29 +21,12 @@
 from murfey.client.contexts.tomo import TomographyContext
 from murfey.client.instance_environment import MurfeyInstanceEnvironment
 from murfey.client.rsync import RSyncerUpdate, TransferResult
-from murfey.client.tui.forms import FormDependency
 from murfey.util.client import Observer, get_machine_config_client
 from murfey.util.mdoc import get_block
 from murfey.util.models import ProcessingParametersSPA, ProcessingParametersTomo
 
 logger = logging.getLogger("murfey.client.analyser")
 
-spa_form_dependencies: dict = {
-    "use_cryolo": FormDependency(
-        dependencies={"estimate_particle_diameter": False}, trigger_value=False
-    ),
-    "estimate_particle_diameter": FormDependency(
-        dependencies={
-            "use_cryolo": True,
-            "boxsize": "None",
-            "small_boxsize": "None",
-            "mask_diameter": "None",
-            "particle_diameter": "None",
-        },
-        trigger_value=True,
-    ),
-}
-
 
 class Analyser(Observer):
     def __init__(
@@ -326,13 +309,6 @@ def _analyse(self):
                                 self.notify(
                                     {
                                         "form": dc_metadata,
-                                        "dependencies": (
-                                            spa_form_dependencies
-                                            if isinstance(
-                                                self._context, SPAModularContext
-                                            )
-                                            else {}
-                                        ),
                                     }
                                 )
 
@@ -388,13 +364,6 @@ def _analyse(self):
                                 self.notify(
                                     {
                                         "form": dc_metadata,
-                                        "dependencies": (
-                                            spa_form_dependencies
-                                            if isinstance(
-                                                self._context, SPAModularContext
-                                            )
-                                            else {}
-                                        ),
                                     }
                                 )
                 elif isinstance(

src/murfey/client/multigrid_control.py

@@ -408,7 +408,6 @@ def _data_collection_form(self, response: dict):
             )
             if self._form_values.get("gain_ref") in (None, "None"):
                 self._form_values["gain_ref"] = self._environment.gain_ref
-            self._form_dependencies = response.get("dependencies", {})
             self._data_collection_form_complete = True
         elif self._register_dc is None:
             self._data_collection_form_complete = True

src/murfey/client/tui/app.py

@@ -63,7 +63,6 @@ class MurfeyTUI(App):
     rsync_processes: Dict[Path, RSyncer] = {}
     analysers: Dict[Path, Analyser] = {}
     _form_values: dict = reactive({})
-    _form_dependencies: dict = {}
 
     def __init__(
         self,
@@ -446,7 +445,6 @@ def _data_collection_form(self, response: dict):
             )
             if self._form_values.get("gain_ref") in (None, "None"):
                 self._form_values["gain_ref"] = self._environment.gain_ref
-            self._form_dependencies = response.get("dependencies", {})
             self.processing_btn.disabled = False
             self._data_collection_form_complete = True
         elif self._register_dc is None:
@@ -602,9 +600,7 @@ async def on_load(self, event):
         )
 
     def _install_processing_form(self):
-        self.processing_form = ProcessingForm(
-            self._form_values, dependencies=self._form_dependencies
-        )
+        self.processing_form = ProcessingForm(self._form_values)
         self.install_screen(self.processing_form, "processing-form")
 
     def on_input_submitted(self, event: Input.Submitted):

src/murfey/client/tui/forms.py

@@ -46,7 +46,7 @@
 )
 from werkzeug.utils import secure_filename
 
-from murfey.client.analyser import Analyser, spa_form_dependencies
+from murfey.client.analyser import Analyser
 from murfey.client.contexts.spa import SPAModularContext
 from murfey.client.contexts.tomo import TomographyContext
 from murfey.client.gain_ref import determine_gain_ref
@@ -55,7 +55,6 @@
     global_env_lock,
 )
 from murfey.client.rsync import RSyncer
-from murfey.client.tui.forms import FormDependency
 from murfey.util import posix_path
 from murfey.util.api import url_path_for
 from murfey.util.client import capture_post, get_machine_config_client, read_config
@@ -346,9 +345,7 @@ def on_button_pressed(self, event: Button.Pressed) -> None:
                     )
                 transfer_routes[s] = _default
             self.app.install_screen(
-                DestinationSelect(
-                    transfer_routes, self._context, dependencies=spa_form_dependencies
-                ),
+                DestinationSelect(transfer_routes, self._context),
                 "destination-select-screen",
             )
             self.app.pop_screen()
@@ -423,13 +420,11 @@ def __init__(
         self,
         form: dict,
         *args,
-        dependencies: Dict[str, FormDependency] | None = None,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
         self._form = form
         self._inputs: Dict[Input, str] = {}
-        self._dependencies = dependencies or {}
 
     def compose(self):
         inputs = []
@@ -447,8 +442,6 @@ def compose(self):
                 i.value = "None" if default is None else default
             self._inputs[i] = k.name
             inputs.append(i)
-        for i, k in self._inputs.items():
-            self._check_dependency(k, i.value)
         confirm_btn = Button("Confirm", id="confirm-btn")
         if self._form.get("motion_corr_binning") == "2":
             self._vert = VerticalScroll(
@@ -502,23 +495,6 @@ def on_switch_changed(self, event):
         else:
             k = self._inputs[event.switch]
             self._form[k] = event.value
-            self._check_dependency(k, event.value)
-
-    def _check_dependency(self, key: str, value: Any):
-        if x := self._dependencies.get(key):
-            for d, v in x.dependencies.items():
-                if value == x.trigger_value:
-                    self._form[d] = v
-                    for i, dk in self._inputs.items():
-                        if dk == d:
-                            i.value = v
-                            i.disabled = True
-                            break
-                else:
-                    for i, dk in self._inputs.items():
-                        if dk == d:
-                            i.disabled = False
-                            break
 
     def on_input_changed(self, event):
         k = self._inputs[event.input]
@@ -967,7 +943,6 @@ def __init__(
         transfer_routes: Dict[Path, str],
         context: Type[SPAModularContext] | Type[TomographyContext],
         *args,
-        dependencies: Dict[str, FormDependency] | None = None,
         destination_overrides: Optional[Dict[Path, str]] = None,
         use_transfer_routes: bool = False,
         **kwargs,
@@ -976,7 +951,6 @@ def __init__(
         self._transfer_routes = transfer_routes
         self._destination_overrides: Dict[Path, str] = destination_overrides or {}
         self._user_params: Dict[str, str] = {}
-        self._dependencies = dependencies or {}
         self._inputs: Dict[Input, str] = {}
         self._context = context
         self._use_transfer_routes = use_transfer_routes
@@ -1089,38 +1063,19 @@ def compose(self):
                     )
                 )
                 self.app._environment.superres = False
-            for i, k in self._inputs.items():
-                self._check_dependency(k, i.value)
         yield VerticalScroll(
             *params_bulk,
             id="user-params",
         )
         yield Button("Confirm", id="destination-btn")
 
-    def _check_dependency(self, key: str, value: Any):
-        if x := self._dependencies.get(key):
-            for d, v in x.dependencies.items():
-                if value == x.trigger_value:
-                    self._user_params[d] = str(v)
-                    for i, dk in self._inputs.items():
-                        if dk == d:
-                            i.value = v
-                            i.disabled = True
-                            break
-                else:
-                    for i, dk in self._inputs.items():
-                        if dk == d:
-                            i.disabled = False
-                            break
-
     def on_switch_changed(self, event):
         if event.switch.id == "superres-multigrid":
             self.app._environment.superres = event.value
         else:
             for k in self._context.user_params:
                 if event.switch.id == k.name:
                     self._user_params[k.name] = event.value
-                    self._check_dependency(k.name, event.value)
 
     def on_radio_set_changed(self, event: RadioSet.Changed) -> None:
         if event.index == 0:
@@ -1133,7 +1088,6 @@ def on_radio_set_changed(self, event: RadioSet.Changed) -> None:
             DestinationSelect(
                 self._transfer_routes,
                 self._context,
-                dependencies=spa_form_dependencies,
                 destination_overrides=self._destination_overrides,
                 use_transfer_routes=True,
             ),
@@ -1249,9 +1203,7 @@ def compose(self):
             if len(self.app.visits)
             else [Button("No ongoing visits found")]
         )
-        self.app.processing_form = ProcessingForm(
-            self.app._form_values, dependencies=self.app._form_dependencies
-        )
+        self.app.processing_form = ProcessingForm(self.app._form_values)
         yield Header()
         info_widget = RichLog(id="info", markup=True)
         yield info_widget