Update app.py via AI Editor

app.py

@@ -49,13 +49,12 @@ def get_data_from_session(session_id, key):
 API_KEY = os.getenv('ACCUWEATHER_API_KEY')
 BASE_URL = "http://dataservice.accuweather.com"
 
-# Index IDs from AccuWeather's documentation (example IDs, replace with actual as needed)
 INDEX_IDS = {
-    "Health": 31,          # e.g., Flu Index
-    "Environmental": 34,   # e.g., Air Quality Index
-    "Pollen": 11,          # e.g., Tree Pollen
-    "Mosquito": 50,        # e.g., Mosquito Index
-    "Pests": 53            # e.g., Pest Activity
+    "Health": 31,
+    "Environmental": 34,
+    "Pollen": 11,
+    "Mosquito": 50,
+    "Pests": 53
 }
 
 def get_location_key(lat, lon):
@@ -150,13 +149,19 @@ def get_indices_1day(location_key, index_id):
     try:
         response = requests.get(url, params=params)
         response.raise_for_status()
-        # returns a list with one dict per day (only 1 for 1day endpoint)
         return response.json()
     except requests.RequestException as e:
         logger.error(f"Error in get_indices_1day {index_id}: {e}")
         return None
 
 def create_current_weather_card(current):
+    if not current:
+        return dbc.Card([
+            dbc.CardBody([
+                html.H4("Current Weather", className="card-title"),
+                html.P("No weather data available.")
+            ])
+        ], className="mb-4")
     return dbc.Card([
         dbc.CardBody([
             html.H4("Current Weather", className="card-title"),
@@ -243,27 +248,23 @@ def create_forecast_5day_card(forecast):
         ])
     ], className="mb-4")
 
-def create_indices_card(indices_dict):
-    cards = []
-    for idx_name, idx_data in indices_dict.items():
-        if not idx_data or not isinstance(idx_data, list) or 'Category' not in idx_data[0]:
-            cards.append(html.Div([
-                html.H5(f"{idx_name} Index"),
-                html.P("No data available.")
-            ], style={"marginBottom": "10px"}))
-        else:
-            info = idx_data[0]
-            cards.append(html.Div([
-                html.H5(f"{idx_name} Index"),
-                html.P(f"{info.get('Name', '')}: {info.get('Category', '')}"),
-                html.P(f"Value: {info.get('Value', 'N/A')}"),
-                html.P(f"Category Value: {info.get('CategoryValue', 'N/A')}"),
-                html.P(f"Text: {info.get('Text', '')}")
-            ], style={"marginBottom": "10px"}))
+def create_environmental_api_card(environmental_data):
+    if not environmental_data or not isinstance(environmental_data, list) or not environmental_data[0]:
+        return dbc.Card([
+            dbc.CardBody([
+                html.H4("Environmental API", className="card-title"),
+                html.P("No environmental data available.")
+            ])
+        ], className="mb-4")
+    info = environmental_data[0]
     return dbc.Card([
         dbc.CardBody([
-            html.H4("Today's Health & Environmental Indices", className="card-title"),
-            *cards
+            html.H4("Environmental API", className="card-title"),
+            html.P(f"Name: {info.get('Name', 'N/A')}"),
+            html.P(f"Category: {info.get('Category', 'N/A')}"),
+            html.P(f"Value: {info.get('Value', 'N/A')}"),
+            html.P(f"Category Value: {info.get('CategoryValue', 'N/A')}"),
+            html.P(f"Text: {info.get('Text', 'N/A')}")
         ])
     ], className="mb-4")
 
@@ -281,21 +282,12 @@ app.layout = dbc.Container([
     ]),
     dbc.Row([
         dbc.Col([
-            dbc.Card([
-                dbc.CardBody([
-                    html.H5("Navigation", className="card-title"),
-                    dbc.Nav([
-                        dbc.NavLink("Health & Env. Indices", href="#", id="nav-health"),
-                        dbc.NavLink("Current Weather", href="#", id="nav-current"),
-                    ], vertical=True, pills=True)
-                ])
-            ], className="mb-4"),
             dcc.Loading(
                 id="loading",
                 type="default",
                 children=[
-                    html.Div(id="indices-output"),
-                    html.Div(id="current-weather-output")
+                    html.Div(id="current-weather-output"),
+                    html.Div(id="environmental-api-output")
                 ],
                 style={"width": "100%"}
             )
@@ -305,8 +297,6 @@ app.layout = dbc.Container([
                 id="loading-forecast",
                 type="default",
                 children=[
-                    html.Div(id="hourly-forecast-output"),
-                    html.Div(id="forecast-1day-output"),
                     html.Div(id="forecast-output")
                 ],
                 style={"width": "100%"}
@@ -351,10 +341,8 @@ def set_session_cookie(response):
 
 @app.callback(
     [
-        Output("indices-output", "children"),
         Output("current-weather-output", "children"),
-        Output("hourly-forecast-output", "children"),
-        Output("forecast-1day-output", "children"),
+        Output("environmental-api-output", "children"),
         Output("forecast-output", "children"),
     ],
     [Input("location-store", "data")],
@@ -367,10 +355,10 @@ def update_weather(location, session_data):
     if not location or 'error' in location:
         error_message = location.get('error', 'Waiting for location data...') if location else 'Waiting for location data...'
         logger.warning(f"Session {session_id} waiting for location: {error_message}")
-        return [dbc.Spinner(color="primary"), "", "", "", ""]
+        return [dbc.Spinner(color="primary"), "", ""]
 
     lat, lon = location["latitude"], location["longitude"]
-    results = {"indices": "", "current": "", "hourly": "", "forecast_1day": "", "forecast": ""}
+    results = {"current": "", "environmental": "", "forecast": ""}
     def fetch_weather_data():
         try:
             location_key = get_data_from_session(session_id, "location_key")
@@ -382,27 +370,19 @@ def update_weather(location, session_data):
 
             current = get_current_conditions(location_key)
             forecast_5day = get_forecast_5day(location_key)
-            forecast_1day = get_forecast_1day(location_key)
-            hourly_1hour = get_hourly_forecast_1hour(location_key)
-            indices_dict = {}
-            for idx_name, idx_id in INDEX_IDS.items():
-                indices_dict[idx_name] = get_indices_1day(location_key, idx_id)
+            environmental_data = get_indices_1day(location_key, INDEX_IDS["Environmental"])
 
-            if current is None or forecast_5day is None or forecast_1day is None:
+            if current is None or forecast_5day is None:
                 raise ValueError("Failed to fetch weather data")
 
-            results["indices"] = create_indices_card(indices_dict)
             results["current"] = create_current_weather_card(current)
-            results["hourly"] = create_hourly_1hour_card(hourly_1hour)
-            results["forecast_1day"] = create_forecast_1day_card(forecast_1day)
+            results["environmental"] = create_environmental_api_card(environmental_data)
             results["forecast"] = create_forecast_5day_card(forecast_5day)
             save_session_data(session_id, "weather_results", results)
         except Exception as e:
             logger.error(f"Session {session_id} error: {str(e)}")
-            results["indices"] = ""
             results["current"] = ""
-            results["hourly"] = ""
-            results["forecast_1day"] = ""
+            results["environmental"] = ""
             results["forecast"] = dbc.Card([
                 dbc.CardBody([
                     html.P(f"Error fetching weather data: {str(e)}", className="text-danger")
@@ -415,14 +395,12 @@ def update_weather(location, session_data):
     weather_results = get_data_from_session(session_id, "weather_results")
     if weather_results:
         return [
-            weather_results.get("indices", ""),
             weather_results.get("current", ""),
-            weather_results.get("hourly", ""),
-            weather_results.get("forecast_1day", ""),
+            weather_results.get("environmental", ""),
             weather_results.get("forecast", ""),
         ]
     else:
-        return [dbc.Spinner(color="primary"), "", "", "", ""]
+        return [dbc.Spinner(color="primary"), "", ""]
 
 if __name__ == '__main__':
     print("Starting the Dash application...")