error handling and location resolution

tools/weather.py

@@ -2,6 +2,7 @@ from smolagents.tools import Tool
 import requests
 from typing import Any, Optional
 import os  # Added for accessing environment variables
+import re
 
 class WeatherTool(Tool):
     """Tool for getting weather information for a location."""
@@ -26,22 +27,40 @@ class WeatherTool(Tool):
         Returns:
             A string with the current weather information.
         """
+        # Validate that location contains only allowed characters: letters, digits, spaces, and hyphens
+        if not re.fullmatch(r'[A-Za-z0-9\s-]+', location):
+            return "Error: Location contains invalid characters. Only letters, digits, spaces, and hyphens are allowed."
         try:
-            # Using OpenWeatherMap API with a free tier (limited requests)
-            api_key = os.getenv('OPENWEATHERMAP_API_KEY')  # OpenWeatherMap API key from env variable
-            url = f"http://api.openweathermap.org/data/2.5/weather?q={location}&appid={api_key}&units=metric"
-            
-            response = requests.get(url)
-            data = response.json()
-            
-            if response.status_code == 200:
-                temp = data["main"]["temp"]
-                weather = data["weather"][0]["description"]
-                humidity = data["main"]["humidity"]
-                wind_speed = data["wind"]["speed"]
-                return f"The current weather in {location} is {temp}°C with {weather}. Humidity: {humidity}%, Wind speed: {wind_speed} m/s."
+            # Get the API key from environment variables
+            api_key = os.getenv('OPENWEATHERMAP_API_KEY')
+            if not api_key:
+                return "Error: OPENWEATHERMAP_API_KEY not set in environment variables."
+
+            # First, geocode the location to get latitude and longitude
+            geo_url = f"http://api.openweathermap.org/geo/1.0/direct?q={location}&limit=1&appid={api_key}"
+            geo_response = requests.get(geo_url)
+            geo_data = geo_response.json()
+            if not geo_data:
+                return f"Error: Could not geocode location '{location}'."
+            lat = geo_data[0].get('lat')
+            lon = geo_data[0].get('lon')
+            if lat is None or lon is None:
+                return f"Error: Latitude or longitude not found for location '{location}'."
+
+            # Call the OpenWeatherMap One Call API 3.0 endpoint
+            weather_url = f"https://api.openweathermap.org/data/3.0/onecall?lat={lat}&lon={lon}&exclude=minutely,hourly,daily,alerts&appid={api_key}&units=metric"
+            weather_response = requests.get(weather_url)
+            weather_data = weather_response.json()
+
+            if weather_response.status_code == 200:
+                current = weather_data.get('current', {})
+                temp = current.get('temp', 'N/A')
+                weather_desc = current.get('weather', [{}])[0].get('description', 'N/A')
+                humidity = current.get('humidity', 'N/A')
+                wind_speed = current.get('wind_speed', 'N/A')
+                return f"The current weather in {location} is {temp}°C with {weather_desc}. Humidity: {humidity}%, Wind speed: {wind_speed} m/s."
             else:
-                return f"Error fetching weather for {location}: {data.get('message', 'Unknown error')}"
+                return f"Error fetching weather for {location}: {weather_data.get('message', 'Unknown error')}"
         except Exception as e:
             return f"Error fetching weather for {location}: {str(e)}"