v0.75052 - detailed US NWS weather alerts

Author: FlyingFathead

README.md

@@ -236,6 +236,7 @@ If you run into any issues, consult the logs or reach out on the repository's [I
 ---
 
 # Changelog
+- v0.75052 - include the details from U.S. National Weather Service on alerts
 - v0.75051 - updated `config.ini` for configuring NWS weather forecasts & alerts
   - suggested method is to supplement via NWS the additional weather data you need
   - leaving U.S. NWS's weather alerts on in `config.ini` is highly recommended, even if you have other fetching methods enabled (i.e. OpenWeatherMap), rather be safe than sorry

src/api_get_nws_weather.py

@@ -82,6 +82,7 @@ async def get_nws_forecast(lat, lon, retries=NWS_RETRIES, delay=NWS_RETRY_DELAY)
 
     return None
 
+# get alerts via NWS (weather.gov)
 async def get_nws_alerts(lat, lon):
     """
     Fetches active alerts from the NWS API for the given latitude and longitude.
@@ -91,7 +92,7 @@ async def get_nws_alerts(lat, lon):
         lon (float): Longitude in decimal degrees.
     
     Returns:
-        list: A list of active alerts or an empty list if none are found.
+        list: A list of active alerts with detailed information or an empty list if none are found.
     """
 
     if not FETCH_NWS_ALERTS:
@@ -106,8 +107,26 @@ async def get_nws_alerts(lat, lon):
             response.raise_for_status()
             alerts_data = response.json()
 
-            # Extract alerts from GeoJSON
-            alerts = alerts_data.get('features', [])
+            # Extracting the detailed alerts
+            alerts = []
+            for feature in alerts_data.get('features', []):
+                properties = feature.get('properties', {})
+                alert = {
+                    'headline': properties.get('headline'),
+                    'description': properties.get('description'),
+                    'instruction': properties.get('instruction'),
+                    'severity': properties.get('severity'),
+                    'event': properties.get('event'),
+                    'areaDesc': properties.get('areaDesc'),
+                    'certainty': properties.get('certainty'),
+                    'urgency': properties.get('urgency'),
+                    'effective': properties.get('effective'),
+                    'expires': properties.get('expires'),
+                    'senderName': properties.get('senderName'),
+                    'response': properties.get('response'),
+                    # Add more fields if needed
+                }
+                alerts.append(alert)
             return alerts
 
         except httpx.HTTPStatusError as e:
@@ -116,3 +135,40 @@ async def get_nws_alerts(lat, lon):
             logging.error(f"Error fetching NWS alerts: {e}")
 
     return []
+
+# # // (old method)
+# # get alerts via NWS (weather.gov)
+# async def get_nws_alerts(lat, lon):
+#     """
+#     Fetches active alerts from the NWS API for the given latitude and longitude.
+    
+#     Args:
+#         lat (float): Latitude in decimal degrees.
+#         lon (float): Longitude in decimal degrees.
+    
+#     Returns:
+#         list: A list of active alerts or an empty list if none are found.
+#     """
+
+#     if not FETCH_NWS_ALERTS:
+#         logging.info("Fetching NWS alerts is disabled in the config.")
+#         return []
+
+#     alerts_url = f"{NWS_BASE_URL}/alerts/active?point={lat},{lon}"
+    
+#     async with httpx.AsyncClient() as client:
+#         try:
+#             response = await client.get(alerts_url, headers={'User-Agent': NWS_USER_AGENT})
+#             response.raise_for_status()
+#             alerts_data = response.json()
+            
+#             # Extract alerts from GeoJSON
+#             alerts = alerts_data.get('features', [])
+#             return alerts
+        
+#         except httpx.HTTPStatusError as e:
+#             logging.error(f"NWS Alerts API HTTP error: {e.response.status_code} - {e.response.text}")
+#         except Exception as e:
+#             logging.error(f"Error fetching NWS alerts: {e}")
+    
+#     return []

src/api_get_openweathermap.py

@@ -14,6 +14,7 @@
 
 # Import the NWS data fetching function
 from api_get_nws_weather import get_nws_forecast, get_nws_alerts
+from config_paths import NWS_USER_AGENT, NWS_RETRIES, NWS_RETRY_DELAY, FETCH_NWS_FORECAST, FETCH_NWS_ALERTS
 
 # date & time utils
 import datetime as dt
@@ -404,7 +405,7 @@ async def combine_weather_data(city_name, country, lat, lon, current_weather_dat
         lon_rounded = round(lon, 4)
         alerts_url = f"https://api.weather.gov/alerts/active?point={lat_rounded},{lon_rounded}"
         async with httpx.AsyncClient(follow_redirects=True) as client:
-            alerts_response = await client.get(alerts_url, headers={'User-Agent': 'YourAppName ([email protected])'})
+            alerts_response = await client.get(alerts_url, headers={'User-Agent': NWS_USER_AGENT})
             alerts_response.raise_for_status()
             alerts_data = alerts_response.json()
     except httpx.HTTPStatusError as e:
@@ -422,6 +423,7 @@ async def combine_weather_data(city_name, country, lat, lon, current_weather_dat
 
             event = properties.get('event', 'EVENT').upper()
             headline = properties.get('headline', 'HEADLINE')
+            description = properties.get('description', 'No further details available')  # Fetching the detailed description            
             instruction = properties.get('instruction', 'INSTRUCTION')
             severity = properties.get('severity', 'Unknown').capitalize()
             certainty = properties.get('certainty', 'Unknown').capitalize()
@@ -433,6 +435,7 @@ async def combine_weather_data(city_name, country, lat, lon, current_weather_dat
             alerts_info += (
                 f"{idx}. ⚠️ <b>{event}</b>\n"
                 f"<b>Vaara:</b> {headline}\n"
+                f"<b>Kuvaus:</b> {description}\n"  # Adding the detailed description                
                 f"<b>Ohjeet:</b> {instruction}\n"
                 f"<b>Alue:</b> {area_desc}\n"
                 f"<b>Vakavuus:</b> {severity}\n"

src/main.py

@@ -5,7 +5,7 @@
 # https://github.com/FlyingFathead/TelegramBot-OpenAI-API
 #
 # version of this program
-version_number = "0.75051"
+version_number = "0.75052"
 
 # Add the project root directory to Python's path
 import sys