anemoi-utils 0.4.37__tar.gz → 0.4.38__tar.gz

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

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

{anemoi_utils-0.4.37 → anemoi_utils-0.4.38}/CHANGELOG.md

@@ -8,6 +8,20 @@ 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.38](https://github.com/ecmwf/anemoi-utils/compare/0.4.37...0.4.38) (2025-10-22)
+
+
+### Features
+
+* **testing:** Add download timeout ([#230](https://github.com/ecmwf/anemoi-utils/issues/230)) ([721d114](https://github.com/ecmwf/anemoi-utils/commit/721d114f2702985d9fbabf68f384f7ccedb7cfb3))
+* **testing:** Sane test data download retries ([#227](https://github.com/ecmwf/anemoi-utils/issues/227)) ([1e08996](https://github.com/ecmwf/anemoi-utils/commit/1e089962b14f05f4aa56eb66a884bfe50ce60dcc))
+
+
+### Bug Fixes
+
+* Fix frequency_to_string outputing 108000s ([#216](https://github.com/ecmwf/anemoi-utils/issues/216)) ([5806a0c](https://github.com/ecmwf/anemoi-utils/commit/5806a0c996235fb3a19d34eeb25813280c5c989f))
+* Support dicts of supporting_arrays ([#229](https://github.com/ecmwf/anemoi-utils/issues/229)) ([9badbad](https://github.com/ecmwf/anemoi-utils/commit/9badbad360609d254717e0d32c6171beb903eb21))
+
 ## [0.4.37](https://github.com/ecmwf/anemoi-utils/compare/0.4.36...0.4.37) (2025-09-30)
 
 

{anemoi_utils-0.4.37/src/anemoi_utils.egg-info → anemoi_utils-0.4.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.37
+Version: 0.4.38
 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.37 → anemoi_utils-0.4.38}/src/anemoi/utils/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.37'
-__version_tuple__ = version_tuple = (0, 4, 37)
+__version__ = version = '0.4.38'
+__version_tuple__ = version_tuple = (0, 4, 38)
 
-__commit_id__ = commit_id = 'gceecf1ec8'
+__commit_id__ = commit_id = 'g30b2d7452'

{anemoi_utils-0.4.37 → anemoi_utils-0.4.38}/src/anemoi/utils/checkpoints.py

@@ -20,6 +20,7 @@ import zipfile
 from collections.abc import Callable
 from tempfile import TemporaryDirectory
 
+import numpy as np
 import tqdm
 
 LOG = logging.getLogger(__name__)
@@ -147,6 +148,41 @@ def load_supporting_arrays(zipf: zipfile.ZipFile, entries: dict) -> dict:
     return supporting_arrays
 
 
+def _get_supporting_arrays_paths(directory: str, folder: str, supporting_arrays: dict | np.ndarray) -> dict:
+    """Get the paths of supporting arrays."""
+    if supporting_arrays is None:
+        return {}
+
+    if isinstance(supporting_arrays, dict):
+        return {
+            new_key: _get_supporting_arrays_paths(f"{directory}/{folder}", new_key, new_value)
+            for new_key, new_value in supporting_arrays.items()
+        }
+
+    return dict(
+        path=f"{directory}/{folder}.numpy",
+        shape=supporting_arrays.shape,
+        dtype=str(supporting_arrays.dtype),
+    )
+
+
+def _write_array_to_bytes(array: dict | np.ndarray, name: str, entry: dict, zipf: zipfile.ZipFile) -> None:
+    """Write a supporting array to bytes in a zip file."""
+    if isinstance(array, dict):
+        for sub_name, sub_array in array.items():
+            _write_array_to_bytes(sub_array, sub_name, entry[sub_name], zipf)
+        return None
+
+    LOG.info(
+        "Saving supporting array `%s` to %s (shape=%s, dtype=%s)",
+        name,
+        entry["path"],
+        entry["shape"],
+        entry["dtype"],
+    )
+    zipf.writestr(entry["path"], array.tobytes())
+
+
 def save_metadata(
     path: str, metadata: dict, *, supporting_arrays: dict = None, name: str = DEFAULT_NAME, folder: str = DEFAULT_FOLDER
 ) -> None:
@@ -189,29 +225,14 @@ def save_metadata(
         LOG.info("Saving metadata to %s/%s/%s", directory, folder, name)
 
         metadata = metadata.copy()
-        if supporting_arrays is not None:
-            metadata["supporting_arrays_paths"] = {
-                key: dict(path=f"{directory}/{folder}/{key}.numpy", shape=value.shape, dtype=str(value.dtype))
-                for key, value in supporting_arrays.items()
-            }
-        else:
-            metadata["supporting_arrays_paths"] = {}
+        metadata["supporting_arrays_paths"] = _get_supporting_arrays_paths(directory, folder, supporting_arrays)
 
         zipf.writestr(
             f"{directory}/{folder}/{name}",
             json.dumps(metadata),
         )
 
-        for name, entry in metadata["supporting_arrays_paths"].items():
-            value = supporting_arrays[name]
-            LOG.info(
-                "Saving supporting array `%s` to %s (shape=%s, dtype=%s)",
-                name,
-                entry["path"],
-                entry["shape"],
-                entry["dtype"],
-            )
-            zipf.writestr(entry["path"], value.tobytes())
+        _write_array_to_bytes(supporting_arrays, "", metadata["supporting_arrays_paths"], zipf)
 
 
 def _edit_metadata(path: str, name: str, callback: Callable, supporting_arrays: dict | None = None) -> None:

{anemoi_utils-0.4.37 → anemoi_utils-0.4.38}/src/anemoi/utils/dates.py

@@ -260,39 +260,21 @@ def frequency_to_string(frequency: datetime.timedelta) -> str:
         A string representation of the frequency.
     """
 
-    frequency = frequency_to_timedelta(frequency)
+    total_seconds = int(frequency.total_seconds())
 
-    total_seconds = frequency.total_seconds()
     if total_seconds < 0:
         return f"-{frequency_to_string(-frequency)}"
-    assert int(total_seconds) == total_seconds, total_seconds
-    total_seconds = int(total_seconds)
 
-    seconds = total_seconds
+    if total_seconds % (24 * 3600) == 0:
+        return f"{total_seconds // (24 * 3600)}d"
 
-    days = seconds // (24 * 3600)
-    seconds %= 24 * 3600
-    hours = seconds // 3600
-    seconds %= 3600
-    minutes = seconds // 60
-    seconds %= 60
+    if total_seconds % 3600 == 0:
+        return f"{total_seconds // 3600}h"
 
-    if days > 0 and hours == 0 and minutes == 0 and seconds == 0:
-        return f"{days}d"
+    if total_seconds % 60 == 0:
+        return f"{total_seconds // 60}m"
 
-    if days == 0 and hours > 0 and minutes == 0 and seconds == 0:
-        return f"{hours}h"
-
-    if days == 0 and hours == 0 and minutes > 0 and seconds == 0:
-        return f"{minutes}m"
-
-    if days == 0 and hours == 0 and minutes == 0 and seconds > 0:
-        return f"{seconds}s"
-
-    if days > 0:
-        return f"{total_seconds}s"
-
-    return str(frequency)
+    return f"{total_seconds}s"
 
 
 def frequency_to_seconds(frequency: int | str | datetime.timedelta) -> int:

{anemoi_utils-0.4.37 → anemoi_utils-0.4.38}/src/anemoi/utils/testing.py

@@ -114,7 +114,7 @@ class GetTestData:
 
         LOG.info(f"Downloading test data from {url} to {target}")
 
-        download(url, target)
+        download(url, target, maximum_retries=5, retry_after=60, timeout=60)
 
         if gzipped:
             import gzip

{anemoi_utils-0.4.37 → anemoi_utils-0.4.38/src/anemoi_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.37
+Version: 0.4.38
 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.37 → anemoi_utils-0.4.38}/tests/test_frequency.py

@@ -17,10 +17,11 @@ from anemoi.utils.dates import frequency_to_timedelta
 def test_frequency_to_string() -> None:
     """Test the frequency_to_string function for converting timedelta to string."""
     assert frequency_to_string(datetime.timedelta(hours=1)) == "1h"
-    assert frequency_to_string(datetime.timedelta(hours=1, minutes=30)) == "1:30:00"
+    assert frequency_to_string(datetime.timedelta(hours=1, minutes=30)) == "90m"
     assert frequency_to_string(datetime.timedelta(days=10)) == "10d"
+    assert frequency_to_string(datetime.timedelta(hours=30)) == "30h"
     assert frequency_to_string(datetime.timedelta(minutes=10)) == "10m"
-    assert frequency_to_string(datetime.timedelta(minutes=90)) == "1:30:00"
+    assert frequency_to_string(datetime.timedelta(minutes=90)) == "90m"
 
 
 def test_frequency_to_timedelta() -> None:

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

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