Merge branch 'main' into feat/consistent-path-behaviour-on-outputs

Author: HCookie

.pre-commit-config.yaml

@@ -27,12 +27,12 @@ repos:
     -   id: python-check-blanket-noqa # Check for # noqa: all
     -   id: python-no-log-warn # Check for log.warn
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 25.1.0
+  rev: 25.9.0
   hooks:
   - id: black
     args: [--line-length=120]
 - repo: https://github.com/pycqa/isort
-  rev: 6.0.1
+  rev: 6.1.0
   hooks:
   - id: isort
     args:
@@ -41,7 +41,7 @@ repos:
     - --profile black
     - --project anemoi
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.11
+  rev: v0.13.3
   hooks:
   - id: ruff
     args:
@@ -65,7 +65,7 @@ repos:
   - id: docconvert
     args: ["numpy"]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.6.0"
+  rev: "v2.7.0"
   hooks:
   - id: pyproject-fmt
 -   repo: https://github.com/jshwi/docsig # Check docstrings against function sig

pyproject.toml

@@ -44,7 +44,7 @@ classifiers = [
 dynamic = [ "version" ]
 dependencies = [
   "anemoi-transform>0.1.13",
-  "anemoi-utils[text,provenance]>=0.4.32",
+  "anemoi-utils[provenance,text]>=0.4.32",
   "aniso8601",
   "anytree",
   "deprecation",
@@ -61,7 +61,7 @@ dependencies = [
 
 optional-dependencies.all = [
   "anemoi-datasets",
-  "anemoi-inference[huggingface,tests,zarr,plot]",
+  "anemoi-inference[huggingface,plot,tests,zarr]",
   "anemoi-utils[all]>=0.4.32",
 ]
 optional-dependencies.dev = [ "anemoi-inference[all,docs,plugin,tests]" ]

src/anemoi/inference/metadata.py

@@ -1129,7 +1129,7 @@ def patch(self, patch: dict) -> None:
         def merge(main: dict[str, Any], patch: dict[str, Any]) -> None:
 
             for k, v in patch.items():
-                if isinstance(v, dict):
+                if isinstance(v, dict) and isinstance(main.get(k, {}), dict):
                     if k not in main:
                         main[k] = {}
                     merge(main[k], v)

tests/unit/test_metadata.py

@@ -0,0 +1,54 @@
+# (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.
+#
+# 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.
+
+import pytest
+
+from anemoi.inference.metadata import Metadata
+from anemoi.inference.testing.mock_checkpoint import mock_load_metadata
+
+
+@pytest.mark.parametrize(
+    "initial, patch, expected",
+    [
+        (
+            {"config": {"dataloader": {"dataset": "abc"}}},
+            {"config": {"dataloader": {"something": {"else": "123"}}}},
+            {"dataset": "abc", "something": {"else": "123"}},
+        ),
+        (
+            {"config": {"dataloader": [{"dataset": "abc"}, {"dataset": "xyz"}]}},
+            {"config": {"dataloader": {"cutout": [{"dataset": "123"}, {"dataset": "456"}]}}},
+            {"cutout": [{"dataset": "123"}, {"dataset": "456"}]},
+        ),
+        (
+            {"config": {"dataloader": "abc"}},
+            {"config": {"dataloader": "xyz"}},
+            "xyz",
+        ),
+    ],
+)
+def test_patch(initial, patch, expected):
+    metadata = Metadata(initial)
+    assert metadata._metadata == initial
+
+    metadata.patch(patch)
+    assert metadata._metadata["config"]["dataloader"] == expected
+
+
+def test_constant_fields_patch():
+    model_metadata = mock_load_metadata("unit/checkpoints/atmos.json", supporting_arrays=False)
+    metadata = Metadata(model_metadata)
+
+    fields = ["z", "sdor", "slor", "lsm"]
+    metadata.patch({"dataset": {"constant_fields": fields}})
+    assert metadata._metadata["dataset"]["constant_fields"] == fields
+
+    # check that the rest of the metadata is still the same after patching
+    metadata._metadata["dataset"].pop("constant_fields")
+    assert model_metadata == metadata._metadata