fix logic to extract parameters from file names in the contour subfolder

pyaerocom/aeroval/experiment_output.py

@@ -15,6 +15,7 @@
     TypeValidator,
     sort_dict_by_name,
 )
+from pyaerocom.aeroval import EvalSetup
 from pyaerocom.aeroval.collections import ObsCollection
 from pyaerocom.aeroval.glob_defaults import (
     VariableInfo,
@@ -28,7 +29,6 @@
 )
 from pyaerocom.aeroval.json_utils import round_floats
 from pyaerocom.aeroval.modelentry import ModelEntry
-from pyaerocom.aeroval import EvalSetup
 from pyaerocom.aeroval.varinfo_web import VarinfoWeb
 from pyaerocom.colocation.colocated_data import ColocatedData
 from pyaerocom.exceptions import EntryNotAvailable, VariableDefinitionError
@@ -339,18 +339,17 @@ def _info_from_contour_dir_file(file: pathlib.PosixPath):
         str
             Time period
         """
-        spl = os.path.basename(file.name).split(file.suffix)[0].split("_")
-
-        if len(spl) == 3:  # png, webp
-            name = spl[0]
-            var_name = spl[1]
-            per = spl[2]
-            return (name, var_name, per)
-        elif len(spl) == 2:  # geojson
-            name = spl[1]
-            var_name = spl[0]
-            per = None
-            return (name, var_name, per)
+        suffix = file.suffix
+        spl = os.path.basename(file.name).split(suffix)[0].split("_")
+
+        if len(spl) == 3:
+            if suffix == ".png" or suffix == ".webp" or suffix == ".geojson":
+                name = spl[1]
+                var_name = spl[0]
+                per = spl[2]
+                return (name, var_name, per)
+            else:
+                raise NotImplementedError(f"{suffix} file format not supported")
         else:
             raise ValueError(f"invalid contour filename: {file}")
 

tests/aeroval/test_experiment_output.py

@@ -1,16 +1,15 @@
 from __future__ import annotations
 
+import pathlib
 from pathlib import Path
 
 import aerovaldb
 import pytest
 
 from pyaerocom import const
-from pyaerocom.aeroval import ExperimentProcessor
+from pyaerocom.aeroval import EvalSetup, ExperimentProcessor
 from pyaerocom.aeroval.experiment_output import ExperimentOutput, ProjectOutput
 from pyaerocom.aeroval.json_utils import read_json, write_json
-from pyaerocom.aeroval import EvalSetup
-import pathlib
 
 BASEDIR_DEFAULT = Path(const.OUTPUTDIR) / "aeroval" / "data"
 
@@ -174,20 +173,32 @@ def test_ExperimentOutput__info_from_map_file_error(filename: str):
     )
 
 
-def test_ExperimentOutput__info_from_contour_dir_file():
-    file = pathlib.PosixPath("path/to/name_vertical_period.txt")
+def test_ExperimentOutput__info_from_contour_dir_file_webp():
+    file = pathlib.PosixPath("path/to/var_name_period.webp")
     output = ExperimentOutput._info_from_contour_dir_file(file)
+    assert output == ("name", "var", "period")
 
-    assert output == ("name", "vertical", "period")
+
+def test_ExperimentOutput__info_from_contour_dir_file_geojson():
+    file = pathlib.PosixPath("path/to/var_model_period.geojson")
+    output = ExperimentOutput._info_from_contour_dir_file(file)
+    assert output == ("model", "var", "period")
 
 
 def test_ExperimentOutput__info_from_contour_dir_file_error():
-    file = pathlib.PosixPath("path/to/obs_vertical_model_period.txt")
+    file = pathlib.PosixPath("path/to/obs_vertical_model_period.geojson")
     with pytest.raises(ValueError) as e:
         ExperimentOutput._info_from_contour_dir_file(file)
     assert "invalid contour filename" in str(e.value)
 
 
+def test_ExperimentOutput__info_from_contour_dir_file_error_extension():
+    file = pathlib.PosixPath("path/to/name_vertical_period.txt")
+    with pytest.raises(NotImplementedError) as e:
+        ExperimentOutput._info_from_contour_dir_file(file)
+    assert ".txt file format not supported" in str(e.value)
+
+
 def test_ExperimentOutput__results_summary_EMPTY(dummy_expout: ExperimentOutput):
     assert dummy_expout._results_summary() == dict(obs=[], ovar=[], vc=[], mod=[], mvar=[], per=[])