Merge branch 'main' into add-nominatim-metrics

Author: Agent

fingr/config.py

@@ -2,7 +2,6 @@
 
 import os
 import secrets
-from typing import List
 
 from .logging import get_logger
 
@@ -27,10 +26,10 @@ def load_user_agent() -> str:
     return "default fingr useragent"
 
 
-def load_motd_list() -> List[str]:
+def load_motd_list() -> list[str]:
     """Load message of the day list from file."""
     motdfile: str = "motd.txt"
-    motdlist: List[str] = []
+    motdlist: list[str] = []
     count: int = 0
 
     try:
@@ -51,17 +50,17 @@ def load_motd_list() -> List[str]:
     return motdlist
 
 
-def random_message(messages: List[str]) -> str:
+def random_message(messages: list[str]) -> str:
     """Pick a random message of the day."""
     if len(messages) == 0:
         return ""
     return "[" + messages[secrets.randbelow(len(messages))] + "]\n"
 
 
-def load_deny_list() -> List[str]:
+def load_deny_list() -> list[str]:
     """Load list of IPs to deny service from file."""
     denyfile: str = "deny.txt"
-    denylist: List[str] = []
+    denylist: list[str] = []
     count: int = 0
 
     try:

fingr/formatting.py

@@ -2,7 +2,7 @@
 
 import datetime
 import math
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
 import pysolar.solar  # type: ignore[import-untyped]
 import pytz  # type: ignore[import-untyped]
@@ -41,7 +41,7 @@ def format_meteogram(
     output: str = ""
 
     # Init graph
-    graph: Dict[int, str] = {}
+    graph: dict[int, str] = {}
     tempheight: int = 11
     timeline: int = 13
     windline: int = 15
@@ -98,7 +98,7 @@ def format_meteogram(
         templow = temphigh - 1
 
     # Create temp range
-    temps: List[int] = []
+    temps: list[int] = []
     for t in range(int(temphigh), int(templow) - 1, tempstep):
         temps.append(t)
 
@@ -118,7 +118,7 @@ def format_meteogram(
             pass
 
     # create rainaxis #TODO: make this scale
-    rainaxis: List[str] = []
+    rainaxis: list[str] = []
     for r in range(rainheight, 0, rainstep):
         if r <= rainhigh:  # + 1
             rainaxis.append(f"{r:2.0f} mm ")
@@ -181,7 +181,7 @@ def format_meteogram(
         for i in range(1, tempheight):  # draw temp
             try:
                 # parse out numbers to be compared
-                temptomatch: List[int] = [temperature]
+                temptomatch: list[int] = [temperature]
                 tempingraph: int = int(graph[i][:3].strip())
 
                 if tempstep < -1:  # TODO: this should scale higher than one step
@@ -225,12 +225,6 @@ def format_meteogram(
                 else:  # if int(item['symbolnumber']) in [5,6,9,10,11,14]: #rain
                     rainsymbol = "|"
 
-                # if 0 > int(item['temperature']): #rain but cold
-                #     rainsymbol = "*"
-
-                # if verbose:
-                #     print("rainmax: ", rainmax,"i",i,"rain",rain)
-
                 # if overflow, print number at top
                 if rain > 10 and i == 1:
                     rainsymbol = f"{rain:2.0f}"
@@ -268,14 +262,14 @@ def format_meteogram(
 
 
 def print_units(
-    graph: Dict[int, str],
+    graph: dict[int, str],
     screenwidth: int,
     imperial: bool,
     beaufort: bool,
     windline: int,
     windstrline: int,
     timeline: int,
-) -> Dict[int, str]:
+) -> dict[int, str]:
     """Add units for rain, wind, etc."""
     graph[0] = " 'C" + str.rjust("Rain (mm) ", screenwidth - 3)
     if imperial:
@@ -306,7 +300,7 @@ def format_oneliner(
     offset: int = 0,
     wind_chill: bool = False,
 ) -> str:
-    """Return a one-line weather forecast. TODO: remove json, respect windchill, imperial, etc."""
+    """Return a one-line weather forecast."""
     start_time: Optional[datetime.datetime] = None
     place: str = forecast.place.name
     next6: str = forecast.json["data"]["properties"]["timeseries"][0]["data"]["next_6_hours"]

fingr/location.py

@@ -2,7 +2,7 @@
 
 import datetime
 import socket
-from typing import Any, Optional, Tuple, Union
+from typing import Any, Optional, Union
 
 import pytz  # type: ignore[import-untyped]
 import redis
@@ -38,7 +38,7 @@ def get_timezone(lat: float, lon: float) -> Timezone:
 
 def resolve_location(
     redis_client: RedisClient, geolocator: Optional[Nominatim], data: str = "Oslo/Norway"
-) -> Tuple[Optional[float], Optional[float], str, bool]:
+) -> tuple[Optional[float], Optional[float], str, bool]:
     """Get coordinates from location name. Return lat, long, name, cached."""
     with track_time(location_resolution_duration):
         # Check if coordinates

fingr/server.py

@@ -3,7 +3,7 @@
 import argparse
 import asyncio
 import sys
-from typing import Any, Optional, Tuple
+from typing import Any, Optional
 
 import redis
 from geopy.geocoders import Nominatim  # type: ignore[import-untyped]
@@ -94,7 +94,7 @@ async def handle_request(reader: asyncio.StreamReader, writer: asyncio.StreamWri
     with track_time(request_duration):
         try:
             user_input: str = clean_input(data.decode())
-            addr: Tuple[str, int] = writer.get_extra_info("peername")  # type: ignore[assignment]
+            addr: tuple[str, int] = writer.get_extra_info("peername")  # type: ignore[assignment]
             screenwidth: int = 80
             wind_chill: bool = False
 
@@ -259,7 +259,7 @@ async def start_server(args: argparse.Namespace) -> None:
         handle_request, args.host, args.port
     )
 
-    addr: Tuple[str, int] = server.sockets[0].getsockname()  # type: ignore[assignment]
+    addr: tuple[str, int] = server.sockets[0].getsockname()  # type: ignore[assignment]
     logger.info("Server ready", host=addr[0], port=addr[1])
 
     async with server:

fingr/weather.py

@@ -1,6 +1,6 @@
 """Weather data fetching and processing."""
 
-from typing import Any, Tuple
+from typing import Any
 
 from metno_locationforecast import Forecast, Place  # type: ignore[import-untyped]
 
@@ -18,7 +18,7 @@
 
 def fetch_weather(
     lat: float, lon: float, address: str = "", user_agent: str = ""
-) -> Tuple[Any, Any]:
+) -> tuple[Any, Any]:
     """Get forecast data using metno-locationforecast."""
     with track_time(weather_fetch_duration):
         location: Place = Place(address, lat, lon)
@@ -44,6 +44,15 @@ def fetch_weather(
 
 
 def calculate_wind_chill(temperature: float, wind_speed: float) -> int:
+    """Calculate wind chill temperature using the formula.
+
+    Args:
+        temperature: Temperature in Celsius
+        wind_speed: Wind speed in m/s
+
+    Returns:
+        Wind chill temperature as integer
+    """
     return int(
         13.12
         + (0.615 * float(temperature))

fingr_test.py

@@ -71,7 +71,8 @@ def test_random_message(self):
 
     def test_get_timezone(self):
         tz = get_timezone(lat=59, lon=11)
-        self.assertEqual(tz.zone, "Europe/Oslo")
+        # pytz timezone objects have a 'zone' attribute
+        self.assertEqual(tz.zone, "Europe/Oslo")  # type: ignore[attr-defined]
 
     def test_sun_up(self):
         dt = datetime.datetime.fromtimestamp(1727987676, tz=pytz.timezone("UTC"))