Update app

demo.py

@@ -35,7 +35,9 @@ with gr.Blocks(css=css) as demo:
   [Data from SportsNavi](https://sports.yahoo.co.jp/)
   ''')
   # player = gr.Dropdown(value=None, choices=sorted(player_df['name'].dropna().tolist()), label='Player')
-  player = gr.Dropdown(value=None, choices=sorted(player_df.filter(pl.col('name').is_not_null())['name'].to_list()), label='Player')
+  with gr.Row():
+    player = gr.Dropdown(value=None, choices=sorted(player_df.filter(pl.col('name').is_not_null())['name'].to_list()), label='Player')
+    handedness = gr.Radio(value='Both', choices=['Both', 'Left', 'Right'], type='value', interactive=False, label='Batter Handedness')
   player_info = gr.Markdown()
   download_file = gr.DownloadButton(label='Download player data')
   with gr.Group():
@@ -83,7 +85,10 @@ with gr.Blocks(css=css) as demo:
     '''
     )
 
-  player.input(get_data, inputs=player, outputs=[player_info, download_file, usage, pitch_velo_summary, pitch_loc_summary, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, velo_stats])
+  inputs = [player, handedness]
+  outputs = [player_info, handedness, download_file, usage, pitch_velo_summary, pitch_loc_summary, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, velo_stats]
+  player.input(get_data, inputs=inputs, outputs=outputs)
+  handedness.input(get_data, inputs=inputs, outputs=outputs)
 
 demo.launch(
     share=True,

gradio_function.py

@@ -49,7 +49,7 @@ colorscale = [
 ]
 
 
-def plot_pitch_map(player=None, loc=None, pitch_type=None, pitch_name=None, all_pitches=False, min_pitches=2):
+def plot_pitch_map(df, player=None, loc=None, pitch_type=None, pitch_name=None, all_pitches=False, min_pitches=2):
   assert not ((loc is None and player is None) or (loc is not None and player is not None)), 'exactly one of `player` or `loc` must be specified'
 
   if loc is None and player is not None:
@@ -109,18 +109,19 @@ def plot_pitch_map(player=None, loc=None, pitch_type=None, pitch_name=None, all_
 
 
 # velo distribution
-def plot_pitch_velo(player=None, velos=None, pitch_type=None, pitch_name=None, min_pitches=2):
-  assert not ((velos is None and player is None) or (velos is not None and player is not None)), 'exactly one of `player` or `loc` must be specified'
+def plot_pitch_velo(df=None, player=None, velos=None, pitch_type=None, pitch_name=None, min_pitches=2):
+  assert not ((velos is None and player is None) or (velos is not None and player is not None)), 'exactly one of `player` or `velos` must be specified'
 
   if velos is None and player is not None:
     assert not ((pitch_type is None and pitch_name is None) or (pitch_type is not None and pitch_name is not None)), 'exactly one of `pitch_type` or `pitch_name` must be specified'
+    assert df is not None, '`df` must be provided if `velos` not provided'
     pitch_val = pitch_type or pitch_name
     pitch_col = 'pitch_type' if pitch_type else 'pitch_name'
     # velos = df.set_index(['name', pitch_col]).sort_index().loc[(player, pitch_val), 'release_speed']
     velos = df.filter((pl.col('name') == player) & (pl.col(pitch_col) == pitch_val))['release_speed']
 
   if isinstance(velos, int):
-    velos = [velos]
+    velos = [velos] # is this line still necessary after porting to polars?
 
   fig = go.Figure()
   if len(velos) >= min_pitches:
@@ -157,11 +158,12 @@ def plot_pitch_velo(player=None, velos=None, pitch_type=None, pitch_name=None, m
   return fig
 
 
-def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitches=2):
+def plot_all_pitch_velo(df=None, player=None, player_df=None, pitch_counts=None, min_pitches=2):
   # assert not ((player is None and player_df is None) or (player is not None and player_df is not None)), 'exactly one of `player` or `player_df` must be specified'
 
   if player_df is None and player is not None:
     assert pitch_counts is None, '`pitch_counts` must be `None` if `player_df` is None'
+    assert df is not None, '`df` must be provided if `player_df` is None'
     # player_df = df.set_index('name').sort_index().loc[player].sort_values('pitch_name').set_index('pitch_name')
     # pitch_counts = player_df.index.value_counts(ascending=True)
     player_df = df.filter((pl.col('name') == player) & (pl.col('release_speed').is_not_null()))
@@ -251,13 +253,22 @@ def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitc
   return fig
 
 
-def get_data(player):
+def get_data(player, handedness):
   player_name = f'# {player}'
 
   # _df = df.set_index('name').sort_index().loc[player]
   # _df.to_csv(f'files/npb.csv', index=False)
   # _df_by_pitch_name = _df.set_index('pitch_name').sort_index()
   _df = df.filter(pl.col('name') == player)
+  league_df = df
+  if handedness == 'Right':
+    _df = _df.filter(pl.col('stand') == 'R')
+    league_df = league_df.filter(pl.col('stand') == 'R')
+  elif handedness == 'Left':
+    _df = _df.filter(pl.col('stand') == 'L')
+    league_df = league_df.filter(pl.col('stand') == 'L')
+
+  handedness = gr.update(value=handedness, interactive=True)
 
   # usage_fig = px.pie(_df['pitch_name'], names='pitch_name')
   usage_fig = px.pie(_df.select('pitch_name'), names='pitch_name')
@@ -267,8 +278,8 @@ def get_data(player):
   pitch_counts = _df['pitch_name'].value_counts().sort('count', descending=True)
 
   # pitch_velo_summary = plot_all_pitch_velo(player=player, player_df=_df_by_pitch_name, pitch_counts=pitch_counts.sort_values(ascending=True))
-  pitch_velo_summary = plot_all_pitch_velo(player=player, player_df=_df.filter(pl.col('release_speed').is_not_null()), pitch_counts=pitch_counts.sort('count', descending=False))
-  pitch_loc_summary = plot_pitch_map(player, all_pitches=True)
+  pitch_velo_summary = plot_all_pitch_velo(df=league_df, player=player, player_df=_df.filter(pl.col('release_speed').is_not_null()), pitch_counts=pitch_counts.sort('count', descending=False))
+  pitch_loc_summary = plot_pitch_map(df=_df, player=player, all_pitches=True)
 
   pitch_groups = []
   pitch_names = []
@@ -295,7 +306,7 @@ def get_data(player):
         visible=True
     ))
     pitch_maps.append(gr.update(
-        value=plot_pitch_map(player, pitch_name=pitch_name),
+        value=plot_pitch_map(df=_df, player=player, pitch_name=pitch_name),
         label='Pitch location',
         visible=True
     ))
@@ -322,4 +333,4 @@ def get_data(player):
       .drop('Count')
   )
 
-  return player_name, 'files/npb.csv', usage_fig, pitch_velo_summary, pitch_loc_summary, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, velo_stats
+  return player_name, handedness, 'files/npb.csv', usage_fig, pitch_velo_summary, pitch_loc_summary, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, velo_stats