Update and improve version check

stormworkflow/main.py

@@ -18,17 +18,32 @@
 
 _logger = logging.getLogger(__file__)
 
-CUR_INPUT_VER = Version('0.0.3')
+CUR_INPUT_VER = Version('0.0.4')
+VER_UPDATE_FUNCS = []
 
 
-def _handle_input_v0_0_1_to_v0_0_2(inout_conf):
+def _input_version(prev, curr):
+    def decorator(handler):
+        def wrapper(inout_conf):
+            ver = Version(inout_conf['input_version'])
 
-    ver = Version(inout_conf['input_version'])
+            # Only update config if specified version matches the
+            # assumed one
+            if ver != Version(prev):
+                return ver
 
-    # Only update config if specified version matches the assumed one
-    if ver != Version('0.0.1'):
-        return ver
+            # TODO: Need return values?
+            handler(inout_conf)
 
+            return Version(curr)
+        global VER_UPDATE_FUNCS
+        VER_UPDATE_FUNCS.append(wrapper)
+        return wrapper
+    return decorator
+
+
+@_input_version('0.0.1', '0.0.2')
+def _handle_input_v0_0_1_to_v0_0_2(inout_conf):
 
     _logger.info(
         "Adding perturbation variables for persistent RMW perturbation"
@@ -40,24 +55,23 @@ def _handle_input_v0_0_1_to_v0_0_2(inout_conf):
       'max_sustained_wind_speed',
     ]
 
-    return Version('0.0.2')
-
 
+@_input_version('0.0.2', '0.0.3')
 def _handle_input_v0_0_2_to_v0_0_3(inout_conf):
 
-    ver = Version(inout_conf['input_version'])
-
-    # Only update config if specified version matches the assumed one
-    if ver != Version('0.0.2'):
-        return ver
-
-
     _logger.info(
         "Adding RMW fill method default to persistent"
     )
     inout_conf['rmw_fill_method'] = 'persistent'
 
-    return Version('0.0.3')
+
+@_input_version('0.0.3', '0.0.4')
+def _handle_input_v0_0_3_to_v0_0_4(inout_conf):
+
+    _logger.info(
+        "Path to observations"
+    )
+    inout_conf['NHC_OBS'] = ''
 
 
 def handle_input_version(inout_conf):
@@ -77,10 +91,7 @@ def handle_input_version(inout_conf):
             f"Input version not supported! Max version supported is {CUR_INPUT_VER}"
         )
 
-    for fn in [
-            _handle_input_v0_0_1_to_v0_0_2,
-            _handle_input_v0_0_2_to_v0_0_3,
-    ]:
+    for fn in VER_UPDATE_FUNCS:
         ver = fn(inout_conf)
         inout_conf['input_version'] = str(ver)
 

stormworkflow/refs/input.yaml

@@ -1,5 +1,5 @@
 ---
-input_version: 0.0.3
+input_version: 0.0.4
 
 storm: "florence"
 year: 2018

tests/conftest.py

@@ -6,10 +6,11 @@
 
 
 refs = files('stormworkflow.refs')
-test_refs = files('tests.data.refs')
+test_refs = files('data.refs')
 input_v0_0_1 = test_refs.joinpath('input_v0.0.1.yaml')
 input_v0_0_2 = test_refs.joinpath('input_v0.0.2.yaml')
 input_v0_0_3 = test_refs.joinpath('input_v0.0.3.yaml')
+input_v0_0_4 = test_refs.joinpath('input_v0.0.4.yaml')
 input_latest = refs.joinpath('input.yaml')
 
 
@@ -33,6 +34,9 @@ def conf_v0_0_2():
 def conf_v0_0_3():
     return read_conf(input_v0_0_3)
 
+@pytest.fixture
+def conf_v0_0_4():
+    return read_conf(input_v0_0_4)
 
 @pytest.fixture
 def conf_latest():

tests/data/refs/input_v0.0.4.yaml

@@ -0,0 +1,49 @@
+---
+input_version: 0.0.4
+
+storm: "florence"
+year: 2018
+suffix: ""
+subset_mesh: 1
+hr_prelandfall: -1
+past_forecast: 1
+hydrology: 0
+use_wwm: 0
+pahm_model: "gahm"
+num_perturb: 2
+sample_rule: "korobov"
+perturb_vars:
+  - "cross_track"
+  - "along_track"
+#  - "radius_of_maximum_winds"
+  - "radius_of_maximum_winds_persistent"
+  - "max_sustained_wind_speed"
+rmw_fill_method: "persistent"
+
+spinup_exec: "pschism_PAHM_TVD-VL"
+hotstart_exec: "pschism_PAHM_TVD-VL"
+
+hpc_solver_nnodes: 3
+hpc_solver_ntasks: 108
+hpc_account: ""
+hpc_partition: ""
+
+RUN_OUT: ""
+L_NWM_DATASET: ""
+L_TPXO_DATASET: ""
+L_LEADTIMES_DATASET: ""
+L_TRACK_DIR: ""
+L_DEM_HI: ""
+L_DEM_LO: ""
+L_MESH_HI: ""
+L_MESH_LO: ""
+L_SHP_DIR: ""
+NHC_OBS: ""
+
+TMPDIR: "/tmp"
+PATH_APPEND: ""
+
+L_SOLVE_MODULES:
+  - "intel/2022.1.2"
+  - "impi/2022.1.2"
+  - "netcdf"

tests/test_input_version.py

@@ -45,3 +45,8 @@ def test_v0_0_2_to_latest(conf_v0_0_2, conf_latest):
 def test_v0_0_3_to_latest(conf_v0_0_3, conf_latest):
     handle_input_version(conf_v0_0_3)
     assert conf_latest == conf_v0_0_3
+
+
+def test_v0_0_4_to_latest(conf_v0_0_4, conf_latest):
+    handle_input_version(conf_v0_0_4)
+    assert conf_latest == conf_v0_0_4