anemoi-utils 0.4.19__tar.gz → 0.4.21__tar.gz

anemoi_utils-0.4.21/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+    ".": "0.4.21"
+}

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/CHANGELOG.md

@@ -8,6 +8,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Please add your functional changes to the appropriate section in the PR.
 Keep it human-readable, your future self will thank you!
 
+## [0.4.21](https://github.com/ecmwf/anemoi-utils/compare/0.4.20...0.4.21) (2025-04-07)
+
+
+### Features
+
+* allow temporary settings ([#143](https://github.com/ecmwf/anemoi-utils/issues/143)) ([38cefb5](https://github.com/ecmwf/anemoi-utils/commit/38cefb5c4ebd4e496d2c332e1d1d8b86d551615c))
+
+
+### Bug Fixes
+
+* pydantic schemas ([#141](https://github.com/ecmwf/anemoi-utils/issues/141)) ([c30f804](https://github.com/ecmwf/anemoi-utils/commit/c30f804012a4200eee69f5fb0708d4af760cb5f7))
+
+## [0.4.20](https://github.com/ecmwf/anemoi-utils/compare/0.4.19...0.4.20) (2025-04-04)
+
+
+### Features
+
+* better message in testing ([#138](https://github.com/ecmwf/anemoi-utils/issues/138)) ([44f1638](https://github.com/ecmwf/anemoi-utils/commit/44f1638d64439af1e66f37f5e01f0cb4a384e175))
+
 ## [0.4.19](https://github.com/ecmwf/anemoi-utils/compare/0.4.18...0.4.19) (2025-04-04)
 
 

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.19
+Version: 0.4.21
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License:                                  Apache License
@@ -228,6 +228,7 @@ Requires-Dist: aniso8601
 Requires-Dist: importlib-metadata; python_version < "3.10"
 Requires-Dist: multiurl
 Requires-Dist: numpy
+Requires-Dist: pydantic>=2.9
 Requires-Dist: python-dateutil
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < "3.11"

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/pyproject.toml

@@ -1,4 +1,4 @@
-# (C) Copyright 2024 Anemoi contributors.
+# (C) Copyright 2025 Anemoi contributors.
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
@@ -44,6 +44,7 @@ dependencies = [
   "importlib-metadata; python_version<'3.10'",
   "multiurl",
   "numpy",
+  "pydantic>=2.9",
   "python-dateutil",
   "pyyaml",
   "tomli; python_version<'3.11'",

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi/utils/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.19'
-__version_tuple__ = version_tuple = (0, 4, 19)
+__version__ = version = '0.4.21'
+__version_tuple__ = version_tuple = (0, 4, 21)

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi/utils/config.py

@@ -10,6 +10,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import json
 import logging
 import os
@@ -239,6 +240,7 @@ CONFIG = {}
 CHECKED = {}
 CONFIG_LOCK = threading.RLock()
 QUIET = False
+CONFIG_PATCH = None
 
 
 def _find(config: Union[dict, list], what: str, result: list = None) -> list:
@@ -550,7 +552,10 @@ def load_config(
     """
 
     with CONFIG_LOCK:
-        return _load_config(name, secrets, defaults)
+        config = _load_config(name, secrets, defaults)
+        if CONFIG_PATCH is not None:
+            config = CONFIG_PATCH(config)
+        return config
 
 
 def load_raw_config(name: str, default: Any = None) -> Union[DotDict, str]:
@@ -668,3 +673,21 @@ def merge_configs(*configs: dict) -> dict:
         _merge_dicts(result, config)
 
     return result
+
+
+@contextlib.contextmanager
+def temporary_config(tmp: dict) -> None:
+
+    global CONFIG_PATCH
+
+    def patch_config(config: dict) -> dict:
+        return merge_configs(config, tmp)
+
+    with CONFIG_LOCK:
+
+        CONFIG_PATCH = patch_config
+
+        try:
+            yield
+        finally:
+            CONFIG_PATCH = None

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi/utils/grids.py

@@ -13,6 +13,9 @@
 import logging
 import os
 from io import BytesIO
+from typing import List
+from typing import Tuple
+from typing import Union
 
 import numpy as np
 import requests
@@ -121,7 +124,7 @@ def nearest_grid_points(
 
 
 @cached(collection="grids", encoding="npz")
-def _grids(name: str) -> bytes:
+def _grids(name: Union[str, List[float], Tuple[float, ...]]) -> bytes:
     """Get grid data by name.
 
     Parameters
@@ -136,6 +139,15 @@ def _grids(name: str) -> bytes:
     """
     from anemoi.utils.config import load_config
 
+    if isinstance(name, (tuple, list)):
+        assert len(name) == 2, "Grid name must be a list or a tuple of length 2"
+        assert all(isinstance(i, (int, float)) for i in name), "Grid name must be a list or a tuple of numbers"
+        if name[0] == name[1]:
+            name = str(float(name[0]))
+        else:
+            name = str(float(name[0])) + "x" + str(float(name[1]))
+        name = name.replace(".", "p")
+
     user_path = load_config().get("utils", {}).get("grids_path")
     if user_path:
         path = os.path.expanduser(os.path.join(user_path, f"grid-{name}.npz"))
@@ -146,6 +158,10 @@ def _grids(name: str) -> bytes:
         else:
             LOG.warning("Custom user path %s does not exist", path)
 
+    # To add a grid
+    # anemoi-transform get-grid --source mars grid=o400,levtype=sfc,param=2t grid-o400.npz
+    # nexus-cli -u xxxx -p yyyy -s GET_INSTANCE --repository anemoi upload --remote-path grids --local-path grid-o400.npz
+
     url = GRIDS_URL_PATTERN.format(name=name.lower())
     LOG.warning("Downloading grids from %s", url)
     response = requests.get(url)
@@ -153,7 +169,7 @@ def _grids(name: str) -> bytes:
     return response.content
 
 
-def grids(name: str) -> dict:
+def grids(name: Union[str, List[float], Tuple[float, ...]]) -> dict:
     """Load grid data by name.
 
     Parameters
@@ -166,7 +182,7 @@ def grids(name: str) -> dict:
     dict
         The grid data
     """
-    if name.endswith(".npz"):
+    if isinstance(name, str) and name.endswith(".npz"):
         return dict(np.load(name))
 
     data = _grids(name)

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi/utils/rules.py

@@ -51,10 +51,12 @@ class Rule:
 
     @property
     def result(self) -> Any:
+        """The result associated with the rule."""
         return self._result
 
     @property
     def condition(self) -> Dict[str, Any]:
+        """The conditions that define the rule."""
         return self._match
 
 
@@ -216,3 +218,28 @@ class RuleSet:
             An iterator over the Rule objects in the RuleSet.
         """
         return iter(self.rules)
+
+    def __len__(self) -> int:
+        """Return the number of rules in the RuleSet.
+
+        Returns
+        -------
+        int
+            The number of rules in the RuleSet.
+        """
+        return len(self.rules)
+
+    def __getitem__(self, index: int) -> Rule:
+        """Retrieve a rule by its index.
+
+        Parameters
+        ----------
+        index : int
+            The index of the rule to retrieve.
+
+        Returns
+        -------
+        Rule
+            The rule at the specified index.
+        """
+        return self.rules[index]

anemoi_utils-0.4.21/src/anemoi/utils/schemas/__init__.py

@@ -0,0 +1,20 @@
+# (C) Copyright 2025 ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+
+from pydantic import BaseModel as PydanticBaseModel
+
+
+class BaseModel(PydanticBaseModel):
+    class Config:
+        """Pydantic BaseModel configuration."""
+
+        use_attribute_docstrings = True
+        use_enum_values = True
+        validate_assignment = True
+        validate_default = True
+        extra = "forbid"

anemoi_utils-0.4.21/src/anemoi/utils/schemas/errors.py

@@ -0,0 +1,54 @@
+# (C) Copyright 2025 ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+
+from collections.abc import Iterator
+from typing import Any
+
+from pydantic import BaseModel as PydanticBaseModel
+from pydantic import ValidationError
+from pydantic_core import ErrorDetails
+
+CUSTOM_MESSAGES = {
+    "missing": "A config entry seems to be missing. If not please check for any typos.",
+    "extra_forbidden": "Extra entries in the config are forebidden. Please check for typos.",
+}
+
+
+def convert_errors(e: ValidationError, custom_messages: dict[str, str]) -> list[ErrorDetails]:
+    new_errors: list[ErrorDetails] = []
+    for error in e.errors():
+        custom_message = custom_messages.get(error["type"])
+
+        if custom_message:
+
+            ctx = error.get("ctx")
+            error["msg"] = custom_message.format(**ctx) if ctx else custom_message
+        new_errors.append(error)
+    return new_errors
+
+
+class ValidationError(Exception):
+    pass
+
+
+def allowed_values(v: Any, values: list[Any]) -> Any:
+    if v not in values:
+        msg = {f"Value {v} not in {values}"}
+        raise ValidationError(msg)
+    return v
+
+
+def required_fields(model: type[PydanticBaseModel], recursive: bool = False) -> Iterator[str]:
+    for name, field in model.model_fields.items():
+        if not field.is_required():
+            continue
+        t = field.annotation
+        if recursive and isinstance(t, type) and issubclass(t, PydanticBaseModel):
+            yield from required_fields(t, recursive=True)
+        else:
+            yield name

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi/utils/testing.py

@@ -19,6 +19,8 @@ from functools import lru_cache
 import pytest
 from multiurl import download
 
+from anemoi.utils.humanize import list_to_human
+
 LOG = logging.getLogger(__name__)
 
 TEST_DATA_URL = "https://object-store.os-api.cci1.ecmwf.int/ml-tests/test-data/samples/"
@@ -160,7 +162,7 @@ def get_test_archive(path: str, extension=".extracted") -> str:
         return target
 
 
-def packages_installed(*names) -> bool:
+def packages_installed(*names: str) -> bool:
     """Check if all the given packages are installed.
 
     Use this function to check if the required packages are installed before running tests.
@@ -194,7 +196,7 @@ def packages_installed(*names) -> bool:
     return True
 
 
-def _missing_packages(*names) -> list[str]:
+def _missing_packages(*names: str) -> list[str]:
     """Check if the given packages are missing.
 
     Use this function to check if the required packages are missing before running tests.
@@ -252,12 +254,26 @@ skip_if_offline = pytest.mark.skipif(_offline(), reason="No internet connection"
 skip_slow_tests = pytest.mark.skipif(not _run_slow_tests(), reason="Skipping slow tests")
 
 
-def skip_missing_packages(*names):
-    missing = _missing_packages(*names)
+def skip_missing_packages(*names: str) -> callable:
+    """Skip a test if any of the specified packages are missing.
+
+    Parameters
+    ----------
+    names : str
+        The names of the packages to check.
+
+    Returns
+    -------
+    Callable
+        A decorator that skips the test if any of the specified packages are missing.
+    """
+
+    missing = [f"'{p}'" for p in _missing_packages(*names)]
+
     if len(missing) == 0:
         return lambda f: f
 
     if len(missing) == 1:
         return pytest.mark.skipif(True, reason=f"Package {missing[0]} is not installed")
 
-    return pytest.mark.skipif(True, reason=f"Packages {', '.join(missing)} are not installed")
+    return pytest.mark.skipif(True, reason=f"Packages {list_to_human(missing)} are not installed")

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.19
+Version: 0.4.21
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License:                                  Apache License
@@ -228,6 +228,7 @@ Requires-Dist: aniso8601
 Requires-Dist: importlib-metadata; python_version < "3.10"
 Requires-Dist: multiurl
 Requires-Dist: numpy
+Requires-Dist: pydantic>=2.9
 Requires-Dist: python-dateutil
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < "3.11"

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi_utils.egg-info/SOURCES.txt

@@ -75,6 +75,8 @@ src/anemoi/utils/mars/requests.py
 src/anemoi/utils/remote/__init__.py
 src/anemoi/utils/remote/s3.py
 src/anemoi/utils/remote/ssh.py
+src/anemoi/utils/schemas/__init__.py
+src/anemoi/utils/schemas/errors.py
 src/anemoi_utils.egg-info/PKG-INFO
 src/anemoi_utils.egg-info/SOURCES.txt
 src/anemoi_utils.egg-info/dependency_links.txt

{anemoi_utils-0.4.19 → anemoi_utils-0.4.21}/src/anemoi_utils.egg-info/requires.txt

@@ -1,6 +1,7 @@
 aniso8601
 multiurl
 numpy
+pydantic>=2.9
 python-dateutil
 pyyaml
 tqdm

anemoi_utils-0.4.19/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-    ".": "0.4.19"
-}