Update app

data.py

@@ -69,14 +69,10 @@ df['swing'] = ~df['description'].isin(['B', 'BB', 'LS', 'inv_K', 'bunt_K', 'HBP'
 df['csw'] = df['description'].isin(['SS', 'K', 'LS', 'inv_K'])
 df['normal_pitch'] = ~df['description'].isin(['obstruction', 'illegal_pitch', 'defensive_interference']) # guess
 
-whiff_rate = df.groupby(['name', 'pitch_name'])
-whiff_rate = (whiff_rate['whiff'].sum() / whiff_rate['swing'].sum() * 100).round(1).rename('Whiff%').reset_index()
+df_by_player_pitch = df.groupby(['name', 'pitch_name'])
+whiff_rate = (df_by_player_pitch['whiff'].sum() / df_by_player_pitch['swing'].sum() * 100).round(1).rename('Whiff%')
+csw_rate = (df_by_player_pitch['csw'].sum() / df_by_player_pitch['normal_pitch'].sum() * 100).round(1).rename('CSW%')
+velo = df_by_player_pitch['release_speed'].apply(lambda x: round(x.mean(), 1)).rename('Velocity')
 
-csw_rate = df.groupby(['name', 'pitch_name'])
-csw_rate = (csw_rate['csw'].sum() / csw_rate['normal_pitch'].sum() * 100).round(1).rename('CSW%').reset_index()
-
-pitch_stats = pd.merge(
-    whiff_rate,
-    csw_rate,
-    on=['name', 'pitch_name']
-).set_index(['name', 'pitch_name'])
+pitch_stats = pd.concat([whiff_rate, csw_rate, velo], axis=1)
+league_pitch_stats = pd.DataFrame(df.groupby('pitch_name')['release_speed'].apply(lambda x: round(x.mean(), 1)).rename('Velocity'))

demo.py

@@ -33,16 +33,14 @@ with gr.Blocks(css=css) as demo:
   # NPB data visualization demo
   [Data from SportsNavi](https://sports.yahoo.co.jp/)
   ''')
-  player = gr.Dropdown(choices=sorted(player_df['name'].dropna().tolist()), label='Player')
+  player = gr.Dropdown(value=None, choices=sorted(player_df['name'].dropna().tolist()), label='Player')
   player_info = gr.Markdown()
   download_file = gr.DownloadButton(label='Download player data')
-  with gr.Row():
-    with gr.Column():
-      gr.Markdown('## Pitch Distribution')
-      usage = gr.Plot(label='Pitch Distribution', elem_classes='pitch-usage')
-    with gr.Column():
-      gr.Markdown('## Pitch Velocity')
-      pitch_velo_summary = gr.Plot(show_label=False, elem_classes='pitch-velo-summary')
+  with gr.Group():
+    with gr.Row():
+      usage = gr.Plot(label='Pitch Distribution')#, elem_classes='pitch-usage')
+      pitch_velo_summary = gr.Plot(label='Velocity Summary')#, elem_classes='pitch-velo-summary')
+      pitch_loc_summary = gr.Plot(label='Overall Location')
 
 
   max_pitch_maps = len(jp_pitch_to_en_pitch)
@@ -70,18 +68,21 @@ with gr.Blocks(css=css) as demo:
             pitch_names.append(gr.Markdown(f'### Pitch {col+1}', visible=visible))
             pitch_infos.append(gr.DataFrame(pd.DataFrame([{'Whiff%': None, 'CSW%': None}]), interactive=False, visible=visible))
             pitch_velos.append(gr.Plot(show_label=False, elem_classes='pitch-velo', visible=visible))
-            pitch_maps.append(gr.Plot(label='Pitch location', elem_classes='pitch-loc', visible=visible))
+            pitch_maps.append(gr.Plot(label='Pitch Location', elem_classes='pitch-loc', visible=visible))
+
+  gr.Markdown('## Pitch Velocity')
+  velo_stats = gr.DataFrame(pd.DataFrame([{'Avg. Velo': None, 'League Avg. Velo': None}]), interactive=False, label='Pitch Velocity')
 
   gr.Markdown('## Bugs and other notes')
   with gr.Accordion('Click to open', open=False):
     gr.Markdown('''
-    - No padding in pie charts leads to hovertext getting cut off near the bottom for some players
     - Y axis ticks messy when no velocity distribution is plotted
     - Topmost distribution in summary velo distribution plot is clipped
+    - DataFrame precision inconsistent
     '''
     )
 
-  player.input(get_data, inputs=player, outputs=[player_info, download_file, usage, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, pitch_velo_summary])
+  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])
 
 demo.launch(
     share=True,

gradio_function.py

@@ -8,7 +8,7 @@ import pandas as pd
 import gradio as gr
 
 from translate import max_pitch_types
-from data import df, pitch_stats
+from data import df, pitch_stats, league_pitch_stats
 
 # GRADIO FUNCTIONS
 
@@ -48,42 +48,54 @@ colorscale = [
 ]
 
 
-def plot_pitch_map(player=None, loc=None, pitch_type=None, pitch_name=None):
+def plot_pitch_map(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:
-    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'
-    pitch_val = pitch_type or pitch_name
-    pitch_col = 'pitch_type' if pitch_type else 'pitch_name'
-    loc = df.set_index(['name', pitch_col]).loc[(player, pitch_val), ['plate_x', 'plate_z']]
-  Z = fit_pred_kde(loc.to_numpy().T, X, Y)
+    if all_pitches:
+      assert not (pitch_type is not None or pitch_name is not None), 'cannot have `pitch_type` or `pitch_name` when `all_pitches` is `True`'
+      loc = df.sort_values('name').set_index('name').loc[player, ['plate_x', 'plate_z']]
+    else:
+      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'
+      pitch_val = pitch_type or pitch_name
+      pitch_col = 'pitch_type' if pitch_type else 'pitch_name'
+      loc = df.sort_values('name').set_index(['name', pitch_col]).loc[(player, pitch_val), ['plate_x', 'plate_z']]
 
   fig = go.Figure()
-  fig.add_shape(
-      type="rect",
-      **coordinatify(sz_h, sz_w),
-      line_color='gray',
-      # fillcolor='rgba(220, 220, 220, 0.75)', #gainsboro
-  )
-  fig.add_shape(
-      type="rect",
-      **coordinatify(h_h, h_w),
-      line_color='dimgray',
-  )
-  fig.add_trace(go.Contour(
-      z=Z,
-      x=kde_range,
-      y=kde_range,
-      colorscale=colorscale,
-      zmin=1e-5,
-      zmax=Z.max(),
-      contours={
-          'start': 1e-5,
-          'end': Z.max(),
-          'size': Z.max() / 6
-      },
-      showscale=False
-  ))
+  if len(loc) >= min_pitches:
+    Z = fit_pred_kde(loc.to_numpy().T, X, Y)
+    fig.add_shape(
+        type="rect",
+        **coordinatify(sz_h, sz_w),
+        line_color='gray',
+        # fillcolor='rgba(220, 220, 220, 0.75)', #gainsboro
+    )
+    fig.add_shape(
+        type="rect",
+        **coordinatify(h_h, h_w),
+        line_color='dimgray',
+    )
+    fig.add_trace(go.Contour(
+        z=Z,
+        x=kde_range,
+        y=kde_range,
+        colorscale=colorscale,
+        zmin=1e-5,
+        zmax=Z.max(),
+        contours={
+            'start': 1e-5,
+            'end': Z.max(),
+            'size': Z.max() / 6
+        },
+        showscale=False
+    ))
+  else:
+      fig.add_annotation(
+          x=0,
+          y=0,
+          text=f'No visualization<br>as less than {min_pitches} pitches thrown',
+          showarrow=False
+      )
   fig.update_layout(
     xaxis=dict(range=[-plot_s/2, plot_s/2+1], showticklabels=False),
     yaxis=dict(range=[-plot_s/2, plot_s/2+1], scaleanchor='x', scaleratio=1, showticklabels=False),
@@ -93,24 +105,24 @@ def plot_pitch_map(player=None, loc=None, pitch_type=None, pitch_name=None):
   return fig
 
 
-def plot_empty_pitch_map():
-  fig = go.Figure()
-  fig.add_annotation(
-      x=0,
-      y=0,
-      text='No visualization<br>as less than 10 pitches thrown',
-      showarrow=False
-  )
-  fig.update_layout(
-    xaxis=dict(range=[-plot_s/2, plot_s/2+1], showticklabels=False),
-    yaxis=dict(range=[-plot_s/2, plot_s/2+1], scaleanchor='x', scaleratio=1, showticklabels=False),
-    # width=384,
-    # height=384
-  )
-  return fig
+# def plot_empty_pitch_map():
+#   fig = go.Figure()
+#   fig.add_annotation(
+#       x=0,
+#       y=0,
+#       text='No visualization<br>as less than 10 pitches thrown',
+#       showarrow=False
+#   )
+#   fig.update_layout(
+#     xaxis=dict(range=[-plot_s/2, plot_s/2+1], showticklabels=False),
+#     yaxis=dict(range=[-plot_s/2, plot_s/2+1], scaleanchor='x', scaleratio=1, showticklabels=False),
+#     # width=384,
+#     # height=384
+#   )
+#   return fig
 
 # velo distribution
-def plot_pitch_velo(player=None, velos=None, pitch_type=None, pitch_name=None):
+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'
 
   if velos is None and player is not None:
@@ -118,13 +130,27 @@ def plot_pitch_velo(player=None, velos=None, pitch_type=None, pitch_name=None):
     pitch_val = pitch_type or pitch_name
     pitch_col = 'pitch_type' if pitch_type else 'pitch_name'
     velos = df.set_index(['name', pitch_col]).loc[(player, pitch_val), 'release_speed']
+  
+  if isinstance(velos, int):
+    velos = [velos]
 
-  fig = go.Figure(data=go.Violin(x=velos, side='positive', hoveron='points', points=False, meanline_visible=True, name='Velocity Distribution'))
-  median = velos.median()
+  fig = go.Figure()
+  if len(velos) >= min_pitches:
+    fig = fig.add_trace(go.Violin(x=velos, side='positive', hoveron='points', points=False, meanline_visible=True, name='Velocity Distribution'))
+    median = velos.median()
+    x_range = [median-25, median+25]
+  else:
+    fig.add_annotation(
+        x=(170+125)/2,
+        y=0.3/2,
+        text=f'No visualization<br>as less than {min_pitches} pitches thrown',
+        showarrow=False,
+    )
+    x_range = [125, 170]
   fig.update_layout(
     xaxis=dict(
         title='Velocity',
-        range=[median-25, median+25],
+        range=x_range,
         scaleratio=2
     ),
     yaxis=dict(
@@ -143,39 +169,39 @@ def plot_pitch_velo(player=None, velos=None, pitch_type=None, pitch_name=None):
   return fig
 
 
-def plot_empty_pitch_velo():
-  fig = go.Figure()
-  fig.add_annotation(
-      x=(170+125)/2,
-      y=0.3/2,
-      text='No visualization<br>as less than 10 pitches thrown',
-      showarrow=False,
-  )
-  fig.update_layout(
-    xaxis=dict(
-        title='Velocity',
-        range=[125, 170],
-        scaleratio=2
-    ),
-    yaxis=dict(
-        title='Frequency',
-        range=[0, 0.3],
-        scaleanchor='x',
-        scaleratio=1,
-        # tickvals=np.linspace(0, 0.3, 3),
-        # ticktext=np.linspace(0, 0.3, 3),
-        tickvals=[0.15],
-        ticktext=[0.15]
-    ),
-    autosize=True,
-    # width=512,
-    # height=256,
-    modebar_remove=['zoom', 'autoScale', 'resetScale'],
-  )
-  return fig
-
-
-def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitches=10):
+# def plot_empty_pitch_velo():
+#   fig = go.Figure()
+#   fig.add_annotation(
+#       x=(170+125)/2,
+#       y=0.3/2,
+#       text='No visualization<br>as less than 10 pitches thrown',
+#       showarrow=False,
+#   )
+#   fig.update_layout(
+#     xaxis=dict(
+#         title='Velocity',
+#         range=[125, 170],
+#         scaleratio=2
+#     ),
+#     yaxis=dict(
+#         title='Frequency',
+#         range=[0, 0.3],
+#         scaleanchor='x',
+#         scaleratio=1,
+#         # tickvals=np.linspace(0, 0.3, 3),
+#         # ticktext=np.linspace(0, 0.3, 3),
+#         tickvals=[0.15],
+#         ticktext=[0.15]
+#     ),
+#     autosize=True,
+#     # width=512,
+#     # height=256,
+#     modebar_remove=['zoom', 'autoScale', 'resetScale'],
+#   )
+#   return fig
+
+
+def plot_all_pitch_velo(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:
@@ -221,7 +247,7 @@ def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitc
       fig.add_trace(go.Scatter(
           x=[velo_center],
           y=[pitch_name],
-          text=['No visualization as less than 10 pitches thrown'],
+          text=[f'No visualization as less than {min_pitches} pitches thrown'],
           textposition='top center',
           hovertext=False,
           mode="lines+text",
@@ -230,16 +256,6 @@ def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitc
           name=pitch_name,
       ))
 
-  fig.add_trace(go.Violin(
-      x=player_df['release_speed'],
-      y=[player]*len(player_df),
-      side='positive',
-      orientation='h',
-      meanline_visible=True,
-      points=False,
-      legendrank=0,
-      name=player
-  ))
   fig.add_trace(go.Violin(
       x=league_df['release_speed'],
       y=[player]*len(league_df),
@@ -253,9 +269,20 @@ def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitc
       # visible='legendonly',
       name='NPB',
   ))
+  fig.add_trace(go.Violin(
+      x=player_df['release_speed'],
+      y=[player]*len(player_df),
+      side='positive',
+      orientation='h',
+      meanline_visible=True,
+      points=False,
+      legendrank=0,
+      name=player
+  ))
 
-  fig.update_xaxes(title='Velocity')
-  fig.update_layout(violingap=0, violingroupgap=0)
+  fig.update_xaxes(title='Velocity', range=[player_df['release_speed'].dropna().min() - 2, player_df['release_speed'].dropna().max() + 2])
+  fig.update_yaxes(range=[0, len(pitch_counts)+1-0.25], visible=False)
+  fig.update_layout(violingap=0, violingroupgap=0, legend=dict(orientation='h', y=-0.15, yanchor='top'))
 
   return fig
 
@@ -263,14 +290,18 @@ def plot_all_pitch_velo(player=None, player_df=None, pitch_counts=None, min_pitc
 def get_data(player):
   player_name = f'# {player}'
 
-  _df = df.set_index('name').loc[player]
+  _df = df.sort_values('name').set_index('name').loc[player]
   _df.to_csv(f'files/npb.csv', index=False)
-  _df_by_pitch_name = _df.set_index('pitch_name')
+  _df_by_pitch_name = _df.set_index('pitch_name').sort_values('pitch_name')
 
   usage_fig = px.pie(_df['pitch_name'], names='pitch_name')
   usage_fig.update_traces(texttemplate='%{percent:.1%}', hovertemplate=f'<b>{player}</b><br>' + 'threw a <b>%{label}</b><br><b>%{percent:.1%}</b> of the time (<b>%{value}</b> pitches)')
 
   pitch_counts = _df['pitch_name'].value_counts()
+  
+  pitch_velo_summary = plot_all_pitch_velo(player=player, player_df=_df_by_pitch_name, pitch_counts=pitch_counts.sort_values(ascending=True))
+  pitch_loc_summary = plot_pitch_map(player, all_pitches=True)
+  
   pitch_groups = []
   pitch_names = []
   pitch_infos = []
@@ -288,16 +319,15 @@ def get_data(player):
         visible=True
     ))
 
-    if count > 10:
-      pitch_velos.append(gr.update(
-          value=plot_pitch_velo(velos=_df_by_pitch_name.loc[pitch_name, 'release_speed']),
-          visible=True
-      ))
-      pitch_maps.append(gr.update(value=plot_pitch_map(player, pitch_name=pitch_name), label='Pitch location', visible=True))
-
-    else:
-      pitch_velos.append(gr.update(value=plot_empty_pitch_velo(),visible=True ))
-      pitch_maps.append(gr.update(value=plot_empty_pitch_map(), label=pitch_name, visible=True))
+    pitch_velos.append(gr.update(
+        value=plot_pitch_velo(velos=_df_by_pitch_name.loc[pitch_name, 'release_speed']),
+        visible=True
+    ))
+    pitch_maps.append(gr.update(
+        value=plot_pitch_map(player, pitch_name=pitch_name),
+        label='Pitch location',
+        visible=True
+    ))
 
   for _ in range(max_pitch_types - len(pitch_names)):
     pitch_groups.append(gr.update(visible=False))
@@ -307,6 +337,6 @@ def get_data(player):
     pitch_velos.append(gr.update(value=None, visible=False))
     pitch_maps.append(gr.update(value=None, visible=False))
 
-  pitch_velo_summary = plot_all_pitch_velo(player=player, player_df=_df_by_pitch_name, pitch_counts=pitch_counts.sort_values(ascending=True))
+  velo_stats = pd.concat([pitch_stats.loc[player, 'Velocity'].rename('Avg. Velo'), league_pitch_stats['Velocity'].rename('League Avg. Velo')], join='inner', axis=1).rename_axis(['Pitch']).reset_index()
 
-  return player_name, 'files/npb.csv', usage_fig, *pitch_groups, *pitch_names, *pitch_infos, *pitch_velos, *pitch_maps, pitch_velo_summary
+  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