fix: adjust due to deprecations and add typing (#271)

ways · HCookie · web-flow · commit b52788eff7c6 · 2026-02-18T10:46:11.000Z
## Description
- Add types where missing
- Fix datetime.utcnow deprecation
- Improve string formatting for readability
- Remove useless int()

Co-authored-by: Harrison Cook &lt;Harrison.cook@ecmwf.int&gt;
diff --git a/src/anemoi/utils/config.py b/src/anemoi/utils/config.py
@@ -65,7 +65,19 @@ def __init__(self, *args, **kwargs):
             super().__setitem__(k, self.convert_to_nested_dot_dict(v))
 
     @staticmethod
-    def convert_to_nested_dot_dict(value):
+    def convert_to_nested_dot_dict(value: Any) -> Any:
+        """Convert nested dicts to DotDict recursively.
+
+        Parameters
+        ----------
+        value : Any
+            The value to convert
+
+        Returns
+        -------
+        Any
+            Converted value with nested dicts as DotDict
+        """
         if isinstance(value, dict) or is_omegaconf_dict(value):
             return DotDict(value)
 
diff --git a/src/anemoi/utils/humanize.py b/src/anemoi/utils/humanize.py
@@ -337,7 +337,7 @@ def when(
 
     if now is None:
         if use_utc:
-            now = datetime.datetime.utcnow()
+            now = datetime.datetime.now(datetime.UTC)
         else:
             now = datetime.datetime.now()
 
@@ -352,7 +352,7 @@ def when(
     if diff == 0:
         return "right now"
 
-    def _(x):
+    def _(x: str) -> str:
         if last == "last":
             return f"{x} ago"
         else:
@@ -376,46 +376,38 @@ def _(x):
     jthen = then.toordinal()
 
     if jnow == jthen:
-        return "today at %02d:%02d" % (then.hour, then.minute)
+        return f"today at {then.hour:02d}:{then.minute:02d}"
 
     if jnow == jthen + 1:
-        return "yesterday at %02d:%02d" % (then.hour, then.minute)
+        return f"yesterday at {then.hour:02d}:{then.minute:02d}"
 
     if jnow == jthen - 1:
-        return "tomorrow at %02d:%02d" % (then.hour, then.minute)
+        return f"tomorrow at {then.hour:02d}:{then.minute:02d}"
 
     if abs(jnow - jthen) <= 7:
         if last == "next":
             last = "this"
-        return "{} {}".format(
-            last,
-            DOW[then.weekday()],
-        )
+        return f"{last} {DOW[then.weekday()]}"
 
     if abs(jnow - jthen) < 32 and now.month == then.month:
-        return "the %d%s of this month" % (then.day, __(then.day))
+        return f"the {then.day}{__(then.day)} of this month"
 
     if abs(jnow - jthen) < 64 and now.month == then.month + 1:
-        return "the %d%s of %s month" % (then.day, __(then.day), last)
+        return f"the {then.day}{__(then.day)} of {last} month"
 
     if short:
         years = int(abs(jnow - jthen) / 365.25 + 0.5)
         if years == 1:
-            return "%s year" % last
+            return f"{last} year"
 
         if years > 1:
-            return _("%d years" % (years,))
+            return _(f"{years} years")
 
         delta = abs(now - then)
         if delta.days > 1 and delta.days < 30:
-            return _("%d days" % (delta.days,))
+            return _(f"{delta.days} days")
 
-    return "on %s %d %s %d" % (
-        DOW[then.weekday()],
-        then.day,
-        MONTH[then.month - 1],
-        then.year,
-    )
+    return f"on {DOW[then.weekday()]} {then.day} {MONTH[then.month - 1]} {then.year}"
 
 
 def string_distance(s: str, t: str) -> int:
@@ -439,8 +431,8 @@ def string_distance(s: str, t: str) -> int:
     n = len(t)
     d = np.zeros((m + 1, n + 1), dtype=int)
 
-    one = int(1)
-    zero = int(0)
+    one = 1
+    zero = 0
 
     d[:, 0] = np.arange(m + 1)
     d[0, :] = np.arange(n + 1)
diff --git a/src/anemoi/utils/text.py b/src/anemoi/utils/text.py
@@ -18,7 +18,7 @@
 # https://en.wikipedia.org/wiki/Box-drawing_character
 
 
-def dotted_line(width=84) -> str:
+def dotted_line(width: int = 84) -> str:
     """Return a dotted line using '┈'.
 
     >>> dotted_line(40)
@@ -165,7 +165,7 @@ def boxed(text: str, min_width: int = 80, max_width: int = 80) -> str:
 
     if max_width is not None:
 
-        def shorten_line(line, max_width):
+        def shorten_line(line: list, max_width: int) -> list:
             if visual_len(line) > max_width:
                 while visual_len(line) >= max_width:
                     line = line[:-1]
@@ -175,7 +175,7 @@ def shorten_line(line, max_width):
         width = min(width, max_width)
         lines = [shorten_line(line, max_width) for line in lines]
 
-    def pad_line(line, width):
+    def pad_line(line: list, width: int) -> list:
         line = line + [" "] * (width - visual_len(line))
         return line
 
