Upload tool

requirements.txt

@@ -1,3 +1,2 @@
 geopy
-osmnx
 smolagents

tool.py

@@ -3,12 +3,12 @@ from typing import Any, Optional
 
 class SimpleTool(Tool):
     name = "calculate_journey_metrics"
-    description = "Calculates comprehensive journey metrics including distance and time using OpenStreetMap."
+    description = "Calculates journey metrics including distance and time."
     inputs = {"start_location":{"type":"string","description":"The starting point of the journey."},"destination_location":{"type":"string","description":"The endpoint of the journey."},"transportation_mode":{"type":"string","nullable":True,"description":"Mode of transport ('driving', 'walking', 'bicycling', or 'transit'). Defaults to 'driving'."}}
     output_type = "string"
 
     def forward(self, start_location: str, destination_location: str, transportation_mode: Optional[str] = None) -> str:
-        """Calculates comprehensive journey metrics including distance and time using OpenStreetMap.
+        """Calculates journey metrics including distance and time.
 
         Args:
             start_location: The starting point of the journey.
@@ -17,25 +17,34 @@ class SimpleTool(Tool):
                                Defaults to 'driving'.
 
         Returns:
-            str: A detailed description of the journey including distance and time.
+            str: Journey distance and estimated time.
         """
-        import osmnx as ox
+        from geopy.geocoders import Nominatim
         from geopy.distance import geodesic
 
         try:
+            # Initialize geocoder
+            geolocator = Nominatim(user_agent="journey_metrics_calculator")
+
             # Get coordinates
-            start_coords = ox.geocode(start_location)
-            end_coords = ox.geocode(destination_location)
+            start = geolocator.geocode(start_location)
+            end = geolocator.geocode(destination_location)
+
+            if not start or not end:
+                return "Could not find one or both locations"
 
-            # Calculate straight-line distance
-            distance_km = geodesic(start_coords, end_coords).kilometers
+            # Calculate distance
+            distance_km = geodesic(
+                (start.latitude, start.longitude),
+                (end.latitude, end.longitude)
+            ).kilometers
 
             # Define speeds (km/h)
             speeds = {
                 'driving': 60,
                 'walking': 5,
                 'bicycling': 15,
-                'transit': 25
+                'transit': 30
             }
 
             # Get speed for mode
@@ -43,11 +52,10 @@ class SimpleTool(Tool):
 
             # Calculate time
             hours = distance_km / speed
-            minutes = hours * 60
 
-            # Format response based on time
-            if minutes < 60:
-                time_str = f"{int(minutes)} minutes"
+            # Format time string
+            if hours < 1:
+                time_str = f"{int(hours * 60)} minutes"
             elif hours < 24:
                 hrs = int(hours)
                 mins = int((hours - hrs) * 60)
@@ -56,14 +64,11 @@ class SimpleTool(Tool):
                 days = hours / 24
                 time_str = f"{days:.1f} days"
 
-            response = (
+            return (
                 f"Journey metrics:\n"
                 f"Distance: {distance_km:.1f} kilometers\n"
-                f"Estimated time: {time_str}\n"
-                f"Mode: {transportation_mode or 'driving'}"
+                f"Estimated time by {transportation_mode or 'driving'}: {time_str}"
             )
 
-            return response
-
         except Exception as e:
             return f"Error calculating journey metrics: {str(e)}"