Upload tool

tool.py

@@ -4,7 +4,7 @@ from typing import Any, Optional
 class SimpleTool(Tool):
     name = "calculate_journey_metrics"
     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'."}}
+    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', 'transit', or 'plane'). Defaults to 'driving'."}}
     output_type = "string"
 
     def forward(self, start_location: str, destination_location: str, transportation_mode: Optional[str] = None) -> str:
@@ -13,7 +13,7 @@ class SimpleTool(Tool):
         Args:
             start_location: The starting point of the journey.
             destination_location: The endpoint of the journey.
-            transportation_mode: Mode of transport ('driving', 'walking', 'bicycling', or 'transit'). 
+            transportation_mode: Mode of transport ('driving', 'walking', 'bicycling', 'transit', or 'plane'). 
                                Defaults to 'driving'.
 
         Returns:
@@ -39,31 +39,60 @@ class SimpleTool(Tool):
                 (end.latitude, end.longitude)
             ).kilometers
 
-            # Define speeds (km/h)
+            # Define speeds (km/h) with more realistic values
             speeds = {
-                'driving': 60,
-                'walking': 5,
-                'bicycling': 15,
-                'transit': 30
+                'driving': {'urban': 30, 'highway': 100, 'average': 80},
+                'walking': {'average': 5},
+                'bicycling': {'casual': 12, 'average': 20},
+                'transit': {'urban': 30, 'intercity': 60},
+                'plane': {
+                    'short_haul': 500,  # Including taxiing, takeoff, landing
+                    'medium_haul': 700,
+                    'long_haul': 800
+                }
             }
 
-            # Get speed for mode
-            speed = speeds.get(transportation_mode, speeds['driving'])
+            # Get appropriate speed based on distance and mode
+            if transportation_mode == 'plane':
+                if distance_km < 500:
+                    speed = speeds['plane']['short_haul']
+                elif distance_km < 3000:
+                    speed = speeds['plane']['medium_haul']
+                else:
+                    speed = speeds['plane']['long_haul']
+
+                # Add airport procedures time (hours)
+                additional_time = 2  # 2 hours for airport procedures
+            else:
+                # Default to driving if mode not specified
+                mode = transportation_mode or 'driving'
+                speed = speeds.get(mode, speeds['driving'])['average']
+                additional_time = 0
 
             # Calculate time
-            hours = distance_km / speed
+            travel_time = distance_km / speed
+            total_hours = travel_time + additional_time
 
             # Format time string
-            if hours < 1:
-                time_str = f"{int(hours * 60)} minutes"
-            elif hours < 24:
-                hrs = int(hours)
-                mins = int((hours - hrs) * 60)
+            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 = hours / 24
+                days = total_hours / 24
                 time_str = f"{days:.1f} days"
 
+            # Additional information for plane travel
+            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}"
+                )
+
             return (
                 f"Journey metrics:\n"
                 f"Distance: {distance_km:.1f} kilometers\n"