Update port options in UI managers to allow random available ports

Author: dwr-psandhu

schismviz/out2dui.py

@@ -405,7 +405,7 @@ def _merge(cfg, **cli_overrides):
 @click.option("--title", default=None, help="Dashboard title shown in the browser.")
 @click.option(
     "--port", default=None, type=int,
-    help="Port for the Panel server (default: 5006).",
+    help="Port for the Panel server (0 or unset = random available port).",
 )
 @click.option(
     "--show/--no-show", default=True,
@@ -439,7 +439,7 @@ def show_out2d_ui(
         nodes_csv: nodes.csv
         variables: "elevation,depthAverageVelX"
         title: "SCHISM out2d"
-        port: 5006
+        port: 0
     """
     import glob as _glob
     import pandas as pd
@@ -488,7 +488,7 @@ def show_out2d_ui(
 
     # ---- build manager and launch UI ---------------------------------------
     dashboard_title = cfg.get("title", "SCHISM out2d")
-    server_port = int(cfg.get("port", 5006))
+    server_port = int(cfg.get("port", 0) or 0)
 
     def build_manager():
         return SchismOut2DUIManager(

schismviz/schismcalibplotui.py

@@ -577,8 +577,8 @@ def get_name_to_color(self):
     default=False,
     help="Validate config and print resolved settings without launching the UI",
 )
-@click.option("--port", default=5006, help="Port to serve the UI on")
-def schism_calib_plot_ui(config_file, base_dir=None, dry_run=False, port=5006, **kwargs):
+@click.option("--port", default=0, help="Port to serve the UI on (0 = random available port).")
+def schism_calib_plot_ui(config_file, base_dir=None, dry_run=False, port=0, **kwargs):
     """
     config_file: str
         yaml file containing configuration

schismviz/schismui.py

@@ -22,10 +22,10 @@ class SchismDataReferenceReader(DataReferenceReader):
 
     ``source == "datastore"`` rows are fetched via the observation datastore;
     all other rows are fetched from the matching :class:`SchismStudy` output
-    files.  ``convert_units`` is checked on the owning manager at every
-    :meth:`load` call.  Caching is intentionally disabled on all
-    :class:`~dvue.catalog.DataReference` objects using this reader so that
-    toggling ``convert_units`` is always reflected immediately.
+    files.  This reader always returns **raw** data (no unit conversion);
+    unit conversion is applied by :meth:`SchismOutputUIDataManager.get_data`
+    so that caching of the raw series remains valid across ``convert_units``
+    toggle events.
 
     Parameters
     ----------
@@ -34,7 +34,7 @@ class SchismDataReferenceReader(DataReferenceReader):
     obs_datastore : StationDatastore or None
         Observation datastore for ``source == "datastore"`` entries.
     manager : SchismOutputUIDataManager
-        Owning manager; provides the reactive ``convert_units`` flag.
+        Owning manager (kept for compatibility; no longer used here).
     """
 
     def __init__(self, study_dir_map, obs_datastore, manager):
@@ -47,8 +47,6 @@ def load(self, **attributes) -> pd.DataFrame:
         unit = attributes.get("unit", "")
         if source == "datastore":
             df = self._datastore.get_data(attributes)
-            if self._manager.convert_units:
-                df, unit = schismstudy.convert_to_SI(df, unit)
         else:
             base_dir = str(pathlib.Path(attributes["filename"]).parent)
             study = self._study_dir_map[base_dir]
@@ -57,8 +55,6 @@ def load(self, **attributes) -> pd.DataFrame:
             except KeyError as e:
                 logger.warning(str(e).strip("'\""))
                 raise
-            if self._manager.convert_units:
-                df, unit = schismstudy.convert_to_SI(df, unit)
         df = df[slice(df.first_valid_index(), df.last_valid_index())]
         df.attrs["unit"] = unit
         df.attrs["ptype"] = "INST-VAL"
@@ -241,13 +237,27 @@ def _build_dvue_catalog(self, crs=None) -> DataCatalog:
                 catalog.add(DataReference(
                     reader=self._schism_reader,
                     name=ref_name,
-                    cache=False,  # convert_units is reactive; always re-run
                     **attrs,
                 ))
             except ValueError:
                 pass  # duplicate name; skip
         return catalog
 
+    def get_data(self, df):
+        """Yield data frames for each selected row, applying unit conversion.
+
+        Raw data is cached by :class:`~dvue.catalog.DataReference`; unit
+        conversion is applied here (post-cache) so that toggling
+        ``convert_units`` is reflected immediately without invalidating the
+        cache.
+        """
+        for data in super().get_data(df):
+            if self.convert_units:
+                unit = data.attrs.get("unit", "")
+                data, unit = schismstudy.convert_to_SI(data, unit)
+                data.attrs["unit"] = unit
+            yield data
+
     def get_time_range(self, dfcat):
         return self.time_range
 
@@ -349,7 +359,7 @@ def get_map_marker_columns(self):
 @click.option("--flux_out", default="flux.out", help="Path to the flux.out file")
 @click.option("--reftime", default=None, help="Reference time")
 @click.option("--yaml-file", default=None, help="Path to the yaml file")
-@click.option("--port", default=5006, help="Port to serve the UI on")
+@click.option("--port", default=0, help="Port to serve the UI on (0 = random available port).")
 def show_schism_output_ui(
     schism_dir=".",
     flux_xsect_file="flow_station_xsects.yaml",
@@ -359,7 +369,7 @@ def show_schism_output_ui(
     repo_dir="screened",
     inventory_file="inventory_datasets.csv",
     yaml_file=None,
-    port=5006,
+    port=0,
 ):
     """
     Shows Data UI for SCHISM output files.