modified WCC and WDC functions

api_playground.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 1,
    "id": "b7d2515e",
    "metadata": {},
    "outputs": [
@@ -32,6 +32,178 @@
     "# FastF1"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "62bf0598",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "req         WARNING \tDEFAULT CACHE ENABLED! (941.49 MB) /home/arre/.cache/fastf1\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "    position positionText  points  wins        driverId  driverNumber  \\\n",
+      "0          1            1   186.0     5         piastri            81   \n",
+      "1          2            2   176.0     2          norris             4   \n",
+      "2          3            3   137.0     2  max_verstappen            33   \n",
+      "3          4            4   111.0     0         russell            63   \n",
+      "4          5            5    94.0     0         leclerc            16   \n",
+      "5          6            6    71.0     0        hamilton            44   \n",
+      "6          7            7    48.0     0       antonelli            12   \n",
+      "7          8            8    42.0     0           albon            23   \n",
+      "8          9            9    21.0     0          hadjar             6   \n",
+      "9         10           10    20.0     0            ocon            31   \n",
+      "10        11           11    16.0     0      hulkenberg            27   \n",
+      "11        12           12    14.0     0          stroll            18   \n",
+      "12        13           13    12.0     0           sainz            55   \n",
+      "13        14           14    11.0     0           gasly            10   \n",
+      "14        15           15    10.0     0         tsunoda            22   \n",
+      "15        16           16     6.0     0         bearman            87   \n",
+      "16        17           17     4.0     0          lawson            30   \n",
+      "17        18           18     2.0     0          alonso            14   \n",
+      "18        19           19     0.0     0       bortoleto             5   \n",
+      "19        20           20     0.0     0          doohan             7   \n",
+      "20        21           21     0.0     0       colapinto            43   \n",
+      "\n",
+      "   driverCode                                          driverUrl    givenName  \\\n",
+      "0         PIA         http://en.wikipedia.org/wiki/Oscar_Piastri        Oscar   \n",
+      "1         NOR          http://en.wikipedia.org/wiki/Lando_Norris        Lando   \n",
+      "2         VER        http://en.wikipedia.org/wiki/Max_Verstappen          Max   \n",
+      "3         RUS  http://en.wikipedia.org/wiki/George_Russell_(r...       George   \n",
+      "4         LEC       http://en.wikipedia.org/wiki/Charles_Leclerc      Charles   \n",
+      "5         HAM        http://en.wikipedia.org/wiki/Lewis_Hamilton        Lewis   \n",
+      "6         ANT  https://en.wikipedia.org/wiki/Andrea_Kimi_Anto...  Andrea Kimi   \n",
+      "7         ALB       http://en.wikipedia.org/wiki/Alexander_Albon    Alexander   \n",
+      "8         HAD         https://en.wikipedia.org/wiki/Isack_Hadjar        Isack   \n",
+      "9         OCO          http://en.wikipedia.org/wiki/Esteban_Ocon      Esteban   \n",
+      "10        HUL  http://en.wikipedia.org/wiki/Nico_H%C3%BClkenberg         Nico   \n",
+      "11        STR          http://en.wikipedia.org/wiki/Lance_Stroll        Lance   \n",
+      "12        SAI      http://en.wikipedia.org/wiki/Carlos_Sainz_Jr.       Carlos   \n",
+      "13        GAS          http://en.wikipedia.org/wiki/Pierre_Gasly       Pierre   \n",
+      "14        TSU          http://en.wikipedia.org/wiki/Yuki_Tsunoda         Yuki   \n",
+      "15        BEA        http://en.wikipedia.org/wiki/Oliver_Bearman       Oliver   \n",
+      "16        LAW           http://en.wikipedia.org/wiki/Liam_Lawson         Liam   \n",
+      "17        ALO       http://en.wikipedia.org/wiki/Fernando_Alonso     Fernando   \n",
+      "18        BOR    https://en.wikipedia.org/wiki/Gabriel_Bortoleto      Gabriel   \n",
+      "19        DOO           http://en.wikipedia.org/wiki/Jack_Doohan         Jack   \n",
+      "20        COL      http://en.wikipedia.org/wiki/Franco_Colapinto       Franco   \n",
+      "\n",
+      "    familyName dateOfBirth driverNationality  constructorIds  \\\n",
+      "0      Piastri  2001-04-06        Australian       [mclaren]   \n",
+      "1       Norris  1999-11-13           British       [mclaren]   \n",
+      "2   Verstappen  1997-09-30             Dutch      [red_bull]   \n",
+      "3      Russell  1998-02-15           British      [mercedes]   \n",
+      "4      Leclerc  1997-10-16        Monegasque       [ferrari]   \n",
+      "5     Hamilton  1985-01-07           British       [ferrari]   \n",
+      "6    Antonelli  2006-08-25           Italian      [mercedes]   \n",
+      "7        Albon  1996-03-23              Thai      [williams]   \n",
+      "8       Hadjar  2004-09-28            French            [rb]   \n",
+      "9         Ocon  1996-09-17            French          [haas]   \n",
+      "10  Hülkenberg  1987-08-19            German        [sauber]   \n",
+      "11      Stroll  1998-10-29          Canadian  [aston_martin]   \n",
+      "12       Sainz  1994-09-01           Spanish      [williams]   \n",
+      "13       Gasly  1996-02-07            French        [alpine]   \n",
+      "14     Tsunoda  2000-05-11          Japanese  [rb, red_bull]   \n",
+      "15     Bearman  2005-05-08           British          [haas]   \n",
+      "16      Lawson  2002-02-11     New Zealander  [red_bull, rb]   \n",
+      "17      Alonso  1981-07-29           Spanish  [aston_martin]   \n",
+      "18   Bortoleto  2004-10-14         Brazilian        [sauber]   \n",
+      "19      Doohan  2003-01-20        Australian        [alpine]   \n",
+      "20   Colapinto  2003-05-27         Argentine        [alpine]   \n",
+      "\n",
+      "                                      constructorUrls        constructorNames  \\\n",
+      "0              [http://en.wikipedia.org/wiki/McLaren]               [McLaren]   \n",
+      "1              [http://en.wikipedia.org/wiki/McLaren]               [McLaren]   \n",
+      "2      [http://en.wikipedia.org/wiki/Red_Bull_Racing]              [Red Bull]   \n",
+      "3   [http://en.wikipedia.org/wiki/Mercedes-Benz_in...              [Mercedes]   \n",
+      "4     [http://en.wikipedia.org/wiki/Scuderia_Ferrari]               [Ferrari]   \n",
+      "5     [http://en.wikipedia.org/wiki/Scuderia_Ferrari]               [Ferrari]   \n",
+      "6   [http://en.wikipedia.org/wiki/Mercedes-Benz_in...              [Mercedes]   \n",
+      "7   [http://en.wikipedia.org/wiki/Williams_Grand_P...              [Williams]   \n",
+      "8   [http://en.wikipedia.org/wiki/RB_Formula_One_T...            [RB F1 Team]   \n",
+      "9         [http://en.wikipedia.org/wiki/Haas_F1_Team]          [Haas F1 Team]   \n",
+      "10   [http://en.wikipedia.org/wiki/Sauber_Motorsport]                [Sauber]   \n",
+      "11  [http://en.wikipedia.org/wiki/Aston_Martin_in_...          [Aston Martin]   \n",
+      "12  [http://en.wikipedia.org/wiki/Williams_Grand_P...              [Williams]   \n",
+      "13      [http://en.wikipedia.org/wiki/Alpine_F1_Team]        [Alpine F1 Team]   \n",
+      "14  [http://en.wikipedia.org/wiki/RB_Formula_One_T...  [RB F1 Team, Red Bull]   \n",
+      "15        [http://en.wikipedia.org/wiki/Haas_F1_Team]          [Haas F1 Team]   \n",
+      "16  [http://en.wikipedia.org/wiki/Red_Bull_Racing,...  [Red Bull, RB F1 Team]   \n",
+      "17  [http://en.wikipedia.org/wiki/Aston_Martin_in_...          [Aston Martin]   \n",
+      "18   [http://en.wikipedia.org/wiki/Sauber_Motorsport]                [Sauber]   \n",
+      "19      [http://en.wikipedia.org/wiki/Alpine_F1_Team]        [Alpine F1 Team]   \n",
+      "20      [http://en.wikipedia.org/wiki/Alpine_F1_Team]        [Alpine F1 Team]   \n",
+      "\n",
+      "   constructorNationalities  \n",
+      "0                 [British]  \n",
+      "1                 [British]  \n",
+      "2                [Austrian]  \n",
+      "3                  [German]  \n",
+      "4                 [Italian]  \n",
+      "5                 [Italian]  \n",
+      "6                  [German]  \n",
+      "7                 [British]  \n",
+      "8                 [Italian]  \n",
+      "9                [American]  \n",
+      "10                  [Swiss]  \n",
+      "11                [British]  \n",
+      "12                [British]  \n",
+      "13                 [French]  \n",
+      "14      [Italian, Austrian]  \n",
+      "15               [American]  \n",
+      "16      [Austrian, Italian]  \n",
+      "17                [British]  \n",
+      "18                  [Swiss]  \n",
+      "19                 [French]  \n",
+      "20                 [French]  \n"
+     ]
+    }
+   ],
+   "source": [
+    "ergast = fastf1.ergast.Ergast()\n",
+    "driver_standings = ergast.get_driver_standings(2025).content[0]\n",
+    "print(driver_standings)\n",
+    "#driver_standing = driver_standings[[\"position\", \"points\", \"wins\", \"driverCode\"]].reset_index(drop=True)\n",
+    "#driver_standing = driver_standing[driver_standing[\"driverCode\"] == \"HAM\"]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "id": "bd15c64a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'Ferrari',\n",
+      " 'Force India',\n",
+      " 'Haas F1 Team',\n",
+      " 'McLaren',\n",
+      " 'Mercedes',\n",
+      " 'Red Bull',\n",
+      " 'Renault',\n",
+      " 'Sauber',\n",
+      " 'Toro Rosso',\n",
+      " 'Williams'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "ergast = fastf1.ergast.Ergast()\n",
+    "constructor_standings = ergast.get_constructor_standings(2018).content[0]\n",
+    "pprint(set(constructor_standings[\"constructorName\"]))\n",
+    "#constructor_standing = constructor_standings[[\"position\", \"points\", \"wins\", \"constructorName\"]].reset_index(drop=True)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 16,

fastf1_tools.py

@@ -19,7 +19,8 @@ from utils import parser_utils, track_utils
 from utils.constants import (
     AVAILABLE_SESSION_TYPES,
     DRIVER_DETAILS,
-    CONSTRUCTOR_DETAILS
+    CONSTRUCTOR_DETAILS,
+    CURRENT_YEAR
 )
 
 # Custom types
@@ -123,15 +124,15 @@ def driver_championship_standings(year: int, driver_name: str) -> str:
         str: Formatted string with driver's position, points, and wins
     """
 
-    with open("assets/driver_abbreviations.json") as f:
-        driver_abbreviations = json.load(f)
-        driver_abbreviation = driver_abbreviations[driver_name]
     ergast = fastf1.ergast.Ergast()
     driver_standings = ergast.get_driver_standings(year).content[0]
-    driver_standing = driver_standings[["position", "points", "wins", "driverCode"]].reset_index(drop=True)
-    driver_standing = driver_standing[driver_standing["driverCode"] == driver_abbreviation]
+    driver_standing = driver_standings[["position", "points", "wins", "givenName", "familyName"]].reset_index(drop=True)
+    driver_standing = driver_standing[(driver_standing["givenName"] + " " + driver_standing["familyName"]) == driver_name]
+    if driver_standing.empty:
+        return f"Could not find stats for {driver_name}"
     suffix = "st" if driver_standing['position'].iloc[0] == 1 else "nd" if driver_standing['position'].iloc[0] == 2 else "rd" if driver_standing['position'].iloc[0] == 3 else "th"
-    standings_string = f"{driver_name} is {driver_standing['position'].iloc[0]}{suffix} with {driver_standing['points'].iloc[0]} points and {driver_standing['wins'].iloc[0]} wins"
+    is_was = "is" if year == CURRENT_YEAR else "was"
+    standings_string = f"{driver_name} {is_was} {driver_standing['position'].iloc[0]}{suffix} with {driver_standing['points'].iloc[0]} points and {driver_standing['wins'].iloc[0]} wins"
     return standings_string
     
 def constructor_championship_standings(year: int, constructor_name: str) -> str:
@@ -145,26 +146,13 @@ def constructor_championship_standings(year: int, constructor_name: str) -> str:
         str: Formatted string with constructor's position, points, and wins
     """
 
-    team_mapping = {
-    "McLaren": "McLaren",
-    "Ferrari": "Ferrari",
-    "Red Bull Racing": "Red Bull",
-    "Mercedes": "Mercedes",
-    "Aston Martin": "Aston Martin",
-    "Alpine": "Alpine F1 Team",
-    "Haas": "Haas F1 Team",
-    "Racing Bulls": "RB F1 Team",
-    "Williams": "Williams",
-    "Kick Sauber": "Sauber"
-    }
-
     ergast = fastf1.ergast.Ergast()
     constructor_standings = ergast.get_constructor_standings(year).content[0]
     constructor_standing = constructor_standings[["position", "points", "wins", "constructorName"]].reset_index(drop=True)
-    mapped_name = team_mapping[constructor_name]
-    constructor_standing = constructor_standing[constructor_standing["constructorName"] == mapped_name]
+    constructor_standing = constructor_standing[constructor_standing["constructorName"] == constructor_name]
     suffix = "st" if constructor_standing['position'].iloc[0] == 1 else "nd" if constructor_standing['position'].iloc[0] == 2 else "rd" if constructor_standing['position'].iloc[0] == 3 else "th"
-    standings_string = f"{constructor_name} are {constructor_standing['position'].iloc[0]}{suffix} with {constructor_standing['points'].iloc[0]} points and {constructor_standing['wins'].iloc[0]} wins"
+    are_were = "are" if year == CURRENT_YEAR else "were"
+    standings_string = f"{constructor_name} {are_were} {constructor_standing['position'].iloc[0]}{suffix} with {constructor_standing['points'].iloc[0]} points and {constructor_standing['wins'].iloc[0]} wins"
     return standings_string
 
 def track_visualization(year: int, round: gp, visualization_type: str, driver_name: str) -> Image.Image: