anemoi-utils 0.4.9__tar.gz → 0.4.10__tar.gz

{anemoi_utils-0.4.9 → anemoi_utils-0.4.10}/.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
     - --force-single-line-imports
     - --profile black
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.2
+  rev: v0.8.1
   hooks:
   - id: ruff
     args:
@@ -64,7 +64,7 @@ repos:
   hooks:
   - id: pyproject-fmt
 -   repo: https://github.com/jshwi/docsig # Check docstrings against function sig
-    rev: v0.64.0
+    rev: v0.65.0
     hooks:
     -   id: docsig
         args:
@@ -74,7 +74,6 @@ repos:
         - --check-protected  # Check protected methods
         - --check-class      # Check class docstrings
         - --disable=E113     # Disable empty docstrings
-        - --summary          # Print a summary
 ci:
   autoupdate_schedule: monthly
 ci:

{anemoi_utils-0.4.9 → anemoi_utils-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.4.9
+Version: 0.4.10
 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.9 → anemoi_utils-0.4.10}/src/anemoi/utils/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.9'
-__version_tuple__ = version_tuple = (0, 4, 9)
+__version__ = version = '0.4.10'
+__version_tuple__ = version_tuple = (0, 4, 10)

anemoi_utils-0.4.10/src/anemoi/utils/commands/requests.py

@@ -0,0 +1,44 @@
+# (C) Copyright 2024 European Centre for Medium-Range Weather Forecasts.
+# 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 json
+
+from anemoi.utils.mars.requests import print_request
+
+from . import Command
+
+
+class Requests(Command):
+    """Convert a JSON requests file to MARS format."""
+
+    def add_arguments(self, command_parser):
+        command_parser.add_argument("input")
+        command_parser.add_argument("output")
+        command_parser.add_argument("--verb", default="retrieve")
+        command_parser.add_argument("--only-one-field", action="store_true")
+
+    def run(self, args):
+        with open(args.input) as f:
+            requests = json.load(f)
+
+        if args.only_one_field:
+            for r in requests:
+                for key in (
+                    "grid",
+                    "area",
+                ):
+                    r.pop(key, None)
+                for k, v in list(r.items()):
+                    if isinstance(v, list):
+                        r[k] = v[-1]
+
+        with open(args.output, "w") as f:
+            for r in requests:
+                print_request(args.verb, r, file=f)
+
+
+command = Requests

{anemoi_utils-0.4.9 → anemoi_utils-0.4.10}/src/anemoi/utils/config.py

@@ -50,14 +50,14 @@ class DotDict(dict):
         super().__init__(*args, **kwargs)
 
         for k, v in self.items():
-            if isinstance(v, dict):
+            if isinstance(v, dict) or is_omegaconf_dict(v):
                 self[k] = DotDict(v)
 
-            if isinstance(v, list):
-                self[k] = [DotDict(i) if isinstance(i, dict) else i for i in v]
+            if isinstance(v, list) or is_omegaconf_list(v):
+                self[k] = [DotDict(i) if isinstance(i, dict) or is_omegaconf_dict(i) else i for i in v]
 
             if isinstance(v, tuple):
-                self[k] = [DotDict(i) if isinstance(i, dict) else i for i in v]
+                self[k] = [DotDict(i) if isinstance(i, dict) or is_omegaconf_dict(i) else i for i in v]
 
     @classmethod
     def from_file(cls, path: str):
@@ -106,6 +106,24 @@ class DotDict(dict):
         return f"DotDict({super().__repr__()})"
 
 
+def is_omegaconf_dict(value) -> bool:
+    try:
+        from omegaconf import DictConfig
+
+        return isinstance(value, DictConfig)
+    except ImportError:
+        return False
+
+
+def is_omegaconf_list(value) -> bool:
+    try:
+        from omegaconf import ListConfig
+
+        return isinstance(value, ListConfig)
+    except ImportError:
+        return False
+
+
 CONFIG = {}
 CHECKED = {}
 CONFIG_LOCK = threading.RLock()
@@ -376,3 +394,11 @@ def find(metadata, what, result=None, *, select: callable = None):
             find(v, what, result)
 
     return result
+
+
+def merge_configs(*configs):
+    result = {}
+    for config in configs:
+        _merge_dicts(result, config)
+
+    return result

anemoi_utils-0.4.10/src/anemoi/utils/logs.py

@@ -0,0 +1,40 @@
+# (C) Copyright 2024 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.
+
+
+"""Logging utilities."""
+
+import logging
+import threading
+
+thread_local = threading.local()
+
+
+LOGGER = logging.getLogger(__name__)
+
+
+def set_logging_name(name):
+    thread_local.logging_name = name
+
+
+class ThreadCustomFormatter(logging.Formatter):
+    def format(self, record):
+        record.logging_name = thread_local.logging_name
+        return super().format(record)
+
+
+def enable_logging_name(name="main"):
+    thread_local.logging_name = name
+
+    formatter = ThreadCustomFormatter("%(asctime)s - %(logging_name)s - %(levelname)s - %(message)s")
+
+    logger = logging.getLogger()
+
+    for handler in logger.handlers:
+        handler.setFormatter(formatter)

anemoi_utils-0.4.10/src/anemoi/utils/mars/requests.py

@@ -0,0 +1,22 @@
+# (C) Copyright 2024 European Centre for Medium-Range Weather Forecasts.
+# 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 sys
+
+
+def print_request(verb, request, file=sys.stdout):
+    r = [verb]
+    for k, v in request.items():
+        if not isinstance(v, (list, tuple, set)):
+            v = [v]
+        v = [str(_) for _ in v]
+        v = "/".join(v)
+        r.append(f"{k}={v}")
+
+    r = ",\n   ".join(r)
+    print(r, file=file)
+    print(file=file)

{anemoi_utils-0.4.9 → anemoi_utils-0.4.10}/src/anemoi_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.4.9
+Version: 0.4.10
 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.9 → anemoi_utils-0.4.10}/src/anemoi_utils.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ src/anemoi/utils/dates.py
 src/anemoi/utils/grib.py
 src/anemoi/utils/hindcasts.py
 src/anemoi/utils/humanize.py
+src/anemoi/utils/logs.py
 src/anemoi/utils/provenance.py
 src/anemoi/utils/registry.py
 src/anemoi/utils/s3.py
@@ -52,8 +53,10 @@ src/anemoi/utils/text.py
 src/anemoi/utils/timer.py
 src/anemoi/utils/commands/__init__.py
 src/anemoi/utils/commands/config.py
+src/anemoi/utils/commands/requests.py
 src/anemoi/utils/mars/__init__.py
 src/anemoi/utils/mars/mars.yaml
+src/anemoi/utils/mars/requests.py
 src/anemoi/utils/remote/__init__.py
 src/anemoi/utils/remote/s3.py
 src/anemoi/utils/remote/ssh.py