driver module only contains dicts

app.py

@@ -1,13 +1,11 @@
 import os
-from shiny import module, App, ui, render, reactive
+from shiny import App, ui, render, reactive
 import fastf1 as ff1
 import matplotlib.pyplot as plt
 from matplotlib.collections import LineCollection
 from matplotlib import cm
 import numpy as np
 import shinyswatch
-from modules import plot
-from modules import test_module
 from modules import drivers
 
 # Define cache folder path
@@ -20,24 +18,9 @@ ff1.Cache.enable_cache(cache_path)
 ff1.Cache.offline_mode(enabled=True)
 
 # Define drivers
-drivers_2023 = {'Fastest driver': 'Fastest driver', 'VER': 'Max Verstappen', 
-                'NOR': 'Lando Norris', 'GAS': 'Pierre Gasly', 'PER': 'Sergio Perez', 
-                'ALO': 'Fernando Alonso', 'LEC': 'Charles Leclerc', 'STR': 'Lance Stroll', 
-                'MAG': 'Kevin Magnussen', 'TSU': 'Yuki Tsunoda', 'ALB': 'Alexander Albon',
-                'ZHO': 'Guanyu Zhou', 'HUL': 'Nico Hülkenberg', 'OCO': 'Esteban Ocon',
-                'HAM': 'Lewis Hamilton', 'SAI': 'Carlos Sainz', 'RUS': 'George Russel',
-                'BOT': 'Valteri Bottas', 'PIA': 'Oscar Piastri', 'VRI': 'Nyck de Vries',
-                'SAR': 'Logan Sargeant', 'RIC': 'Daniel Ricciardo'}
-
-drivers_2022 = {'Fastest driver': 'Fastest driver', 'VER': 'Max Verstappen', 
-                'NOR': 'Lando Norris', 'GAS': 'Pierre Gasly', 'PER': 'Sergio Perez', 
-                'ALO': 'Fernando Alonso', 'LEC': 'Charles Leclerc', 'STR': 'Lance Stroll', 
-                'MAG': 'Kevin Magnussen', 'TSU': 'Yuki Tsunoda', 'ALB': 'Alexander Albon',
-                'ZHO': 'Guanyu Zhou', 'HUL': 'Nico Hülkenberg', 'OCO': 'Esteban Ocon',
-                'HAM': 'Lewis Hamilton', 'SAI': 'Carlos Sainz', 'RUS': 'George Russel',
-                'BOT': 'Valteri Bottas', 'VRI': 'Nyck de Vries', 'VET': 'Sebastian Vettel',
-                'RIC': 'Daniel Ricciardo', 'MSC': 'Mick Schumacher',
-                'LAT': 'Nicolas Latifi'}
+drivers_2023 = drivers.drivers_2023
+
+drivers_2022 = drivers.drivers_2022
 
 app_ui = ui.page_fluid(
     {"style": "padding: 10px"},
@@ -68,20 +51,27 @@ app_ui = ui.page_fluid(
             ui.row(
                 ui.column(
                     6,
-                    drivers.driver_ui('driver1_select')
+                    ui.input_select(
+                        "driver1_select", label="Select driver 1:",
+                        choices = ["Fastest driver"],
+                        selected = "Fastest driver"
+                    )
                 ),
                 ui.column(
                     6,
-                    drivers.driver_ui('driver2_select')
+                    ui.input_select(
+                        "driver2_select", label="Select driver 2:",
+                        choices = ["Fastest driver"],
+                        selected = "Fastest driver"
+                    )
                 )
             ),
             ui.row(
                 ui.column(
                     6,
-                    #test_module.test_ui("calc_1")
-                    plot.plot1_ui("gear_1")
-                    #ui.output_text("fastest_driver_1"),
-                    #ui.output_text("laptime_1")
+                    ui.output_plot("gear_1"),
+                    ui.output_text("fastest_driver_1"),
+                    ui.output_text("laptime_1")
                 ),
                 ui.column(
                     6,
@@ -96,8 +86,6 @@ app_ui = ui.page_fluid(
 
 def server(input, output, session):
 
-    plot.plot1_server("gear_1")
-
     # Updating driver selection list
     @reactive.Effect()
     def _():
@@ -117,6 +105,38 @@ def server(input, output, session):
             choices=driver_options,
             selected=input.driver2_select()
         )
+    
+    # Get required data for driver 2 based on selection
+    @reactive.Calc
+    def get_data_1():
+        try:
+            ui.notification_show("Data takes a couple seconds to load.", duration=3, type = 'default')
+            
+            f1_session = ff1.get_session(int(input.year()), input.track_select(), input.session_type())
+            f1_session.load()
+
+            # Check if user input == fastest driver
+            if input.driver1_select() == "Fastest driver":
+                lap = f1_session.laps.pick_fastest()
+            else:
+                laps_driver = f1_session.laps.pick_driver(input.driver1_select())
+                lap = laps_driver.pick_fastest()
+            
+            tel = lap.get_telemetry()
+            driver = lap['Driver']
+
+            #converting data to numpy data tables
+            x = np.array(tel['X'].values)
+            y = np.array(tel['Y'].values)
+
+            points = np.array([x, y]).T.reshape(-1, 1, 2)
+            segments = np.concatenate([points[:-1], points[1:]], axis=1)
+            gear = tel['nGear'].to_numpy().astype(float)
+            lap_time = lap['LapTime']
+            return segments, gear, driver, lap_time
+
+        except Exception:
+            ui.notification_show("Data not available. Select another track or driver.", duration=10, type = 'error')
 
     # Get required data for driver 2 based on selection
     @reactive.Calc
@@ -152,7 +172,7 @@ def server(input, output, session):
     @output
     @render.text
     def fastest_driver_1():
-        segments, gear, driver, lap_time = plot.plot1_server("gear_1")
+        segments, gear, driver, lap_time = get_data_1()
         #print(f"The driver of the fastest lap this session is: {driver}")
         return f"Graph shows the fastest lap of: {driver}"
     
@@ -166,7 +186,7 @@ def server(input, output, session):
     @output
     @render.text
     def laptime_1():
-        segments, gear, driver, lap_time = plot.plot1_server("gear_1")
+        segments, gear, driver, lap_time = get_data_1()
         delta_str= str(lap_time)
         # Split the time delta string to extract hours, minutes, and seconds
         time_parts = delta_str.split(" ")[-1].split(":")
@@ -191,6 +211,30 @@ def server(input, output, session):
 
         return f"The lap time is: {formatted_time}"
 
+    @output
+    @render.plot
+    def gear_1():
+        try:
+            segments, gear, driver, lap_time = get_data_1()
+            
+            cmap = cm.get_cmap('Paired')
+            lc_comp = LineCollection(segments, norm=plt.Normalize(1, cmap.N+1), cmap=cmap)
+            lc_comp.set_array(gear)
+            lc_comp.set_linewidth(4)
+
+            plt.gca().add_collection(lc_comp)
+            plt.axis('equal')
+            plt.tick_params(labelleft=False, left=False, labelbottom=False, bottom=False)
+
+            cbar = plt.colorbar(mappable=lc_comp, label="Gear", boundaries=np.arange(1, 10))
+            cbar.set_ticks(np.arange(1.5, 9.5))
+            cbar.set_ticklabels(np.arange(1, 9))
+    
+            plt
+
+        except Exception:
+            pass
+
     @output
     @render.plot
     def gear_2():