Merge pull request #1335 from metno/fix_read_pyaro_filters

Adds better definition of filters. Adds tqdm to read_pyaro

pyaerocom/io/pyaro/pyaro_config.py

@@ -29,7 +29,7 @@ class PyaroConfig(BaseModel):
     name: str
     data_id: str
     filename_or_obj_or_url: str
-    filters: dict[str, dict[str, list[str]]]
+    filters: dict[str, dict[str, list[str]] | dict[str, list[tuple]]]
     name_map: dict[str, str] | None = None  # no Unit conversion option
 
     ##########################

pyaerocom/io/pyaro/read_pyaro.py

@@ -4,6 +4,8 @@
 from copy import deepcopy
 from typing import NewType
 
+from tqdm import tqdm
+
 import numpy as np
 from pyaro import list_timeseries_engines, open_timeseries
 from pyaro.timeseries import Data, Reader, Station
@@ -161,9 +163,7 @@ def _convert_to_ungriddeddata(self, pyaro_data: dict[str, Data]) -> UngriddedDat
         metadata_idx = 0
         for var, var_data in pyaro_data.items():
             size = var_size[var]
-            for i in range(
-                0, size
-            ):  # The 1 start is a temp fix for the empty first row of the current Data implementation from pyaro
+            for i in tqdm(range(size), disable=None):
                 data_line = var_data[i]
                 current_station = data_line["stations"]