refactor: clean comparison logic

Author: willdunklin

src/e3sm_compareview/app.py

@@ -18,6 +18,7 @@
     comparison_signature_for,
     label_signature_for,
     normalize_comparison_mode,
+    normalize_comparison_type,
     normalize_two_sim_target,
 )
 from e3sm_compareview.components import doc, drawers, file_browser, toolbars
@@ -459,21 +460,11 @@ async def _import_state(self, state_content):
             self.state.two_sim_test_simulation_file = comparisons.get(
                 "target", self.state.two_sim_test_simulation_file
             )
-            raw_mode = comparisons.get("mode")
-            if raw_mode in ("two-sim", "multi-sim"):
-                self.state.comparison_mode = raw_mode
-            else:
-                self.state.comparison_mode = comparisons.get(
-                    "strategy", self.state.comparison_mode
-                )
-
-            raw_type = comparisons.get("type")
-            if raw_type in ("diff", "comp1", "comp2"):
-                self.state.comparison_type = raw_type
-            else:
-                legacy_type = comparisons.get("mode")
-                if legacy_type in ("diff", "comp1", "comp2"):
-                    self.state.comparison_type = legacy_type
+            self.state.comparison_mode = normalize_comparison_mode(
+                comparisons.get("mode", comparisons.get("strategy", self.state.comparison_mode))
+            )
+            raw_type = comparisons.get("type", comparisons.get("mode"))
+            self.state.comparison_type = normalize_comparison_type(raw_type)
             self.state.selected_columns = comparisons.get(
                 "columns", self.state.selected_columns
             )

src/e3sm_compareview/comparison.py

@@ -11,6 +11,12 @@ def normalize_comparison_mode(mode):
     return "multi-sim"
 
 
+def normalize_comparison_type(comparison_type):
+    if comparison_type in COMPARISON_TYPES:
+        return comparison_type
+    return "diff"
+
+
 def default_simulation_label(file_path):
     return Path(file_path).stem
 

src/e3sm_compareview/components/simulation_selection.py

@@ -2,6 +2,7 @@
 from trame.widgets import vuetify3 as v3
 
 from e3sm_compareview.components.drawer_utils import drawer_style
+from e3sm_compareview.comparison import normalize_two_sim_target
 from e3sm_quickview.utils import js
 
 SIMULATION_DRAG_HANDLE_EVENTS = """
@@ -196,13 +197,9 @@ def _on_control_selected(self, control_path, **_):
         self.state.control_simulation_file = control_path
         if self.state.comparison_mode != "two-sim":
             return
-        if self.state.two_sim_test_simulation_file != control_path:
-            return
 
-        fallback = control_path
-        for sim in self.state.simulation_configs or []:
-            sim_path = sim.get("path")
-            if sim_path and sim_path != control_path:
-                fallback = sim_path
-                break
-        self.state.two_sim_test_simulation_file = fallback
+        self.state.two_sim_test_simulation_file = normalize_two_sim_target(
+            self.state.simulation_configs,
+            control_path,
+            self.state.two_sim_test_simulation_file,
+        )

src/e3sm_compareview/pipeline.py

@@ -271,7 +271,7 @@ def _build_view_specs(self, variables):
 
         control = self.simulation_configs[0]
         for var_name in variables:
-            per_mode_specs = {}
+            per_type_specs = {}
             control_array_name = self.control_array_name(var_name)
             control_metadata = {
                 "array_name": control_array_name,
@@ -319,7 +319,7 @@ def _build_view_specs(self, variables):
                     specs.append(comparison_spec)
                     self.array_metadata[comparison_spec["array_name"]] = comparison_spec
 
-                per_mode_specs[comparison_type] = sorted(
+                per_type_specs[comparison_type] = sorted(
                     specs,
                     key=lambda spec: spec.get("source_index", 0),
                 )
@@ -360,7 +360,7 @@ def _build_view_specs(self, variables):
                     )
 
             self.variable_view_specs[var_name] = {
-                "multi-sim": per_mode_specs,
+                "multi-sim": per_type_specs,
                 "two-sim": two_sim_specs,
             }