Add sinker-change

convert.py

@@ -47,6 +47,7 @@ ball_kind = {
     50: 'Eephus', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'Hard Sinker',
     52: 'Hard Slider',
+    53: 'Sinker-Change' # custom class for changeups that are classified as sinekrs
 }
 
 ball_kind_code = {
@@ -72,7 +73,8 @@ ball_kind_code = {
     49: 'FC',
     50: 'EP', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'HS',
-    52: 'HL'
+    52: 'HL',
+    53: 'SG' # custom class for changeups that are classified as sinekrs
 }
 
 general_ball_kind = {
@@ -99,6 +101,7 @@ general_ball_kind = {
     50: 'Eephus', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'Sinker',
     52: 'Vertical Slider',
+    53: 'Changeup'
 }
 
 general_ball_kind_code = {
@@ -124,7 +127,8 @@ general_ball_kind_code = {
     49: 'FC',
     50: 'EP', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'SI',
-    52: 'VS'
+    52: 'VS',
+    53: 'CH'
 }
 
 basic_ball_kind = {
@@ -148,9 +152,10 @@ basic_ball_kind = {
     47: 'Fastball',
     48: 'Fastball',
     49: 'Fastball',
-    50: 'Other', # technically "super" eephus but I haven't encountered a normal one yet
+    50: 'Off-speed', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'Fastball',
     52: 'Breaking',
+    53: 'Off-speed',
 }
 
 basic_ball_kind_code = {
@@ -174,9 +179,10 @@ basic_ball_kind_code = {
     47: 'FB',
     48: 'FB',
     49: 'FB',
-    50: 'Other', # technically "super" eephus but I haven't encountered a normal one yet
+    50: 'OS', # technically "super" eephus but I haven't encountered a normal one yet
     51: 'FB',
     52: 'BR',
+    53: 'OS'
 }
 
 verify_and_return_basic_ball_kind_code = create_verify_and_return_fn(basic_ball_kind_code.values())
@@ -401,7 +407,8 @@ ball_kind_code_to_color = {
     'FC': 'sienna',
     'EP': 'darkgray', # technically "super" eephus but I haven't encountered a normal one yet
     'HS': 'darkorange',
-    'HL': 'darkkhaki'
+    'HL': 'darkkhaki',
+    'SG': 'olive'
 }
 
 

data.py

@@ -210,6 +210,7 @@ data_df = (
         pl.col('batLR').replace_strict(lr),
         pl.col('pitLR').replace_strict(lr),
         pl.col('date').str.to_date('%Y%m%d'),
+        pl.col('date').str.to_date('%Y%m%d').dt.year().alias('season'), # TO-DO: replace lines that re-compute season with season column
         
         pl.when(pl.col('GameKindName').str.contains('Regular Season') | (pl.col('GameKindName') == 'Interleague'))
         .then(pl.lit('Regular Season'))
@@ -297,6 +298,38 @@ data_df = (
         .then(pl.lit('Oppo'))
         .alias('batted_ball_direction')
     )
+    # some sinkers are really changeups
+    .with_columns(
+      pl.when(pl.col('x').is_not_null() & pl.col('y').is_not_null() & (pl.col('ballSpeed') > 0))
+      .then('ballSpeed')
+      .mean()
+      .over('pitId', 'season', 'ballKind_code')
+      .alias('avg_velo')
+    )
+    .with_columns(
+        pl.when(pl.col('general_ballKind_code') == '4S')
+        .then('avg_velo')
+        .max()
+        .over('pitId', 'season')
+        .alias('4S_velo')
+    )
+    .with_columns(
+        (
+            (pl.col('ballKind_code') == 'SI')
+            & (pl.col('avg_velo') < 140)
+            & (pl.col('4S_velo') - pl.col('avg_velo') > 3)
+        )
+        .alias('replace_sinker'),
+    )
+    .with_columns(
+        pl.when('replace_sinker').then(pl.lit(ball_kind[53])).otherwise('ballKind').alias('ballKind'),
+        pl.when('replace_sinker').then(pl.lit(ball_kind_code[53])).otherwise('ballKind_code').alias('ballKind_code'),
+        pl.when('replace_sinker').then(pl.lit(general_ball_kind[53])).otherwise('general_ballKind').alias('general_ballKind'),
+        pl.when('replace_sinker').then(pl.lit(general_ball_kind_code[53])).otherwise('general_ballKind_code').alias('general_ballKind_code'),
+        pl.when('replace_sinker').then(pl.lit(basic_ball_kind[53])).otherwise('basic_ballKind').alias('basic_ballKind'),
+        pl.when('replace_sinker').then(pl.lit(basic_ball_kind_code[53])).otherwise('basic_ballKind_code').alias('basic_ballKind_code'),
+    )
+    .drop('replace_sinker')
     
     .filter(pl.col('ballKind_code') != '-')
     .unique()

pitch_leaderboard.py

@@ -157,9 +157,9 @@ def create_pitch_leaderboard(player_team_type):
     return [create_df_value(cols) for cols in theme_to_cols.values()]
 
 
-  now = datetime.now()
-  start_datetime_init = datetime(now.year, 1, 1)
-  end_datetime_init = now
+  start_datetime_init = datetime(data_df['season'].max(), 1, 1)
+  max_date = data_df['date'].max()
+  end_datetime_init = min(datetime.now(), datetime(max_date.year, max_date.month, max_date.day))
   with gr.Blocks() as app:
     gr.Markdown(f'# {player_team_type.title()} Pitch Leaderboard')
     with gr.Row():