merge conflicts

Author: ryansurf

help.txt

@@ -1,7 +1,7 @@
 Usage:
 
     $ curl localhost:8000                     # current location
-    $ curl localhost:8000?args=loc=new_york   # surf report in New new_york
+    $ curl localhost:8000?loc=new_york        # surf report in New York
 
 Supported location types:
 
@@ -18,26 +18,34 @@ Units:
 
 Arguments:
 
-    location / loc	                          #Specify the location of your forecast
-    forecast / fc	                          # Number of forecast days. Max = 7, default = 0
-    hide_wave / hw	                          # Hide the default wave art
-    show_large_wave / slw	                  # Show the large wave art
-    hide_uv / huv	                          # Hide uv index
-    hide_height / hh	                      # Hide surf height
-    hide_direction / hdir	                  # Hide Swell direction
-    hide_period / hp	                      # Hide swell period
-    hide_location / hl	                      # Hide location
-    hide_date / hdate	                      # Hide date in forecast
-    metric / m	                              # Numbers in Metric units. Defaults to Imperial
-    decimal / dec	                          # Specify decimal points in output
-    color / c	                              # Choose color of wave art. Ex: color=light_blue
+    location / loc                            # Specify the location of your forecast
+    forecast / fc                             # Number of forecast days. Max = 7, default = 0
+    hide_wave / hw                            # Hide the default wave art
+    show_large_wave / slw                     # Show the large wave art
+    show_air_temp / sat                       # Show the air temperature
+    show_wind_speed / sws                     # Show the wind speed
+    show_wind_direction / swd                 # Show the wind direction
+    hide_uv / huv                             # Hide UV index
+    hide_height / hh                          # Hide surf height
+    hide_direction / hdir                     # Hide swell direction
+    hide_period / hp                          # Hide swell period
+    hide_location / hl                        # Hide location
+    hide_date / hdate                         # Hide date in forecast
+    metric / m                                # Numbers in Metric units. Defaults to Imperial
+    decimal / dec                             # Specify decimal points in output
+    color / c                                 # Choose color of wave art. Ex: color=light_blue
+    json / j                                  # Output the data in JSON format. Must be the only argument
+    gpt / g                                   # Activates the GPT surf report. Change the GPT_PROMPT variable in .env to customize responses. Default = off
 
 Color Options:
 
-    defualt, red, green, yellow, blue, purple, teal, light_blue
+    default, red, green, yellow, blue, purple, teal, light_blue
 
 Examples:
 
     curl localhost:8000
-    curl localhost:8000?args=location=new_york,hide_height,hide_wave,show_large_wave
-    curl localhost:8000?args=fc=3,hdate,loc=trestles,c=light_blue
+    curl localhost:8000?loc=new_york,hide_height,hide_wave,show_large_wave
+    curl localhost:8000?fc=3,hdate,loc=trestles,c=light_blue
+    curl localhost:8000?loc=malibu,show_air_temp,show_wind_speed,show_wind_direction
+    curl localhost:8000?loc=nazare,json
+    curl localhost:8000?loc=gold_coast,gpt,color=yellow

src/api.py

@@ -159,7 +159,11 @@ def forecast(lat, long, decimal, days=0):
     retry_session = retry(cache_session, retries=5, backoff_factor=0.2)
     openmeteo = openmeteo_requests.Client(session=retry_session)
 
-    url = "https://marine-api.open-meteo.com/v1/marine"
+    # First URL is the marine API. Second is for general weather/UV index
+    urls = (
+        "https://marine-api.open-meteo.com/v1/marine",
+        "https://api.open-meteo.com/v1/forecast",
+    )
     params = {
         "latitude": lat,
         "longitude": long,
@@ -172,9 +176,14 @@ def forecast(lat, long, decimal, days=0):
         "timezone": "auto",
         "forecast_days": days,
     }
-    responses = openmeteo.weather_api(url, params=params)
+
+    params_uv = {"latitude": lat, "longitude": long, "daily": "uv_index_max"}
+
+    responses = openmeteo.weather_api(urls[0], params=params)
+    responses_uv = openmeteo.weather_api(urls[1], params=params_uv)
 
     response = responses[0]
+    response_uv = responses_uv[0]
 
     daily_height_max = helper.round_decimal(
         response.Daily().Variables(0).ValuesAsNumpy(), decimal
@@ -186,6 +195,10 @@ def forecast(lat, long, decimal, days=0):
         response.Daily().Variables(2).ValuesAsNumpy(), decimal
     )
 
+    daily_uv_index_max = helper.round_decimal(
+        response_uv.Daily().Variables(0).ValuesAsNumpy(), decimal
+    )
+
     daily_data = {
         "date": pd.date_range(
             start=pd.to_datetime(response.Daily().Time(), unit="s", utc=True),
@@ -194,12 +207,12 @@ def forecast(lat, long, decimal, days=0):
             inclusive="left",
         )
     }
-
     return [
         daily_height_max,
         daily_direction_dominant,
         daily_period_max,
         daily_data["date"],
+        daily_uv_index_max,
     ]
 
 

src/helper.py

@@ -150,6 +150,8 @@ def print_forecast(ocean, forecast):
             print("Wave Direction: ", day[1])
         if int(ocean["show_period"]) == 1:
             print("Wave Period: ", day[2])
+        if int(ocean["show_uv"]) == 1:
+            print("UV Index: ", day[4])
         print("\n")
 
 
@@ -250,16 +252,17 @@ def forecast_to_json(data, decimal):
     """
     Takes forecast() as input and returns it in JSON format
     """
-    surf_height, swell_direction, swell_period, dates = data
+    surf_height, swell_direction, swell_period, dates, uv_index = data
 
     # Formatting into JSON
     forecasts = []
     for i in range(len(dates)):
         forecast = {
             "date": str(dates[i].date()),
-            "height": round(float(surf_height[i]), decimal),
-            "direction": round(float(swell_direction[i]), decimal),
-            "period": round(float(swell_period[i]), decimal),
+            "surf height": round(float(surf_height[i]), decimal),
+            "swell direction": round(float(swell_direction[i]), decimal),
+            "swell period": round(float(swell_period[i]), decimal),
+            "uv index": round(float(uv_index[i]), decimal),
         }
         forecasts.append(forecast)