From f4d27b5e83df3887742f211529f650062d1e0f32 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:32:53 -0600
Subject: [PATCH] Bugfix #2189 main_v5.0 - spaces in complex thresholds (#2193)

---
 .github/jobs/get_metviewer.sh                              | 4 ++--
 .../pytests/util/string_manip/test_util_string_manip.py    | 2 ++
 .../pytests/wrappers/grid_stat/test_grid_stat_wrapper.py   | 7 +++++--
 metplus/util/string_manip.py                               | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/jobs/get_metviewer.sh b/.github/jobs/get_metviewer.sh
index f96752758c..5cf1058454 100755
--- a/.github/jobs/get_metviewer.sh
+++ b/.github/jobs/get_metviewer.sh
@@ -7,13 +7,13 @@ export METVIEWER_DIR=$RUNNER_WORKSPACE/output/metviewer
 export METVIEWER_DOCKER_IMAGE=dtcenter/metviewer:develop
 
 # install docker-compose
-apk add docker-compose
+apk add docker-cli-compose
 
 # download docker-compose.yml file from METviewer develop branch
 wget https://raw.githubusercontent.com/dtcenter/METviewer/develop/docker/docker-compose.yml
 
 # Run docker-compose to create the containers
-docker-compose up -d
+docker compose up -d
 
 # sleep for a few seconds to ensure database has fully started
 sleep 20
diff --git a/internal/tests/pytests/util/string_manip/test_util_string_manip.py b/internal/tests/pytests/util/string_manip/test_util_string_manip.py
index 22453a53fe..d53f19b469 100644
--- a/internal/tests/pytests/util/string_manip/test_util_string_manip.py
+++ b/internal/tests/pytests/util/string_manip/test_util_string_manip.py
@@ -128,6 +128,8 @@ def test_threshold(key, value):
         ("goSFP90", None),
         ("NA", [('NA', '')]),
         ("<USP90(2.5)", [('<', 'USP90(2.5)')]),
+        ('gt4 && lt5', [('gt', 4), ('lt', 5)]),
+        (' gt4', [('gt', 4)]),
     ]
 )
 @pytest.mark.util
diff --git a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py
index cb8c9abc4e..8f39418d64 100644
--- a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py
+++ b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py
@@ -14,9 +14,10 @@
 obs_name = 'APCP_03'
 obs_level_no_quotes = '(*,*)'
 obs_level = f'"{obs_level_no_quotes}"'
-fcst_fmt = f'field = [{{ name="{fcst_name}"; level="{fcst_level}"; }}];'
+both_thresh = ' lt-0.5,gt-0.5 && lt0.5,gt0.5 '
+fcst_fmt = f'field = [{{ name="{fcst_name}"; level="{fcst_level}"; cat_thresh=[{both_thresh}]; }}];'
 obs_fmt = (f'field = [{{ name="{obs_name}"; '
-           f'level="{obs_level_no_quotes}"; }}];')
+           f'level="{obs_level_no_quotes}"; cat_thresh=[{both_thresh}]; }}];')
 time_fmt = '%Y%m%d%H'
 run_times = ['2005080700', '2005080712']
 
@@ -52,6 +53,7 @@ def set_minimum_config_settings(config):
     config.set('config', 'FCST_VAR1_LEVELS', fcst_level)
     config.set('config', 'OBS_VAR1_NAME', obs_name)
     config.set('config', 'OBS_VAR1_LEVELS', obs_level)
+    config.set('config', 'BOTH_VAR1_THRESH', both_thresh)
 
 
 @pytest.mark.parametrize(
@@ -751,6 +753,7 @@ def test_grid_stat_single_field(metplus_config, config_overrides,
                      ]
 
     all_cmds = wrapper.run_all_times()
+    assert len(all_cmds) == len(expected_cmds)
     print(f"ALL COMMANDS: {all_cmds}")
 
     missing_env = [item for item in env_var_values
diff --git a/metplus/util/string_manip.py b/metplus/util/string_manip.py
index 07f4610c81..b796cd468e 100644
--- a/metplus/util/string_manip.py
+++ b/metplus/util/string_manip.py
@@ -323,7 +323,7 @@ def get_threshold_via_regex(thresh_string):
     # split thresh string by || or &&
     thresh_split = re.split(r'\|\||&&', thresh_string)
     # check each threshold for validity
-    for thresh in thresh_split:
+    for thresh in [item.strip() for item in thresh_split]:
         found_match = False
         for comp in list(VALID_COMPARISONS)+list(VALID_COMPARISONS.values()):
             # if valid, add to list of tuples