Enhance scoring percentages by adding 'Top Score' metric and updating data handling for DK and FD ownership calculations. Adjusted UI options for slate selection and improved data filtering.

app.py

@@ -17,7 +17,7 @@ def init_conn():
     
 db, db2 = init_conn()
 
-game_format = {'Win Percentage': '{:.2%}','First Inning Lead Percentage': '{:.2%}',
+game_format = {'Win Percentage': '{:.2%}','First Inning Lead Percentage': '{:.2%}', 'Top Score': '{:.2%}',
               'Fifth Inning Lead Percentage': '{:.2%}', '8+ runs': '{:.2%}', 'DK LevX': '{:.2%}', 'FD LevX': '{:.2%}'}
 
 player_roo_format = {'Top_finish': '{:.2%}','Top_5_finish': '{:.2%}', 'Top_10_finish': '{:.2%}', '20+%': '{:.2%}', '2x%': '{:.2%}', '3x%': '{:.2%}',
@@ -50,12 +50,15 @@ def init_baselines():
     cursor = collection.find()
     team_frame = pd.DataFrame(cursor)
     scoring_percentages = team_frame.drop(columns=['_id'])
-    scoring_percentages = scoring_percentages[['Names', 'Avg First Inning', 'First Inning Lead Percentage', 'Avg Fifth Inning', 'Fifth Inning Lead Percentage', 'Avg Score', '8+ runs', 'Win Percentage']]
+    scoring_percentages = scoring_percentages[['Names', 'Avg First Inning', 'First Inning Lead Percentage', 'Avg Fifth Inning', 'Fifth Inning Lead Percentage', 'Avg Score', '8+ runs', 'Win Percentage', 'Slate', 'Top Score']]
     scoring_percentages['8+ runs'] = scoring_percentages['8+ runs'].replace('%', '', regex=True).astype(float)
     scoring_percentages['Win Percentage'] = scoring_percentages['Win Percentage'].replace('%', '', regex=True).astype(float)
+    scoring_percentages['Top Score'] = scoring_percentages['Top Score'].replace('', np.nan).astype(float)
     dk_hitters_only = dk_roo[dk_roo['pos_group'] != 'Pitchers']
+    dk_hitters_only = dk_hitters_only.replace('CWS', 'CHW')
     dk_team_ownership = dk_hitters_only.groupby('Team')['Own%'].sum().reset_index()
     fd_hitters_only = fd_roo[fd_roo['pos_group'] != 'Pitchers']
+    fd_hitters_only = fd_hitters_only.replace('CWS', 'CHW')
     fd_team_ownership = fd_hitters_only.groupby('Team')['Own%'].sum().reset_index()
     scoring_percentages = scoring_percentages.merge(dk_team_ownership, left_on='Names', right_on='Team', how='left')
     scoring_percentages.rename(columns={'Own%': 'DK Own%'}, inplace=True)
@@ -63,6 +66,8 @@ def init_baselines():
     scoring_percentages = scoring_percentages.merge(fd_team_ownership, left_on='Names', right_on='Team', how='left')
     scoring_percentages.rename(columns={'Own%': 'FD Own%'}, inplace=True)
     scoring_percentages.drop('Team', axis=1, inplace=True)
+    scoring_percentages['DK LevX'] = scoring_percentages['Top Score'].rank(pct=True).astype(float) - scoring_percentages['DK Own%'].rank(pct=True).astype(float)
+    scoring_percentages['FD LevX'] = scoring_percentages['Top Score'].rank(pct=True).astype(float) - scoring_percentages['FD Own%'].rank(pct=True).astype(float)
     
     return roo_data, sd_roo_data, scoring_percentages, dk_roo, fd_roo
 
@@ -244,8 +249,17 @@ with tab1:
     st.header("Scoring Percentages")
     with st.expander("Info and Filters"):
         with st.container():
-            slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary Slate', 'All Games'), key='slate_var1')
+            slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'All Games'), key='slate_var1')
             own_var1 = st.radio("How would you like to display team ownership?", ('Sum', 'Average'), key='own_var1')
+    
+    if slate_var1 == 'Main Slate':
+        scoring_percentages = scoring_percentages[scoring_percentages['Slate'] == 'Main']
+    elif slate_var1 != 'Main Slate':
+        pass
+
+    scoring_percentages = scoring_percentages.sort_values(by='8+ runs', ascending=False)
+    scoring_percentages = scoring_percentages.drop('Slate', axis=1)
+    
     if view_var == "Simple":
         scoring_percentages = scoring_percentages[['Names', 'Avg Score', '8+ runs', 'Win Percentage']]
         st.dataframe(scoring_percentages.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(game_format, precision=2), height=750, use_container_width = True, hide_index=True)