Fix Z-Swing% and Chase% and arrange player and batter columns into tabs

player_team_leaderboard.py

@@ -58,16 +58,36 @@ def create_player_team_leaderboard_app(player_team_type):
   # stats
   if pitching:
     pct_stats = ['K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
-    stats_with_pctls = ['FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'F-Str%', 'PAR%', 'Ball%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Behind%']
-    cols = ['Pitcher', 'Team', 'Throws', 'IP', 'TBF', 'FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
+    stats_with_pctls = ['FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Behind%']
+    # cols = ['Pitcher', 'Team', 'Throws', 'IP', 'TBF', 'FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
+    prefix_cols = ['Pitcher', 'Team', 'Throws', 'IP', 'TBF', 'FB Velo', 'K%', 'BB%']
+    plate_disc_cols = ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%']
+    batted_ball_cols = ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
+    approach_cols = ['Strike%', 'Ball%', 'F-Str%', 'PAR%', 'Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
+    all_cols = {
+      theme: prefix_cols + cols 
+      for theme, cols 
+      in {'Plate Discipline': plate_disc_cols, 'Batted Ball': batted_ball_cols, 'Approach': approach_cols}.items()
+    }
     if team:
-      cols = [col for col in cols if col not in ('Pitcher', 'Throws')]
+      # cols = [col for col in cols if col not in ('Pitcher', 'Throws')]
+      prefix_cols = [col for col in prefix_cols if col not in ('Pitcher', 'Throws')]
   else:
     pct_stats = ['K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%']
     stats_with_pctls = ['K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'Zone%'] # , 'OBP']
-    cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']#, 'AB', 'H', 'BB', 'HBP', 'SF', 'OBP']
+    # cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']#, 'AB', 'H', 'BB', 'HBP', 'SF', 'OBP']
+    prefix_cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%']
+    plate_disc_cols = ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%']
+    batted_ball_cols = ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
+    all_cols = {
+      theme: prefix_cols + cols 
+      for theme, cols 
+      in {'Plate Discipline': plate_disc_cols, 'Batted Ball': batted_ball_cols}.items()
+    }
     if team:
-      cols = [col for col in cols if col not in ('Batter', 'Bats')]
+      # cols = [col for col in cols if col not in ('Batter', 'Bats')]
+      prefix_cols = [col for col in prefix_cols if col not in ('Batter', 'Bats')]
+      
 
   # col names
   player_type = 'pitcher' if pitching else 'batter'
@@ -119,44 +139,47 @@ def create_player_team_leaderboard_app(player_team_type):
     if include_teams is not None:
       pitcher_stats = pitcher_stats.filter(pl.col('Team').is_in(include_teams))
 
-    styling = []
-    for i, row in enumerate(pitcher_stats[cols].iter_rows()):
-      styling_row = []
-      for col, item in zip(pitcher_stats[cols].columns, row):
-        # _styling = 'font-size: 0.75em; '
-        if col in stats_with_pctls:
-          r, g, b = (stat_cmap([pitcher_stats[f'{col}_pctl'][i]])[0, :3]*255).astype(np.uint8)
-          styling_row.append(f'color: black; background-color: rgba({r}, {g}, {b})')
-        elif col == 'Team':
-          styling_row.append(f'color: {get_text_color_from_team(item)}; background-color: {team_names_short_to_color[item]}')
-        else:
-          styling_row.append('')
-      styling.append(styling_row)
-
-    display_value = []
-    for row in pitcher_stats[cols].iter_rows():
-      display_value_row = []
-      for col, item in zip(cols, row):
-        if col in pct_stats:
-          display_value_row.append(f'{item:.1f}%')
-        elif col in ['OBP']:
-          display_value_row.append(f'{item:.3f}')
-        elif isinstance(item, float):
-          display_value_row.append(f'{item:.1f}')
-        else:
-          display_value_row.append(item)
-      display_value.append(display_value_row)
-
-    value = {
-        'data': pitcher_stats[cols].rows(),
-        'headers': cols,
-        'metadata': {
-            'styling': styling,
-            'display_value': display_value,
-        }
-    }
-    
-    return value
+    def create_df_value(cols):
+      styling = []
+      for i, row in enumerate(pitcher_stats[cols].iter_rows()):
+        styling_row = []
+        for col, item in zip(pitcher_stats[cols].columns, row):
+          # _styling = 'font-size: 0.75em; '
+          if col in stats_with_pctls:
+            r, g, b = (stat_cmap([pitcher_stats[f'{col}_pctl'][i]])[0, :3]*255).astype(np.uint8)
+            styling_row.append(f'color: black; background-color: rgba({r}, {g}, {b})')
+          elif col == 'Team':
+            styling_row.append(f'color: {get_text_color_from_team(item)}; background-color: {team_names_short_to_color[item]}')
+          else:
+            styling_row.append('')
+        styling.append(styling_row)
+
+      display_value = []
+      for row in pitcher_stats[cols].iter_rows():
+        display_value_row = []
+        for col, item in zip(cols, row):
+          if col in pct_stats:
+            display_value_row.append(f'{item:.1f}%')
+          elif col in ['OBP']:
+            display_value_row.append(f'{item:.3f}')
+          elif isinstance(item, float):
+            display_value_row.append(f'{item:.1f}')
+          else:
+            display_value_row.append(item)
+        display_value.append(display_value_row)
+
+      value = {
+          'data': pitcher_stats[cols].rows(),
+          'headers': cols,
+          'metadata': {
+              'styling': styling,
+              'display_value': display_value,
+          }
+      }
+      
+      return value
+
+    return [create_df_value(cols) for cols in all_cols.values()]
 
 
   now = datetime.now()
@@ -184,25 +207,29 @@ def create_player_team_leaderboard_app(player_team_type):
         
     search = gr.Button('Search')
     pin_columns = gr.Checkbox(True, label='Pin columns')
-    leaderboard = gr.DataFrame(
-      pl.DataFrame({'Pitcher': [], 'Pitch': []}),
-      column_widths=[get_col_width(col, player_team_type) for col in cols],
-      show_copy_button=True,
-      show_search='filter',
-      pinned_columns=1,
-      elem_id='leaderboard'
-    )
+    leaderboards = []
+    for theme, cols in all_cols.items():
+      with gr.Tab(theme):
+        leaderboard = gr.DataFrame(
+          pl.DataFrame({'Pitcher': [], 'Pitch': []}),
+          column_widths=[get_col_width(col, player_team_type) for col in cols],
+          show_copy_button=True,
+          show_search='filter',
+          pinned_columns=1,
+          elem_id='leaderboard'
+        )
+        leaderboards.append(leaderboard)
 
     gr.Markdown(notes)
 
-    search.click(gr_create_player_team_leaderboard, inputs=[start_date, end_date, min_ip, qualified, pitcher_lr, batter_lr, include_teams], outputs=leaderboard)
+    search.click(gr_create_player_team_leaderboard, inputs=[start_date, end_date, min_ip, qualified, pitcher_lr, batter_lr, include_teams], outputs=leaderboards)
     # gr.api(gr_create_player_team_leaderboard, api_name=f'gr_create_{player_team_type.replace(" ", "_")}_leaderboard')
     all_teams.click(lambda _teams : [] if _teams == TEAMS else TEAMS, inputs=include_teams, outputs=include_teams)
     qualified.change(lambda qualified: gr.Number(interactive=not qualified), inputs=qualified, outputs=min_ip)
     pin_columns.input(
-      lambda pin: gr.DataFrame(pinned_columns=1 if pin else None),
+      lambda pin: [gr.DataFrame(pinned_columns=1 if pin else None)]*len(all_cols),
       inputs=pin_columns,
-      outputs=leaderboard
+      outputs=leaderboards
     )
     
   return app

stats.py

@@ -9,8 +9,8 @@ from convert import verify_and_return_presult
 valid_pitch = pl.col('x').is_not_null() & pl.col('y').is_not_null() & (pl.col('ballSpeed') > 0)
 
 swing = (pl.col('swing').sum() / pl.col('pitch').sum()).alias('Swing%')
-z_swing = ((pl.col('swing') & pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Z-Swing%')
-chase = ((pl.col('swing') & ~pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Chase%')
+z_swing = ((pl.col('swing') & pl.col('zone')).sum() / pl.col('zone').sum()).alias('Z-Swing%')
+chase = ((pl.col('swing') & ~pl.col('zone')).sum() / (~pl.col('zone')).sum()).alias('Chase%')
 contact = ((pl.col('swing') & ~pl.col('whiff')).sum()/pl.col('swing').sum()).alias('Contact%')
 z_con = ((pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(pl.col('zone') & pl.col('swing')).sum()).alias('Z-Contact%')
 o_con = ((~pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(~pl.col('zone') & pl.col('swing')).sum()).alias('O-Contact%')
@@ -23,7 +23,7 @@ ball = (is_ball.sum() / pl.col('pitch').sum()).alias('Ball%')
 strike = (is_non_ball.sum() / pl.col('pitch').sum()).alias('Strike%')
 is_two_str = pl.col('before_s') == 2 # named this way in case I use two_str for 2-Str%
 first_count = (pl.col('before_s') == 0) & (pl.col('before_b') == 0)
-f_strike = ((is_non_ball & first_count).sum() / first_count.sum()).alias('F-Str%')
+f_strike = ((is_non_ball  & first_count).sum() / first_count.sum()).alias('F-Str%')
 par = (((is_two_str & pl.col('presult').str.contains('strikeout')).sum()) / is_two_str.sum()).alias('PAR%')
 behind = (((pl.col('before_b') > pl.col('before_s')) & (pl.col('before_s') < 2) & (pl.col('before_b') > 1)).sum() / pl.len()).alias('Behind%')
 zone = (pl.col('zone').sum() / pl.col('pitch').sum()).alias('Zone%')