Add weekly pitcher leaderboard

daily_pitcher_leaderboard.py

@@ -18,8 +18,25 @@ df = (
 )
 
 
-def get_pitcher_leaderboards(date, top_players, strict, ignore_zero_whiffs, show_rank, debug):
-    _df = df.filter(pl.col('game_date') == date)
+def filter_pitcher_leaderboard_by_date(date, *args, **kwargs):
+    day_df = df.filter(pl.col('game_date') == date)
+    monday = date - datetime.timedelta(days=date.weekday())
+    sunday = date + datetime.timedelta(days=6-date.weekday())
+    week_df = df.filter((pl.col('game_date') >= monday) & (pl.col('game_date') <= sunday))
+    return (
+        f'<center><h1>Daily Leaderboard<h1><h2>{date.strftime("%B %d, %Y")}</h2><h3>{date.strftime("%A")}</h3></center>',
+        f'<center><h1>Weekly Leaderboard<h1><h2>{monday.strftime("%B %d, %Y")} to {sunday.strftime("%B %d, %Y")}</h2><h3>{monday.strftime("%A")} to {sunday.strftime("%A")} </h3></center>',
+        *compute_pitcher_leaderboards(day_df, *args, **kwargs),
+        *compute_pitcher_leaderboards(week_df, *args, **kwargs),
+        gr.update(interactive=True),
+        gr.update(interactive=True),
+        gr.update(interactive=True),
+        gr.update(interactive=True)
+    )
+    
+def compute_pitcher_leaderboards(df, top_players, strict, ignore_zero_whiffs, show_rank, debug):
+    # _df = df.filter(pl.col('game_date') == date)
+    _df = df
 
     other_cols = ['Name']
     
@@ -68,14 +85,15 @@ def get_pitcher_leaderboards(date, top_players, strict, ignore_zero_whiffs, show
             .with_row_index(offset=1)
             .rename({'index': 'Rank'})
         )
-        
-    return (
-        f'<center><h1>Daily Leaderboard<h1><h2>{date.strftime("%B %d, %Y")}</h2><h3>{date.strftime("%A")}</h3></center>',
-        whiffs,
-        velos,
-        gr.update(interactive=True),
-        gr.update(interactive=True)
-    )
+
+    return whiffs, velos
+    # return (
+        # f'<center><h1>Daily Leaderboard<h1><h2>{date.strftime("%B %d, %Y")}</h2><h3>{date.strftime("%A")}</h3></center>',
+        # whiffs,
+        # velos,
+        # gr.update(interactive=True),
+        # gr.update(interactive=True)
+    # )
 
 
 def go_back_day(date):
@@ -83,6 +101,12 @@ def go_back_day(date):
 
 def go_forward_day(date):
     return date + datetime.timedelta(days=1)
+
+def go_back_week(date):
+    return date - datetime.timedelta(days=7)
+
+def go_forward_week(date):
+    return date + datetime.timedelta(days=7)
     
 def create_daily_pitcher_leaderboard():
     with gr.Blocks(
@@ -111,31 +135,39 @@ def create_daily_pitcher_leaderboard():
             search_btn = gr.Button('Search', scale=1, min_width=100)
 
         with gr.Row():
-            prev_btn = gr.Button('Previous', interactive=False)
-            next_btn = gr.Button('Next', interactive=False)
+            prev_week_btn = gr.Button('Previous Week', interactive=False)
+            prev_day_btn = gr.Button('Previous Day', interactive=False)
+            next_day_btn = gr.Button('Next Day', interactive=False)
+            next_week_btn = gr.Button('Next Week', interactive=False)
 
 
-        header = gr.HTML('<center><h1>Daily Leaderboard<h1><h2 style="display: none;"></h2><h3 style="display: none;"></h3></center>')
+        daily_header = gr.HTML('<center><h1>Daily Leaderboard<h1><h2 style="display: none;"></h2><h3 style="display: none;"></h3></center>')
         with gr.Row():
-            whiffs = gr.Dataframe(pl.DataFrame({'Name': [], 'Whiffs': []}), label='Whiffs', interactive=False)
-            velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False)
+            daily_whiffs = gr.Dataframe(pl.DataFrame({'Name': [], 'Whiffs': []}), label='Whiffs', interactive=False)
+            daily_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False)
+
+        weekly_header = gr.HTML('<center><h1>Weekly Leaderboard<h1><h2 style="display: none;"></h2><h3 style="display: none;"></h3></center>')
+        with gr.Row():
+            weekly_whiffs = gr.Dataframe(pl.DataFrame({'Name': [], 'Whiffs': []}), label='Whiffs', interactive=False)
+            weekly_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False)
 
         search_kwargs = dict(
-            fn=get_pitcher_leaderboards,
+            fn=filter_pitcher_leaderboard_by_date,
             inputs=[date_picker, top_players, strict, ignore_zero_whiffs, show_rank, debug],
-            outputs=[header, whiffs, velos, prev_btn, next_btn]
+            outputs=[daily_header, weekly_header, daily_whiffs, daily_velos, weekly_whiffs, weekly_velos, prev_day_btn, next_day_btn, prev_week_btn, next_week_btn]
         )
         search_btn.click(**search_kwargs)
-        (
-            prev_btn
-            .click(go_back_day, date_picker, date_picker)
-            .then(**search_kwargs)
-        )
-        (
-            next_btn
-            .click(go_forward_day, date_picker, date_picker)
-            .then(**search_kwargs)
-        )
+        for btn, fn in (
+            (prev_day_btn, go_back_day),
+            (next_day_btn, go_forward_day),
+            (prev_week_btn, go_back_week),
+            (next_week_btn, go_forward_week)
+        ):
+            (
+                btn
+                .click(fn, date_picker, date_picker)
+                .then(**search_kwargs)
+            )
         
         
         

pitch_leaderboard.py

@@ -2,17 +2,18 @@ import gradio as gr
 import polars as pl
 
 
-from data import df, game_df, compute_pitch_stats
+from data import df, game_df, compute_pitch_stats, SEASONS
 from gradio_function import *
 from css import css
 
-# pitch_stats = pitch_stats.rename({'name': 'Player', 'pitch_name': 'Pitch'})
+SEASONS = [int(season) for season in SEASONS]
 
 def filter_pitch_leaderboard(season, min_pitches):
   return (
     compute_pitch_stats(df.filter(pl.col('game_year') == season))
     .filter(pl.col('Count') >= min_pitches)
     .sort('CSW%', descending=True)
+    .rename({'name': 'Player', 'pitch_name': 'Pitch'})
   )
 
 def create_pitch_leaderboard():
@@ -20,13 +21,13 @@ def create_pitch_leaderboard():
         css=css
     ) as demo:
         init_min_pitches = 100
-        init_season = df['game_year'].max()
+        init_season = max(SEASONS)
         init_pitch_stats = filter_pitch_leaderboard(init_season, init_min_pitches)
         init_pitch_stats.write_csv('pitch_leaderboard.csv')
         pitch_leaderboard_df = gr.State(init_pitch_stats)
 
         with gr.Row():
-            season = gr.Number(init_season, precision=0, label='Season')
+            season = gr.Dropdown(choices=SEASONS, value=init_season, label='Season')
             min_pitches = gr.Number(init_min_pitches, precision=0, label='Min. Pitches')
         pitch_leaderboard_download_file = gr.DownloadButton(value='pitch_leaderboard.csv', label='Download leaderboard')
         pitch_leaderboard = gr.Dataframe(value=pitch_leaderboard_df.value)