Update app.py

app.py

@@ -409,10 +409,25 @@ def server(input, output, session):
         import polars as pl
 
         # Compute total pitches for each pitcher
-        df_pitcher_totals = df_spring_stuff.group_by("pitcher_id").agg(
+        df_pitcher_totals = df_spring_stuff.group_by(["pitcher_id"]).agg(
             pl.col("start_speed").count().alias("pitcher_total")
         )
 
+        df_pitcher_totals_hands = (
+            df_spring_stuff
+            .group_by(["pitcher_id", "batter_hand"])
+            .agg(pl.col("start_speed").count().alias("pitcher_total"))
+            .pivot(
+                values="pitcher_total",
+                index="pitcher_id",
+                columns="batter_hand",
+                aggregate_function="sum"
+            )
+            .rename({"L": "pitcher_total_left", "R": "pitcher_total_right"})
+            .fill_null(0)  # Fill missing values with 0 if some pitchers don't face both hands
+        )
+                
+        
         df_spring_group = df_spring_stuff.group_by(['pitcher_id', 'pitcher_name', 'pitch_type']).agg([
             pl.col('start_speed').count().alias('count'),
             pl.col('start_speed').mean().alias('start_speed'),
@@ -423,12 +438,13 @@ def server(input, output, session):
             pl.col('release_pos_x').mean().alias('release_pos_x'),
             pl.col('extension').mean().alias('extension'),
             pl.col('tj_stuff_plus').mean().alias('tj_stuff_plus'),
-            (pl.col('start_speed').filter(pl.col('batter_hand')=='L').count()).alias('rhh_count'),
-            (pl.col('start_speed').filter(pl.col('batter_hand')=='R').count()).alias('lhh_count')
+            (pl.col("batter_hand").eq("R").sum()).alias("rhh_count"),  # Corrected: Counts RHH (batter_hand == "R")
+            (pl.col("batter_hand").eq("L").sum()).alias("lhh_count")   # Corrected: Counts LHH (batter_hand == "L")
         ])
 
         # Join total pitches per pitcher to the grouped DataFrame on pitcher_id
-        df_spring_group = df_spring_group.join(df_pitcher_totals, on="pitcher_id", how="left")
+        df_spring_group = df_spring_group.join(df_pitcher_totals, on=["pitcher_id"], how="left")
+        df_spring_group = df_spring_group.join(df_pitcher_totals_hands, on=["pitcher_id"], how="left")
 
         # Now calculate the pitch percent for each pitcher/pitch_type combination
         df_spring_group = df_spring_group.with_columns(
@@ -437,10 +453,11 @@ def server(input, output, session):
 
         # Optionally, if you want the percentage of left/right-handed batters within the group:
         df_spring_group = df_spring_group.with_columns([
-            (pl.col("rhh_count") / pl.col("pitcher_total")).alias("rhh_percent"),
-            (pl.col("lhh_count") / pl.col("pitcher_total")).alias("lhh_percent")
+            (pl.col("rhh_count") / pl.col("pitcher_total_right")).alias("rhh_percent"),
+            (pl.col("lhh_count") / pl.col("pitcher_total_left")).alias("lhh_percent")
         ])
 
+
         df_merge = df_spring_group.join(df_year_old_group,on=['pitcher_id','pitch_type'],how='left',suffix='_old')
 
 
@@ -515,8 +532,8 @@ def server(input, output, session):
             { "title": "New Pitch?", "field": "new_pitch", "width": 125, "headerFilter":"input" ,"frozen":False,},
             { "title": "Pitches", "field": "count", "width": 100 , "headerFilter":"input","contextMenu":True},
             { "title": "Pitch%", "field": "pitch_percent_formatted", "width": 100, "headerFilter":"input"},
-            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 100, "headerFilter":"input"},
             { "title": "LHH%", "field": "lhh_percent_formatted", "width": 100, "headerFilter":"input"},
+            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 100, "headerFilter":"input"},
             { "title": "Velocity", "field": "start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
             { "title": "Max Velo", "field": "max_start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
             { "title": "iVB", "field": "ivb_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
@@ -566,11 +583,26 @@ def server(input, output, session):
         import polars as pl
 
         # Compute total pitches for each pitcher
-        df_pitcher_totals = df_spring_stuff.group_by(["pitcher_id",'game_id','game_date']).agg(
+        df_pitcher_totals = df_spring_stuff.group_by(["pitcher_id"]).agg(
             pl.col("start_speed").count().alias("pitcher_total")
         )
 
-        df_spring_group = df_spring_stuff.group_by(['pitcher_id', 'pitcher_name', 'pitch_type','game_id','game_date']).agg([
+        df_pitcher_totals_hands = (
+            df_spring_stuff
+            .group_by(["pitcher_id", "batter_hand"])
+            .agg(pl.col("start_speed").count().alias("pitcher_total"))
+            .pivot(
+                values="pitcher_total",
+                index="pitcher_id",
+                columns="batter_hand",
+                aggregate_function="sum"
+            )
+            .rename({"L": "pitcher_total_left", "R": "pitcher_total_right"})
+            .fill_null(0)  # Fill missing values with 0 if some pitchers don't face both hands
+        )
+                
+        
+        df_spring_group = df_spring_stuff.group_by(['pitcher_id', 'pitcher_name', 'pitch_type']).agg([
             pl.col('start_speed').count().alias('count'),
             pl.col('start_speed').mean().alias('start_speed'),
             pl.col('start_speed').max().alias('max_start_speed'),
@@ -580,12 +612,13 @@ def server(input, output, session):
             pl.col('release_pos_x').mean().alias('release_pos_x'),
             pl.col('extension').mean().alias('extension'),
             pl.col('tj_stuff_plus').mean().alias('tj_stuff_plus'),
-            (pl.col('start_speed').filter(pl.col('batter_hand')=='L').count()).alias('rhh_count'),
-            (pl.col('start_speed').filter(pl.col('batter_hand')=='R').count()).alias('lhh_count')
+            (pl.col("batter_hand").eq("R").sum()).alias("rhh_count"),  # Corrected: Counts RHH (batter_hand == "R")
+            (pl.col("batter_hand").eq("L").sum()).alias("lhh_count")   # Corrected: Counts LHH (batter_hand == "L")
         ])
 
         # Join total pitches per pitcher to the grouped DataFrame on pitcher_id
-        df_spring_group = df_spring_group.join(df_pitcher_totals, on=["pitcher_id",'game_id','game_date'], how="left")
+        df_spring_group = df_spring_group.join(df_pitcher_totals, on=["pitcher_id"], how="left")
+        df_spring_group = df_spring_group.join(df_pitcher_totals_hands, on=["pitcher_id"], how="left")
 
         # Now calculate the pitch percent for each pitcher/pitch_type combination
         df_spring_group = df_spring_group.with_columns(
@@ -594,10 +627,11 @@ def server(input, output, session):
 
         # Optionally, if you want the percentage of left/right-handed batters within the group:
         df_spring_group = df_spring_group.with_columns([
-            (pl.col("rhh_count") / pl.col("pitcher_total")).alias("rhh_percent"),
-            (pl.col("lhh_count") / pl.col("pitcher_total")).alias("lhh_percent")
+            (pl.col("rhh_count") / pl.col("pitcher_total_right")).alias("rhh_percent"),
+            (pl.col("lhh_count") / pl.col("pitcher_total_left")).alias("lhh_percent")
         ])
 
+
         df_merge = df_spring_group.join(df_year_old_group,on=['pitcher_id','pitch_type'],how='left',suffix='_old')
 
 
@@ -673,8 +707,8 @@ def server(input, output, session):
             { "title": "Date", "field": "game_date", "width": 100, "headerFilter":"input" ,"frozen":True,},
             { "title": "Pitches", "field": "count", "width": 100 , "headerFilter":"input"},
             { "title": "Pitch%", "field": "pitch_percent_formatted", "width": 100, "headerFilter":"input"},
-            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 100, "headerFilter":"input"},
             { "title": "LHH%", "field": "lhh_percent_formatted", "width": 100, "headerFilter":"input"},
+            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 100, "headerFilter":"input"},
             { "title": "Velocity", "field": "start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
             { "title": "Max Velo", "field": "max_start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },            
             { "title": "iVB", "field": "ivb_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
@@ -842,9 +876,9 @@ def server(input, output, session):
             { "title": "Pitch Type", "field": "pitch_type", "width": 125, "headerFilter":"input" ,"frozen":True,},
             { "title": "New?", "field": "new_pitch", "width": 125, "headerFilter":"input" ,"frozen":False,},
             { "title": "Pitches", "field": "count", "width": 100 , "headerFilter":"input"},
-            { "title": "Pitch%", "field": "pitch_percent_formatted", "width": 100, "headerFilter":"input"},
-            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 90, "headerFilter":"input"},
+            { "title": "Pitch%", "field": "pitch_percent_formatted", "width": 100, "headerFilter":"input"},+
             { "title": "LHH%", "field": "lhh_percent_formatted", "width": 90, "headerFilter":"input"},
+            { "title": "RHH%", "field": "rhh_percent_formatted", "width": 90, "headerFilter":"input"},
             { "title": "Velocity", "field": "start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
             { "title": "Max Velo", "field": "max_start_speed_formatted", "width": 100, "headerFilter":"input", "formatter":"textarea" },
             { "title": "iVB", "field": "ivb_formatted", "width": 80, "headerFilter":"input", "formatter":"textarea" },