tests, formatting fixes

Author: ryansurf

src/api.py

@@ -13,8 +13,8 @@
 import pandas as pd
 import requests
 from cachetools import TTLCache, cached
-from geopy.geocoders import Nominatim
 from geopy.distance import great_circle
+from geopy.geocoders import Nominatim
 
 from src import helper
 from src.open_meteo import openmeteo_client
@@ -37,7 +37,6 @@
 _ocean_lock = Lock()
 
 
-
 @lru_cache(maxsize=128)
 def get_coordinates(args: tuple) -> list | str:
     """
@@ -186,7 +185,12 @@ def ocean_information(
     params = {
         "latitude": lat,
         "longitude": long,
-        "current": ["wave_height", "wave_direction", "wave_period", "sea_surface_temperature"],
+        "current": [
+            "wave_height",
+            "wave_direction",
+            "wave_period",
+            "sea_surface_temperature",
+        ],
         "length_unit": unit,
         "timezone": "auto",
         "forecast_days": 3,
@@ -207,7 +211,12 @@ def ocean_information(
     current_wave_period = round(current.Variables(2).Value(), decimal)
     current_sea_surface_temperature = current.Variables(3).Value()
 
-    return [current_wave_height, current_wave_direction, current_wave_period, current_sea_surface_temperature]
+    return [
+        current_wave_height,
+        current_wave_direction,
+        current_wave_period,
+        current_sea_surface_temperature,
+    ]
 
 
 @cached(ocean_history_cache, lock=_ocean_lock)
@@ -486,26 +495,26 @@ def get_hourly_forecast(
 
     return curr_hour_data
 
+
 @cached(_tide_cache, lock=_ocean_lock)
 def get_tide_data(lat: float, long: float):
     """
     Fetches tide data for the given cords
     """
-    station_id, station_distance = nearest_station(lat, long)
+    station_id, _ = nearest_station(lat, long)
     begin = (datetime.now(timezone.utc) - timedelta(days=1)).strftime("%Y%m%d")
 
-
     url = "https://api.tidesandcurrents.noaa.gov/api/prod/datagetter"
     params = {
         "station": station_id,
         "product": "predictions",
         "datum": "MLLW",
-        "interval": "hilo",        # high/low only; omit for 6-min intervals
-        "units": "english",      
+        "interval": "hilo",  # high/low only; omit for 6-min intervals
+        "units": "english",
         "time_zone": "gmt",
         "format": "json",
         "begin_date": begin,
-        "range": 72,   # hours
+        "range": 72,  # hours
     }
     r = requests.get(url, params=params, timeout=10)
     r.raise_for_status()
@@ -514,11 +523,14 @@ def get_tide_data(lat: float, long: float):
 
 @lru_cache(maxsize=1)
 def _get_stations():
-    url = "https://api.tidesandcurrents.noaa.gov/mdapi/prod/webapi/stations.json"
+    url = (
+        "https://api.tidesandcurrents.noaa.gov/mdapi/prod/webapi/stations.json"
+    )
     r = requests.get(url, params={"type": "tidepredictions"}, timeout=10)
     r.raise_for_status()
     return r.json()["stations"]
 
+
 def nearest_station(lat: float, long: float) -> tuple[str, float]:
     """
     returns the id of the nearest NOAA station in respect to the given cords
@@ -635,4 +647,4 @@ def separate_args_and_get_location(args: list) -> dict:
 
 
 if __name__ == "__main__":
-    print(get_tide_data(40.741895, -73.989308))
+    print(get_tide_data(40.741895, -73.989308))

src/helper.py

@@ -11,7 +11,6 @@
 from src import api, art
 from src.gpt import get_llm_client
 
-
 logger = logging.getLogger(__name__)
 
 MAX_FORECAST_DAYS = 7
@@ -245,7 +244,7 @@ def print_ocean_data(arguments_dict, ocean_data_dict):
     ]
 
     for arg_key, data_key, label in mappings:
-        if arguments_dict[arg_key]:
+        if arguments_dict.get(arg_key) and data_key in ocean_data_dict:
             print(f"{label}{ocean_data_dict[data_key]}")
 
     if arguments_dict.get("show_tide") and ocean_data_dict.get("Tide"):
@@ -257,8 +256,13 @@ def print_ocean_data(arguments_dict, ocean_data_dict):
             arrow = f"{color}{arrow}{art.colors['end']}"
         extreme = tide["next_extreme"]
         extreme_type = "High" if extreme["type"] == "H" else "Low"
-        extreme_time = datetime.fromisoformat(extreme["time"]).strftime("%H:%M UTC")
-        print(f"Tide: {tide['height_ft']} ft {arrow} | Next {extreme_type}: {extreme['height']:.2f} ft @ {extreme_time}")
+        extreme_time = datetime.fromisoformat(extreme["time"]).strftime(
+            "%H:%M UTC"
+        )
+        print(
+            f"Tide: {tide['height_ft']} ft {arrow} | "
+            f"Next {extreme_type}: {extreme['height']:.2f} ft @ {extreme_time}"
+        )
 
 
 def print_forecast(ocean, forecast):
@@ -411,15 +415,21 @@ def get_gpt_response(surf_data):
         tide = surf_data["Tide"]
         extreme = tide["next_extreme"]
         extreme_type = "high" if extreme["type"] == "H" else "low"
-        extreme_time = datetime.fromisoformat(extreme["time"]).strftime("%H:%M UTC")
+        extreme_time = datetime.fromisoformat(extreme["time"]).strftime(
+            "%H:%M UTC"
+        )
         tide_desc = (
-            f" The tide is currently {tide['direction']} at {tide['height_ft']} ft,"
-            f" with the next {extreme_type} tide of {extreme['height']:.2f} ft at {extreme_time}."
+            f" The tide is currently {tide['direction']} at"
+            f" {tide['height_ft']} ft, with the next {extreme_type} tide"
+            f" of {extreme['height']:.2f} ft at {extreme_time}."
         )
 
     sea_temp_desc = ""
     if surf_data.get("Sea Surface Temperature") is not None:
-        sea_temp_desc = f" The sea surface temperature is {surf_data['Sea Surface Temperature']} {unit_label}."
+        sea_temp_desc = (
+            f" The sea surface temperature is"
+            f" {surf_data['Sea Surface Temperature']} {unit_label}."
+        )
 
     summary = (
         f"Today at {surf_data['Location']}, the surf height is "
@@ -434,19 +444,22 @@ def get_gpt_response(surf_data):
         logger.error("LLM request failed: %s", e)
         return "Unable to generate GPT response."
 
+
 def current_tide(lat: float, long: float) -> dict:
     predictions = api.get_tide_data(lat, long)["predictions"]
 
     parsed = [
         {
-            "time": datetime.strptime(p["t"], "%Y-%m-%d %H:%M").replace(tzinfo=timezone.utc),
+            "time": datetime.strptime(p["t"], "%Y-%m-%d %H:%M").replace(
+                tzinfo=timezone.utc
+            ),
             "height": float(p["v"]),
             "type": p["type"],
         }
         for p in predictions
     ]
 
-    now = datetime.now(timezone.utc)   # ← tz-aware UTC
+    now = datetime.now(timezone.utc)  # ← tz-aware UTC
 
     prev = next_ = None
     for a, b in zip(parsed, parsed[1:]):
@@ -460,7 +473,8 @@ def current_tide(lat: float, long: float) -> dict:
     span = (next_["time"] - prev["time"]).total_seconds()
     elapsed = (now - prev["time"]).total_seconds()
     x = elapsed / span
-    height = prev["height"] + (next_["height"] - prev["height"]) * (1 - cos(pi * x)) / 2
+    delta = next_["height"] - prev["height"]
+    height = prev["height"] + delta * (1 - cos(pi * x)) / 2
 
     direction = "incoming" if next_["type"] == "H" else "outgoing"
 
@@ -475,6 +489,5 @@ def current_tide(lat: float, long: float) -> dict:
     }
 
 
-
 if __name__ == "__main__":
-    print(current_tide(32.856132, -117.2175761))
+    print(current_tide(32.856132, -117.2175761))

tests/test_api.py

@@ -126,7 +126,12 @@ def test_ocean_information(mock_create_client):
     mock_var_3.Value.return_value = 20.0
 
     mock_current = MagicMock()
-    mock_current.Variables.side_effect = [mock_var_0, mock_var_1, mock_var_2, mock_var_3]
+    mock_current.Variables.side_effect = [
+        mock_var_0,
+        mock_var_1,
+        mock_var_2,
+        mock_var_3,
+    ]
 
     mock_response = MagicMock()
     mock_response.Current.return_value = mock_current