Avoid too wide supplementary file search (#2771)

Author: bouweandela

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: "v0.12.2"
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy

esmvalcore/_recipe/to_datasets.py

@@ -9,7 +9,7 @@
 from typing import TYPE_CHECKING, Any
 
 from esmvalcore.cmor.table import _CMOR_KEYS, _update_cmor_facets
-from esmvalcore.dataset import Dataset, _isglob
+from esmvalcore.dataset import INHERITED_FACETS, Dataset, _isglob
 from esmvalcore.esgf.facets import FACETS
 from esmvalcore.exceptions import RecipeError
 from esmvalcore.local import LocalFile, _replace_years_with_timerange
@@ -249,7 +249,7 @@ def _append_missing_supplementaries(
             supplementary_facets: Facets = {
                 facet: "*"
                 for facet in FACETS.get(project, ["mip"])
-                if facet not in _CMOR_KEYS
+                if facet not in _CMOR_KEYS + tuple(INHERITED_FACETS)
             }
             if "version" in facets:
                 supplementary_facets["version"] = "*"

tests/unit/recipe/test_to_datasets.py

@@ -253,6 +253,7 @@ def test_merge_supplementaries_combine_dataset_with_variable(session):
     assert len(datasets) == 1
     assert len(datasets[0].supplementaries) == 2
     assert datasets[0].supplementaries[0].facets["short_name"] == "areacella"
+    assert datasets[0].supplementaries[0].facets["dataset"] == "AWI-ESM-1-1-LR"
     assert datasets[0].supplementaries[1].facets["short_name"] == "sftlf"
 
 
@@ -404,9 +405,12 @@ def test_append_missing_supplementaries():
         facets,
         settings,
     )
-
     short_names = {f["short_name"] for f in supplementaries}
     assert short_names == {"areacella", "sftlf"}
+    sftlf = supplementaries[1]
+    assert (
+        "dataset" not in sftlf
+    )  # dataset will be inherited from the main variable
 
 
 def test_report_unexpanded_globs(mocker):