Add shareable leaderboards

daily_weekly_leaderboard.py

@@ -4,6 +4,7 @@ import polars as pl
 import pandas as pd
 import matplotlib.pyplot as plt
 from plottable import Table, ColumnDefinition
+from plottable.plots import circled_image
 
 from data import df, game_df
 from gradio_function import *
@@ -37,8 +38,8 @@ def filter_pitcher_leaderboard_by_date(date, *args, **kwargs):
         daily_velos,
         weekly_whiffs,
         weekly_velos,
-        plot_tables(daily_whiffs, daily_velos, 'Daily', f'{date.strftime("%B %d, %Y")}\n{date.strftime("%A")}'),
-        plot_tables(weekly_whiffs, weekly_velos, 'Weekly', f'{monday.strftime("%B %d, %Y")} to {sunday.strftime("%B %d, %Y")}\n{monday.strftime("%A")} to {sunday.strftime("%A")}'),
+        *plot_tables(daily_whiffs, daily_velos, 'Daily', f'{date.strftime("%B %d, %Y")}\n{date.strftime("%A")}'),
+        *plot_tables(weekly_whiffs, weekly_velos, 'Weekly', f'{monday.strftime("%B %d, %Y")} to {sunday.strftime("%B %d, %Y")}\n{monday.strftime("%A")} to {sunday.strftime("%A")}'),
         gr.update(interactive=True),
         gr.update(interactive=True),
         gr.update(interactive=True),
@@ -50,7 +51,7 @@ def compute_pitcher_leaderboards(df, top_players, strict, ignore_zero_whiffs, sh
     # _df = df.filter(pl.col('game_date') == date)
     _df = df
 
-    other_cols = ['Name']
+    other_cols = ['Team', 'Name']
     
     if debug:
         other_cols = ['game_date'] + other_cols
@@ -109,25 +110,39 @@ def compute_pitcher_leaderboards(df, top_players, strict, ignore_zero_whiffs, sh
 
 
 def plot_tables(whiffs, velos, time_type, subheader):
-    fig, (whiff_ax, velo_ax) = plt.subplots(ncols=2, constrained_layout=True, sharey=True)
+    whiff_fig, whiff_ax = plt.subplots(figsize=(4, 6))
 
-    whiffs = whiffs.to_pandas()
+    whiffs = (
+        whiffs
+        .with_columns(
+            pl.col('Team').map_elements(lambda team: f'assets/{team.lower()}.png', return_dtype=str)
+        )
+    ).to_pandas()
     if 'Rank' in whiffs.columns:
         whiffs = whiffs.set_index('Rank')
     else:
         whiffs.index = pd.Series(range(1, len(whiffs)+1), name='Rank')
     Table(
-      whiffs,
+      (
+        whiffs
+      ),
       column_definitions=[
-          ColumnDefinition(name="Rank", title="Rank", width=0.25),
-          ColumnDefinition(name="Name", title="Player", textprops={'ha': 'left'}),
-          ColumnDefinition(name="Whiffs", title="#", width=0.25)
+        ColumnDefinition(name="Rank", title="Rank", width=0.25),
+        ColumnDefinition(name='Team', title='Team', width=0.25, plot_fn=circled_image, textprops={'ha': 'center'}),
+        ColumnDefinition(name="Name", title="Player", textprops={'ha': 'left'}),
+        ColumnDefinition(name="Whiffs", title="#", width=0.25)
       ],
       ax=whiff_ax
     )
-    whiff_ax.set_title('Whiffs')
+    whiff_fig.suptitle(f'{time_type} Whiff Leaderboard\n{subheader}')
 
-    velos = velos.to_pandas()
+    velo_fig, velo_ax = plt.subplots(figsize=(4, 6))
+    velos = (
+        velos
+        .with_columns(
+            pl.col('Team').map_elements(lambda team: f'assets/{team.lower()}.png', return_dtype=str)
+        )
+    ).to_pandas()
     if 'Rank' in velos.columns:
         velos = velos.set_index('Rank')
     else:
@@ -135,16 +150,16 @@ def plot_tables(whiffs, velos, time_type, subheader):
     Table(
       velos,
       column_definitions=[
-          ColumnDefinition(name="Rank", title="Rank", width=0.25),
-          ColumnDefinition(name="Name", title="Player", textprops={'ha': 'left'}),
-          ColumnDefinition(name="Velocity", title="MPH")
+        ColumnDefinition(name="Rank", title="Rank", width=0.25),
+        ColumnDefinition(name='Team', title='Team', width=0.25, plot_fn=circled_image, textprops={'ha': 'center'}),
+        ColumnDefinition(name="Name", title="Player", textprops={'ha': 'left'}),
+        ColumnDefinition(name="Velocity", title="MPH", width=0.25)
       ],
       ax=velo_ax
     )
-    velo_ax.set_title('Velocity')
-
-    fig.suptitle(f'{time_type} Leaderboard\n{subheader}')
-    return fig
+    velo_fig.suptitle(f'{time_type} Velocity Leaderboard\n{subheader}')
+    
+    return whiff_fig, velo_fig
 
 def go_back_day(date):
     return date - datetime.timedelta(days=1)
@@ -194,29 +209,34 @@ def create_daily_pitcher_leaderboard():
             next_day_btn = gr.Button('Next Day', interactive=False)
             next_week_btn = gr.Button('Next Week', interactive=False)
 
+        with gr.Tab('Tables for viewing'):
+            daily_header = gr.HTML('<center><h1>Daily Leaderboard<h1><h2 style="display: none;"></h2><h3 style="display: none;"></h3></center>')
+            with gr.Row():
+                daily_whiffs = gr.Dataframe(pl.DataFrame({'Name': [], 'Whiffs': []}), label='Whiffs', interactive=False, height=1000)
+                daily_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False, height=1000)
 
-        daily_header = gr.HTML('<center><h1>Daily Leaderboard<h1><h2 style="display: none;"></h2><h3 style="display: none;"></h3></center>')
-        with gr.Row():
-            daily_whiffs = gr.Dataframe(pl.DataFrame({'Name': [], 'Whiffs': []}), label='Whiffs', interactive=False, height=1000)
-            daily_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False, height=1000)
+            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, height=1000)
+                weekly_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False, height=1000)
 
-        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, height=1000)
-            weekly_velos = gr.Dataframe(pl.DataFrame({'Name': [], 'Velocity': []}), label='Velocity', interactive=False, height=1000)
+        with gr.Tab('Tables for sharing'):
+            gr.Markdown('''# Plotted leaderboards
 
-        gr.Markdown('''# Plotted leaderboards
+            For easier sharing
+            ''')
+            with gr.Row():
+                daily_whiffs_plot = gr.Plot(label='Whiffs')
+                daily_velos_plot = gr.Plot(label='Velocity')
 
-        For easier sharing
-        ''')
-        with gr.Row():
-            daily_plot = gr.Plot(label='Daily plot')
-            weekly_plot = gr.Plot(label='Weekly plot')
+            with gr.Row():
+                weekly_whiffs_plot = gr.Plot(label='Whiffs')
+                weekly_velos_plot = gr.Plot(label='Velocity')
             
         search_kwargs = dict(
             fn=filter_pitcher_leaderboard_by_date,
             inputs=[date_picker, top_players, strict, ignore_zero_whiffs, show_rank, debug],
-            outputs=[daily_header, weekly_header, daily_whiffs, daily_velos, weekly_whiffs, weekly_velos, daily_plot, weekly_plot, prev_day_btn, next_day_btn, prev_week_btn, next_week_btn]
+            outputs=[daily_header, weekly_header, daily_whiffs, daily_velos, weekly_whiffs, weekly_velos, daily_whiffs_plot, daily_velos_plot, weekly_whiffs_plot, weekly_velos_plot, prev_day_btn, next_day_btn, prev_week_btn, next_week_btn]
         )
         search_btn.click(**search_kwargs)
         for btn, fn in (