anemoi-utils 0.4.19__py3-none-any.whl → 0.4.20__py3-none-any.whl

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.20'
+__version_tuple__ = version_tuple = (0, 4, 20)

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/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/"
@@ -253,11 +255,12 @@ skip_slow_tests = pytest.mark.skipif(not _run_slow_tests(), reason="Skipping slo
 
 
 def skip_missing_packages(*names):
-    missing = _missing_packages(*names)
+    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.dist-info → anemoi_utils-0.4.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.19
+Version: 0.4.20
 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

{anemoi_utils-0.4.19.dist-info → anemoi_utils-0.4.20.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anemoi/utils/__init__.py,sha256=uVhpF-VjIl_4mMywOVtgTutgsdIsqz-xdkwxeMhzuag,730
 anemoi/utils/__main__.py,sha256=6LlE4MYrPvqqrykxXh7XMi50UZteUY59NeM8P9Zs2dU,910
-anemoi/utils/_version.py,sha256=ckoIBbD6SbpUXLLR-S_0NN-a9fgpE7KOAJuuoR3ua9s,513
+anemoi/utils/_version.py,sha256=a0Lwyg5BR-wqrpFfOdiqEhJkQTdIGbZv9WA1aUNeyF0,513
 anemoi/utils/caching.py,sha256=rXbeAmpBcMbbfN4EVblaHWKicsrtx1otER84FEBtz98,6183
 anemoi/utils/checkpoints.py,sha256=N4WpAZXa4etrpSEKhHqUUtG2-x9w3FJMHcLO-dDAXPY,9600
 anemoi/utils/cli.py,sha256=IyZfnSw0u0yYnrjOrzvm2RuuKvDk4cVb8pf8BkaChgA,6209
@@ -9,7 +9,7 @@ anemoi/utils/config.py,sha256=UtxlkSMhqZR0LAKi19aG6jaaNiSmsXCzE6v2AWHhx5E,16861
 anemoi/utils/dates.py,sha256=CnY6JOdpk0T-waPEowMRTkcMzxcN0GcjPVtLkwH_byw,17196
 anemoi/utils/devtools.py,sha256=W3OBu96MkXRIl7Qh1SE5Zd6aB1R0QlnmlrlpBYM0fVY,3527
 anemoi/utils/grib.py,sha256=201WcxjjAl92Y2HX2kZ2S8Qr5dN-oG7nV-vQLaybzP4,3610
-anemoi/utils/grids.py,sha256=edTrMK8hpE9ZBzSfwcRftgk0jljNAK3i8CraadILQoM,4427
+anemoi/utils/grids.py,sha256=uYgkU_KIg8FTUiuKV0Pho2swMMeXcSQ9CQe0MFlRr_I,5262
 anemoi/utils/hindcasts.py,sha256=iYVIxSNFL2HJcc_k1abCFLkpJFGHT8WKRIR4wcAwA3s,2144
 anemoi/utils/humanize.py,sha256=pjnFJAKHbEAOfcvn8c48kt-8eFy6FGW_U2ruJvfamrA,25189
 anemoi/utils/logs.py,sha256=naTgrmPwWHD4eekFttXftS4gtcAGYHpCqG4iwYprNDA,1804
@@ -19,7 +19,7 @@ anemoi/utils/rules.py,sha256=xYCiUV_HXTGFe93diqMLQsMJCWGi5umd_bWEeYP8XFY,6318
 anemoi/utils/s3.py,sha256=xMT48kbcelcjjqsaU567WI3oZ5eqo88Rlgyx5ECszAU,4074
 anemoi/utils/sanitise.py,sha256=ZYGdSX6qihQANr3pHZjbKnoapnzP1KcrWdW1Ul1mOGk,3668
 anemoi/utils/sanitize.py,sha256=43ZKDcfVpeXSsJ9TFEc9aZnD6oe2cUh151XnDspM98M,462
-anemoi/utils/testing.py,sha256=2H9yxsZriCF_juVX0zYsUCBwA9XC20OfSRZvFkRH7jY,6873
+anemoi/utils/testing.py,sha256=7wDIpiNIhXhHv5rN-LjgTY9DqMMMVpwPbzvYpWTKfLg,6947
 anemoi/utils/text.py,sha256=HkzIvi24obDceFLpJEwBJ9PmPrJUkQN2TrElJ-A87gU,14441
 anemoi/utils/timer.py,sha256=_leKMYza2faM7JKlGE7LCNy13rbdPnwaCF7PSrI_NmI,3895
 anemoi/utils/commands/__init__.py,sha256=5u_6EwdqYczIAgJfCwRSyQAYFEqh2ZuHHT57g9g7sdI,808
@@ -31,9 +31,9 @@ anemoi/utils/mars/requests.py,sha256=VFMHBVAAl0_2lOcMBa1lvaKHctN0lDJsI6_U4BucGew
 anemoi/utils/remote/__init__.py,sha256=swPWHQoh-B6Xq9R489tPw0FykMue7f-bJ8enneFYSYE,20776
 anemoi/utils/remote/s3.py,sha256=spQ8l0rwQjLZh9dZu5cOsYIvNwKihQfCJ6YsFYegeqI,17339
 anemoi/utils/remote/ssh.py,sha256=xNtsawh8okytCKRehkRCVExbHZj-CRUQNormEHglfuw,8088
-anemoi_utils-0.4.19.dist-info/licenses/LICENSE,sha256=8HznKF1Vi2IvfLsKNE5A2iVyiri3pRjRPvPC9kxs6qk,11354
-anemoi_utils-0.4.19.dist-info/METADATA,sha256=IeSKCPc77w2aDSaRudxLPmy70LE9-bMwqNq15lZyT24,15410
-anemoi_utils-0.4.19.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-anemoi_utils-0.4.19.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.4.19.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.4.19.dist-info/RECORD,,
+anemoi_utils-0.4.20.dist-info/licenses/LICENSE,sha256=8HznKF1Vi2IvfLsKNE5A2iVyiri3pRjRPvPC9kxs6qk,11354
+anemoi_utils-0.4.20.dist-info/METADATA,sha256=3fUbrATAsi8f1GCjTqsfLS3ND00wSzfpfjmzOvqVljQ,15410
+anemoi_utils-0.4.20.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+anemoi_utils-0.4.20.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.20.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.20.dist-info/RECORD,,