Upload tool

app.py

@@ -1,34 +1,6 @@
+from smolagents import launch_gradio_demo
+from tool import SimpleTool
 
-import gradio as gr
-from smolagents import load_tool
+tool = SimpleTool()
 
-# Load the tool
-journey_tool = load_tool("MHamdan/journey-metrics-tool", trust_remote_code=True)
-
-def create_interface():
-    return gr.Interface(
-        fn=journey_tool,
-        inputs=[
-            gr.Textbox(label="Start Location", placeholder="Enter starting point"),
-            gr.Textbox(label="Destination Location", placeholder="Enter destination"),
-            gr.Dropdown(
-                choices=["driving", "walking", "bicycling", "transit", "plane"],
-                label="Transportation Mode",
-                value="driving"
-            )
-        ],
-        outputs=gr.Textbox(label="Journey Details"),
-        title="Journey Metrics Calculator",
-        description="Calculate travel distance and time between two locations.",
-        examples=[
-            ["Montreal", "Toronto", "plane"],
-            ["Vancouver", "Whistler", "driving"],
-            ["Ottawa", "Kingston", "bicycling"],
-            ["New York", "Los Angeles", "plane"],
-            ["London", "Paris", "train"]
-        ]
-    )
-
-# Create and launch the interface
-iface = create_interface()
-iface.launch()
+launch_gradio_demo(tool)

requirements.txt

@@ -1,4 +1,2 @@
-
-gradio>=4.0.0
-geopy>=2.3.0
+geopy
 smolagents

tool.py

@@ -21,71 +21,86 @@ class SimpleTool(Tool):
         """
         from geopy.geocoders import Nominatim
         from geopy.distance import geodesic
+        import time
 
         try:
-            geolocator = Nominatim(user_agent="journey_metrics_calculator")
+            # Initialize geocoder with increased timeout
+            geolocator = Nominatim(user_agent="journey_metrics_calculator", timeout=10)
+
+            # Add delay between requests to avoid rate limiting
+            time.sleep(1)
             start = geolocator.geocode(start_location)
+            time.sleep(1)
             end = geolocator.geocode(destination_location)
 
             if not start or not end:
-                return "Could not find one or both locations"
+                return "Could not find one or both locations. Please check spelling and try again."
 
+            # Calculate distance
             distance_km = geodesic(
                 (start.latitude, start.longitude),
                 (end.latitude, end.longitude)
             ).kilometers
 
+            # Define speeds (km/h) with more realistic values
             speeds = {
-                'driving': {'urban': 30, 'highway': 100, 'average': 80},
+                'driving': {'urban': 50, 'highway': 100, 'average': 80},
                 'walking': {'average': 5},
-                'bicycling': {'casual': 12, 'average': 20},
+                'bicycling': {'casual': 15, 'average': 20},
                 'transit': {'urban': 30, 'intercity': 60},
                 'plane': {
-                    'short_haul': 500,
-                    'medium_haul': 700,
-                    'long_haul': 800
+                    'short_haul': 500,  # <500km
+                    'medium_haul': 700, # 500-3000km
+                    'long_haul': 850    # >3000km
                 }
             }
 
+            # Calculate time based on mode and distance
             if transportation_mode == 'plane':
+                # Select appropriate plane speed based on distance
                 if distance_km < 500:
                     speed = speeds['plane']['short_haul']
                 elif distance_km < 3000:
                     speed = speeds['plane']['medium_haul']
                 else:
                     speed = speeds['plane']['long_haul']
-                additional_time = 2
+
+                # Calculate flight time
+                flight_hours = distance_km / speed
+
+                # Add airport procedures time (2 hours total)
+                total_hours = flight_hours + 2
+
+                # Format the response for plane travel
+                flight_minutes = int(flight_hours * 60)
+                total_hrs = int(total_hours)
+                total_mins = int((total_hours - total_hrs) * 60)
+
+                return (
+                    f"Journey metrics:\n"
+                    f"Distance: {distance_km:.1f} kilometers\n"
+                    f"Flight time: {flight_minutes} minutes\n"
+                    f"Total estimated time (including airport procedures): "
+                    f"{total_hrs} hours and {total_mins} minutes"
+                )
             else:
+                # Get speed for other modes
                 mode = transportation_mode or 'driving'
-                speed = speeds.get(mode, speeds['driving'])['average']
-                additional_time = 0
-
-            travel_time = distance_km / speed
-            total_hours = travel_time + additional_time
-
-            if total_hours < 1:
-                time_str = f"{int(total_hours * 60)} minutes"
-            elif total_hours < 24:
-                hrs = int(total_hours)
-                mins = int((total_hours - hrs) * 60)
-                time_str = f"{hrs} hours and {mins} minutes"
-            else:
-                days = total_hours / 24
-                time_str = f"{days:.1f} days"
+                if mode not in speeds:
+                    return f"Unsupported transportation mode: {mode}"
+
+                speed = speeds[mode]['average']
+                hours = distance_km / speed
+
+                # Format time string
+                hrs = int(hours)
+                mins = int((hours - hrs) * 60)
 
-            if transportation_mode == 'plane':
                 return (
                     f"Journey metrics:\n"
                     f"Distance: {distance_km:.1f} kilometers\n"
-                    f"Flight time: {int(travel_time * 60)} minutes\n"
-                    f"Total estimated time (including airport procedures): {time_str}"
+                    f"Estimated time by {mode}: {hrs} hours and {mins} minutes"
                 )
 
-            return (
-                f"Journey metrics:\n"
-                f"Distance: {distance_km:.1f} kilometers\n"
-                f"Estimated time by {transportation_mode or 'driving'}: {time_str}"
-            )
-
         except Exception as e:
-            return f"Error calculating journey metrics: {str(e)}"
+            return f"Error calculating journey metrics: Please try again with more specific location names. Error: {str(e)}"