Update app.py

app.py

@@ -5,43 +5,55 @@ import requests
 import os
 from datetime import datetime
 
-# Assuming weather_model.py exists; if not, we'll inline it
-try:
-    from weather_model import get_weather_data
-except ImportError:
-    def get_weather_data(city, days, api_key):
-        try:
+# Inline weather_model.py with fixes
+def get_weather_data(city, days, api_key):
+    try:
+        # Fallback to coordinates if city name fails
+        city_coords = {
+            "Hyderabad": {"lat": 17.3850, "lon": 78.4867},
+            "Gadwal": {"lat": 16.2350, "lon": 77.8050},
+            "Bengaluru": {"lat": 12.9716, "lon": 77.5946}
+        }
+        
+        coords = city_coords.get(city)
+        if not coords:
             geo_url = f"http://api.openweathermap.org/geo/1.0/direct?q={city}&limit=1&appid={api_key}"
             geo_response = requests.get(geo_url).json()
             if not geo_response:
                 return None
-            lat, lon = geo_response[0]['lat'], geo_response[0]['lon']
-
-            url = f"http://api.openweathermap.org/data/2.5/onecall?lat={lat}&lon={lon}&exclude=minutely,hourly&units=metric&appid={api_key}"
-            response = requests.get(url).json()
-
-            current = {
-                'temp': response['current']['temp'],
-                'weather': response['current']['weather'][0]['description'],
-                'humidity': response['current']['humidity'],
-                'wind_speed': response['current']['wind_speed']
-            }
-
-            forecast = []
-            for i in range(min(days, len(response['daily']))):
-                day = response['daily'][i]
-                forecast.append({
-                    'date': datetime.fromtimestamp(day['dt']).strftime('%Y-%m-%d'),
-                    'temp': day['temp']['day'],
-                    'precipitation': day.get('rain', 0) + day.get('snow', 0),
-                    'wind_speed': day['wind_speed'],
-                    'weather': day['weather'][0]['main']
-                })
-
-            return {'current': current, 'forecast': forecast}
-        except Exception as e:
-            print(f"Error fetching weather data: {e}")
-            return None
+            coords = {"lat": geo_response[0]['lat'], "lon": geo_response[0]['lon']}
+
+        url = f"http://api.openweathermap.org/data/2.5/onecall?lat={coords['lat']}&lon={coords['lon']}&exclude=minutely,hourly&units=metric&appid={api_key}"
+        response = requests.get(url, timeout=10).json()
+
+        current = {
+            'temp': response['current']['temp'],
+            'weather': response['current']['weather'][0]['description'],
+            'humidity': response['current']['humidity'],
+            'wind_speed': response['current']['wind_speed']
+        }
+
+        forecast = []
+        for i in range(min(days, len(response['daily']))):
+            day = response['daily'][i]
+            forecast.append({
+                'date': datetime.fromtimestamp(day['dt']).strftime('%Y-%m-%d'),
+                'temp': day['temp']['day'],
+                'precipitation': day.get('rain', 0) + day.get('snow', 0),
+                'wind_speed': day['wind_speed'],
+                'weather': day['weather'][0]['main']
+            })
+
+        return {'current': current, 'forecast': forecast}
+    except requests.exceptions.RequestException as e:
+        print(f"Network error for {city}: {e}")
+        return None
+    except KeyError as e:
+        print(f"API response error for {city}: {e}")
+        return None
+    except Exception as e:
+        print(f"Unexpected error for {city}: {e}")
+        return None
 
 # Initialize Dash app
 app = dash.Dash(__name__)
@@ -51,14 +63,14 @@ app.title = "Weather Forecast Dashboard"
 API_KEY = os.getenv("OPENWEATHERMAP_API_KEY", "53d50455f91b6bc3c920959e2954576d")
 
 # Fixed locations
-LOCATIONS = ["Hyderabad", "Jogulamba Gadwal", "Bangalore"]
+LOCATIONS = ["Hyderabad", "Gadwal", "Bengaluru"]
 DAYS = 5  # Fixed 5-day forecast
 
 # Layout
 app.layout = html.Div([
     html.Div([
         html.H1("Weather Forecast Dashboard", style={'textAlign': 'center', 'color': '#FFFFFF'}),
-        html.P("Current weather for Hyderabad, Gadwal, and Karnataka (Bangalore).", 
+        html.P("Current weather for Hyderabad, Gadwal, and Bengaluru (Karnataka).", 
                style={'textAlign': 'center', 'color': '#D3D9D4'})
     ], style={'backgroundColor': '#212A31', 'padding': '20px'}),