Refactor Streamlit app layout and functionality to improve user experience. Introduced new columns for data loading and viewing options, added a segmented control for tab selection, and streamlined data reset logic. Enhanced site selection handling for Draftkings and Fanduel, ensuring consistent functionality across different views.

src/streamlit_app.py

@@ -184,19 +184,42 @@ dk_id_dict_sd = dict(zip(sd_roo_data['Player'], sd_roo_data['player_id']))
 fd_id_dict = dict(zip(roo_data[roo_data['Site'] == 'Fanduel']['Player'], roo_data[roo_data['Site'] == 'Fanduel']['player_id']))
 fd_id_dict_sd = dk_id_dict_sd
 hold_display = roo_data
-lineup_display = []
-check_list = []
-rand_player = 0
-boost_player = 0
-salaryCut = 0
 
-tab1, tab2 = st.tabs(["Player Overall Projections", "Optimals and Exposures"])
-
-with tab1:
+app_load_reset_column, app_view_site_column = st.columns([1, 9])
+with app_load_reset_column:
+    if st.button("Load/Reset Data", key='reset_data_button'):
+        st.cache_data.clear()
+        roo_data, sd_roo_data, timestamp = init_baselines()
+        dk_id_dict = dict(zip(roo_data[roo_data['Site'] == 'Draftkings']['Player'], roo_data[roo_data['Site'] == 'Draftkings']['player_id']))
+        dk_id_dict_sd = dict(zip(sd_roo_data['Player'], sd_roo_data['player_id']))
+        fd_id_dict = dict(zip(roo_data[roo_data['Site'] == 'Fanduel']['Player'], roo_data[roo_data['Site'] == 'Fanduel']['player_id']))
+        fd_id_dict_sd = dk_id_dict_sd
+        dk_lineups = init_DK_lineups('Regular')
+        fd_lineups = init_FD_lineups('Regular')
+        hold_display = roo_data
+        for key in st.session_state.keys():
+            del st.session_state[key]
+with app_view_site_column:
+    with st.container():
+        app_view_column, app_site_column = st.columns([3, 3])
+        with app_view_column:
+            view_var = st.selectbox("Select view", ["Simple", "Advanced"], key='view_selectbox')
+        with app_site_column:
+            site_var = st.selectbox("What site do you want to view?", ('Draftkings', 'Fanduel'), key='site_selectbox')
+
+selected_tab = st.segmented_control(
+    "Select Tab",
+    options=["Player ROO", "Optimals"],
+    selection_mode='single',
+    default='Player ROO',
+    width='stretch',
+    label_visibility='collapsed',
+    key='tab_selector'
+)
+
+if selected_tab == "Player ROO":
     with st.expander("Info and Filters"):
         if st.button("Reset Data", key='reset1'):
-                # Clear values from *all* all in-memory and on-disk data caches:
-                # i.e. clear values from both square and cube
                 st.cache_data.clear()
                 roo_data, sd_roo_data, timestamp = init_baselines()
                 dk_id_dict = dict(zip(roo_data[roo_data['Site'] == 'Draftkings']['Player'], roo_data[roo_data['Site'] == 'Draftkings']['player_id']))
@@ -210,20 +233,14 @@ with tab1:
                     del st.session_state[key]
 
         st.write(timestamp)
-
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            view_var = st.radio("Select a View", ["Simple", "Advanced"])
-        with col2:
-            site_var = st.radio("Select a Site", ["Draftkings", "FanDuel"])
-        with col3:
-            type_var = st.radio("Select a Type", ["Full Slate", "Showdown"])
-            if type_var == "Full Slate":
-                display = hold_display[hold_display['Site'] == site_var]
-                display = display.drop_duplicates(subset=['Player'])
-            elif type_var == "Showdown":
-                display = sd_roo_data
-                display = display.drop_duplicates(subset=['Player'])
+        
+        type_var = st.radio("Select a Type", ["Full Slate", "Showdown"])
+        if type_var == "Full Slate":
+            display = hold_display[hold_display['Site'] == site_var]
+            display = display.drop_duplicates(subset=['Player'])
+        elif type_var == "Showdown":
+            display = sd_roo_data
+            display = display.drop_duplicates(subset=['Player'])
     
     export_data = display.copy()
     export_data_pm = display[['Player', 'Salary', 'Median', 'Own']]
@@ -263,7 +280,7 @@ with tab1:
             display = display.set_index('Player')
             st.dataframe(display.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True)
 
-with tab2:
+if selected_tab == "Optimals":
     with st.expander("Info and Filters"):
         if st.button("Load/Reset Data", key='reset2'):
             st.cache_data.clear()
@@ -279,35 +296,30 @@ with tab2:
             for key in st.session_state.keys():
                 del st.session_state[key]
         
-        col1, col2, col3, col4, col5 = st.columns(5)
-        with col1:      
-            site_var1 = st.radio("What site are you working with?", ('Draftkings', 'Fanduel'))
-            if site_var1 == 'Draftkings':
-                id_dict = dk_id_dict.copy()
-                id_dict_sd = dk_id_dict_sd.copy()
-            elif site_var1 == 'Fanduel':
-                id_dict = fd_id_dict.copy()
-                id_dict_sd = fd_id_dict_sd.copy()
-            
-        with col2:
+        col1, col2, col3, col4 = st.columns(5)
+        with col1:
             slate_var1 = st.radio("Which data are you loading?", ('Regular', 'Showdown'))
             if slate_var1 == 'Regular':
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     dk_lineups = init_DK_lineups('Regular')
-                elif site_var1 == 'Fanduel':
+                    id_dict = dk_id_dict.copy()
+                elif site_var == 'Fanduel':
                     fd_lineups = init_FD_lineups('Regular')
+                    id_dict = fd_id_dict.copy()
             elif slate_var1 == 'Showdown':
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     dk_lineups = init_DK_lineups('Showdown')
-                elif site_var1 == 'Fanduel':
+                    id_dict_sd = dk_id_dict_sd.copy()
+                elif site_var == 'Fanduel':
                     fd_lineups = init_FD_lineups('Showdown')
+                    id_dict_sd = fd_id_dict_sd.copy()
 
             if slate_var1 == 'Regular':
                 raw_baselines = roo_data
             elif slate_var1 == 'Showdown':
                 raw_baselines = sd_roo_data
             
-            if site_var1 == 'Draftkings':
+            if site_var == 'Draftkings':
                 if slate_var1 == 'Regular':
                     ROO_slice = raw_baselines[raw_baselines['Site'] == 'Draftkings']
                     player_salaries = dict(zip(ROO_slice['Player'], ROO_slice['Salary']))
@@ -318,7 +330,7 @@ with tab2:
                 max_own = np.max(dk_lineups[:,8])
                 column_names = dk_columns
 
-            elif site_var1 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 raw_baselines = hold_display
                 if slate_var1 == 'Regular':
                     ROO_slice = raw_baselines[raw_baselines['Site'] == 'Fanduel']
@@ -328,21 +340,21 @@ with tab2:
                 min_own = np.min(fd_lineups[:,8])
                 max_own = np.max(fd_lineups[:,8])
                 column_names = fd_columns
-        with col3:
+        with col2:
             lineup_num_var = st.number_input("How many lineups do you want to display?", min_value=1, max_value=1000, value=150, step=1)
         
-        with col4:
+        with col3:
             player_var1 = st.radio("Do you want a frame with specific Players?", ('Full Slate', 'Specific Players'), key='player_var1')
             if player_var1 == 'Specific Players':
                     player_var2 = st.multiselect('Which players do you want?', options = raw_baselines['Player'].unique())
             elif player_var1 == 'Full Slate':
                     player_var2 = raw_baselines.Player.values.tolist()
         
-        with col5:
-            if site_var1 == 'Draftkings':
+        with col4:
+            if site_var == 'Draftkings':
                 salary_min_var = st.number_input("Minimum salary used", min_value = 0, max_value = 50000, value = 49000, step = 100, key = 'salary_min_var')
                 salary_max_var = st.number_input("Maximum salary used", min_value = 0, max_value = 50000, value = 50000, step = 100, key = 'salary_max_var')
-            elif site_var1 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 salary_min_var = st.number_input("Minimum salary used", min_value = 0, max_value = 60000, value = 59000, step = 100, key = 'salary_min_var')
                 salary_max_var = st.number_input("Maximum salary used", min_value = 0, max_value = 60000, value = 60000, step = 100, key = 'salary_max_var')
 
@@ -351,12 +363,12 @@ with tab2:
             if st.button("Prepare full data export", key='data_export'):
                 name_export = pd.DataFrame(st.session_state.working_seed.copy(), columns=column_names)
                 data_export = pd.DataFrame(st.session_state.working_seed.copy(), columns=column_names)
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     if slate_var1 == 'Regular':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
                     elif slate_var1 == 'Showdown':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
-                elif site_var1 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     if slate_var1 == 'Regular':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
                     elif slate_var1 == 'Showdown':
@@ -401,12 +413,12 @@ with tab2:
             if st.button("Prepare full data export (Filtered)", key='data_export_filtered'):
                 name_export = pd.DataFrame(st.session_state.working_seed.copy(), columns=column_names)
                 data_export = pd.DataFrame(st.session_state.working_seed.copy(), columns=column_names)
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     if slate_var1 == 'Regular':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
                     elif slate_var1 == 'Showdown':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
-                elif site_var1 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     if slate_var1 == 'Regular':
                         map_columns = ['FLEX1', 'FLEX2', 'FLEX3', 'FLEX4', 'FLEX5', 'FLEX6']
                     elif slate_var1 == 'Showdown':
@@ -453,7 +465,7 @@ with tab2:
                         mime='text/csv',
                     )
         
-    if site_var1 == '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':
@@ -470,7 +482,7 @@ with tab2:
                 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_var1 == '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':
@@ -499,9 +511,9 @@ with tab2:
         if st.button("Reset Optimals", key='reset3'):
             for key in st.session_state.keys():
                 del st.session_state[key]
-            if site_var1 == 'Draftkings':
+            if site_var == 'Draftkings':
                 st.session_state.working_seed = dk_lineups.copy()
-            elif site_var1 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 st.session_state.working_seed = fd_lineups.copy()
         
         st.session_state.data_export_display = st.session_state.data_export_display[st.session_state.data_export_display['salary'].between(salary_min_var, salary_max_var)]
@@ -517,7 +529,7 @@ with tab2:
     with st.container():
         if 'working_seed' in st.session_state:
             # Create a new dataframe with summary statistics
-            if site_var1 == 'Draftkings':
+            if site_var == 'Draftkings':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -539,7 +551,7 @@ with tab2:
                         np.std(st.session_state.working_seed[:,8])
                     ]
                 })
-            elif site_var1 == 'Fanduel':
+            elif site_var == 'Fanduel':
                 summary_df = pd.DataFrame({
                     'Metric': ['Min', 'Average', 'Max', 'STDdev'],
                     'Salary': [
@@ -577,9 +589,9 @@ with tab2:
         tab1, tab2 = st.tabs(["Display Frequency", "Seed Frame Frequency"])
         with tab1:
             if 'data_export_display' in st.session_state:
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
-                elif site_var1 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     player_columns = st.session_state.data_export_display.iloc[:, :6]
                 
                 # Flatten the DataFrame and count unique values
@@ -613,9 +625,9 @@ with tab2:
                 )
         with tab2:
             if 'working_seed' in st.session_state:
-                if site_var1 == 'Draftkings':
+                if site_var == 'Draftkings':
                     player_columns = st.session_state.working_seed[:, :6]
-                elif site_var1 == 'Fanduel':
+                elif site_var == 'Fanduel':
                     player_columns = st.session_state.working_seed[:, :6]
                 
                 # Flatten the DataFrame and count unique values