Refactor scoring percentage calculations to accommodate multiple slate types for Draftkings and Fanduel. Update game format keys for clarity and enhance player display by including team information. Adjust data handling for ownership metrics and streamline the display of scoring statistics based on user-selected views.

app.py

@@ -16,8 +16,8 @@ def init_conn():
     
 db = init_conn()
 
-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%}'}
+game_format = {'Win%': '{:.2%}','First Inning Lead Percentage': '{:.2%}', 'Top Score': '{:.2%}',
+              'Fifth Inning Lead Percentage': '{:.2%}', '8+ Runs': '{:.2%}', 'LevX': '{:.2%}'}
 
 player_roo_format = {'Top_finish': '{:.2%}','Top_5_finish': '{:.2%}', 'Top_10_finish': '{:.2%}', '20+%': '{:.2%}', '2x%': '{:.2%}', '3x%': '{:.2%}',
                    '4x%': '{:.2%}'}
@@ -53,10 +53,17 @@ 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', 'Slate', 'Top Score']]
+    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',
+    'DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'DK Main Top Score', 'FD Main Top Score', 'DK Secondary Top Score', 'FD Secondary Top Score',
+    'DK Turbo Top Score', 'FD Turbo 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)
+    scoring_percentages['DK Main Top Score'] = scoring_percentages['DK Main Top Score'].replace('', np.nan).astype(float)
+    scoring_percentages['FD Main Top Score'] = scoring_percentages['FD Main Top Score'].replace('', np.nan).astype(float)
+    scoring_percentages['DK Secondary Top Score'] = scoring_percentages['DK Secondary Top Score'].replace('', np.nan).astype(float)
+    scoring_percentages['FD Secondary Top Score'] = scoring_percentages['FD Secondary Top Score'].replace('', np.nan).astype(float)
+    scoring_percentages['DK Turbo Top Score'] = scoring_percentages['DK Turbo Top Score'].replace('', np.nan).astype(float)
+    scoring_percentages['FD Turbo Top Score'] = scoring_percentages['FD Turbo Top Score'].replace('', np.nan).astype(float)
     
     return roo_data, sd_roo_data, scoring_percentages, dk_roo, fd_roo, dk_id_map, fd_id_map
 
@@ -238,20 +245,40 @@ 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', 'All Games'), key='slate_var1')
+            slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary Slate', 'Turbo Slate'), 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
+    if site_var == 'Draftkings':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Main Slate'] == 1]
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Secondary Slate'] == 1]
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Turbo Slate'] == 1]
+    elif site_var == 'Fanduel':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Main Slate'] == 1]
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Secondary Slate'] == 1]
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Turbo Slate'] == 1]
 
     dk_hitters_only = dk_roo[dk_roo['pos_group'] != 'Pitchers']
-    dk_hitters_only = dk_hitters_only[dk_hitters_only['Slate'] == 'main_slate']
+    if slate_var1 == 'Main Slate':
+        dk_hitters_only = dk_hitters_only[dk_hitters_only['Slate'] == 'main_slate']
+    elif slate_var1 == 'Secondary Slate':
+        dk_hitters_only = dk_hitters_only[dk_hitters_only['Slate'] == 'secondary_slate']
+    elif slate_var1 == 'Turbo Slate':
+        dk_hitters_only = dk_hitters_only[dk_hitters_only['Slate'] == 'turbo_slate']
     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[fd_hitters_only['Slate'] == 'main_slate']
+    if slate_var1 == 'Main Slate':
+        fd_hitters_only = fd_hitters_only[fd_hitters_only['Slate'] == 'main_slate']
+    elif slate_var1 == 'Secondary Slate':
+        fd_hitters_only = fd_hitters_only[fd_hitters_only['Slate'] == 'secondary_slate']
+    elif slate_var1 == 'Turbo Slate':
+        fd_hitters_only = fd_hitters_only[fd_hitters_only['Slate'] == 'turbo_slate']
     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')
@@ -260,14 +287,40 @@ with tab1:
     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)
-
+    if site_var == 'Draftkings':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages['DK LevX'] = scoring_percentages['DK Main Top Score'].rank(pct=True).astype(float) - scoring_percentages['DK Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'DK Main Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Secondary Top Score', 'FD Secondary Top Score', 'DK Turbo Top Score', 'FD Turbo Top Score'], axis=1)
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages['DK LevX'] = scoring_percentages['DK Secondary Top Score'].rank(pct=True).astype(float) - scoring_percentages['DK Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'DK Secondary Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Main Top Score', 'FD Secondary Top Score', 'DK Turbo Top Score', 'FD Turbo Top Score'], axis=1)
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages['DK LevX'] = scoring_percentages['DK Turbo Top Score'].rank(pct=True).astype(float) - scoring_percentages['DK Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'DK Turbo Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Main Top Score', 'FD Secondary Top Score', 'DK Secondary Top Score', 'FD Turbo Top Score'], axis=1)
+    elif site_var == 'Fanduel':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages['FD LevX'] = scoring_percentages['FD Main Top Score'].rank(pct=True).astype(float) - scoring_percentages['FD Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'FD Main Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'DK Main Top Score', 'DK Secondary Top Score', 'FD Secondary Top Score', 'DK Turbo Top Score', 'FD Turbo Top Score'], axis=1)
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages['FD LevX'] = scoring_percentages['FD Secondary Top Score'].rank(pct=True).astype(float) - scoring_percentages['FD Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'FD Secondary Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Main Top Score', 'DK Secondary Top Score', 'DK Turbo Top Score', 'FD Turbo Top Score'], axis=1)
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages['FD LevX'] = scoring_percentages['FD Turbo Top Score'].rank(pct=True).astype(float) - scoring_percentages['FD Own%'].rank(pct=True).astype(float)
+            scoring_percentages = scoring_percentages.rename(columns={'FD Turbo Top Score': 'Top Score'})
+            scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Main Top Score', 'FD Secondary Top Score', 'DK Secondary Top Score', 'DK Turbo Top Score'], axis=1)
     scoring_percentages = scoring_percentages.sort_values(by='8+ runs', ascending=False)
-    scoring_percentages = scoring_percentages.drop('Slate', axis=1)
+    if site_var == 'Draftkings':
+        scoring_percentages = scoring_percentages.rename(columns={'DK LevX': 'LevX', 'DK Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
+    elif site_var == 'Fanduel':
+        scoring_percentages = scoring_percentages.rename(columns={'FD LevX': 'LevX', 'FD Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
     
     if view_var == "Simple":
-        scoring_percentages = scoring_percentages[['Names', 'Avg Score', '8+ runs', 'Win Percentage']]
+        scoring_percentages = scoring_percentages[['Names', 'Runs', '8+ Runs', 'Win%', 'LevX', 'Own%']]
         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)
     elif view_var == "Advanced":
         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)
@@ -343,7 +396,7 @@ with tab2:
 
     if view_var == "Simple":
         try:
-            player_roo_disp = player_roo_disp[['Player', 'Position', 'Salary', 'Median', 'Ceiling', 'Own%']]
+            player_roo_disp = player_roo_disp[['Player', 'Position', 'Team', 'Salary', 'Median', 'Ceiling', 'Own%']]
             st.dataframe(player_roo_disp.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True, hide_index=True)
         except:
             st.dataframe(player_roo_disp.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True, hide_index=True)