Changes in simulator frontend and backend

README.md

@@ -1,6 +1,6 @@
 ---
 title: F1 Strategy Api
-emoji: 🐠
+emoji: 🏎️
 colorFrom: indigo
 colorTo: pink
 sdk: docker

src/api/simulator.py

@@ -1,14 +1,14 @@
 import pandas as pd
+import yaml
+import os
 from model_loader import model_loader # We import the loader instance
 
-# A simple mapping for default temperatures if the user doesn't provide them.
-DEFAULT_TRACK_TEMPS = {
-    "Silverstone": {"airtemp": 20.0, "tracktemp": 30.0},
-    "Monza": {"airtemp": 25.0, "tracktemp": 40.0},
-    "Bahrain": {"airtemp": 28.0, "tracktemp": 35.0},
-    "Spa-Francorchamps": {"airtemp": 18.0, "tracktemp": 25.0},
-    # Add other tracks as needed
-}
+# --- THE FIX ---
+# Load the track configuration from our new YAML file.
+# This is done once when the application starts.
+CONFIG_PATH = os.path.join(os.path.dirname(__file__), 'track_config.yaml')
+with open(CONFIG_PATH, 'r') as f:
+    TRACK_CONFIG = yaml.safe_load(f)
 
 class RaceSimulator:
     def __init__(self, model, preprocessor):
@@ -34,32 +34,39 @@ class RaceSimulator:
         """
         Runs a full race simulation based on a user-defined strategy.
         """
-        # --- 1. Extract and validate inputs (using lowercase) ---
+        # --- 1. Get track-specific defaults from our loaded config ---
+        track_name = strategy.get("track")
+        track_defaults = TRACK_CONFIG['tracks'].get(track_name, TRACK_CONFIG['default'])
+        
+        # --- 2. Extract and validate inputs, using defaults as fallbacks ---
         base_params = {
-            "track": strategy.get("track"),
+            "track": track_name,
             "driver": strategy.get("driver"),
             "year": 2025,
+            "airtemp": strategy.get("air_temp", track_defaults["air_temp"]),
+            "tracktemp": strategy.get("track_temp", track_defaults["track_temp"]),
         }
         
-        default_temps = DEFAULT_TRACK_TEMPS.get(base_params["track"], {"airtemp": 22.0, "tracktemp": 32.0})
-        base_params["airtemp"] = strategy.get("air_temp", default_temps["airtemp"])
-        base_params["tracktemp"] = strategy.get("track_temp", default_temps["tracktemp"])
-
+        pit_stop_time = track_defaults["pit_stop_time"]
         stints = strategy.get("stints", [])
         if not stints:
             raise ValueError("Strategy must include at least one stint.")
 
-        # --- 2. Run the lap-by-lap simulation ---
+        # --- 3. Run the lap-by-lap simulation ---
         lap_records = []
         total_laps = sum(stint['laps'] for stint in stints)
         current_lap_number = 1
+        total_race_time = 0.0
+
+        for i, stint_info in enumerate(stints):
+            # Add pit stop time for every stop after the first stint
+            if i > 0:
+                total_race_time += pit_stop_time
 
-        for stint_info in stints:
             compound = stint_info['compound']
             num_laps_in_stint = stint_info['laps']
             
             for tyre_lap in range(1, num_laps_in_stint + 1):
-                # Using lowercase keys to match the training data columns
                 lap_data = {
                     "tyrelife": float(tyre_lap),
                     "lapnumber": float(current_lap_number),
@@ -68,6 +75,7 @@ class RaceSimulator:
                 }
                 
                 predicted_time = self._predict_lap_time(lap_data)
+                total_race_time += predicted_time
                 
                 lap_records.append({
                     "Lap Number": current_lap_number,
@@ -77,7 +85,7 @@ class RaceSimulator:
                 })
                 current_lap_number += 1
 
-        # --- 3. Calculate summary statistics ---
+        # --- 4. Calculate summary statistics ---
         if not lap_records:
             return {"error": "Simulation produced no results."}
 
@@ -87,6 +95,7 @@ class RaceSimulator:
         
         summary = {
             "total_laps_simulated": total_laps,
+            "total_race_time": round(total_race_time, 3),
             "average_lap_time": round(results_df['LapTimeInSeconds'].mean(), 3),
             "best_lap": {
                 "lap_time": best_lap['LapTimeInSeconds'],
@@ -98,7 +107,7 @@ class RaceSimulator:
                 "lap_number": int(worst_lap['Lap Number']),
                 "compound": worst_lap['Compound'],
             },
-            "pit_stop_disclaimer": "Total race time does not include time lost during pit stops (typically +2.0-5.0s per stop)."
+            "pit_stop_info": f"Simulation includes {len(stints) - 1} pit stop(s), adding {pit_stop_time:.1f}s each."
         }
 
         return {

track-config.yaml

@@ -0,0 +1,179 @@
+# src/api/track_config.yaml
+# This file stores default simulation parameters for each F1 track for the 2025 season.
+
+# Default values used if a specific track is not found in the list below.
+default:
+  air_temp: 22.0
+  track_temp: 32.0
+  pit_stop_time: 23.0 # Average time lost in a standard pit stop
+  total_laps: 55
+
+# Track-specific overrides for the 2025 F1 Season
+tracks:
+  # 1. Australian Grand Prix
+  Melbourne:
+    air_temp: 20.0
+    track_temp: 35.0
+    pit_stop_time: 21.5
+    total_laps: 58
+
+  # 2. Chinese Grand Prix
+  Shanghai:
+    air_temp: 22.0
+    track_temp: 38.0
+    pit_stop_time: 23.5
+    total_laps: 56
+
+  # 3. Japanese Grand Prix
+  Suzuka:
+    air_temp: 18.0
+    track_temp: 28.0
+    pit_stop_time: 23.0
+    total_laps: 53
+
+  # 4. Bahrain Grand Prix
+  Bahrain:
+    air_temp: 28.0
+    track_temp: 35.0
+    pit_stop_time: 22.5
+    total_laps: 57
+
+  # 5. Saudi Arabian Grand Prix
+  Jeddah:
+    air_temp: 26.0
+    track_temp: 32.0
+    pit_stop_time: 21.0
+    total_laps: 50
+
+  # 6. Miami Grand Prix
+  Miami:
+    air_temp: 29.0
+    track_temp: 45.0
+    pit_stop_time: 22.0
+    total_laps: 57
+
+  # 7. Emilia Romagna Grand Prix
+  Imola:
+    air_temp: 20.0
+    track_temp: 40.0
+    pit_stop_time: 28.0 # Very long pit lane
+    total_laps: 63
+
+  # 8. Monaco Grand Prix
+  Monaco:
+    air_temp: 24.0
+    track_temp: 45.0
+    pit_stop_time: 20.5 # Very short pit lane
+    total_laps: 78
+
+  # 9. Spanish Grand Prix
+  "Circuit de Barcelona-Catalunya":
+    air_temp: 26.0
+    track_temp: 44.0
+    pit_stop_time: 22.2
+    total_laps: 66
+
+  # 10. Canadian Grand Prix
+  Montreal:
+    air_temp: 19.0
+    track_temp: 33.0
+    pit_stop_time: 18.5 # Short pit lane
+    total_laps: 70
+
+  # 11. Austrian Grand Prix
+  Spielberg:
+    air_temp: 22.0
+    track_temp: 42.0
+    pit_stop_time: 19.5 # Short pit lane
+    total_laps: 71
+
+  # 12. British Grand Prix
+  Silverstone:
+    air_temp: 20.0
+    track_temp: 30.0
+    pit_stop_time: 24.5 # Long pit lane
+    total_laps: 52
+
+  # 13. Belgian Grand Prix
+  "Spa-Francorchamps":
+    air_temp: 18.0
+    track_temp: 25.0
+    pit_stop_time: 21.5
+    total_laps: 44
+
+  # 14. Hungarian Grand Prix
+  Budapest:
+    air_temp: 28.0
+    track_temp: 50.0
+    pit_stop_time: 20.0
+    total_laps: 70
+
+  # 15. Dutch Grand Prix
+  Zandvoort:
+    air_temp: 20.0
+    track_temp: 35.0
+    pit_stop_time: 21.0
+    total_laps: 72
+
+  # 16. Italian Grand Prix
+  Monza:
+    air_temp: 25.0
+    track_temp: 40.0
+    pit_stop_time: 24.0
+    total_laps: 53
+
+  # 17. Azerbaijan Grand Prix
+  Baku:
+    air_temp: 24.0
+    track_temp: 48.0
+    pit_stop_time: 22.0
+    total_laps: 51
+
+  # 18. Singapore Grand Prix
+  Singapore:
+    air_temp: 29.0
+    track_temp: 36.0
+    pit_stop_time: 25.0 # Long pit lane
+    total_laps: 62
+
+  # 19. United States Grand Prix
+  Austin:
+    air_temp: 27.0
+    track_temp: 38.0
+    pit_stop_time: 21.8
+    total_laps: 56
+
+  # 20. Mexican Grand Prix
+  "Mexico City":
+    air_temp: 22.0
+    track_temp: 46.0
+    pit_stop_time: 20.0
+    total_laps: 71
+
+  # 21. Brazilian Grand Prix
+  "Sao Paulo":
+    air_temp: 21.0
+    track_temp: 40.0
+    pit_stop_time: 21.2
+    total_laps: 71
+
+  # 22. Las Vegas Grand Prix
+  "Las Vegas":
+    air_temp: 15.0
+    track_temp: 18.0
+    pit_stop_time: 22.5
+    total_laps: 50
+
+  # 23. Qatar Grand Prix
+  Lusail:
+    air_temp: 30.0
+    track_temp: 36.0
+    pit_stop_time: 20.5
+    total_laps: 57
+
+  # 24. Abu Dhabi Grand Prix
+  "Yas Marina":
+    air_temp: 28.0
+    track_temp: 34.0
+    pit_stop_time: 22.8
+    total_laps: 58