Upload tool

requirements.txt

@@ -1,2 +1,2 @@
-smolagents
 requests
+smolagents

tool.py

@@ -1,6 +1,9 @@
 from typing import Any, Optional
 from smolagents.tools import Tool
+import json
+import typing
 import requests
+import logging
 
 class UserLocationTool(Tool):
     name = "get_user_location"
@@ -9,16 +12,88 @@ class UserLocationTool(Tool):
     output_type = "string"
 
     def __init__(self):
+        # Calls the constructor of the parent class `Tool`
         super().__init__()
         self.dependencies = ["requests"]
 
+    def _validate_location_data(self, data: dict) -> str | None:
+        """Validates the location data and returns error message if invalid."""
+        # Import inside method as per SmolAgents requirements
+        from typing import Optional
+
+        required_fields = ['city', 'region', 'country']
+
+        if not isinstance(data, dict):
+            return f"Expected dictionary data, got {type(data)}"
+
+        missing_fields = [field for field in required_fields if field not in data]
+        if missing_fields:
+            return f"Missing required location fields: {', '.join(missing_fields)}"
+
+        empty_fields = [field for field in required_fields if not data.get(field)]
+        if empty_fields:
+            return f"Empty values for fields: {', '.join(empty_fields)}"
+
+        return None
+
     def forward(self) -> str:
-        # Import requests inside the function as per requirements
+        # Import inside method as per SmolAgents requirements
         import requests
+        import json
+        import logging
+
+        logger = logging.getLogger(__name__)
+        logger.setLevel(logging.INFO)
 
         try:
-            response = requests.get("https://ipinfo.io/")
-            data = response.json()
-            return data["city"]
+            logger.info("Initiating request to ipinfo.io")
+            response = requests.get("https://ipinfo.io/", timeout=5)
+
+            # Handle rate limiting
+            if response.status_code == 429:
+                error_msg = "Rate limit exceeded for IP geolocation service"
+                logger.error(error_msg)
+                return f"Error getting user location: {error_msg}. Please try again later."
+
+            # Handle other HTTP errors
+            if response.status_code != 200:
+                error_msg = f"HTTP {response.status_code}: {response.reason}"
+                logger.error(f"ipinfo.io request failed: {error_msg}")
+                return f"Error getting user location: Server returned {error_msg}"
+
+            try:
+                data = response.json()
+            except json.JSONDecodeError as e:
+                error_msg = f"Invalid JSON response: {str(e)}"
+                logger.error(error_msg)
+                return f"Error getting user location: {error_msg}"
+
+            # Validate the response data
+            validation_error = self._validate_location_data(data)
+            if validation_error:
+                logger.error(f"Data validation failed: {validation_error}")
+                return f"Error getting user location: {validation_error}"
+
+            location = f"According to your IP address, the user's location is {data['city']}, {data['region']}, {data['country']}."
+            logger.info(f"Successfully retrieved location: {location}")
+            return location
+
+        except requests.exceptions.Timeout:
+            error_msg = "Request timed out after 5 seconds"
+            logger.error(error_msg)
+            return f"Error getting user location: {error_msg}. Please try again."
+
+        except requests.exceptions.ConnectionError as e:
+            error_msg = f"Connection failed: {str(e)}"
+            logger.error(error_msg)
+            return f"Error getting user location: Unable to connect to location service. Please check your internet connection."
+
+        except requests.exceptions.RequestException as e:
+            error_msg = f"Network error: {str(e)}"
+            logger.error(error_msg)
+            return f"Error getting user location: {error_msg}"
+
         except Exception as e:
-            return f"Error getting user location: {str(e)}. It looks like https://ipinfo.io/ did not return a valid response."
+            error_msg = f"Unexpected error: {str(e)}"
+            logger.error(error_msg)
+            return f"Error getting user location: An unexpected error occurred. Please try again later."