Reduce depending on global state

esmvalcore/_recipe/check.py

@@ -36,14 +36,15 @@
     from pathlib import Path
 
     from esmvalcore._task import TaskSet
+    from esmvalcore.config import Session
     from esmvalcore.dataset import Dataset
     from esmvalcore.typing import Facets
 
 
 logger = logging.getLogger(__name__)
 
 
-def align_metadata(step_settings: dict[str, Any]) -> None:
+def align_metadata(step_settings: dict[str, Any], session: Session) -> None:
     """Check settings of preprocessor ``align_metadata``."""
     project = step_settings.get("target_project")
     mip = step_settings.get("target_mip")
@@ -61,6 +62,7 @@ def align_metadata(step_settings: dict[str, Any]) -> None:
             mip,
             short_name,
             branding_suffix=branding_suffix,
+            session=session,
         )
     except ValueError as exc:
         if strict:

esmvalcore/_recipe/recipe.py

@@ -146,6 +146,7 @@ def _update_target_levels(
         settings["extract_levels"]["levels"] = get_cmor_levels(
             levels["cmor_table"],
             levels["coordinate"],
+            session=dataset.session,
         )
     elif "dataset" in levels:
         dataset_name = levels["dataset"]
@@ -600,7 +601,7 @@ def _update_align_metadata(
             "target_short_name",
             dataset.facets["short_name"],
         )
-        check.align_metadata(settings["align_metadata"])
+        check.align_metadata(settings["align_metadata"], dataset.session)
 
 
 def _update_extract_shape(

esmvalcore/cmor/_fixes/fix.py

@@ -7,6 +7,7 @@
 import inspect
 import logging
 import tempfile
+import warnings
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -26,7 +27,7 @@
     _get_single_cube,
 )
 from esmvalcore.cmor.fixes import get_time_bounds
-from esmvalcore.cmor.table import get_var_info
+from esmvalcore.cmor.table import get_tables
 from esmvalcore.iris_helpers import (
     has_unstructured_grid,
     safe_convert_units,
@@ -51,8 +52,9 @@ class Fix:
     def __init__(
         self,
         vardef: VariableInfo,
+        *,
+        session: Session,
         extra_facets: dict | None = None,
-        session: Session | None = None,
         frequency: str | None = None,
     ) -> None:
         """Initialize fix object.
@@ -61,11 +63,11 @@ def __init__(
         ----------
         vardef:
             CMOR table entry of the variable.
-        extra_facets:
-            Extra facets. For details, see :ref:`config-extra-facets`.
         session:
             Current session which includes configuration and directory
             information.
+        extra_facets:
+            Extra facets. For details, see :ref:`config-extra-facets`.
         frequency:
             Expected frequency of the variable. If not given, use the one from
             the CMOR table entry of the variable.
@@ -210,7 +212,7 @@ def get_fixes(
         extra_facets: dict | None = None,
         session: Session | None = None,
         frequency: str | None = None,
-    ) -> list:
+    ) -> list[Fix]:
         """Get the fixes that must be applied for a given dataset.
 
         It will look for them at the module
@@ -247,15 +249,25 @@ def get_fixes(
 
         Returns
         -------
-        list[Fix]
+        :
             Fixes to apply for the given data.
 
         """
+        if session is None:
+            warnings.warn(
+                "Not providing a `session` argument or using `session=None` "
+                "is deprecated and will no longer be supported in v2.17.0.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            from esmvalcore.config import CFG  # noqa: PLC0415
+
+            session = CFG.start_session("fix")
+
         if extra_facets is None:
             extra_facets = {}
 
-        vardef = get_var_info(
-            project,
+        vardef = get_tables(session, project).get_variable(
             mip,
             short_name,
             branding_suffix=extra_facets.get("branding_suffix"),
@@ -372,7 +384,10 @@ def fix_metadata(self, cubes: Sequence[Cube]) -> CubeList:
             Fixed cubes.
 
         """
-        # Make sure the this fix also works when no extra_facets are given
+        # Make sure the this fix also works when no extra_facets are given.
+        # Note that this never happens in practice because `"project"` and
+        # `"dataset"` are inserted into `extra_facets` in
+        # `esmvalcore.cmor.fix.fix_*`.
         if "project" in self.extra_facets and "dataset" in self.extra_facets:
             dataset_str = (
                 f"{self.extra_facets['project']}:"
@@ -598,7 +613,8 @@ def _fix_alternative_generic_level_coords(self, cube: Cube) -> Cube:
                     _get_alternative_generic_lev_coord(
                         cube,
                         coord_name,
-                        self.vardef.table_type,
+                        project=self.extra_facets["project"],
+                        session=self.session,
                     )
                 )
             except ValueError:  # no alternatives found

esmvalcore/cmor/_utils.py

@@ -5,7 +5,7 @@
 import logging
 from typing import TYPE_CHECKING
 
-import esmvalcore.cmor.table
+from esmvalcore.cmor.table import get_tables
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -14,25 +14,27 @@
     from iris.cube import Cube
 
     from esmvalcore.cmor.table import CoordinateInfo, VariableInfo
+    from esmvalcore.config import Session
 
 logger = logging.getLogger(__name__)
 
 _ALTERNATIVE_GENERIC_LEV_COORDS = {
     "alevel": {
-        "CMIP5": ["alt40", "plevs"],
-        "CMIP6": ["alt16", "plev3"],
-        "obs4MIPs": ["alt16", "plev3"],
+        "CMIP5Info": ["alt40", "plevs"],
+        "CMIP6Info": ["alt16", "plev3"],
+        "Obs4MIPsInfo": ["alt16", "plev3"],
     },
     "zlevel": {
-        "CMIP3": ["pressure"],
+        "CMIP3Info": ["pressure"],
     },
 }
 
 
 def _get_alternative_generic_lev_coord(
     cube: Cube,
     coord_name: str,
-    cmor_table_type: str,
+    project: str,
+    session: Session,
 ) -> tuple[CoordinateInfo, Coord]:
     """Find alternative generic level coordinate in cube.
 
@@ -42,10 +44,10 @@ def _get_alternative_generic_lev_coord(
         Cube to be checked.
     coord_name:
         Name of the generic level coordinate.
-    cmor_table_type:
-        CMOR table type, e.g., CMIP3, CMIP5, CMIP6. Note: This is NOT the
-        project of the dataset, but rather the entry `cmor_type` in
-        `config-developer.yml`.
+    project:
+        Project that the dataset belongs to.
+    session:
+        The session to use.
 
     Returns
     -------
@@ -63,14 +65,16 @@ def _get_alternative_generic_lev_coord(
         coord_name,
         {},
     )
-    allowed_alternatives = alternatives_for_coord.get(cmor_table_type, [])
+    tables = get_tables(session, project)
+    allowed_alternatives = alternatives_for_coord.get(
+        tables.__class__.__name__,
+        [],
+    )
 
     # Check if any of the allowed alternative coordinates is present in the
     # cube
     for allowed_alternative in allowed_alternatives:
-        cmor_coord = esmvalcore.cmor.table.CMOR_TABLES[cmor_table_type].coords[
-            allowed_alternative
-        ]
+        cmor_coord = tables.coords[allowed_alternative]
         if cube.coords(var_name=cmor_coord.out_name):
             cube_coord = cube.coord(var_name=cmor_coord.out_name)
             return (cmor_coord, cube_coord)