start sidebar module

app.py

@@ -1,12 +1,12 @@
 import os
-from shiny import App, ui, render, reactive
+from shiny import App, ui, render, reactive, module
 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 drivers
+from modules import drivers, sidebar
 
 # Define cache folder path
 cache_path = os.getcwd() + "/cache"
@@ -19,7 +19,6 @@ ff1.Cache.offline_mode(enabled=True)
 
 # Define drivers
 drivers_2023 = drivers.drivers_2023
-
 drivers_2022 = drivers.drivers_2022
 
 app_ui = ui.page_fluid(
@@ -29,24 +28,8 @@ app_ui = ui.page_fluid(
     ui.panel_title("Gear usage in fastest lap"),
     ui.layout_sidebar(
         ui.panel_sidebar(
-            ui.input_select(
-                "track_select", "Select track:",
-                choices = ["Austria", "Hungary", "Spain", "Bahrain", "United-Kingdom"],
-                selected = "Austria"
-            ),
-            ui.input_radio_buttons(
-                "session_type", "Session type:", 
-                choices = {"R": "Race", "Q": "Qualification"}, 
-                selected = "R"
-            ),
-            ui.input_radio_buttons(
-                "year", "Year:", 
-                choices = ["2023", "2022"], 
-                selected = "2023"
-            ),
-            width=2
+            sidebar.sidebar_content("sidebar_content")
         ),
-        
         ui.panel_main(
             ui.row(
                 ui.column(
@@ -89,7 +72,7 @@ def server(input, output, session):
     # Updating driver selection list
     @reactive.Effect()
     def _():
-        if input.year() == "2023":
+        if sidebar.sidebar_content("year") == "2023":
             driver_options = drivers_2023
         elif input.year() == "2022":
             driver_options = drivers_2022

modules/plot.py

@@ -1,74 +0,0 @@
-import os
-from shiny import module, 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
-
-# UI
-@module.ui
-def plot1_ui(label: str = 'plot1'):
-    return ui.div(
-        ui.output_plot('plot1')
-    )
-
-# Server
-@module.server
-def plot1_server(input, output, session):
-    @reactive.Calc
-    # Get required data for driver 1 based on selection
-    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')
-
-        @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

modules/sidebar.py

@@ -0,0 +1,29 @@
+import os
+from shiny import module, 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
+
+@module.ui
+def sidebar_content(id):
+    return ui.div(
+        ui.input_select(
+            "track_select", "Select track:",
+            choices = ["Austria", "Hungary", "Spain", "Bahrain", "United-Kingdom"],
+            selected = "Austria"
+        ),
+        ui.input_radio_buttons(
+            "session_type", "Session type:", 
+            choices = {"R": "Race", "Q": "Qualification"}, 
+            selected = "R"
+        ),
+        ui.input_radio_buttons(
+            "year", "Year:", 
+            choices = ["2023", "2022"], 
+            selected = "2023"
+        ),
+        width=2
+    )