Fix weather tool implementation and improve API response handling

app.py

@@ -9,15 +9,17 @@ import os  # Added for accessing environment variables
 from typing import Any, Optional
 import re
 
-@tool
+@tool("get_weather")  # Add the tool name explicitly
 def get_weather(location: str) -> str:
     """Get the current weather for a specified location.
     Args:
         location: A string representing a city (e.g., 'New York', 'Paris').
+    Returns:
+        str: A string containing 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. I cannot disambiguate between cities with the same name."
+        return "Error: Location contains invalid characters. Only letters, digits, spaces, and hyphens are allowed."
     try:
         # Get the API key from environment variables
         api_key = os.getenv('OPENWEATHERMAP_API_KEY')
@@ -41,17 +43,17 @@ def get_weather(location: str) -> str:
         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."
+            temp = weather_data.get('main', {}).get('temp', 'N/A')
+            weather_desc = weather_data.get('weather', [{}])[0].get('description', 'N/A')
+            humidity = weather_data.get('main', {}).get('humidity', 'N/A')
+            wind_speed = weather_data.get('wind', {}).get('speed', 'N/A')
+            return f"The current weather in {location} is {temp}°F with {weather_desc}. Humidity: {humidity}%, Wind speed: {wind_speed} mph."
         else:
             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)}" 
+        return f"Error fetching weather for {location}: {str(e)}"
 
+# Initialize tools
 final_answer = FinalAnswerTool()
 duck_duck_go_search = DuckDuckGoSearchTool()
 
@@ -75,9 +77,9 @@ with open("prompts.yaml", 'r') as stream:
 agent = CodeAgent(
     model=model,
     tools=[
+        get_weather,  # Pass the function directly, not an instance
         final_answer,
         duck_duck_go_search,
-        get_weather
     ],
     max_steps=6,
     verbosity_level=1,