Add Secondary%

convert.py

@@ -1,3 +1,11 @@
+def create_verify_and_return_fn(source):
+  def _verify_and_return(inputs):
+    for x in inputs:
+      assert x in source, f'{x} is invalid'
+    return inputs
+  return _verify_and_return
+
+
 aux_global_id_to_code = {
     7911: 'G',
     7912: 'S',
@@ -119,6 +127,60 @@ general_ball_kind_code = {
     52: 'VS'
 }
 
+basic_ball_kind = {
+    -1: '-',
+    31: 'Fastball',
+    32: 'Breaking',
+    33: 'Breaking',
+    34: 'Breaking',
+    35: 'Breaking',
+    36: 'Breaking',
+    37: 'Breaking',
+    38: 'Breaking',
+    39: 'Off-speed',
+    40: 'Off-speed',
+    41: 'Off-speed',
+    42: 'Fastball',
+    43: 'Off-speed',
+    44: 'Off-speed',
+    45: 'Breaking',
+    46: 'Fastball',
+    47: 'Fastball',
+    48: 'Fastball',
+    49: 'Fastball',
+    50: 'Other', # technically "super" eephus but I haven't encountered a normal one yet
+    51: 'Fastball',
+    52: 'Breaking',
+}
+
+basic_ball_kind_code = {
+    -1: '-',
+    31: 'FB',
+    32: 'BR',
+    33: 'BR',
+    34: 'BR',
+    35: 'BR',
+    36: 'BR',
+    37: 'BR',
+    38: 'BR',
+    39: 'OS',
+    40: 'OS',
+    41: 'OS',
+    42: 'FB',
+    43: 'OS',
+    44: 'OS',
+    45: 'BR',
+    46: 'FB',
+    47: 'FB',
+    48: 'FB',
+    49: 'FB',
+    50: 'Other', # technically "super" eephus but I haven't encountered a normal one yet
+    51: 'FB',
+    52: 'BR',
+}
+
+verify_and_return_basic_ball_kind_code = create_verify_and_return_fn(basic_ball_kind_code.values())
+
 lr = {1: 'l', 2: 'r'}
 
 presult = {
@@ -161,10 +223,11 @@ presult = {
     141: 'Unknown'
 }
 
-def verify_and_return_presult(presults):
-  for _presult in presults:
-    assert _presult in presult.values(), f'{_presult} is invalid'
-  return presults
+verify_and_return_presult = create_verify_and_return_fn(presult.values())
+# def verify_and_return_presult(presults):
+  # for _presult in presults:
+    # assert _presult in presult.values(), f'{_presult} is invalid'
+  # return presults
 
 bresult = {
     0: '空振り三振',

data.py

@@ -11,7 +11,10 @@ from itertools import product
 from convert import (
   aux_global_id_to_code, presult, 
   team_name_short,
-  ball_kind, ball_kind_code, general_ball_kind, general_ball_kind_code, lr, 
+  ball_kind, ball_kind_code, 
+  general_ball_kind, general_ball_kind_code,
+  basic_ball_kind, basic_ball_kind_code,
+  lr, 
   game_kind
 )
 
@@ -188,6 +191,8 @@ data_df = (
         pl.col('ballKind').replace_strict(ball_kind_code).alias('ballKind_code'),
         pl.col('ballKind').replace_strict(general_ball_kind).alias('general_ballKind'),
         pl.col('ballKind').replace_strict(general_ball_kind_code).alias('general_ballKind_code'),
+        pl.col('ballKind').replace_strict(basic_ball_kind).alias('basic_ballKind'),
+        pl.col('ballKind').replace_strict(basic_ball_kind_code).alias('basic_ballKind_code'),
         pl.col('batLR').replace_strict(lr),
         pl.col('pitLR').replace_strict(lr),
         pl.col('date').str.to_date('%Y%m%d'),

player_team_leaderboard.py

@@ -38,7 +38,7 @@ def create_player_team_leaderboard_app(player_team_type):
     theme_to_cols = {
       'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'PLUS%'],
       'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%'],
-      'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
+      'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%', 'Sec%']
     }
     all_cols = prefix_cols + sum(list(theme_to_cols.values()), [])
     for theme, cols in theme_to_cols.items():

stats.py

@@ -4,7 +4,7 @@ from data import data_df
 # from enum import Enum
 from types import SimpleNamespace
 
-from convert import verify_and_return_presult
+from convert import verify_and_return_presult, verify_and_return_basic_ball_kind_code
 
 class Player:
   PITCHER = 'pitcher'
@@ -69,6 +69,7 @@ register_stat('Arm%', (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') >= 0).ot
 register_stat('High%', (pl.col('y') > 125).mean(), True, None)
 register_stat('Low%', (pl.col('y') <= 125).mean(), True, None)
 register_stat('MM%', (pl.col('x').is_between(-20, 20) & pl.col('y').is_between(100, 100+50)).mean(), True, None)
+register_stat('Sec%', (pl.col('basic_ballKind_code').is_in(verify_and_return_basic_ball_kind_code(['BR', 'OS']))).sum() / pl.col('pitch').sum(), True, None) 
 register_stat('GB%', pl.col('G') + pl.col('B'), True, Player.PITCHER, True)
 register_stat('FB%', pl.col('F') + pl.col('P'), True, Player.BATTER, True)
 register_stat('LD%', pl.col('L'), True, Player.BATTER, True)