Update app.py

app.py

@@ -41,6 +41,7 @@ def init_baselines():
     load_display.replace('', np.nan, inplace=True)
     load_display = load_display.dropna(subset=['PA'])
     load_display = load_display.drop_duplicates(subset=['Player'], keep='first')
+    load_display= load_display.sort_values(by='Player', ascending=False)
     
     hitter_rhp = load_display.copy()
     
@@ -51,6 +52,7 @@ def init_baselines():
     load_display.replace('', np.nan, inplace=True)
     load_display = load_display.dropna(subset=['PA'])
     load_display = load_display.drop_duplicates(subset=['Player'], keep='first')
+    load_display= load_display.sort_values(by='Player', ascending=False)
     
     hitter_lhp = load_display.copy()
     
@@ -60,6 +62,7 @@ def init_baselines():
     load_display = pd.DataFrame(worksheet.get_all_records())
     load_display.replace('', np.nan, inplace=True)
     load_display = load_display.dropna(subset=['True AVG'])
+    load_display= load_display.sort_values(by='Names', ascending=False)
     
     pitcher_rhh = load_display.copy()
     
@@ -69,17 +72,28 @@ def init_baselines():
     load_display = pd.DataFrame(worksheet.get_all_records())
     load_display.replace('', np.nan, inplace=True)
     load_display = load_display.dropna(subset=['True AVG'])
+    load_display= load_display.sort_values(by='Names', ascending=False)
     
     pitcher_lhh = load_display.copy()
+    
+    time.sleep(.5)
+    
+    worksheet = sh.worksheet('Bullpen_xData')
+    load_display = pd.DataFrame(worksheet.get_all_records())
+    load_display.replace('', np.nan, inplace=True)
+    load_display = load_display.dropna(subset=['HWS Ratio'])
+    load_display= load_display.sort_values(by='Names', ascending=False)
+    
+    bullpen_data = load_display.copy()
 
-    return hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh
+    return hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh, bullpen_data
 
 @st.cache_resource
-def calc_poisson(hitter_val, sp_val, sp_count, bp_count):
+def calc_poisson(hitter_val, sp_val, bp_val, sp_count, bp_count):
     base_val = hitter_val
     opp_val = sp_val
     sp_combo_val = sum([base_val, opp_val]) / 2
-    bp_combo_val = sum([base_val, .085]) / 2
+    bp_combo_val = sum([base_val, bp_val]) / 2
     sp_instances = sp_count
     bp_instances = bp_count
     sp_mean = sp_combo_val * sp_instances
@@ -97,14 +111,14 @@ def calc_poisson(hitter_val, sp_val, sp_count, bp_count):
     
     return sp_outcome, bp_outcome, mean_outcome
 
-hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh = init_baselines()
+hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh, bullpen_data = init_baselines()
 
 col1, col2 = st.columns([1, 7])
 
 with col1:
     if st.button("Load/Reset Data", key='reset1'):
           st.cache_data.clear()
-          hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh = init_baselines()
+          hitter_rhp, hitter_lhp, pitcher_rhh, pitcher_lhh, bullpen_data = init_baselines()
           
     pitcher_var1 = st.selectbox("Which pitcher are you looking at?", options = pitcher_rhh['Names'].unique())
     working_pitcher = pitcher_rhh.copy()
@@ -118,13 +132,27 @@ with col1:
         hitter_var1 = st.selectbox("What hitter are you looking at?", options = hitter_lhp['Player'].unique())
         working_hitters = hitter_lhp.copy()
         hitter_check = working_hitters[working_hitters['Player'] == hitter_var1]
+    bullpen_var1 = st.selectbox("Which Bullpen are you looking at?", options = bullpen_data['Names'].unique())
+    working_bullpen = bullpen_data.copy()
+    bullpen_check = working_bullpen[working_bullpen['Names'] == bullpen_var1]
     sp_count = st.number_input("How many PA against the Pitcher?")
     bp_count = st.number_input("How many PA against the Bullpen?")
+    stat_var1 = st.selectbox("What Stat are you looking at?", options = ['Projected Walks', 'Projected Strikeouts', 'Projected HRs'])
 
 with col2:
     if st.button('calculate theoretical means'):
-        hitter_val = hitter_check['BB%'].iloc[0]
-        sp_val = pitcher_check['BB%'].iloc[0]
+        if stat_var1 == 'Projected Walks':
+            hitter_val = hitter_check['BB%'].iloc[0]
+            sp_val = pitcher_check['BB%'].iloc[0]
+            bp_val = bullpen_check['Walkper'].iloc[0] / 100
+        elif stat_var1 == 'Projected Strikeouts':
+            hitter_val = hitter_check['K%'].iloc[0]
+            sp_val = pitcher_check['K%'].iloc[0]
+            bp_val = bullpen_check['Strikeoutper'].iloc[0] / 100
+        elif stat_var1 == 'Projected HRs':
+            hitter_val = hitter_check['xHRs'].iloc[0] / hitter_check['PA'].iloc[0]
+            sp_val = pitcher_check['xHRs'].iloc[0] / pitcher_check['PA'].iloc[0]
+            bp_val = bullpen_check['Homeruns'].iloc[0] / bullpen_check['PA'].iloc[0]
         value = calc_poisson(hitter_val, sp_val, sp_count, bp_count)
         st.write(f"Theoretical mean of the SP instances: {value[0]}")
         st.write(f"Theoretical mean of the BP instances: {value[1]}")