climate-ref-core 0.19.0__tar.gz → 0.19.2__tar.gz

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: climate-ref-core
-Version: 0.19.0
+Version: 0.19.2
 Summary: Core library for the CMIP Rapid Evaluation Framework
 Author-email: Jared Lewis <jared.lewis@climate-resource.com>, Mika Pflueger <mika.pflueger@climate-resource.com>, Bouwe Andela <b.andela@esciencecenter.nl>, Jiwoo Lee <lee1043@llnl.gov>, Min Xu <xum1@ornl.gov>, Nathan Collier <collierno@ornl.gov>, Dora Hegedus <dora.hegedus@stfc.ac.uk>
 License-Expression: Apache-2.0

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-core"
-version = "0.19.0"
+version = "0.19.2"
 description = "Core library for the CMIP Rapid Evaluation Framework"
 readme = "README.md"
 authors = [

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/src/climate_ref_core/esgf/base.py

@@ -165,6 +165,7 @@ class IntakeESGFMixin:
     Mixin that fetches datasets from ESGF using intake-esgf.
 
     Subclasses must define:
+    - project: str
     - facets: dict[str, str | tuple[str, ...]]
     - remove_ensembles: bool
     - time_span: tuple[str, str] | None
@@ -174,6 +175,8 @@ class IntakeESGFMixin:
     """
 
     slug: str
+    project: str
+    """ESGF project to search, always sent because intake-esgf's default varies by release."""
     facets: dict[str, str | tuple[str, ...]]
     remove_ensembles: bool
     time_span: tuple[str, str] | None
@@ -215,7 +218,7 @@ class IntakeESGFMixin:
 
     def fetch_datasets(self) -> pd.DataFrame:
         """Fetch dataset metadata from ESGF."""
-        facets: dict[str, Any] = dict(self.facets)
+        facets: dict[str, Any] = {"project": self.project, **self.facets}
 
         if self.pinned_instance_ids:
             # Ask for the pinned datasets by id as the declared facets may now
@@ -223,7 +226,7 @@ class IntakeESGFMixin:
             # index is read rather than which datasets match.
             logger.info(f"Resolving {len(self.pinned_instance_ids)} pinned datasets for {self.slug}")
             facets = {
-                **({"project": facets["project"]} if "project" in facets else {}),
+                "project": facets["project"],
                 "instance_id": list(self.pinned_instance_ids),
                 # A pin holds even once a newer version of the dataset has been published
                 "latest": [True, False],

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/src/climate_ref_core/esgf/cmip6.py

@@ -46,6 +46,7 @@ class CMIP6Request(IntakeESGFMixin):
     """
 
     source_type = "CMIP6"
+    project = "CMIP6"
 
     cmip6_path_items = (
         "mip_era",

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/src/climate_ref_core/esgf/obs4mips.py

@@ -4,15 +4,10 @@ Obs4MIPs dataset request implementation.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
-
-import pandas as pd
+from typing import Any
 
 from climate_ref_core.esgf.base import IntakeESGFMixin
 
-if TYPE_CHECKING:
-    pass
-
 
 class Obs4MIPsRequest(IntakeESGFMixin):
     """
@@ -22,6 +17,7 @@ class Obs4MIPsRequest(IntakeESGFMixin):
     """
 
     source_type = "obs4MIPs"
+    project = "obs4MIPs"
 
     obs4mips_path_items = (
         "activity_id",
@@ -71,7 +67,7 @@ class Obs4MIPsRequest(IntakeESGFMixin):
             Optional time range filter (start, end) in YYYY-MM format
         """
         self.slug = slug
-        self.facets = {"project": "obs4MIPs", **facets}
+        self.facets = facets
         self.remove_ensembles = remove_ensembles
         self.time_span = time_span
 
@@ -82,13 +78,5 @@ class Obs4MIPsRequest(IntakeESGFMixin):
             if key not in self.avail_facets:
                 raise ValueError(f"Filename path {key!r} not in available facets")
 
-    def fetch_datasets(self) -> pd.DataFrame:
-        """Fetch dataset metadata from ESGF with project=obs4MIPs."""
-        # Ensure project facet is set to obs4MIPs
-        if "project" not in self.facets:
-            self.facets["project"] = "obs4MIPs"
-
-        return super().fetch_datasets()
-
     def __repr__(self) -> str:
         return f"Obs4MIPsRequest(slug={self.slug!r}, facets={self.facets!r})"

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/tests/unit/esgf/test_base.py

@@ -142,7 +142,7 @@ class TestIntakeESGFMixin:
         with patch("climate_ref_core.esgf.base.ESGFCatalog", return_value=mock_cat):
             result = request.fetch_datasets()
 
-        mock_cat.search.assert_called_once_with(source_id="ACCESS-ESM1-5", variable_id="tas")
+        mock_cat.search.assert_called_once_with(project="CMIP6", source_id="ACCESS-ESM1-5", variable_id="tas")
         assert "key" in result.columns
         assert "files" in result.columns
 
@@ -324,6 +324,7 @@ class TestIntakeESGFMixin:
             pinned.fetch_datasets()
 
         mock_cat.search.assert_called_once_with(
+            project="CMIP6",
             instance_id=["CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v1"],
             # A pin holds even once a newer version has been published
             latest=[True, False],

{climate_ref_core-0.19.0 → climate_ref_core-0.19.2}/tests/unit/esgf/test_obs4mips.py

@@ -15,11 +15,8 @@ class TestObs4MIPsRequest:
             facets={"source_id": "GPCP-SG", "variable_id": "pr"},
         )
         assert request.slug == "test-obs"
-        assert request.facets == {
-            "project": "obs4MIPs",
-            "source_id": "GPCP-SG",
-            "variable_id": "pr",
-        }
+        assert request.facets == {"source_id": "GPCP-SG", "variable_id": "pr"}
+        assert request.project == "obs4MIPs"
         assert request.remove_ensembles is False
         assert request.time_span is None
         assert request.source_type == "obs4MIPs"