Update tools/weather.py

tools/weather.py

@@ -21,15 +21,14 @@ class WeatherForecast(Tool):
         return "## Search Results\n\n" + "\n\n".join(postprocessed_results)
 
 
-    def get_weather_forecast(self, city_name: str) -> str:
-        """A tool that fetches the current weather/temperature of a specified city.
-        Args:
-            city_name: A string representing a valid city (e.g., 'Bangalore').
-        """
-
-        latitude, longitude = self.get_coordinates(city_name)
-        
-        base_url = "https://api.open-meteo.com/v1/forecast"  # No API key needed for this version
+    def get_weather_forecast(self, city: str) -> str:
+        latitude, longitude = self.get_coordinates(city)
+    
+        if latitude is None or longitude is None:
+            print(f"Could not get coordinates for {city}.  Cannot retrieve weather forecast.")
+            return None  # Or raise an exception if you prefer
+    
+        base_url = "https://api.open-meteo.com/v1/forecast"
         params = {
             "latitude": latitude,
             "longitude": longitude,
@@ -38,54 +37,70 @@ class WeatherForecast(Tool):
             "forecast_days": 7,
             "timezone": "auto"
         }
-
+    
         try:
-            response = requests.get(base_url, params=params) # No headers needed
-            response.raise_for_status()
-            weatherJSON = response.json()
-            cityName = weatherJSON.get('location').get('name')
-            cityTemp = weatherJSON.get('hourly').get('temperature_2m')
-            averageTemp = round(mean(cityTemp), 1)
-            hourlyunits = weatherJSON.get('hourly_units').get('temperature_2m')
+            response = requests.get(base_url, params=params)
+            response.raise_for_status() # Raise an exception for bad status codes
+            weather_data = response.json()
             return weather_data
-            return f"The current Temperature in {cityName} is {averageTemp}{hourlyunits}!"
+    
         except requests.exceptions.RequestException as e:
-            print(f"Error fetching weather data: {e}")
-            return None
-        except json.JSONDecodeError as e:
-            print(f"Error decoding JSON response: {e}")
+            print(f"Error getting weather forecast: {e}")
             return None
+    
+    # def get_weather_forecast(self, city_name: str) -> str:
+    #     """A tool that fetches the current weather/temperature of a specified city.
+    #     Args:
+    #         city_name: A string representing a valid city (e.g., 'Bangalore').
+    #     """
 
-    def get_coordinates(self, city_name: str) -> [float, float]:
-        """Gets coordinates using OpenStreetMap's Nominatim (no API key, but with limitations)."""
+    #     latitude, longitude = self.get_coordinates(city)
+    #     base_url = "https://api.open-meteo.com/v1/forecast"  # No API key needed for this version
+    #     params = {
+    #         "latitude": latitude,
+    #         "longitude": longitude,
+    #         "hourly": "temperature_2m,precipitation,wind_speed",
+    #         "daily": "temperature_2m_max,temperature_2m_min,precipitation_sum",
+    #         "forecast_days": 7,
+    #         "timezone": "auto"
+    #     }
 
-        # This approach is less reliable and might have rate limits.
-        # It's suitable for basic use cases but not for production.
+    #     try:
+    #         response = requests.get(base_url, params=params) # No headers needed
+    #         response.raise_for_status()
+    #         weatherJSON = response.json()
+    #         cityName = weatherJSON.get('location').get('name')
+    #         cityTemp = weatherJSON.get('hourly').get('temperature_2m')
+    #         averageTemp = round(mean(cityTemp), 1)
+    #         hourlyunits = weatherJSON.get('hourly_units').get('temperature_2m')
+    #         return f"The current Temperature in {cityName} is {averageTemp}{hourlyunits}!"
+    #     except requests.exceptions.RequestException as e:
+    #         print(f"Error fetching weather data: {e}")
+    #         return None
+    #     except json.JSONDecodeError as e:
+    #         print(f"Error decoding JSON response: {e}")
+    #         return None
+
+    def get_coordinates(self, city_name: str) -> [float, float]: 
         headers = {
-            'User-Agent': 'MyGeocodingApp/1.0 (youremail@example.com)'
+            'User-Agent': 'MyGeocodingApp/1.0 (youremail@example.com)'  # Replace with your actual email
         }
-
         city_name = city_name.replace(" ", "+")
         base_url = "https://nominatim.openstreetmap.org/search"
         full_url = f"{base_url}?q={requests.utils.quote(city_name)}&format=json&limit=5"
-
+    
         try:
-            response = requests.get(geocoding_url, headers=headers)
-            response.raise_for_status()
-            geocoding_data = response.json()
-            print(geocoding_data)
-            if geocoding_data:  # Check if any results were found
-                latitude = float(geocoding_data[0]["lat"])
-                longitude = float(geocoding_data[0]["lon"])
+            response = requests.get(full_url, headers=headers)
+            response.raise_for_status()  # Raise an exception for bad status codes (4xx or 5xx)
+            data = response.json()
+    
+            if data:  # Check if the response contains any results
+                latitude = data[0]['lat']
+                longitude = data[0]['lon']
                 return latitude, longitude
             else:
-                print(f"Could not find coordinates for {city_name}")
-                return None, None
-
+                return None, None  # Return None if no results are found
+    
         except requests.exceptions.RequestException as e:
             print(f"Error during geocoding: {e}")
             return None, None
-        except (KeyError, IndexError, ValueError) as e:  # Handle more potential errors
-            print(f"Error parsing geocoding response: {e}")
-            return None, None
-