anemoi-utils 0.3.12__py3-none-any.whl → 0.3.14__py3-none-any.whl

anemoi/utils/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.12'
-__version_tuple__ = version_tuple = (0, 3, 12)
+__version__ = version = '0.3.14'
+__version_tuple__ = version_tuple = (0, 3, 14)

anemoi/utils/cli.py

@@ -12,6 +12,11 @@ import os
 import sys
 import traceback
 
+try:
+    import argcomplete
+except ImportError:
+    argcomplete = None
+
 LOG = logging.getLogger(__name__)
 
 
@@ -100,6 +105,8 @@ def register_commands(here, package, select, fail=None):
 def cli_main(version, description, commands):
     parser = make_parser(description, commands)
     args, unknown = parser.parse_known_args()
+    if argcomplete:
+        argcomplete.autocomplete(parser)
 
     if args.version:
         print(version)

anemoi/utils/dates.py

@@ -8,6 +8,9 @@
 
 import calendar
 import datetime
+import re
+
+import isodate
 
 from .hindcasts import HindcastDatesTimes
 
@@ -66,6 +69,122 @@ def as_datetime(date):
     raise ValueError(f"Invalid date type: {type(date)}")
 
 
+def _compress_dates(dates):
+    dates = sorted(dates)
+    if len(dates) < 3:
+        yield dates
+        return
+
+    prev = first = dates.pop(0)
+    curr = dates.pop(0)
+    delta = curr - prev
+    while curr - prev == delta:
+        prev = curr
+        if not dates:
+            break
+        curr = dates.pop(0)
+
+    yield (first, prev, delta)
+    if dates:
+        yield from _compress_dates([curr] + dates)
+
+
+def compress_dates(dates):
+    dates = [as_datetime(_) for _ in dates]
+    result = []
+
+    for n in _compress_dates(dates):
+        if isinstance(n, list):
+            result.extend([str(_) for _ in n])
+        else:
+            result.append(" ".join([str(n[0]), "to", str(n[1]), "by", str(n[2])]))
+
+    return result
+
+
+def print_dates(dates):
+    print(compress_dates(dates))
+
+
+def frequency_to_string(frequency):
+    # TODO: use iso8601
+    frequency = frequency_to_timedelta(frequency)
+
+    total_seconds = frequency.total_seconds()
+    assert int(total_seconds) == total_seconds, total_seconds
+    total_seconds = int(total_seconds)
+
+    seconds = total_seconds
+
+    days = seconds // (24 * 3600)
+    seconds %= 24 * 3600
+    hours = seconds // 3600
+    seconds %= 3600
+    minutes = seconds // 60
+    seconds %= 60
+
+    if days > 0 and hours == 0 and minutes == 0 and seconds == 0:
+        return f"{days}d"
+
+    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)
+
+
+def frequency_to_timedelta(frequency):
+    # TODO: use iso8601 or check pytimeparse
+
+    if isinstance(frequency, datetime.timedelta):
+        return frequency
+
+    if isinstance(frequency, int):
+        return datetime.timedelta(hours=frequency)
+
+    assert isinstance(frequency, str), (type(frequency), frequency)
+
+    try:
+        return frequency_to_timedelta(int(frequency))
+    except ValueError:
+        pass
+
+    if re.match(r"^\d+[hdms]$", frequency, re.IGNORECASE):
+        unit = frequency[-1].lower()
+        v = int(frequency[:-1])
+        unit = {"h": "hours", "d": "days", "s": "seconds", "m": "minutes"}[unit]
+        return datetime.timedelta(**{unit: v})
+
+    m = frequency.split(":")
+    if len(m) == 2:
+        return datetime.timedelta(hours=int(m[0]), minutes=int(m[1]))
+
+    if len(m) == 3:
+        return datetime.timedelta(hours=int(m[0]), minutes=int(m[1]), seconds=int(m[2]))
+
+    # ISO8601
+    try:
+        return isodate.parse_duration(frequency)
+    except isodate.isoerror.ISO8601Error:
+        pass
+
+    raise ValueError(f"Cannot convert frequency {frequency} to timedelta")
+
+
+def normalize_date(x):
+    if isinstance(x, str):
+        return no_time_zone(datetime.datetime.fromisoformat(x))
+    return x
+
+
 DOW = {
     "monday": 0,
     "tuesday": 1,

anemoi/utils/humanize.py

@@ -104,7 +104,7 @@ def _plural(count):
 def seconds_to_human(seconds: float) -> str:
     """Convert a number of seconds to a human readable string
 
-    >>> seconds(4000)
+    >>> seconds_to_human(4000)
     '1 hour 6 minutes 40 seconds'
 
     Parameters

anemoi/utils/s3.py

@@ -268,7 +268,7 @@ class Download(Transfer):
     def source_size(self, s3_object):
         return s3_object["Size"]
 
-    def transfer_file(self, source, target, overwrite, resume, verbosity, progress, config=None):
+    def transfer_file(self, source, target, overwrite, resume, verbosity, progress=None, config=None):
         try:
             return self._transfer_file(source, target, overwrite, resume, verbosity, config=config)
         except Exception as e:
@@ -343,6 +343,7 @@ def upload(source, target, *, overwrite=False, resume=False, verbosity=1, progre
     """
 
     uploader = Upload()
+
     if os.path.isdir(source):
         uploader.transfer_folder(
             source=source,

anemoi/utils/text.py

@@ -7,6 +7,7 @@
 
 """Text utilities"""
 
+import re
 from collections import defaultdict
 
 # https://en.wikipedia.org/wiki/Box-drawing_character
@@ -32,6 +33,62 @@ def dotted_line(width=84) -> str:
     return "┈" * width
 
 
+# Regular expression to match ANSI escape codes
+_ansi_escape = re.compile(r"\x1b\[([0-9;]*[mGKH])")
+
+
+def _has_ansi_escape(s):
+    return _ansi_escape.search(s) is not None
+
+
+def _split_tokens(s):
+    """Split a string into a list of visual characters with their lenghts."""
+    from wcwidth import wcswidth
+
+    initial = s
+    out = []
+
+    # Function to probe the number of bytes needed to encode the first character
+    def probe_utf8(s):
+        for i in range(1, 5):
+            try:
+                s[:i].encode("utf-8")
+            except UnicodeEncodeError:
+                return i - 1
+        return 1
+
+    while s:
+        match = _ansi_escape.match(s)
+        if match:
+            token = match.group(0)
+            s = s[len(token) :]
+            out.append((token, 0))
+        else:
+            i = probe_utf8(s)
+            token = s[:i]
+            s = s[i:]
+            out.append((token, wcswidth(token)))
+
+    assert "".join(token for (token, _) in out) == initial, (out, initial)
+    return out
+
+
+def visual_len(s):
+    """Compute the length of a string as it appears on the terminal."""
+    if isinstance(s, str):
+        s = _split_tokens(s)
+    assert isinstance(s, (tuple, list)), (type(s), s)
+    if len(s) == 0:
+        return 0
+    for _ in s:
+        assert isinstance(_, tuple), s
+        assert len(_) == 2, s
+    n = 0
+    for _, width in s:
+        n += width
+    return n
+
+
 def boxed(text, min_width=80, max_width=80) -> str:
     """Put a box around a text
 
@@ -57,27 +114,44 @@ def boxed(text, min_width=80, max_width=80) -> str:
 
     """
 
-    lines = text.split("\n")
-    width = max(len(_) for _ in lines)
+    lines = []
+    for line in text.split("\n"):
+        line = line.strip()
+        line = _split_tokens(line)
+        lines.append(line)
+
+    width = max(visual_len(_) for _ in lines)
 
     if min_width is not None:
         width = max(width, min_width)
 
     if max_width is not None:
+
+        def shorten_line(line, max_width):
+            if visual_len(line) > max_width:
+                while visual_len(line) >= max_width:
+                    line = line[:-1]
+                line.append(("…", 1))
+            return line
+
         width = min(width, max_width)
-        lines = []
-        for line in text.split("\n"):
-            if len(line) > max_width:
-                line = line[: max_width - 1] + "…"
-            lines.append(line)
-        text = "\n".join(lines)
+        lines = [shorten_line(line, max_width) for line in lines]
+
+    def pad_line(line, width):
+        line = line + [" "] * (width - visual_len(line))
+        return line
+
+    lines = [pad_line(line, width) for line in lines]
 
     box = []
     box.append("┌" + "─" * (width + 2) + "┐")
     for line in lines:
-        box.append(f"│ {line:{width}} │")
-
+        s = "".join(_[0] for _ in line)
+        if _has_ansi_escape(s):
+            s += "\x1b[0m"
+        box.append(f"│ {s} │")
     box.append("└" + "─" * (width + 2) + "┘")
+
     return "\n".join(box)
 
 
@@ -241,7 +315,7 @@ def table(rows, header, align, margin=0):
                ['B', 120, 1],
                ['C', 9, 123]],
                ['C1', 'C2', 'C3'],
-               ['<', '>', '>']))
+               ['<', '>', '>'])
         C1 │  C2 │  C3
         ───┼─────┼────
         Aa │  12 │   5

anemoi/utils/timer.py

@@ -10,7 +10,7 @@
 import logging
 import time
 
-from .humanize import seconds
+from .humanize import seconds_to_human
 
 LOGGER = logging.getLogger(__name__)
 
@@ -31,4 +31,4 @@ class Timer:
         return time.time() - self.start
 
     def __exit__(self, *args):
-        self.logger.info("%s: %s.", self.title, seconds(self.elapsed))
+        self.logger.info("%s: %s.", self.title, seconds_to_human(self.elapsed))

{anemoi_utils-0.3.12.dist-info → anemoi_utils-0.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.3.12
+Version: 0.3.14
 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
@@ -223,6 +223,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9
 License-File: LICENSE
+Requires-Dist: isodate
 Requires-Dist: pyyaml
 Requires-Dist: tomli
 Requires-Dist: tqdm
@@ -239,19 +240,17 @@ Requires-Dist: pandoc ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: requests ; extra == 'dev'
 Requires-Dist: sphinx ; extra == 'dev'
-Requires-Dist: sphinx-argparse ; extra == 'dev'
+Requires-Dist: sphinx-argparse <0.5 ; extra == 'dev'
 Requires-Dist: sphinx-rtd-theme ; extra == 'dev'
 Requires-Dist: termcolor ; extra == 'dev'
-Requires-Dist: tomli ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: nbsphinx ; extra == 'docs'
 Requires-Dist: pandoc ; extra == 'docs'
 Requires-Dist: requests ; extra == 'docs'
 Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-argparse ; extra == 'docs'
+Requires-Dist: sphinx-argparse <0.5 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
 Requires-Dist: termcolor ; extra == 'docs'
-Requires-Dist: tomli ; extra == 'docs'
 Provides-Extra: grib
 Requires-Dist: requests ; extra == 'grib'
 Provides-Extra: provenance

{anemoi_utils-0.3.12.dist-info → anemoi_utils-0.3.14.dist-info}/RECORD

@@ -1,25 +1,25 @@
 anemoi/utils/__init__.py,sha256=zZZpbKIoGWwdCOuo6YSruLR7C0GzvzI1Wzhyqaa0K7M,456
 anemoi/utils/__main__.py,sha256=cLA2PidDTOUHaDGzd0_E5iioKYNe-PSTv567Y2fuwQk,723
-anemoi/utils/_version.py,sha256=KKAn9DIKrkf9v6mAp59Mf9qI6ZEjCmBhMjuc_1u5SFI,413
+anemoi/utils/_version.py,sha256=uXvaQV0x-j_stHaI7VjSOLUNVrd36A2OO0ftk9b0Dmw,413
 anemoi/utils/caching.py,sha256=EZ4bRG72aTvTxzrbYCgjFpdIn8OtA1rzoRmGg8caWsI,1919
 anemoi/utils/checkpoints.py,sha256=1_3mg4B-ykTVfIvIUEv7IxGyREx_ZcilVbB3U-V6O6I,5165
-anemoi/utils/cli.py,sha256=4uMy6LyL9VPg9ZVNKsimahT5BBVPQgWWk7LUel5dQZE,3545
+anemoi/utils/cli.py,sha256=SWb5_itARlDCq6yEf-VvagTioSW2phKXXFMW2ihXu18,3678
 anemoi/utils/config.py,sha256=s8eqlHsuak058_NJXGMOoT2HenwiZJKcZ9plUWvO7tw,8865
-anemoi/utils/dates.py,sha256=P-AW-dViogxn4t8Q10sO1HldJ2-lez6ILrx6z59tA10,7454
+anemoi/utils/dates.py,sha256=yDIV8hYakNaC9iyYD9WRTNClFO6ZKyM8JKCRUiFJEv8,10413
 anemoi/utils/grib.py,sha256=gVfo4KYQv31iRyoqRDwk5tiqZDUgOIvhag_kO0qjYD0,3067
 anemoi/utils/hindcasts.py,sha256=X8k-81ltmkTDHdviY0SJgvMg7XDu07xoc5ALlUxyPoo,1453
-anemoi/utils/humanize.py,sha256=RzLLhN54UqtA5pUDj9CSU8wMuo9Sx_4CE--akCT7JZY,14973
+anemoi/utils/humanize.py,sha256=-MRGgGG_STTWzIagL4RQnOAooqAIigCcuN-RZ6CK75M,14982
 anemoi/utils/provenance.py,sha256=NL36lM_aCw3fG6VIAouZCRBAJv8a6M3x9cScrFxCMcA,9579
-anemoi/utils/s3.py,sha256=VdugPD5QeyXTHjmYwpyGwmguWo0lwlNf4C3r1obVnFk,18500
-anemoi/utils/text.py,sha256=4Zlc4r9dzRjkKL9xqp2vuQsoJY15bJ3y_Xv3YW_XsmU,8510
-anemoi/utils/timer.py,sha256=JKOgFkpJxmVRn57DEBolmTGwr25P-ePTWASBd8CLeqM,972
+anemoi/utils/s3.py,sha256=kDzbs4nVD2lQuppSe88NVSNpy0wSZpuzkmcAgN2irkU,18506
+anemoi/utils/text.py,sha256=5HBqNwhifus4d3OUnod5q1VgCBdEpzE7o0IR0S85knw,10397
+anemoi/utils/timer.py,sha256=EQcucuwUaGeSpt2S1APJlwSOu6kC47MK9f4h-r8c_AY,990
 anemoi/utils/commands/__init__.py,sha256=qAybFZPBBQs0dyx7dZ3X5JsLpE90pwrqt1vSV7cqEIw,706
 anemoi/utils/commands/config.py,sha256=KEffXZh0ZQfn8t6LXresfd94kDY0gEyulx9Wto5ttW0,824
 anemoi/utils/mars/__init__.py,sha256=RAeY8gJ7ZvsPlcIvrQ4fy9xVHs3SphTAPw_XJDtNIKo,1750
 anemoi/utils/mars/mars.yaml,sha256=R0dujp75lLA4wCWhPeOQnzJ45WZAYLT8gpx509cBFlc,66
-anemoi_utils-0.3.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-anemoi_utils-0.3.12.dist-info/METADATA,sha256=oQ4jBfStHO26IYDrrlq6EpacxP9S-gCW3OyGOLpBs8Y,15514
-anemoi_utils-0.3.12.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-anemoi_utils-0.3.12.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.3.12.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.3.12.dist-info/RECORD,,
+anemoi_utils-0.3.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+anemoi_utils-0.3.14.dist-info/METADATA,sha256=CRVUi4_pMo2st6kwOUgQ0jyEFwl67ZcIHpDo7a4y2NE,15470
+anemoi_utils-0.3.14.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+anemoi_utils-0.3.14.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.3.14.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.3.14.dist-info/RECORD,,

{anemoi_utils-0.3.12.dist-info → anemoi_utils-0.3.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any