Refactor app.py to standardize variable names for site and view selections across all tabs, ensuring consistent data handling and improving user experience with clearer input options.

app.py

@@ -121,17 +121,18 @@ def convert_df(array):
 roo_data, sd_roo_data, scoring_percentages = init_baselines()
 hold_display = roo_data
 
-with st.container():
-    col1, col2 = st.columns([3, 3])
-    with col1:
-        view_var = st.selectbox("Select view", ["Simple", "Advanced"])
-    with col2:
-        site_var = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'))
-
 tab1, tab2, tab3 = st.tabs(["Scoring Percentages", "Player ROO", "Optimals"])
 
 with tab1:
     st.header("Scoring Percentages")
+
+    with st.container():
+        col1, col2 = st.columns([3, 3])
+        with col1:
+            view_var1 = st.selectbox("Select view", ["Simple", "Advanced"])
+        with col2:
+            site_var1 = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'))
+    
     with st.expander("Info and Filters"):
         col1, col2, col3 = st.columns([3, 3, 3])
         with col1:
@@ -148,14 +149,22 @@ with tab1:
         with col3:
             own_var1 = st.radio("How would you like to display team ownership?", ('Sum', 'Average'))
     st.title("Scoring Percentages")
-    if view_var == "Simple":
+    if view_var1 == "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)
-    elif view_var == "Advanced":
+    elif view_var1 == "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)
 
 with tab2:
     st.header("Player ROO")
+
+    with st.container():
+        col1, col2 = st.columns([3, 3])
+        with col1:
+            view_var2 = st.selectbox("Select view", ["Simple", "Advanced"])
+        with col2:
+            site_var2 = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'))
+    
     with st.expander("Info and Filters"):
         col1, col2, col3, col4 = st.columns([3, 3, 3, 3])
         with col1:
@@ -176,7 +185,7 @@ with tab2:
     
     if slate_type_var2 == 'Regular':
         player_roo_raw = roo_data.copy()
-        if site_var == 'Draftkings':
+        if site_var2 == 'Draftkings':
             player_roo_raw['Site'] = 'Draftkings'
 
             if pos_var2 == 'All':
@@ -185,7 +194,7 @@ with tab2:
                 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_var == 'Fanduel':
+        elif site_var2 == 'Fanduel':
             player_roo_raw['Site'] = 'Fanduel'
 
             if pos_var2 == 'All':
@@ -204,19 +213,27 @@ with tab2:
             
     elif slate_type_var2 == 'Showdown':
         player_roo_raw = sd_roo_data.copy()
-        if site_var == 'Draftkings':
+        if site_var2 == 'Draftkings':
             player_roo_raw['Site'] = 'Draftkings'
-        elif site_var == 'Fanduel':
+        elif site_var2 == 'Fanduel':
             player_roo_raw['Site'] = 'Fanduel'
     st.session_state['player_roo'] = player_roo_raw.drop(columns=['site', 'slate', 'version', 'timestamp'])
-    if view_var == "Simple":
+    if view_var2 == "Simple":
         st.session_state['player_roo'] = st.session_state['player_roo'][['Player', 'Position', 'Salary', 'Median', 'Ceiling', 'Own']]
         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)
-    elif view_var == "Advanced":
+    elif view_var2 == "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)
 
 with tab3:
     st.header("Optimals")
+
+    with st.container():
+        col1, col2 = st.columns([3, 3])
+        with col1:
+            site_var3 = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'))
+        with col2:
+            view_var3 = st.selectbox("Select view", ["Simple", "Advanced"])
+            
     with st.expander("Info and Filters"):
         if st.button("Load/Reset Data", key='reset3'):
             st.cache_data.clear()
@@ -231,14 +248,14 @@ with tab3:
         slate_var3 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'))
 
         if slate_type_var3 == 'Regular':
-            if site_var == 'Draftkings':
+            if site_var3 == 'Draftkings':
                 dk_lineups = init_DK_lineups(slate_var3)
-            elif site_var == 'Fanduel':
+            elif site_var3 == 'Fanduel':
                 fd_lineups = init_FD_lineups(slate_var3)
         elif slate_type_var3 == 'Showdown':
-            if site_var == 'Draftkings':
+            if site_var3 == 'Draftkings':
                 dk_lineups = init_DK_lineups(slate_var3)
-            elif site_var == 'Fanduel':
+            elif site_var3 == '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)
         
@@ -247,7 +264,7 @@ with tab3:
         elif slate_type_var3 == 'Showdown':
             raw_baselines = sd_roo_data
         
-        if site_var == 'Draftkings':
+        if site_var3 == 'Draftkings':
             if slate_type_var3 == 'Regular':
                 ROO_slice = raw_baselines[raw_baselines['Site'] == 'Draftkings']
                 player_salaries = dict(zip(ROO_slice['Player'], ROO_slice['Salary']))
@@ -264,7 +281,7 @@ with tab3:
             elif player_var1 == 'Full Slate':
                     player_var2 = raw_baselines.Player.values.tolist()
                     
-        elif site_var == 'Fanduel':
+        elif site_var3 == 'Fanduel':
             raw_baselines = hold_display
             if slate_type_var3 == 'Regular':
                 ROO_slice = raw_baselines[raw_baselines['Site'] == 'Fanduel']
@@ -283,10 +300,10 @@ with tab3:
 
         if st.button("Prepare data export", key='data_export'):
             data_export = st.session_state.working_seed.copy()
-            # if site_var == 'Draftkings':
+            # if site_var3 == '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_var == 'Fanduel':
+            # elif site_var3 == '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(
@@ -296,7 +313,7 @@ with tab3:
                 mime='text/csv',
             )
         
-    if site_var == 'Draftkings':
+    if site_var3 == 'Draftkings':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -313,7 +330,7 @@ with tab3:
                 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_var == 'Fanduel':
+    elif site_var3 == 'Fanduel':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -331,10 +348,10 @@ with tab3:
             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_var == 'Draftkings':
+    # if site_var3 == 'Draftkings':
     #     for col_idx in range(6):
     #         export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
-    # elif site_var == 'Fanduel':
+    # elif site_var3 == 'Fanduel':
     #     for col_idx in range(6):
     #         export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
             
@@ -342,9 +359,9 @@ with tab3:
         if st.button("Reset Optimals", key='reset3'):
             for key in st.session_state.keys():
                 del st.session_state[key]
-            if site_var == 'Draftkings':
+            if site_var3 == 'Draftkings':
                 st.session_state.working_seed = dk_lineups.copy()
-            elif site_var == 'Fanduel':
+            elif site_var3 == '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)
@@ -358,7 +375,7 @@ with tab3:
     with st.container():
         if 'working_seed' in st.session_state:
             # Create a new dataframe with summary statistics
-            if site_var == 'Draftkings':
+            if site_var3 == 'Draftkings':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -380,7 +397,7 @@ with tab3:
                         np.std(st.session_state.working_seed[:,8])
                     ]
                 })
-            elif site_var == 'Fanduel':
+            elif site_var3 == 'Fanduel':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -418,9 +435,9 @@ with tab3:
         tab1, tab2 = st.tabs(["Display Frequency", "Seed Frame Frequency"])
         with tab1:
             if 'data_export_display' in st.session_state:
-                if site_var == 'Draftkings':
+                if site_var3 == 'Draftkings':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
-                elif site_var == 'Fanduel':
+                elif site_var3 == 'Fanduel':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
                 
                 # Flatten the DataFrame and count unique values
@@ -454,9 +471,9 @@ with tab3:
                 )
         with tab2:
             if 'working_seed' in st.session_state:
-                if site_var == 'Draftkings':
+                if site_var3 == 'Draftkings':
                     player_columns = st.session_state.working_seed[:, :6]
-                elif site_var == 'Fanduel':
+                elif site_var3 == 'Fanduel':
                     player_columns = st.session_state.working_seed[:, :6]
                 
                 # Flatten the DataFrame and count unique values