Enforce black font color in percentile cells and change # pinned columns to 1

data.py

@@ -47,6 +47,11 @@ for season in tqdm(SEASONS):
   _aux_sched_df = pl.read_parquet(os.path.join(DATA_PATH, str(season), 'aux_schedule.parquet'))
   aux_sched_df = pl.concat((aux_sched_df, _aux_sched_df))
 
+backup_data_df = data_df
+backup_aux_df = aux_df
+backup_sched_df = sched_df
+backup_aux_sched_df = aux_sched_df
+
 aux_df = (
     aux_df
     .filter(pl.col('type') != 'RUNNER')

pitch_leaderboard.py

@@ -82,10 +82,10 @@ def gr_create_pitch_leaderboard(start_date, end_date, min_pitches, pitcher_lr='B
   for i, row in enumerate(pitch_stats[COLUMNS].iter_rows()):
     styling_row = []
     for col, item in zip(pitch_stats[COLUMNS].columns, row):
-      _styling = 'font-size: 0.75em; '
+      # _styling = 'font-size: 0.75em; '
       if col in STATS_WITH_PCTLS:
         r, g, b = (stat_cmap([pitch_stats[f'{col}_pctl'][i]])[0, :3]*255).astype(np.uint8)
-        styling_row.append(f'background-color: rgba({r}, {g}, {b})')
+        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]}')
       elif col in ['Pitch', 'Pitch (General)']:
@@ -141,13 +141,14 @@ def create_pitch_leaderboard():
       all_teams = gr.Button('Select/Deselect all teams')
         
     search = gr.Button('Search')
-    pin_columns = gr.Button('Pin columns')
+    # pin_columns = gr.Button('Pin columns')
+    pin_columns = gr.Checkbox(True, label='Pin columns')
     leaderboard = gr.DataFrame(
       pl.DataFrame({'Pitcher': [], 'Pitch': []}),
       column_widths=[125, 75, 60, 125, 125] + [max(50, 10*len(stat)) for stat in STATS],
       show_copy_button=True,
       show_search='filter',
-      pinned_columns=3,
+      pinned_columns=1,
       elem_id='leaderboard'
     )
 
@@ -161,9 +162,9 @@ def create_pitch_leaderboard():
       # inputs=pin_columns,
       # outputs=leaderboard
     # )
-    pin_columns.click(
-      lambda : gr.update(pinned_columns=None),
-      # inputs=pin_columns,
+    pin_columns.input(
+      lambda pin: gr.DataFrame(pinned_columns=1 if pin else None),
+      inputs=pin_columns,
       outputs=leaderboard
     )
     

player_team_leaderboard.py

@@ -64,8 +64,8 @@ def create_player_team_leaderboard_app(player_team_type):
       cols = [col for col in 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%', '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%', 'Zone%']
-    cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%']
+    stats_with_pctls = ['K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'Zone%'] # , 'OBP']
+    cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%']#, 'AB', 'H', 'BB', 'HBP', 'SF', 'OBP']
     if team:
       cols = [col for col in cols if col not in ('Batter', 'Bats')]
 
@@ -123,10 +123,10 @@ def create_player_team_leaderboard_app(player_team_type):
     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; '
+        # _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'background-color: rgba({r}, {g}, {b})')
+          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:
@@ -139,6 +139,8 @@ def create_player_team_leaderboard_app(player_team_type):
       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:
@@ -187,7 +189,7 @@ def create_player_team_leaderboard_app(player_team_type):
       column_widths=[get_col_width(col, player_team_type) for col in cols],
       show_copy_button=True,
       show_search='filter',
-      pinned_columns=2,
+      pinned_columns=1,
       elem_id='leaderboard'
     )
 
@@ -198,7 +200,7 @@ def create_player_team_leaderboard_app(player_team_type):
     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=2 if pin else None),
+      lambda pin: gr.DataFrame(pinned_columns=1 if pin else None),
       inputs=pin_columns,
       outputs=leaderboard
     )

stats.py

@@ -8,6 +8,30 @@ 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%')
+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%')
+whiff = (pl.col('whiff').sum() / pl.col('swing').sum()).alias('Whiff%')
+swstr = (pl.col('whiff').sum() / pl.col('pitch').sum()).alias('SwStr%')
+csw = (pl.col('csw').sum() / pl.col('pitch').sum()).alias('CSW%')
+zone = (pl.col('zone').sum() / pl.col('pitch').sum()).alias('Zone%')
+glove = (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') < 0).otherwise(pl.col('x') > 0)).mean().alias('Glove%')
+arm = (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') >= 0).otherwise(pl.col('x') <= 0)).mean().alias('Arm%')
+high = (pl.col('y') > 125).mean().alias('High%')
+low = (pl.col('y') <= 125).mean().alias('Low%')
+mm = (pl.col('x').is_between(-20, 20) & pl.col('y').is_between(100, 100+50)).mean().alias('MM%')
+obp = (
+  pl.col('presult').is_in(verify_and_return_presult(['Single', 'Double', 'Triple', 'Home run', 'Walk', 'Inside-the-park home run', 'Hit by pitch'])).sum() / 
+  (pl.col('AB').first() + pl.col('presult').is_in(verify_and_return_presult(['Walk', 'Hit by pitch', 'Sacrifice fly'])).sum())
+).round(3).alias('OBP')
+h = pl.col('presult').is_in(verify_and_return_presult(['Single', 'Double', 'Triple', 'Home run', 'Inside-the-park home run'])).sum().alias('H')
+bb = pl.col('presult').is_in(verify_and_return_presult(['Walk'])).sum().alias('BB')
+hbp = pl.col('presult').is_in(verify_and_return_presult(['Hit by pitch'])).sum().alias('HBP')
+sf =  pl.col('presult').is_in(verify_and_return_presult(['Sacrifice fly'])).sum().alias('SF')
+
 
 def filter_data_by_date_and_game_kind(data, start_date=None, end_date=None, game_kind=None):
   if start_date is not None:
@@ -105,21 +129,21 @@ def compute_pitch_stats(data, player_type, pitch_class_type, min_pitches=1, pitc
           pl.when(pl.col('x').is_not_null() & pl.col('y').is_not_null() & (pl.col('ballSpeed') > 0)).then('mph').mean().round(1).alias('Avg MPH'),
           pl.col('mph').max().alias('Max MPH'),
           pl.col('aux_bresult').struct.field('batType').drop_nulls().value_counts(normalize=True),
-          (pl.col('swing').sum() / pl.col('pitch').sum()).alias('Swing%'),
-          ((pl.col('swing') & pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Z-Swing%'),
-          ((pl.col('swing') & ~pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Chase%'),
-          ((pl.col('swing') & ~pl.col('whiff')).sum()/pl.col('swing').sum()).alias('Contact%'),
-          ((pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(pl.col('zone') & pl.col('swing')).sum()).alias('Z-Contact%'),
-          ((~pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(~pl.col('zone') & pl.col('swing')).sum()).alias('O-Contact%'),
-          (pl.col('whiff').sum() / pl.col('swing').sum()).alias('Whiff%'),
-          (pl.col('whiff').sum() / pl.col('pitch').sum()).alias('SwStr%'),
-          (pl.col('csw').sum() / pl.col('pitch').sum()).alias('CSW%'),
-          (pl.col('zone').sum() / pl.col('pitch').sum()).alias('Zone%'),
-          (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') < 0).otherwise(pl.col('x') > 0)).mean().alias('Glove%'),
-          (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') >= 0).otherwise(pl.col('x') <= 0)).mean().alias('Arm%'),
-          (pl.col('y') > 125).mean().alias('High%'),
-          (pl.col('y') <= 125).mean().alias('Low%'),
-          (pl.col('x').is_between(-20, 20) & pl.col('y').is_between(100, 100+50)).mean().alias('MM%')
+          swing,
+          z_swing,
+          chase,
+          contact,
+          z_con,
+          o_con,
+          whiff,
+          swstr,
+          csw,
+          zone,
+          glove,
+          arm,
+          high,
+          low,
+          mm,
       )
       .with_columns(
           (pl.col('count')/pl.sum('count').over('pitId')).alias('usage'),
@@ -170,6 +194,14 @@ def compute_player_stats(data, player_type, qual='qualified', pitcher_lr='both',
           # pl.col('inning_code').unique().len().over(over_col).alias('IP'),
           (pl.col('bso').struct.field('o').cast(pl.Int32) - pl.col('beforeBso').struct.field('o').cast(pl.Int32)).sum().mul(1/3).over(over_col).alias('IP'),
           pl.col('pa_code').unique().len().over(over_col).alias('PA'),
+          pl.col('presult').is_in(verify_and_return_presult([
+            'Single', 'Double', 'Triple', 'Home run', 'Inside-the-park home run',
+            'Groundout', 'Flyout', 'Lineout', 'Groundout (Double play)',
+            'Foul fly', 'Foul line (?)',
+            'Error', 'Sacrifice hit error', 'Sacrifice fly error',
+            "Fielder's choice",
+            'Bunt strikeout', 'Swinging strikeout', 'Looking strikeout'
+          ])).sum().over(over_col).alias('AB'),
           # pl.col('presult').is_in(verify_and_return_presult([
             # 'Groundout', 'Flyout', 'Lineout', 'Groundout (Double play)',
             # 'Foul fly', 'Foul line (?)',
@@ -190,9 +222,9 @@ def compute_player_stats(data, player_type, qual='qualified', pitcher_lr='both',
 
   # percentile ascending/descending
   if pitching:
-    stat_descending_pctl = lambda stat: stat in ['BB%', 'FB%', 'LD%', 'Z-Swing%'] or 'Contact%' in stat
+    stat_descending_pctl = lambda stat: stat in ['BB%', 'FB%', 'LD%', 'Z-Swing%', 'OBP'] or 'Contact%' in stat
   else:
-    stat_descending_pctl = lambda stat: not (stat in ['BB%', 'FB%', 'LD%', 'Swing%', 'Z-Swing%'] or 'Contact%' in stat)
+    stat_descending_pctl = lambda stat: not (stat in ['BB%', 'FB%', 'LD%', 'Swing%', 'Z-Swing%', 'OBP'] or 'Contact%' in stat)
 
   # col names
   match player_type:
@@ -230,21 +262,27 @@ def compute_player_stats(data, player_type, qual='qualified', pitcher_lr='both',
         (pl.when(pl.col('presult').str.contains('strikeout')).then(1).otherwise(0).sum() / pl.col('pa_code').unique().len()).alias('K%'),
         (pl.when(pl.col('presult') == 'Walk').then(1).otherwise(0).sum() / pl.col('pa_code').unique().len()).alias('BB%'),
         pl.col('aux_bresult').struct.field('batType').drop_nulls().value_counts(normalize=True),
-        (pl.col('swing').sum() / pl.col('pitch').sum()).alias('Swing%'),
-        ((pl.col('swing') & pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Z-Swing%'),
-        ((pl.col('swing') & ~pl.col('zone')).sum() / pl.col('pitch').sum()).alias('Chase%'),
-        ((pl.col('swing') & ~pl.col('whiff')).sum()/pl.col('swing').sum()).alias('Contact%'),
-        ((pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(pl.col('zone') & pl.col('swing')).sum()).alias('Z-Contact%'),
-        ((~pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(~pl.col('zone') & pl.col('swing')).sum()).alias('O-Contact%'),
-        (pl.col('whiff').sum() / pl.col('swing').sum()).alias('Whiff%'),
-        (pl.col('whiff').sum() / pl.col('pitch').sum()).alias('SwStr%'),
-        (pl.col('csw').sum() / pl.col('pitch').sum()).alias('CSW%'),
-        (pl.col('zone').sum() / pl.col('pitch').sum()).alias('Zone%'),
-        (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') < 0).otherwise(pl.col('x') > 0)).mean().alias('Glove%'),
-        (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') >= 0).otherwise(pl.col('x') <= 0)).mean().alias('Arm%'),
-        (pl.col('y') > 125).mean().alias('High%'),
-        (pl.col('y') <= 125).mean().alias('Low%'),
-        (pl.col('x').is_between(-20, 20) & pl.col('y').is_between(100, 100+50)).mean().alias('MM%'),
+        swing,
+        z_swing,
+        chase,
+        contact,
+        z_con,
+        o_con,
+        whiff,
+        swstr,
+        csw,
+        zone,
+        glove,
+        arm,
+        high,
+        low,
+        mm,
+        pl.col('AB').first(),
+        h,
+        bb,
+        hbp,
+        sf,
+        obp,
         pl.first('qualified')
     )
     .explode('batType')
@@ -259,7 +297,7 @@ def compute_player_stats(data, player_type, qual='qualified', pitcher_lr='both',
     .drop('G', 'F', 'B', 'P', 'L')
     .with_columns(
         (pl.when(pl.col('qualified')).then(pl.col(stat)).rank(descending=stat_descending_pctl(stat))/pl.when(pl.col('qualified')).then(pl.col(stat)).count()).alias(f'{stat}_pctl')
-        for stat in ['FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'Zone%']
+        for stat in ['FB Velo', 'K%', 'BB%', 'Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%', 'GB%', 'FB%', 'LD%', 'Zone%', 'OBP']
     )
     .sort(qual_col, descending=True)
   )