anemoi-utils 0.3.7__tar.gz → 0.3.8__tar.gz

{anemoi_utils-0.3.7/src/anemoi_utils.egg-info → anemoi_utils-0.3.8}/PKG-INFO

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

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.7'
-__version_tuple__ = version_tuple = (0, 3, 7)
+__version__ = version = '0.3.8'
+__version_tuple__ = version_tuple = (0, 3, 8)

{anemoi_utils-0.3.7 → anemoi_utils-0.3.8}/src/anemoi/utils/cli.py

@@ -97,7 +97,7 @@ def register_commands(here, package, select, fail=None):
 
 def cli_main(version, description, commands):
     parser = make_parser(description, commands)
-    args = parser.parse_args()
+    args, unknown = parser.parse_known_args()
 
     if args.version:
         print(version)
@@ -115,8 +115,15 @@ def cli_main(version, description, commands):
         level=logging.DEBUG if args.debug else logging.INFO,
     )
 
+    if unknown and not cmd.accept_unknown_args:
+        # This should trigger an error
+        parser.parse_args()
+
     try:
-        cmd.run(args)
+        if unknown:
+            cmd.run(args, unknown)
+        else:
+            cmd.run(args)
     except ValueError as e:
         traceback.print_exc()
         LOG.error("\n💣 %s", str(e).lstrip())

{anemoi_utils-0.3.7 → anemoi_utils-0.3.8}/src/anemoi/utils/config.py

@@ -134,17 +134,21 @@ def config_path(name="settings.toml"):
 
 
 def _load(path):
-    if path.endswith(".json"):
-        with open(path, "rb") as f:
-            return json.load(f)
-
-    if path.endswith(".yaml") or path.endswith(".yml"):
-        with open(path, "rb") as f:
-            return yaml.safe_load(f)
-
-    if path.endswith(".toml"):
-        with open(path, "rb") as f:
-            return tomllib.load(f)
+    try:
+        if path.endswith(".json"):
+            with open(path, "rb") as f:
+                return json.load(f)
+
+        if path.endswith(".yaml") or path.endswith(".yml"):
+            with open(path, "rb") as f:
+                return yaml.safe_load(f)
+
+        if path.endswith(".toml"):
+            with open(path, "rb") as f:
+                return tomllib.load(f)
+    except (json.JSONDecodeError, yaml.YAMLError, tomllib.TOMLDecodeError) as e:
+        LOG.warning(f"Failed to parse config file {path}", exc_info=e)
+        return ValueError(f"Failed to parse config file {path} [{e}]")
 
     return open(path).read()
 
@@ -224,6 +228,15 @@ def load_config(name="settings.toml"):
         return _load_config(name)
 
 
+def load_raw_config(name, default=None):
+
+    path = config_path(name)
+    if os.path.exists(path):
+        return _load(path)
+
+    return default
+
+
 def check_config_mode(name="settings.toml"):
     """Check that a configuration file is secure.
 

{anemoi_utils-0.3.7 → anemoi_utils-0.3.8}/src/anemoi/utils/dates.py

@@ -9,6 +9,8 @@
 import calendar
 import datetime
 
+from .hindcasts import HindcastDatesTimes
+
 
 def normalise_frequency(frequency):
     if isinstance(frequency, int):
@@ -158,37 +160,6 @@ class DateTimes:
             date += self.increment
 
 
-class HindcastDatesTimes:
-    """The HindcastDatesTimes class is an iterator that generates datetime objects within a given range."""
-
-    def __init__(self, reference_dates, years=20):
-        """_summary_
-
-        Parameters
-        ----------
-        reference_dates : _type_
-            _description_
-        years : int, optional
-            _description_, by default 20
-        """
-
-        self.reference_dates = reference_dates
-
-        if isinstance(years, list):
-            self.years = years
-        else:
-            self.years = range(1, years + 1)
-
-    def __iter__(self):
-        for reference_date in self.reference_dates:
-            for year in self.years:
-                if reference_date.month == 2 and reference_date.day == 29:
-                    date = datetime.datetime(reference_date.year - year, 2, 28)
-                else:
-                    date = datetime.datetime(reference_date.year - year, reference_date.month, reference_date.day)
-                yield (date, reference_date)
-
-
 class Year(DateTimes):
     """Year is defined as the months of January to December."""
 

anemoi_utils-0.3.8/src/anemoi/utils/hindcasts.py

@@ -0,0 +1,40 @@
+# (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 datetime
+
+
+class HindcastDatesTimes:
+    """The HindcastDatesTimes class is an iterator that generates datetime objects within a given range."""
+
+    def __init__(self, reference_dates, years=20):
+        """_summary_
+
+        Parameters
+        ----------
+        reference_dates : _type_
+            _description_
+        years : int, optional
+            _description_, by default 20
+        """
+
+        self.reference_dates = reference_dates
+
+        if isinstance(years, list):
+            self.years = years
+        else:
+            self.years = range(1, years + 1)
+
+    def __iter__(self):
+        for reference_date in self.reference_dates:
+            for year in self.years:
+                if reference_date.month == 2 and reference_date.day == 29:
+                    date = datetime.datetime(reference_date.year - year, 2, 28)
+                else:
+                    date = datetime.datetime(reference_date.year - year, reference_date.month, reference_date.day)
+                yield (date, reference_date)

{anemoi_utils-0.3.7 → anemoi_utils-0.3.8}/src/anemoi/utils/humanize.py

@@ -10,6 +10,7 @@
 """Generate human readable strings"""
 
 import datetime
+import json
 import re
 from collections import defaultdict
 
@@ -472,3 +473,57 @@ def rounded_datetime(d):
         d = d + datetime.timedelta(seconds=1)
     d = d.replace(microsecond=0)
     return d
+
+
+def json_pretty_dump(obj, max_line_length=120, default=str):
+    """Custom JSON dump function that keeps dicts and lists on one line if they are short enough.
+
+    Parameters
+    ----------
+    obj
+        The object to be dumped as JSON.
+    max_line_length
+        Maximum allowed line length for pretty-printing.
+
+    Returns
+    -------
+    unknown
+        JSON string.
+    """
+
+    def _format_json(obj, indent_level=0):
+        """Helper function to format JSON objects with custom pretty-print rules.
+
+        Parameters
+        ----------
+        obj
+            The object to format.
+        indent_level
+            Current indentation level.
+
+        Returns
+        -------
+        unknown
+            Formatted JSON string.
+        """
+        indent = " " * 4 * indent_level
+        if isinstance(obj, dict):
+            items = []
+            for key, value in obj.items():
+                items.append(f'"{key}": {_format_json(value, indent_level + 1)}')
+            line = "{" + ", ".join(items) + "}"
+            if len(line) <= max_line_length:
+                return line
+            else:
+                return "{\n" + ",\n".join([f"{indent}    {item}" for item in items]) + "\n" + indent + "}"
+        elif isinstance(obj, list):
+            items = [_format_json(item, indent_level + 1) for item in obj]
+            line = "[" + ", ".join(items) + "]"
+            if len(line) <= max_line_length:
+                return line
+            else:
+                return "[\n" + ",\n".join([f"{indent}    {item}" for item in items]) + "\n" + indent + "]"
+        else:
+            return json.dumps(obj, default=default)
+
+    return _format_json(obj)

{anemoi_utils-0.3.7 → anemoi_utils-0.3.8/src/anemoi_utils.egg-info}/PKG-INFO

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

@@ -30,6 +30,7 @@ src/anemoi/utils/cli.py
 src/anemoi/utils/config.py
 src/anemoi/utils/dates.py
 src/anemoi/utils/grib.py
+src/anemoi/utils/hindcasts.py
 src/anemoi/utils/humanize.py
 src/anemoi/utils/provenance.py
 src/anemoi/utils/s3.py