Merge pull request #1351 from metno/support-map-overlay

Bump aerovaldb / Support put_map_overlay() in pyaerocom

pyaerocom/aeroval/experiment_output.py

@@ -229,8 +229,10 @@ def _sync_heatmaps_with_menu_and_regions(self) -> None:
         with self.avdb.lock():
             menu = self.avdb.get_menu(self.proj_id, self.exp_id, default={})
             all_regions = self.avdb.get_regions(self.proj_id, self.exp_id, default={})
-            for fp in self.avdb.list_glob_stats(self.proj_id, self.exp_id):
-                data = self.avdb.get_by_uri(fp)
+            for uri in self.avdb.list_glob_stats(
+                self.proj_id, self.exp_id, access_type=aerovaldb.AccessType.URI
+            ):
+                data = self.avdb.get_by_uri(uri)
                 hm = {}
                 for vardisp, info in menu.items():
                     obs_dict = info["obs"]
@@ -250,7 +252,7 @@ def _sync_heatmaps_with_menu_and_regions(self) -> None:
                                 hm_data = self._check_hm_all_regions_avail(all_regions, hm_data)
                                 hm[vardisp][obs][vert_code][mod][modvar] = hm_data
 
-                self.avdb.put_by_uri(hm, fp)
+                self.avdb.put_by_uri(hm, uri)
 
     def _check_hm_all_regions_avail(self, all_regions, hm_data) -> dict:
         if all([x in hm_data for x in all_regions]):
@@ -413,7 +415,10 @@ def _check_clean_ts_file(self, fp) -> bool:
 
         with self.avdb.lock():
             try:
-                data = self.avdb.get_by_uri(fp)
+                # TODO: Hack to get uri. Ideally this should be rewritten to use URIs directly further
+                # up.
+                uri = self.avdb._get_uri_for_file(fp)
+                data = self.avdb.get_by_uri(uri)
             except Exception:
                 logger.exception(f"FATAL: detected corrupt json file: {fp}. Removing file...")
                 os.remove(fp)
@@ -433,7 +438,7 @@ def _check_clean_ts_file(self, fp) -> bool:
                     modified = True
                     logger.info(f"Removing data for model {mod_name} from ts file: {fp}")
 
-            self.avdb.put_by_uri(data_new, fp)
+            self.avdb.put_by_uri(data_new, uri)
         return modified
 
     def _clean_modelmap_files(self) -> list[str]:

pyaerocom_env.yml

@@ -32,7 +32,7 @@ dependencies:
     - geojsoncontour
     - geocoder_reverse_natural_earth >= 0.0.2
     - pyaro >= 0.0.10
-    - aerovaldb == 0.0.15
+    - aerovaldb >= 0.1.0
 ## testing
   - pytest >=7.4
   - pytest-dependency

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "aerovaldb==0.0.17",
+    "aerovaldb>=0.1.0",
     "scitools-iris>=3.8.1",
     "xarray>=2022.12.0",
     "cartopy>=0.21.1",