Update app.py

app.py

@@ -16,12 +16,9 @@ def get_weather_api_key() -> str:
     """
     api_key = '978b53bb6550f5b81b031a823a63f5dc'
     #api_key = os.getenv("OPENWEATHERMAP_API_KEY")
-    if api_key:
-        return api_key
-    else:
-        return "Error: OpenWeatherMap API key not found in environment variables."
-
 
+    return api_key
+'''
 @tool
 def get_weather_forecast(city: str, date: str, api_key: str) -> str:
     """Retrieves the weather forecast for a specified city and date using OpenWeatherMap API.
@@ -72,37 +69,60 @@ def get_weather_forecast(city: str, date: str, api_key: str) -> str:
         return "Invalid date format. Please use YYYY-MM-DD."
     except KeyError:
         return "Weather data not available or API key is invalid"
+'''
 
-def calculate_days_until_date(future_date: str) -> int:
-    """Calculates the number of days until a specified future date.
+@tool 
+def get_weather_forecast(city: str, date: str, api_key: str) -> str:
+    """Retrieves the weather forecast for a specified city and date using OpenWeatherMap API.
 
     Args:
-        future_date: The future date in YYYY-MM-DD format.
+        city: The name of the city.
+        date: The date in YYYY-MM-DD format.
+        api_key: Your OpenWeatherMap API key.
 
     Returns:
-        The number of days until the future date.
+        A string containing the weather forecast, or an error message.
     """
-    future_date_obj = datetime.datetime.strptime(future_date, "%Y-%m-%d").date()
-    today = datetime.date.today()
-    return (future_date_obj - today).days
+    try:
+        date_obj = datetime.datetime.strptime(date, "%Y-%m-%d").date()
+        today = datetime.date.today()
+        if date_obj < today:
+            return "Cannot get weather from past dates."
 
-def generate_travel_plan(weather_forecast: str, days_until_date: int, city: str) -> str:
-    """Generates a travel plan based on weather, days until travel, and city.
+        # Convert date to Unix timestamp for OpenWeatherMap API
+        dt = int(datetime.datetime.combine(date_obj, datetime.datetime.min.time()).timestamp())
 
-    Args:
-        weather_forecast: The weather forecast string.
-        days_until_date: The number of days until the travel date.
-        city: The name of the city.
+        # Get latitude and longitude of the city using geocoding API
+        geocoding_url = f"http://api.openweathermap.org/geo/1.0/direct?q={city}&limit=1&appid={api_key}"
+        geocoding_response = requests.get(geocoding_url)
+        geocoding_data = geocoding_response.json()
 
-    Returns:
-        A string containing the travel plan.
-    """
-    if "rain" in weather_forecast.lower():
-        return f"Since it will be rainy in {city}, pack an umbrella. You are travelling in {days_until_date} days."
-    elif "sunny" in weather_forecast.lower():
-        return f"Enjoy the sunshine in {city}! You are travelling in {days_until_date} days."
-    else:
-        return f"Travel plan for {city} in {days_until_date} days. Weather is {weather_forecast}."
+        if not geocoding_data:
+            return f"Could not find coordinates for {city}."
+
+        lat = geocoding_data[0]["lat"]
+        lon = geocoding_data[0]["lon"]
+
+        # Get weather data using One Call API day_summary endpoint
+        weather_url = f"https://api.openweathermap.org/data/3.0/onecall/day_summary?lat={lat}&lon={lon}&date={dt}&appid={api_key}"
+        weather_response = requests.get(weather_url)
+        weather_data = weather_response.json()
+
+        if "weather" in weather_data and weather_data["weather"]:
+            weather_description = weather_data["weather"][0]["description"]
+            temp_max = weather_data["temp"]["max"]
+            return f"{weather_description}, with a high of {temp_max} degrees Celsius."
+        elif "message" in weather_data:
+            return f"OpenWeatherMap API Error: {weather_data['message']}"
+        else:
+            return "Weather data not available for the specified date."
+
+    except requests.exceptions.RequestException as e:
+        return f"Error connecting to OpenWeatherMap API: {e}"
+    except ValueError:
+        return "Invalid date format. Please use YYYY-MM-DD."
+    except KeyError:
+        return "Weather data not available or API key is invalid"
 
 
 @tool