Update app.py via AI Editor

app.py

@@ -167,45 +167,66 @@ def get_indices_1day(location_key, index_id):
         logger.error(f"Error in get_indices_1day {index_id}: {e}")
         return None
 
-def get_minutecast_forecast(lat, lon):
-    url = f"{BASE_URL}/forecasts/v1/minute"
-    params = {
-        "apikey": API_KEY,
-        "q": f"{lat},{lon}",
-        "details": "true"
-    }
+def get_weather_alarms_1day(location_key):
+    if location_key is None:
+        return None
+    url = f"{BASE_URL}/alarms/v1/1day/{location_key}"
+    params = {"apikey": API_KEY}
     try:
         response = requests.get(url, params=params)
         response.raise_for_status()
-        data = response.json()
-        return data
+        return response.json()
     except requests.RequestException as e:
-        logger.error(f"Error in get_minutecast_forecast: {e}")
+        logger.error(f"Error in get_weather_alarms_1day: {e}")
         return None
 
-def create_summary_card(minutecast_data):
-    if not minutecast_data or not isinstance(minutecast_data, dict):
+def create_weather_alerts_card(alarms_data):
+    if not alarms_data or not isinstance(alarms_data, list) or len(alarms_data) == 0:
         return dbc.Card([
             dbc.CardBody([
-                html.H4("Summary", className="card-title"),
-                html.P("No summary data available.")
+                html.H4("Weather Alerts", className="card-title"),
+                html.P("No weather alerts or alarms for today.")
             ])
         ], className="mb-4")
-    summary = minutecast_data.get("Summary", None)
-    phrase = summary.get("Phrase", "N/A") if summary else "N/A"
-    precipitation = summary.get("PrecipitationSummary", {}) if summary else {}
-    precip_type = precipitation.get("PrecipitationType", "N/A")
-    start_time = summary.get("StartTime", None)
-    end_time = summary.get("EndTime", None)
-    start_str = datetime.strptime(start_time, "%Y-%m-%dT%H:%M:%SZ").strftime("%I:%M %p") if start_time else "N/A"
-    end_str = datetime.strptime(end_time, "%Y-%m-%dT%H:%M:%SZ").strftime("%I:%M %p") if end_time else "N/A"
+    items = []
+    for entry in alarms_data:
+        date = entry.get("Date", "N/A")
+        try:
+            date_str = datetime.strptime(date, "%Y-%m-%dT%H:%M:%S%z").strftime("%A, %B %d %Y")
+        except Exception:
+            date_str = date
+        alarms = entry.get("Alarms", [])
+        if not alarms or not isinstance(alarms, list):
+            continue
+        for alarm in alarms:
+            alarm_type = alarm.get("AlarmType", "N/A")
+            value = alarm.get("Value", {})
+            metric = value.get("Metric", {})
+            imperial = value.get("Imperial", {})
+            metric_val = metric.get("Value")
+            metric_unit = metric.get("Unit", "")
+            imperial_val = imperial.get("Value")
+            imperial_unit = imperial.get("Unit", "")
+            day = alarm.get("Day", {})
+            night = alarm.get("Night", {})
+            day_val = day.get("Imperial", {}).get("Value")
+            day_unit = day.get("Imperial", {}).get("Unit", "")
+            night_val = night.get("Imperial", {}).get("Value")
+            night_unit = night.get("Imperial", {}).get("Unit", "")
+            items.append(html.Div([
+                html.H6(f"{alarm_type} Alert", style={"fontWeight": "bold"}),
+                html.P(f"Date: {date_str}"),
+                html.P(f"Total Day: {day_val} {day_unit}" if day_val is not None else "Day: N/A"),
+                html.P(f"Total Night: {night_val} {night_unit}" if night_val is not None else "Night: N/A"),
+                html.P(f"Total Value: {imperial_val} {imperial_unit}" if imperial_val is not None else "Value: N/A"),
+                html.Hr(style={"marginTop": "0.75rem", "marginBottom": "0.75rem"})
+            ]))
+    if not items:
+        items = [html.P("No weather alerts or alarms for today.")]
     return dbc.Card([
         dbc.CardBody([
-            html.H4("Summary", className="card-title"),
-            html.P(f"Summary: {phrase}"),
-            html.P(f"Precipitation Type: {precip_type}"),
-            html.P(f"Start: {start_str}"),
-            html.P(f"End: {end_str}")
+            html.H4("Weather Alerts", className="card-title"),
+            *items
         ])
     ], className="mb-4")
 
@@ -382,7 +403,7 @@ app.layout = dbc.Container([
                 id="loading",
                 type="default",
                 children=[
-                    html.Div(id="summary-output"),
+                    html.Div(id="weather-alerts-output"),
                     html.Div(id="current-weather-output"),
                     html.Div(id="environmental-indices-output")
                 ],
@@ -438,7 +459,7 @@ def set_session_cookie(response):
 
 @app.callback(
     [
-        Output("summary-output", "children"),
+        Output("weather-alerts-output", "children"),
         Output("current-weather-output", "children"),
         Output("environmental-indices-output", "children"),
         Output("forecast-output", "children"),
@@ -456,7 +477,7 @@ def update_weather(location, session_data):
         return [dbc.Spinner(color="primary"), "", "", ""]
 
     lat, lon = location["latitude"], location["longitude"]
-    results = {"summary": "", "current": "", "indices": "", "hourly12": "", "forecast": "", "minutecast": ""}
+    results = {"weather_alerts": "", "current": "", "indices": "", "hourly12": "", "forecast": ""}
     def fetch_weather_data():
         try:
             location_key = get_data_from_session(session_id, "location_key")
@@ -469,7 +490,7 @@ def update_weather(location, session_data):
             current = get_current_conditions(location_key)
             forecast_5day = get_forecast_5day(location_key)
             hourly_12 = get_hourly_forecast_12hour(location_key)
-            minutecast = get_minutecast_forecast(lat, lon)
+            alarms_1day = get_weather_alarms_1day(location_key)
 
             indices_dict = {}
             for name, idx in INDEX_IDS.items():
@@ -478,7 +499,7 @@ def update_weather(location, session_data):
             if current is None or forecast_5day is None:
                 raise ValueError("Failed to fetch weather data")
 
-            results["summary"] = create_summary_card(minutecast)
+            results["weather_alerts"] = create_weather_alerts_card(alarms_1day)
             results["current"] = create_current_weather_card(current)
             results["indices"] = create_environmental_indices_card(indices_dict)
             results["hourly12"] = create_hourly_12hour_card(hourly_12)
@@ -486,7 +507,7 @@ def update_weather(location, session_data):
             save_session_data(session_id, "weather_results", results)
         except Exception as e:
             logger.error(f"Session {session_id} error: {str(e)}")
-            results["summary"] = ""
+            results["weather_alerts"] = ""
             results["current"] = ""
             results["indices"] = ""
             results["hourly12"] = ""
@@ -495,7 +516,6 @@ def update_weather(location, session_data):
                     html.P(f"Error fetching weather data: {str(e)}", className="text-danger")
                 ])
             ], className="mb-4")
-            results["minutecast"] = ""
 
     with lock:
         fetch_weather_data()
@@ -503,7 +523,7 @@ def update_weather(location, session_data):
     weather_results = get_data_from_session(session_id, "weather_results")
     if weather_results:
         return [
-            weather_results.get("summary", ""),
+            weather_results.get("weather_alerts", ""),
             weather_results.get("current", ""),
             weather_results.get("indices", ""),
             html.Div([