Merge branch 'experimental'

.gitignore

@@ -1,3 +1,3 @@
-
+/pycache/*
 .venv/
 .DS_Store

app.py

@@ -1,11 +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
 
 # Define cache folder path
 cache_path = os.getcwd() + "/cache"
@@ -17,50 +18,32 @@ 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"},
     shinyswatch.theme.minty(),
     ui.include_css("styles.css"),
     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
+            "track_select", "Select track:",
+            choices = ["Austria", "Hungary", "Spain", "Bahrain", "United-Kingdom", "Netherlands"],
+            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
         ),
-        
         ui.panel_main(
             ui.row(
                 ui.column(
@@ -157,6 +140,7 @@ def server(input, output, session):
     def get_data_2():
         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()
 

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/car_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16e2ce5c7812c643704e1898a77f365c83cd90b01cfecc632b2060d8ff9cb567
+size 22334795

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/driver_info.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04c5ee3c0780a8cf02ea3899855a383c2798e48b3599976dfa7348fe90872734
+size 5130

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/position_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32c2f3bff8c8aa56ab2e3e85bc8ab6bb3cb70161ccf4c94af1b4fef0d2425dba
+size 21372759

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/race_control_messages.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:473de25c75a4238f3e8e69e8931e283b9fbf185f64dc6ad80ad73f24c644a72e
+size 2569

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/session_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c08aa968f55d79bfe5d1bd1502b1e610727884ad29332bef8710ff85fdd30a8
+size 453

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/timing_app_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49b0ed5d034aadb6e42dd9a293ec159b073dc053d972dac097a6dde2d2c53575
+size 37094

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/timing_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfeb5e8fc8ae6483c8781a32d1643adaf68c216d7be2471494e07c6f3e3d18ae
+size 75238

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/track_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0142cf62a71a1696a7dd50eec19b2eaea765cd05151d4d99edcd135807f13c11
+size 296

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-03_Qualifying/weather_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46374e8aec8fd39f634e46ba4f82a9b56a0b3809baa50e123652153a590943b5
+size 5576

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/car_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee5975be747ef5b933373235481a8d2d5df8459062e32481047120c86e8fb9cc
+size 43051775

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/driver_info.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c2a1a6e6c953ab9bcb6779814354025a3b2c2170bdf8bb7ad3e4a4cf617ea8a
+size 5130

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/lap_count.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ea5f8b29c307d4775d44827a4be802c5db0a2460c45a6eed5ecf7b98b96ab14
+size 1460

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/position_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef51b00094f9d69d3a8ea2e40fa11fce51f02de38a07b943e85b9f14e2df10d3
+size 47042135

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/race_control_messages.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:501796adbe5baf1721059dd80efd58b9088e6b3fb572bf306d86fc67592f09d7
+size 9860

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/session_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4593182392f84a54b84c1563e627390229bee8db9d393ca0ecf4d9642a50ec1
+size 216

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/timing_app_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6e6bd8979d2e4f521ef958fb1511f23c9869cc232571d94b03d531ba89cf99b
+size 124642

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/timing_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d68c478ba5d07df29e0975d68fa9b432c987469119a60416ae3df8d8a63915e5
+size 1277125

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/track_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9787a6b8b3ef3ba34a8b68bb5294b64abec84584db218a850ab3e0b280386a41
+size 508

cache/2022/2022-09-04_Dutch_Grand_Prix/2022-09-04_Race/weather_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f16667f0ee806f71cb0a52932ffb9e0a7adaf11f10724ade7740dbf9de59171f
+size 10571

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/car_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0553819ceb2c84feb7012569321f67d40af4714e572958857d3b022f1c729bb2
+size 26565437

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/driver_info.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:863adef263f9ac1506fe35791e49a1254479cbebe3b5bd76861d1a7881c5a596
+size 5112

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/position_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ea575204fc4b6f94adf4e5602157da29fa581b4354b63a8318ec21c060f29a5
+size 25257321

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/race_control_messages.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b436a0302d2cae767af521953fc9d1da689330e60892d3a6289019e30aefdbca
+size 5133

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/session_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c21633e9a0a0c8cb656de936b132cbde626531a2456c82a13315ee6dbbf4d16c
+size 532

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/timing_app_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad69e9a54c08d742b053202a190d8fcd91d9cd80758b4171aa3fc71cf5b25fc5
+size 58827

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/timing_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecf477200ed5484810bcb6adc77aa7e8374eceae1c325d33e6d8da1a851a5430
+size 137891

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/track_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79fe0545b11709c515a68f5c025a995e5c08846227b49f0c8e10924ad5f77b32
+size 295

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-26_Qualifying/weather_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e6bb27913b8a2f5bdb7fd83741a20ad39ef61a6ad315222219768a5f520a194
+size 6570

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/car_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4422a47d95831f8bdfaa2c765839c857700be0719229ee1da44208c65a654970
+size 55273617

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/driver_info.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1698c3c63ec51726caf4f6e7f8521b4868bc79978f5195a45130aceafa2b2213
+size 5112

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/lap_count.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b635cbedcb44aa75b0c6f9047c535b44806c091e35149bfec50655f0149e05e
+size 1468

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/position_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7830a2abe835f692c3540e81d03ca4c2e5400af8e01b9f99fcc0a2f348c6dfaa
+size 60375496

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/race_control_messages.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f2be01bc4c5bb914c9166d0933d08065f803a4b52c7cdc492de6be85c4ddb19
+size 6747

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/session_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd8645d8fb4c3cd91220cc14cafbddec68e50eeecbbcdd38425b378201cfcc08
+size 268

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/timing_app_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b73411cf00cb94c0415a72af3a1cd7eb9521ad764ab10e803105b56efcef6251
+size 134433

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/timing_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9f31029d3219e033e7fefe13bf819e3838e6fc62154e277d52723b9a1984b6f
+size 1270451

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/track_status_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d873f94c8d117b76d02d2194160bd608c2b2aaed763923a0bb5947975db46ce
+size 562

cache/2023/2023-08-27_Dutch_Grand_Prix/2023-08-27_Race/weather_data.ff1pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e9e9db86aa559b4e8359f03044fc6f92fb35cfdbc4bb905e7250d28643ceae4
+size 13536

modules/drivers.py

@@ -0,0 +1,19 @@
+# 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', 'DEV': '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', 'DEV': 'Nyck de Vries', 'VET': 'Sebastian Vettel',
+                'RIC': 'Daniel Ricciardo', 'MSC': 'Mick Schumacher',
+                'LAT': 'Nicolas Latifi'}

modules/test_module.py

@@ -0,0 +1,32 @@
+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 test_ui():
+    return ui.div(
+        ui.h2("Number + 5"),
+        ui.input_text(id="num_input", label="Enter number:"),
+        ui.output_text_verbatim(id="answer"),
+    )
+
+
+@module.server
+
+def test_server(input, output, session):
+    @reactive.Calc
+    def calculation():
+        try:
+            return int(input.num_input()) + 5
+        except:
+            return "..."
+            
+    @output
+    @render.text
+    def answer():
+        return f"The answer is {calculation()}"