anemoi-utils 0.4.29__py3-none-any.whl → 0.4.30__py3-none-any.whl

anemoi/utils/humanize.py

@@ -15,14 +15,9 @@ import json
 import re
 import warnings
 from collections import defaultdict
+from collections.abc import Callable
+from collections.abc import Generator
 from typing import Any
-from typing import Callable
-from typing import Dict
-from typing import Generator
-from typing import List
-from typing import Optional
-from typing import Tuple
-from typing import Union
 
 from anemoi.utils.dates import as_datetime
 
@@ -57,7 +52,7 @@ def bytes_to_human(n: float) -> str:
     while n >= 1024:
         n /= 1024.0
         i += 1
-    return "%s%g%s" % (sign, int(n * 10 + 0.5) / 10.0, u[i])
+    return f"{sign}{int(n * 10 + 0.5) / 10.0:g}{u[i]}"
 
 
 def bytes(n: float) -> str:
@@ -99,7 +94,7 @@ def base2_to_human(n: float) -> str:
     while n >= 1024:
         n /= 1024.0
         i += 1
-    return "%g%s" % (int(n * 10 + 0.5) / 10.0, u[i])
+    return f"{int(n * 10 + 0.5) / 10.0:g}{u[i]}"
 
 
 def base2(n: float) -> str:
@@ -151,7 +146,7 @@ def _plural(count: int) -> str:
         return ""
 
 
-def seconds_to_human(seconds: Union[float, datetime.timedelta]) -> str:
+def seconds_to_human(seconds: float | datetime.timedelta) -> str:
     """Convert a number of seconds to a human readable string.
 
     >>> seconds_to_human(4000)
@@ -205,7 +200,7 @@ def seconds_to_human(seconds: Union[float, datetime.timedelta]) -> str:
 
     if not s:
         seconds = round(seconds * 10) / 10
-        s.append("%g second%s" % (seconds, _plural(seconds)))
+        s.append(f"{seconds:g} second{_plural(seconds)}")
     return " ".join(s)
 
 
@@ -303,7 +298,7 @@ def __(n: int) -> str:
 
 
 def when(
-    then: datetime.datetime, now: Optional[datetime.datetime] = None, short: bool = True, use_utc: bool = False
+    then: datetime.datetime, now: datetime.datetime | None = None, short: bool = True, use_utc: bool = False
 ) -> str:
     """Generate a human readable string for a date, relative to now.
 
@@ -359,23 +354,23 @@ def when(
 
     def _(x):
         if last == "last":
-            return "%s ago" % (x,)
+            return f"{x} ago"
         else:
-            return "in %s" % (x,)
+            return f"in {x}"
 
     if diff < 60:
         diff = int(diff + 0.5)
-        return _("%s second%s" % (diff, _plural(diff)))
+        return _(f"{diff} second{_plural(diff)}")
 
     if diff < 60 * 60:
         diff /= 60
         diff = int(diff + 0.5)
-        return _("%s minute%s" % (diff, _plural(diff)))
+        return _(f"{diff} minute{_plural(diff)}")
 
     if diff < 60 * 60 * 6:
         diff /= 60 * 60
         diff = int(diff + 0.5)
-        return _("%s hour%s" % (diff, _plural(diff)))
+        return _(f"{diff} hour{_plural(diff)}")
 
     jnow = now.toordinal()
     jthen = then.toordinal()
@@ -392,7 +387,7 @@ def when(
     if abs(jnow - jthen) <= 7:
         if last == "next":
             last = "this"
-        return "%s %s" % (
+        return "{} {}".format(
             last,
             DOW[then.weekday()],
         )
@@ -462,7 +457,7 @@ def string_distance(s: str, t: str) -> int:
     return d[m, n]
 
 
-def did_you_mean(word: str, vocabulary: List[str]) -> str:
+def did_you_mean(word: str, vocabulary: list[str]) -> str:
     """Pick the closest word in a vocabulary.
 
     >>> did_you_mean("aple", ["banana", "lemon", "apple", "orange"])
@@ -485,7 +480,7 @@ def did_you_mean(word: str, vocabulary: List[str]) -> str:
     return best
 
 
-def dict_to_human(query: Dict[str, Any]) -> str:
+def dict_to_human(query: dict[str, Any]) -> str:
     """Convert a dictionary to a human readable string.
 
     Parameters
@@ -503,7 +498,7 @@ def dict_to_human(query: Dict[str, Any]) -> str:
     return list_to_human(lst)
 
 
-def list_to_human(lst: List[str], conjunction: str = "and") -> str:
+def list_to_human(lst: list[str], conjunction: str = "and") -> str:
     """Convert a list of strings to a human readable string.
 
     >>> list_to_human(["banana", "lemon", "apple", "orange"])
@@ -530,7 +525,7 @@ def list_to_human(lst: List[str], conjunction: str = "and") -> str:
     return f" {conjunction} ".join(lst)
 
 
-def human_to_number(value: Union[str, int], name: str, units: Dict[str, int], none_ok: bool) -> Optional[int]:
+def human_to_number(value: str | int, name: str, units: dict[str, int], none_ok: bool) -> int | None:
     """Convert a human readable string to a number.
 
     Parameters
@@ -568,8 +563,8 @@ def human_to_number(value: Union[str, int], name: str, units: Dict[str, int], no
 
 
 def as_number(
-    value: Union[str, int], name: Optional[str] = None, units: Optional[Dict[str, int]] = None, none_ok: bool = False
-) -> Optional[int]:
+    value: str | int, name: str | None = None, units: dict[str, int] | None = None, none_ok: bool = False
+) -> int | None:
     """Deprecated function to convert a human readable string to a number.
 
     Parameters
@@ -596,7 +591,7 @@ def as_number(
     return human_to_number(value, name, units, none_ok)
 
 
-def human_seconds(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def human_seconds(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Convert a human readable string to seconds.
 
     Parameters
@@ -617,7 +612,7 @@ def human_seconds(value: Union[str, int], name: Optional[str] = None, none_ok: b
     return human_to_number(value, name, units, none_ok)
 
 
-def as_seconds(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def as_seconds(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Deprecated function to convert a human readable string to seconds.
 
     Parameters
@@ -642,7 +637,7 @@ def as_seconds(value: Union[str, int], name: Optional[str] = None, none_ok: bool
     return human_seconds(value, name, none_ok)
 
 
-def human_to_percent(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def human_to_percent(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Convert a human readable string to a percentage.
 
     Parameters
@@ -663,7 +658,7 @@ def human_to_percent(value: Union[str, int], name: Optional[str] = None, none_ok
     return human_to_number(value, name, units, none_ok)
 
 
-def as_percent(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def as_percent(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Deprecated function to convert a human readable string to a percentage.
 
     Parameters
@@ -688,7 +683,7 @@ def as_percent(value: Union[str, int], name: Optional[str] = None, none_ok: bool
     return human_to_percent(value, name, none_ok)
 
 
-def human_to_bytes(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def human_to_bytes(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Convert a human readable string to bytes.
 
     Parameters
@@ -715,7 +710,7 @@ def human_to_bytes(value: Union[str, int], name: Optional[str] = None, none_ok:
     return human_to_number(value, name, units, none_ok)
 
 
-def as_bytes(value: Union[str, int], name: Optional[str] = None, none_ok: bool = False) -> Optional[int]:
+def as_bytes(value: str | int, name: str | None = None, none_ok: bool = False) -> int | None:
     """Deprecated function to convert a human readable string to bytes.
 
     Parameters
@@ -740,7 +735,7 @@ def as_bytes(value: Union[str, int], name: Optional[str] = None, none_ok: bool =
     return human_to_bytes(value, name, none_ok)
 
 
-def human_to_timedelta(value: str, name: Optional[str] = None, none_ok: bool = False) -> datetime.timedelta:
+def human_to_timedelta(value: str, name: str | None = None, none_ok: bool = False) -> datetime.timedelta:
     """Convert a human readable string to a timedelta.
 
     Parameters
@@ -792,7 +787,7 @@ def human_to_timedelta(value: str, name: Optional[str] = None, none_ok: bool = F
     )
 
 
-def as_timedelta(value: str, name: Optional[str] = None, none_ok: bool = False) -> datetime.timedelta:
+def as_timedelta(value: str, name: str | None = None, none_ok: bool = False) -> datetime.timedelta:
     """Deprecated function to convert a human readable string to a timedelta.
 
     Parameters
@@ -892,7 +887,7 @@ def json_pretty_dump(obj: Any, max_line_length: int = 120, default: Callable = s
     return _format_json(obj)
 
 
-def shorten_list(lst: Union[List[Any], Tuple[Any]], max_length: int = 5) -> Union[List[Any], Tuple[Any]]:
+def shorten_list(lst: list[Any] | tuple[Any], max_length: int = 5) -> list[Any] | tuple[Any]:
     """Shorten a list to a maximum length.
 
     Parameters
@@ -918,10 +913,8 @@ def shorten_list(lst: Union[List[Any], Tuple[Any]], max_length: int = 5) -> Unio
 
 
 def _compress_dates(
-    dates: List[datetime.datetime],
-) -> Generator[
-    Union[List[datetime.datetime], Tuple[datetime.datetime, datetime.datetime, datetime.timedelta]], None, None
-]:
+    dates: list[datetime.datetime],
+) -> Generator[list[datetime.datetime] | tuple[datetime.datetime, datetime.datetime, datetime.timedelta], None, None]:
     """Compress a list of dates into a more compact representation.
 
     Parameters
@@ -953,7 +946,7 @@ def _compress_dates(
         yield from _compress_dates([curr] + dates)
 
 
-def compress_dates(dates: List[Union[datetime.datetime, str]]) -> str:
+def compress_dates(dates: list[datetime.datetime | str]) -> str:
     """Compress a list of dates into a human-readable format.
 
     Parameters
@@ -979,7 +972,7 @@ def compress_dates(dates: List[Union[datetime.datetime, str]]) -> str:
     return result
 
 
-def print_dates(dates: List[Union[datetime.datetime, str]]) -> None:
+def print_dates(dates: list[datetime.datetime | str]) -> None:
     """Print a list of dates in a human-readable format.
 
     Parameters
@@ -990,7 +983,7 @@ def print_dates(dates: List[Union[datetime.datetime, str]]) -> None:
     print(compress_dates(dates))
 
 
-def make_list_int(value: Union[str, List[int], Tuple[int], int]) -> List[int]:
+def make_list_int(value: str | list[int] | tuple[int] | int) -> list[int]:
     """Convert a string like "1/2/3" or "1/to/3" or "1/to/10/by/2" to a list of integers.
 
     Parameters

anemoi/utils/mars/__init__.py

@@ -17,9 +17,6 @@ import datetime
 import logging
 import os
 from typing import Any
-from typing import Dict
-from typing import Optional
-from typing import Tuple
 
 import yaml
 
@@ -33,7 +30,7 @@ DEFAULT_MARS_LABELLING = {
 }
 
 
-def _expand_mars_labelling(request: Dict[str, Any]) -> Dict[str, Any]:
+def _expand_mars_labelling(request: dict[str, Any]) -> dict[str, Any]:
     """Expand the request with the default Mars labelling.
 
     Parameters
@@ -54,7 +51,7 @@ def _expand_mars_labelling(request: Dict[str, Any]) -> Dict[str, Any]:
 STREAMS = None
 
 
-def _lookup_mars_stream(request: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+def _lookup_mars_stream(request: dict[str, Any]) -> dict[str, Any] | None:
     """Look up the Mars stream information for a given request.
 
     Parameters
@@ -82,8 +79,8 @@ def _lookup_mars_stream(request: Dict[str, Any]) -> Optional[Dict[str, Any]]:
 
 
 def recenter(
-    date: datetime.datetime, center: Dict[str, Any], members: Dict[str, Any]
-) -> Tuple[Optional[Dict[str, Any]], Optional[Dict[str, Any]]]:
+    date: datetime.datetime, center: dict[str, Any], members: dict[str, Any]
+) -> tuple[dict[str, Any] | None, dict[str, Any] | None]:
     """Recenter the given date with the specified center and members.
 
     Parameters

anemoi/utils/mars/requests.py

@@ -7,11 +7,10 @@
 
 import sys
 from typing import Any
-from typing import Dict
 from typing import TextIO
 
 
-def print_request(verb: str, request: Dict[str, Any], file: TextIO = sys.stdout) -> None:
+def print_request(verb: str, request: dict[str, Any], file: TextIO = sys.stdout) -> None:
     """Prints a formatted request.
 
     Parameters

anemoi/utils/provenance.py

@@ -25,16 +25,11 @@ import sys
 import sysconfig
 from functools import cache
 from typing import Any
-from typing import Dict
-from typing import List
-from typing import Optional
-from typing import Tuple
-from typing import Union
 
 LOG = logging.getLogger(__name__)
 
 
-def lookup_git_repo(path: str) -> Optional[Any]:
+def lookup_git_repo(path: str) -> Any | None:
     """Lookup the git repository for a given path.
 
     Parameters
@@ -62,7 +57,7 @@ def lookup_git_repo(path: str) -> Optional[Any]:
     return None
 
 
-def _check_for_git(paths: List[Tuple[str, str]], full: bool) -> Dict[str, Any]:
+def _check_for_git(paths: list[tuple[str, str]], full: bool) -> dict[str, Any]:
     """Check for git information for the given paths.
 
     Parameters
@@ -112,7 +107,7 @@ def _check_for_git(paths: List[Tuple[str, str]], full: bool) -> Dict[str, Any]:
 
 
 def version(
-    versions: Dict[str, Any], name: str, module: Any, roots: Dict[str, str], namespaces: set, paths: set, full: bool
+    versions: dict[str, Any], name: str, module: Any, roots: dict[str, str], namespaces: set, paths: set, full: bool
 ) -> None:
     """Collect version information for a module.
 
@@ -174,7 +169,7 @@ def version(
     versions[name] = str(module)
 
 
-def _module_versions(full: bool) -> Tuple[Dict[str, Any], set]:
+def _module_versions(full: bool) -> tuple[dict[str, Any], set]:
     """Collect version information for all loaded modules.
 
     Parameters
@@ -216,7 +211,7 @@ def _module_versions(full: bool) -> Tuple[Dict[str, Any], set]:
 
 
 @cache
-def package_distributions() -> Dict[str, List[str]]:
+def package_distributions() -> dict[str, list[str]]:
     """Get the package distributions.
 
     Returns
@@ -235,7 +230,7 @@ def package_distributions() -> Dict[str, List[str]]:
     return metadata.packages_distributions()
 
 
-def import_name_to_distribution_name(packages: List[str]) -> Dict[str, str]:
+def import_name_to_distribution_name(packages: list[str]) -> dict[str, str]:
     """Convert import names to distribution names.
 
     Parameters
@@ -266,7 +261,7 @@ def import_name_to_distribution_name(packages: List[str]) -> Dict[str, str]:
     return distribution_names
 
 
-def module_versions(full: bool) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+def module_versions(full: bool) -> tuple[dict[str, Any], dict[str, Any]]:
     """Collect version information for all loaded modules and their git information.
 
     Parameters
@@ -306,7 +301,7 @@ def _name(obj: Any) -> str:
     return str(obj)
 
 
-def _paths(path_or_object: Union[None, str, List[str], Tuple[str], Any]) -> List[Tuple[str, str]]:
+def _paths(path_or_object: None | str | list[str] | tuple[str] | Any) -> list[tuple[str, str]]:
     """Get the paths for a given path or object.
 
     Parameters
@@ -357,7 +352,7 @@ def _paths(path_or_object: Union[None, str, List[str], Tuple[str], Any]) -> List
     return paths
 
 
-def git_check(*args: Any) -> Dict[str, Any]:
+def git_check(*args: Any) -> dict[str, Any]:
     """Return the git information for the given arguments.
 
     Arguments can be:
@@ -400,7 +395,7 @@ def git_check(*args: Any) -> Dict[str, Any]:
     return result
 
 
-def platform_info() -> Dict[str, Any]:
+def platform_info() -> dict[str, Any]:
     """Get the platform information.
 
     Returns
@@ -429,7 +424,7 @@ def platform_info() -> Dict[str, Any]:
     return r
 
 
-def gpu_info() -> Union[str, List[Dict[str, Any]]]:
+def gpu_info() -> str | list[dict[str, Any]]:
     """Get the GPU information.
 
     Returns
@@ -470,7 +465,7 @@ def path_md5(path: str) -> str:
     return hash.hexdigest()
 
 
-def assets_info(paths: List[str]) -> Dict[str, Any]:
+def assets_info(paths: list[str]) -> dict[str, Any]:
     """Get information about the given assets.
 
     Parameters
@@ -511,7 +506,7 @@ def assets_info(paths: List[str]) -> Dict[str, Any]:
     return result
 
 
-def gather_provenance_info(assets: List[str] = [], full: bool = False) -> Dict[str, Any]:
+def gather_provenance_info(assets: list[str] = [], full: bool = False) -> dict[str, Any]:
     """Gather information about the current environment.
 
     Parameters

anemoi/utils/registry.py

@@ -13,15 +13,12 @@ import logging
 import os
 import sys
 import warnings
+from collections.abc import Callable
 from functools import cached_property
 from typing import Any
-from typing import Callable
-from typing import Dict
 from typing import Generic
-from typing import List
 from typing import Optional
 from typing import TypeVar
-from typing import Union
 
 import entrypoints
 
@@ -121,9 +118,7 @@ class Registry(Generic[T]):
         """
         return _BY_KIND.get(kind)
 
-    def register(
-        self, name: str, factory: Optional[Callable] = None, source: Optional[Any] = None
-    ) -> Optional[Wrapper]:
+    def register(self, name: str, factory: Callable | None = None, source: Any | None = None) -> Wrapper | None:
         """Register a factory with the registry.
 
         Parameters
@@ -201,7 +196,7 @@ class Registry(Generic[T]):
                 LOG.info(f"Registered: {e} ({self._sources.get(e)})")
         return ok
 
-    def lookup(self, name: str, *, return_none: bool = False) -> Optional[Callable]:
+    def lookup(self, name: str, *, return_none: bool = False) -> Callable | None:
         """Lookup a factory by name.
 
         Parameters
@@ -234,7 +229,7 @@ class Registry(Generic[T]):
         return factory
 
     @cached_property
-    def factories(self) -> Dict[str, Callable]:
+    def factories(self) -> dict[str, Callable]:
 
         directory = sys.modules[self.package].__path__[0]
 
@@ -286,7 +281,7 @@ class Registry(Generic[T]):
         return self.__registered
 
     @property
-    def registered(self) -> List[str]:
+    def registered(self) -> list[str]:
         """Get the registered factories."""
 
         return sorted(self.factories.keys())
@@ -314,7 +309,7 @@ class Registry(Generic[T]):
         factory = self.lookup(name)
         return factory(*args, **kwargs)
 
-    def from_config(self, config: Union[str, Dict[str, Any]], *args: Any, **kwargs: Any) -> T:
+    def from_config(self, config: str | dict[str, Any], *args: Any, **kwargs: Any) -> T:
         """Create an instance from a configuration.
 
         Parameters

anemoi/utils/remote/__init__.py

@@ -10,9 +10,8 @@ import logging
 import os
 import shutil
 from abc import abstractmethod
+from collections.abc import Iterable
 from typing import Any
-from typing import Dict
-from typing import Iterable
 
 import tqdm
 
@@ -496,7 +495,7 @@ class Transfer:
             if not target:
                 target = os.path.basename(os.path.dirname(source))
 
-        temporary_target: Dict[Any, Any] = {
+        temporary_target: dict[Any, Any] = {
             False: None,
             True: "{dirname}-downloading/{basename}",
             "-tmp/*": "{dirname}-tmp/{basename}",

anemoi/utils/remote/s3.py

@@ -28,9 +28,9 @@ import fnmatch
 import logging
 import os
 import threading
+from collections.abc import Iterable
 from copy import deepcopy
 from typing import Any
-from typing import Iterable
 
 import tqdm
 

anemoi/utils/rules.py

@@ -7,17 +7,13 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 
+from collections.abc import Mapping
 from typing import Any
-from typing import Dict
-from typing import List
-from typing import Mapping
-from typing import Optional
-from typing import Union
 
 
 class Rule:
 
-    def __init__(self, match: Dict[str, Any], result: Any):
+    def __init__(self, match: dict[str, Any], result: Any):
         """Initialize a Rule object.
 
         Parameters
@@ -55,14 +51,14 @@ class Rule:
         return self._result
 
     @property
-    def condition(self) -> Dict[str, Any]:
+    def condition(self) -> dict[str, Any]:
         """The conditions that define the rule."""
         return self._match
 
 
 class RuleSet:
 
-    def __init__(self, rules: List[Union[Rule, Dict[str, Any], List[Any]]]):
+    def __init__(self, rules: list[Rule | dict[str, Any] | list[Any]]):
         """Initialize a RuleSet object.
 
         Parameters
@@ -73,7 +69,7 @@ class RuleSet:
         """
         assert isinstance(rules, list), "rules must be a list"
 
-        self.rules: List[Rule] = []
+        self.rules: list[Rule] = []
 
         for rule in rules:
             if isinstance(rule, Rule):
@@ -107,7 +103,7 @@ class RuleSet:
             )
 
     @classmethod
-    def from_list(cls, rules: List[Any]) -> "RuleSet":
+    def from_list(cls, rules: list[Any]) -> "RuleSet":
         """Create a RuleSet from a list of rules.
 
         Parameters
@@ -144,19 +140,19 @@ class RuleSet:
         if path.endswith(".json"):
             import json
 
-            with open(path, "r") as f:
+            with open(path) as f:
                 return cls.from_list(json.load(f))
 
         if path.endswith(".yaml") or path.endswith(".yml"):
             import yaml
 
-            with open(path, "r") as f:
+            with open(path) as f:
                 return cls.from_list(yaml.safe_load(f))
 
         raise ValueError("Unsupported file format. Supported formats are .json and .yaml/.yml.")
 
     @classmethod
-    def from_any(cls, rules: Union[str, List[Any]]) -> "RuleSet":
+    def from_any(cls, rules: str | list[Any]) -> "RuleSet":
         """Create a RuleSet from a list or a file path.
 
         Parameters
@@ -182,7 +178,7 @@ class RuleSet:
 
         raise ValueError("Unsupported rules format. Must be a list or a file path.")
 
-    def match(self, obj: Mapping[str, Any], strategy: str = "first-match") -> Optional[Rule]:
+    def match(self, obj: Mapping[str, Any], strategy: str = "first-match") -> Rule | None:
         """Match an object against the rules in the RuleSet.
 
         Parameters

anemoi/utils/s3.py

@@ -8,9 +8,8 @@
 # nor does it submit to any jurisdiction.
 
 import warnings
+from collections.abc import Callable
 from typing import Any
-from typing import Callable
-from typing import Optional
 
 from .remote import transfer
 from .remote.s3 import delete as delete_
@@ -55,7 +54,7 @@ def upload(
     overwrite: bool = False,
     resume: bool = False,
     verbosity: int = 1,
-    progress: Optional[Callable] = None,
+    progress: Callable | None = None,
     threads: int = 1,
 ) -> None:
     """Upload a file to S3.