Refactor app.py to replace radio buttons with selectboxes for view selection and streamline site and slate type inputs across all tabs, enhancing user experience and maintaining consistent data management.

app.py

@@ -124,14 +124,16 @@ hold_display = roo_data
 with st.container():
     col1, col2 = st.columns([3, 3])
     with col1:
-        view_var = st.radio("Select view", ["Simple", "Advanced"])
+        view_var = st.selectbox("Select view", ["Simple", "Advanced"])
     with col2:
-        model_var = st.selectbox("What model do you want to view?", ('Scoring Percentages', 'Player ROO', 'Optimals'), key='model_var')
+        site_var = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'))
 
-if model_var == 'Scoring Percentages':
+tab1, tab2, tab3 = st.tabs(["Scoring Percentages", "Player ROO", "Optimals"])
+
+with tab1:
     st.header("Scoring Percentages")
     with st.expander("Info and Filters"):
-        col1, col2, col3, col4 = st.columns([3, 3, 3, 3])
+        col1, col2, col3 = st.columns([3, 3, 3])
         with col1:
             if st.button("Load/Reset Data", key='reset1'):
                 st.cache_data.clear()
@@ -142,11 +144,9 @@ if model_var == 'Scoring Percentages':
                 for key in st.session_state.keys():
                     del st.session_state[key]
         with col2:
-            site_var1 = st.radio("What site are you working with?", ('Draftkings', 'Fanduel'), key='site_var1')
+            slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary Slate', 'All Games'))
         with col3:
-            slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary Slate', 'All Games'), key='slate_var1')
-        with col4:
-            own_var1 = st.radio("How would you like to display team ownership?", ('Sum', 'Average'), key='own_var1')
+            own_var1 = st.radio("How would you like to display team ownership?", ('Sum', 'Average'))
     st.title("Scoring Percentages")
     if view_var == "Simple":
         scoring_percentages = scoring_percentages[['Names', 'Avg Score', '8+ runs', 'Win Percentage']]
@@ -154,10 +154,10 @@ if model_var == 'Scoring Percentages':
     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)
 
-if model_var == 'Player ROO':
+with tab2:
     st.header("Player ROO")
     with st.expander("Info and Filters"):
-        col1, col2, col3, col4, col5 = st.columns([3, 3, 3, 3, 3])
+        col1, col2, col3, col4 = st.columns([3, 3, 3, 3])
         with col1:
             if st.button("Load/Reset Data", key='reset2'):
                 st.cache_data.clear()
@@ -168,17 +168,15 @@ if model_var == 'Player ROO':
                 for key in st.session_state.keys():
                     del st.session_state[key]
         with col2:
-            site_var2 = st.radio("What site are you working with?", ('Draftkings', 'Fanduel'), key='site_var2')
+            slate_type_var2 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'))
         with col3:
-            slate_type_var2 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'), key='slate_type_var2')
+            slate_var2 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'))
         with col4:
-            slate_var2 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'), key='slate_var2')
-        with col5:
-            pos_var2 = st.radio("Which position group would you like to view?", ('All', 'Pitchers', 'Hitters'), key='pos_var2')
+            pos_var2 = st.radio("Which position group would you like to view?", ('All', 'Pitchers', 'Hitters'))
     
     if slate_type_var2 == 'Regular':
         player_roo_raw = roo_data.copy()
-        if site_var2 == 'Draftkings':
+        if site_var == 'Draftkings':
             player_roo_raw['Site'] = 'Draftkings'
 
             if pos_var2 == 'All':
@@ -187,7 +185,7 @@ if model_var == 'Player ROO':
                 player_roo_raw = player_roo_raw[player_roo_raw['Position'] == 'SP']
             elif pos_var2 == 'Hitters':
                 player_roo_raw = player_roo_raw[player_roo_raw['Position'] != 'SP']
-        elif site_var2 == 'Fanduel':
+        elif site_var == 'Fanduel':
             player_roo_raw['Site'] = 'Fanduel'
 
             if pos_var2 == 'All':
@@ -206,9 +204,9 @@ if model_var == 'Player ROO':
             
     elif slate_type_var2 == 'Showdown':
         player_roo_raw = sd_roo_data.copy()
-        if site_var2 == 'Draftkings':
+        if site_var == 'Draftkings':
             player_roo_raw['Site'] = 'Draftkings'
-        elif site_var2 == 'Fanduel':
+        elif site_var == 'Fanduel':
             player_roo_raw['Site'] = 'Fanduel'
     st.session_state['player_roo'] = player_roo_raw.drop(columns=['site', 'slate', 'version', 'timestamp'])
     if view_var == "Simple":
@@ -217,7 +215,7 @@ if model_var == 'Player ROO':
     elif view_var == "Advanced":
         st.dataframe(st.session_state['player_roo'].style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True, hide_index=True)
 
-if model_var == 'Optimals':
+with tab3:
     st.header("Optimals")
     with st.expander("Info and Filters"):
         if st.button("Load/Reset Data", key='reset3'):
@@ -229,19 +227,18 @@ if model_var == 'Optimals':
             for key in st.session_state.keys():
                 del st.session_state[key]
         
-        site_var3 = st.radio("What site are you working with?", ('Draftkings', 'Fanduel'), key='site_var3')
-        slate_type_var3 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'), key='slate_type_var3')
-        slate_var3 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'), key='slate_var3')
+        slate_type_var3 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'))
+        slate_var3 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'))
 
         if slate_type_var3 == 'Regular':
-            if site_var3 == 'Draftkings':
+            if site_var == 'Draftkings':
                 dk_lineups = init_DK_lineups(slate_var3)
-            elif site_var3 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 fd_lineups = init_FD_lineups(slate_var3)
         elif slate_type_var3 == 'Showdown':
-            if site_var3 == 'Draftkings':
+            if site_var == 'Draftkings':
                 dk_lineups = init_DK_lineups(slate_var3)
-            elif site_var3 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 fd_lineups = init_FD_lineups(slate_var3)
         lineup_num_var = st.number_input("How many lineups do you want to display?", min_value=1, max_value=1000, value=150, step=1)
         
@@ -250,7 +247,7 @@ if model_var == 'Optimals':
         elif slate_type_var3 == 'Showdown':
             raw_baselines = sd_roo_data
         
-        if site_var3 == 'Draftkings':
+        if site_var == 'Draftkings':
             if slate_type_var3 == 'Regular':
                 ROO_slice = raw_baselines[raw_baselines['Site'] == 'Draftkings']
                 player_salaries = dict(zip(ROO_slice['Player'], ROO_slice['Salary']))
@@ -267,7 +264,7 @@ if model_var == 'Optimals':
             elif player_var1 == 'Full Slate':
                     player_var2 = raw_baselines.Player.values.tolist()
                     
-        elif site_var3 == 'Fanduel':
+        elif site_var == 'Fanduel':
             raw_baselines = hold_display
             if slate_type_var3 == 'Regular':
                 ROO_slice = raw_baselines[raw_baselines['Site'] == 'Fanduel']
@@ -286,10 +283,10 @@ if model_var == 'Optimals':
 
         if st.button("Prepare data export", key='data_export'):
             data_export = st.session_state.working_seed.copy()
-            # if site_var3 == 'Draftkings':
+            # if site_var == 'Draftkings':
             #     for col_idx in range(6):
             #         data_export[:, col_idx] = np.array([id_dict.get(player, player) for player in data_export[:, col_idx]])
-            # elif site_var3 == 'Fanduel':
+            # elif site_var == 'Fanduel':
             #     for col_idx in range(6):
             #         data_export[:, col_idx] = np.array([id_dict.get(player, player) for player in data_export[:, col_idx]])
             st.download_button(
@@ -299,7 +296,7 @@ if model_var == 'Optimals':
                 mime='text/csv',
             )
         
-    if site_var3 == 'Draftkings':
+    if site_var == 'Draftkings':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -316,7 +313,7 @@ if model_var == 'Optimals':
                 st.session_state.working_seed = dk_lineups.copy()
             st.session_state.data_export_display = pd.DataFrame(st.session_state.working_seed[0:lineup_num_var], columns=column_names)
         
-    elif site_var3 == 'Fanduel':
+    elif site_var == 'Fanduel':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -334,10 +331,10 @@ if model_var == 'Optimals':
             st.session_state.data_export_display = pd.DataFrame(st.session_state.working_seed[0:lineup_num_var], columns=column_names)
 
     export_file = st.session_state.data_export_display.copy()
-    # if site_var3 == 'Draftkings':
+    # if site_var == 'Draftkings':
     #     for col_idx in range(6):
     #         export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
-    # elif site_var3 == 'Fanduel':
+    # elif site_var == 'Fanduel':
     #     for col_idx in range(6):
     #         export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
             
@@ -345,9 +342,9 @@ if model_var == 'Optimals':
         if st.button("Reset Optimals", key='reset3'):
             for key in st.session_state.keys():
                 del st.session_state[key]
-            if site_var3 == 'Draftkings':
+            if site_var == 'Draftkings':
                 st.session_state.working_seed = dk_lineups.copy()
-            elif site_var3 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 st.session_state.working_seed = fd_lineups.copy()
         if 'data_export_display' in st.session_state:
             st.dataframe(st.session_state.data_export_display.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(precision=2), height=500, use_container_width = True)
@@ -361,7 +358,7 @@ if model_var == 'Optimals':
     with st.container():
         if 'working_seed' in st.session_state:
             # Create a new dataframe with summary statistics
-            if site_var3 == 'Draftkings':
+            if site_var == 'Draftkings':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -383,7 +380,7 @@ if model_var == 'Optimals':
                         np.std(st.session_state.working_seed[:,8])
                     ]
                 })
-            elif site_var3 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -421,9 +418,9 @@ if model_var == 'Optimals':
         tab1, tab2 = st.tabs(["Display Frequency", "Seed Frame Frequency"])
         with tab1:
             if 'data_export_display' in st.session_state:
-                if site_var3 == 'Draftkings':
+                if site_var == 'Draftkings':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
-                elif site_var3 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
                 
                 # Flatten the DataFrame and count unique values
@@ -457,9 +454,9 @@ if model_var == 'Optimals':
                 )
         with tab2:
             if 'working_seed' in st.session_state:
-                if site_var3 == 'Draftkings':
+                if site_var == 'Draftkings':
                     player_columns = st.session_state.working_seed[:, :6]
-                elif site_var3 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     player_columns = st.session_state.working_seed[:, :6]
                 
                 # Flatten the DataFrame and count unique values