Skip to content

Commit

Permalink
Bring in Ergast drivers in races only
Browse files Browse the repository at this point in the history
Fixes #680
  • Loading branch information
Casper-Guo committed Mar 4, 2025
1 parent f3906e1 commit 1873392
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 12 deletions.
27 changes: 15 additions & 12 deletions fastf1/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,7 @@ def _load_drivers_results(self, *, livedata=None):
driver_info_f1 = None
driver_info_ergast = None

info_cols = ('Abbreviation', 'FirstName', 'LastName', 'TeamName',
shared_cols = ('Abbreviation', 'FirstName', 'LastName', 'TeamName',
'FullName', 'DriverNumber')

# try loading from both sources if they are supported
Expand Down Expand Up @@ -2223,23 +2223,26 @@ def _load_drivers_results(self, *, livedata=None):

# F1 and Ergast data
else:
missing_drivers = list(set(driver_info_ergast['DriverNumber'])
.difference(driver_info_f1['DriverNumber']))
# drivers are missing if DNSed (did not start)
# in that case, pull more information from Ergast for these drivers

join_cols \
= list(set(driver_info_ergast.columns).difference(info_cols))
= list(set(driver_info_ergast.columns).difference(shared_cols))

self._results = SessionResults(
driver_info_f1.join(driver_info_ergast.loc[:, join_cols],
how='outer'),
driver_info_f1.join(
driver_info_ergast.loc[:, join_cols],
# Ergast provide the driver list for the race
# this may not be accurate for another session
how='outer' if self.name == "Race" else "left"
),
_force_default_cols=True
)

if missing_drivers:
self._results.loc[missing_drivers, info_cols] \
= driver_info_ergast.loc[missing_drivers, info_cols]
if self.name == "Race":
# drivers are missing if DNSed (did not start)
# fill in their information using Ergast
missing_drivers = list(set(driver_info_ergast['DriverNumber'])
.difference(driver_info_f1['DriverNumber']))
self._results.loc[missing_drivers, shared_cols] \
= driver_info_ergast.loc[missing_drivers, shared_cols]

# set (Grid)Position to NaN instead of default last or zero to
# make the DNS more obvious
Expand Down
22 changes: 22 additions & 0 deletions fastf1/tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,25 @@ def test_tyre_data_parsing():

compare = ver[['Stint', 'Compound', 'FreshTyre', 'TyreLife']]
assert compare.equals(ref)


def test_session_results_drivers():
# Sainz (55) is replaced by Bearman (38) after FP2
session = fastf1.get_session(2024, "Saudi Arabia", 2)
session.load(laps=False, telemetry=False, weather=False)
drivers = session.results.index
assert "55" in drivers
assert "38" not in drivers

session = fastf1.get_session(2024, "Saudi Arabia", 3)
session.load(laps=False, telemetry=False, weather=False)
drivers = session.results.index
assert "38" in drivers
assert "55" not in drivers

# Mick Schumacher (47) is not officially classified
# and does not appear in the F1 API response
session = fastf1.get_session(2022, "Saudi Arabia", "R")
session.load(laps=False, telemetry=False, weather=False)
drivers = session.results.index
assert "47" in drivers
8 changes: 8 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import fastf1


# Load session data
session = fastf1.get_session(2022, "Saudi Arabia", "R")
session.load(laps=False, telemetry=False)

print(session.results)

0 comments on commit 1873392

Please sign in to comment.