Refactor app.py layout and logic for improved user interaction: reorganize UI components for league and site selection, enhance data loading functionality, and streamline slate type handling, ensuring a more intuitive experience for users managing NBA and WNBA lineups.

app.py

@@ -363,72 +363,85 @@ tab1, tab2 = st.tabs(['Range of Outcomes', 'Optimals'])
 
 with tab1:
     
-    with st.expander("Info and Filters"):
-        with st.container():
-            st.info("Advanced view includes all stats and thresholds, simple includes just basic columns for ease of use on mobile")
-        with st.container():
-            # First row - timestamp and reset button
-            col1, col2 = st.columns([3, 1])
-            with col1:
-                st.info(t_stamp)
-            with col2:
-                if st.button("Load/Reset Data", key='reset1'):
-                    st.cache_data.clear()
-                    dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, sd_raw, dk_sd_raw, fd_sd_raw, timestamp = load_overall_stats('NBA')
-                    salary_dict = dict(zip(roo_raw.Player, roo_raw.Salary))
-                    id_dict = dict(zip(roo_raw.Player, roo_raw.player_ID))
-                    salary_dict_sd = dict(zip(sd_raw.Player, sd_raw.Salary))
-                    dk_id_dict_sd = dict(zip(dk_sd_raw.Player, dk_sd_raw.player_ID))
-                    fd_id_dict_sd = dict(zip(fd_sd_raw.Player, fd_sd_raw.player_ID))
-                    dk_nba_lineups = pd.DataFrame(columns=dk_nba_columns)
-                    dk_nba_sd_lineups = pd.DataFrame(columns=dk_nba_sd_columns)
-                    fd_nba_lineups = pd.DataFrame(columns=fd_nba_columns)
-                    fd_nba_sd_lineups = pd.DataFrame(columns=fd_nba_sd_columns)
-
-                    dk_wnba_lineups = pd.DataFrame(columns=dk_wnba_columns)
-                    dk_wnba_sd_lineups = pd.DataFrame(columns=dk_wnba_sd_columns)
-                    fd_wnba_lineups = pd.DataFrame(columns=fd_wnba_columns)
-                    fd_wnba_sd_lineups = pd.DataFrame(columns=fd_wnba_sd_columns)
-                    t_stamp = f"Last Update: " + str(timestamp) + f" CST"
-                    for key in st.session_state.keys():
-                        del st.session_state[key]
-        col1, col2, col3, col4, col5, col6 = st.columns(6)
+    
+    with st.container():
+        st.info("Advanced view includes all stats and thresholds, simple includes just basic columns for ease of use on mobile")
+    reset_col, view_col, site_col, league_col = st.columns(4)
+    with reset_col:
+        # First row - timestamp and reset button
+        col1, col2 = st.columns([3, 1])
         with col1:
-            view_var2 = st.radio("View Type", ('Simple', 'Advanced'), key='view_var2')
+            st.info(t_stamp)
         with col2:
-            league_var = st.radio("What League to load:", ('NBA', 'WNBA'), key='league_var')
-            dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, sd_raw, dk_sd_raw, fd_sd_raw, timestamp = load_overall_stats(league_var)
-        with col3:
+            if st.button("Load/Reset Data", key='reset1'):
+                st.cache_data.clear()
+                dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, sd_raw, dk_sd_raw, fd_sd_raw, timestamp = load_overall_stats('NBA')
+                salary_dict = dict(zip(roo_raw.Player, roo_raw.Salary))
+                id_dict = dict(zip(roo_raw.Player, roo_raw.player_ID))
+                salary_dict_sd = dict(zip(sd_raw.Player, sd_raw.Salary))
+                dk_id_dict_sd = dict(zip(dk_sd_raw.Player, dk_sd_raw.player_ID))
+                fd_id_dict_sd = dict(zip(fd_sd_raw.Player, fd_sd_raw.player_ID))
+                dk_nba_lineups = pd.DataFrame(columns=dk_nba_columns)
+                dk_nba_sd_lineups = pd.DataFrame(columns=dk_nba_sd_columns)
+                fd_nba_lineups = pd.DataFrame(columns=fd_nba_columns)
+                fd_nba_sd_lineups = pd.DataFrame(columns=fd_nba_sd_columns)
+
+                dk_wnba_lineups = pd.DataFrame(columns=dk_wnba_columns)
+                dk_wnba_sd_lineups = pd.DataFrame(columns=dk_wnba_sd_columns)
+                fd_wnba_lineups = pd.DataFrame(columns=fd_wnba_columns)
+                fd_wnba_sd_lineups = pd.DataFrame(columns=fd_wnba_sd_columns)
+                t_stamp = f"Last Update: " + str(timestamp) + f" CST"
+                for key in st.session_state.keys():
+                    del st.session_state[key]
+    with view_col:
+            view_var2 = st.radio("View Type", ('Simple', 'Advanced'), key='view_var2')
+    with site_col:
+        site_var2 = st.radio("Site", ('Draftkings', 'Fanduel'), key='site_var2')
+        if 'working_seed' in st.session_state:
+            del st.session_state['working_seed']
+    with league_col:
+        league_var = st.radio("What League to load:", ('WNBA', 'NBA'), key='league_var')
+        dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, sd_raw, dk_sd_raw, fd_sd_raw, timestamp = load_overall_stats(league_var)
+    with st.expander("Info and Filters"):
+        col1, col2, col3 = st.columns(3)
+        
+        with col1:
             slate_type_var2 = st.radio("What slate type are you working with?", ('Regular', 'Showdown'), key='slate_type_var2')
-        with col4:
-            site_var2 = st.radio("Site", ('Draftkings', 'Fanduel'), key='site_var2')
-
-            # Process site selection
-            if site_var2 == 'Draftkings':
-                if slate_type_var2 == 'Regular':
-                    site_baselines = roo_raw[roo_raw['site'] == 'Draftkings']
-                elif slate_type_var2 == 'Showdown':
-                    site_baselines = sd_raw[sd_raw['site'] == 'Draftkings']
-            elif site_var2 == 'Fanduel':
-                if slate_type_var2 == 'Regular':
-                    site_baselines = roo_raw[roo_raw['site'] == 'Fanduel']
-                elif slate_type_var2 == 'Showdown':
-                    site_baselines = sd_raw[sd_raw['site'] == 'Fanduel']
-        with col5:
+        with col2:
             slate_split = st.radio("Slate Type", ('Main Slate', 'Secondary'), key='slate_split')
 
             if slate_split == 'Main Slate':
-                if slate_type_var2 == 'Regular':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
-                elif slate_type_var2 == 'Showdown':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #1']
+                if site_var2 == 'Draftkings':
+                    if slate_type_var2 == 'Regular':
+                        site_baselines = roo_raw[roo_raw['site'] == 'Draftkings']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
+                    elif slate_type_var2 == 'Showdown':
+                        site_baselines = sd_raw[sd_raw['site'] == 'Draftkings']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #1']
+                elif site_var2 == 'Fanduel':
+                    if slate_type_var2 == 'Regular':
+                        site_baselines = roo_raw[roo_raw['site'] == 'Fanduel']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
+                    elif slate_type_var2 == 'Showdown':
+                        site_baselines = sd_raw[sd_raw['site'] == 'Fanduel']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #1']
             elif slate_split == 'Secondary':
-                if slate_type_var2 == 'Regular':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
-                elif slate_type_var2 == 'Showdown':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #2']
+                if site_var2 == 'Draftkings':
+                    if slate_type_var2 == 'Regular':
+                        site_baselines = roo_raw[roo_raw['site'] == 'Draftkings']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
+                    elif slate_type_var2 == 'Showdown':
+                        site_baselines = sd_raw[sd_raw['site'] == 'Draftkings']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #2']
+                elif site_var2 == 'Fanduel':
+                    if slate_type_var2 == 'Regular':
+                        site_baselines = roo_raw[roo_raw['site'] == 'Fanduel']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
+                    elif slate_type_var2 == 'Showdown':
+                        site_baselines = sd_raw[sd_raw['site'] == 'Fanduel']
+                        raw_baselines = site_baselines[site_baselines['slate'] == 'Showdown #2']
         
-        with col6:
+        with col3:
             split_var2 = st.radio("Slate Range", ('Full Slate Run', 'Specific Games'), key='split_var2')
             if split_var2 == 'Specific Games':
                 team_var2 = st.multiselect('Select teams for ROO', options=raw_baselines['Team'].unique(), key='team_var2')
@@ -501,25 +514,19 @@ with tab2:
     
         col1, col2, col3, col4, col5, col6 = st.columns(6)
         with col1:
-            league_var2 = st.radio("What League to load:", ('NBA', 'WNBA'), key='league_var2')
-        with col2:
             slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary'))
-        with col3:
-            site_var1 = st.radio("What site are you working with?", ('Draftkings', 'Fanduel'))
-            if 'working_seed' in st.session_state:
-                del st.session_state['working_seed']
-        with col4:
+        with col2:
             slate_type_var1 = st.radio("What slate type are you working with?", ('Regular', 'Showdown'))
-        with col5:
+        with col3:
             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 col6:
-            if site_var1 == 'Draftkings':
-                if league_var2 == 'NBA':
+        with col4:
+            if site_var2 == 'Draftkings':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         column_names = dk_nba_columns
                     elif slate_type_var1 == 'Showdown':
                         column_names = dk_nba_sd_columns
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         column_names = dk_wnba_columns
                     elif slate_type_var1 == 'Showdown':
@@ -531,13 +538,13 @@ with tab2:
                 elif player_var1 == 'Full Slate':
                         player_var2 = dk_raw.Player.values.tolist()
                         
-            elif site_var1 == 'Fanduel':
-                if league_var2 == 'NBA':
+            elif site_var2 == 'Fanduel':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         column_names = fd_nba_columns
                     elif slate_type_var1 == 'Showdown':
                         column_names = fd_nba_sd_columns
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         column_names = fd_wnba_columns
                     elif slate_type_var1 == 'Showdown':
@@ -550,26 +557,26 @@ with tab2:
                         player_var2 = fd_raw.Player.values.tolist()
         if st.button("Prepare data export", key='data_export'):
     
-            if site_var1 == 'Draftkings':
+            if site_var2 == 'Draftkings':
                 if slate_type_var1 == 'Regular':
-                    data_export = init_DK_lineups(slate_var1, league_var2)
+                    data_export = init_DK_lineups(slate_var1, league_var)
                     data_export_names = data_export.copy()
                     for col_idx in range(8):
                         data_export[:, col_idx] = np.array([id_dict.get(player, player) for player in data_export[:, col_idx]])
                 elif slate_type_var1 == 'Showdown':
-                    data_export = init_DK_SD_lineups(slate_var1, league_var2)
+                    data_export = init_DK_SD_lineups(slate_var1, league_var)
                     data_export_names = data_export.copy()
                     for col_idx in range(6):
                         data_export[:, col_idx] = np.array([dk_id_dict_sd.get(player, player) for player in data_export[:, col_idx]])
                 
-            elif site_var1 == 'Fanduel':
+            elif site_var2 == 'Fanduel':
                 if slate_type_var1 == 'Regular':
-                    data_export = init_FD_lineups(slate_var1, league_var2)
+                    data_export = init_FD_lineups(slate_var1, league_var)
                     data_export_names = data_export.copy()
                     for col_idx in range(9):
                         data_export[:, col_idx] = np.array([id_dict.get(player, player) for player in data_export[:, col_idx]])
                 elif slate_type_var1 == 'Showdown':
-                    data_export = init_FD_SD_lineups(slate_var1, league_var2)
+                    data_export = init_FD_SD_lineups(slate_var1, league_var)
                     data_export_names = data_export.copy()
                     for col_idx in range(6):
                         data_export[:, col_idx] = np.array([fd_id_dict_sd.get(player, player) for player in data_export[:, col_idx]])
@@ -587,7 +594,7 @@ with tab2:
             )
             
 
-    if site_var1 == 'Draftkings':
+    if site_var2 == 'Draftkings':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -598,20 +605,20 @@ with tab2:
 
         elif 'working_seed' not in st.session_state:
             if slate_type_var1 == 'Regular':
-                st.session_state.working_seed = init_DK_lineups(slate_var1, league_var2)
+                st.session_state.working_seed = init_DK_lineups(slate_var1, league_var)
             elif slate_type_var1 == 'Showdown':
-                st.session_state.working_seed = init_DK_SD_lineups(slate_var1, league_var2)
+                st.session_state.working_seed = init_DK_SD_lineups(slate_var1, league_var)
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
                 st.session_state.working_seed = st.session_state.working_seed[np.equal.outer(st.session_state.working_seed, player_var2).any(axis=1).all(axis=1)]
             elif player_var1 == 'Full Slate':
                 if slate_type_var1 == 'Regular':
-                    st.session_state.working_seed = init_DK_lineups(slate_var1, league_var2)
+                    st.session_state.working_seed = init_DK_lineups(slate_var1, league_var)
                 elif slate_type_var1 == 'Showdown':
-                    st.session_state.working_seed = init_DK_SD_lineups(slate_var1, league_var2)
+                    st.session_state.working_seed = init_DK_SD_lineups(slate_var1, league_var)
             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_var2 == 'Fanduel':
         if 'working_seed' in st.session_state:
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
@@ -622,28 +629,28 @@ with tab2:
         
         elif 'working_seed' not in st.session_state:
             if slate_type_var1 == 'Regular':
-                st.session_state.working_seed = init_FD_lineups(slate_var1, league_var2)
+                st.session_state.working_seed = init_FD_lineups(slate_var1, league_var)
             elif slate_type_var1 == 'Showdown':
-                st.session_state.working_seed = init_FD_SD_lineups(slate_var1, league_var2)
+                st.session_state.working_seed = init_FD_SD_lineups(slate_var1, league_var)
             st.session_state.working_seed = st.session_state.working_seed
             if player_var1 == 'Specific Players':
                 st.session_state.working_seed = st.session_state.working_seed[np.equal.outer(st.session_state.working_seed, player_var2).any(axis=1).all(axis=1)]
             elif player_var1 == 'Full Slate':
                 if slate_type_var1 == 'Regular':
-                    st.session_state.working_seed = init_FD_lineups(slate_var1, league_var2)
+                    st.session_state.working_seed = init_FD_lineups(slate_var1, league_var)
                 elif slate_type_var1 == 'Showdown':
-                    st.session_state.working_seed = init_FD_SD_lineups(slate_var1, league_var2)
+                    st.session_state.working_seed = init_FD_SD_lineups(slate_var1, league_var)
             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_var1 == 'Draftkings':
+    if site_var2 == 'Draftkings':
         if slate_type_var1 == 'Regular':
             for col_idx in range(8):
                 export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
         elif slate_type_var1 == 'Showdown':
             for col_idx in range(6):
                 export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(dk_id_dict_sd)
-    elif site_var1 == 'Fanduel':
+    elif site_var2 == 'Fanduel':
         if slate_type_var1 == 'Regular':
             for col_idx in range(9):
                 export_file.iloc[:, col_idx] = export_file.iloc[:, col_idx].map(id_dict)
@@ -655,24 +662,24 @@ 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 league_var2 == 'NBA':
+            if site_var2 == 'Draftkings':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         st.session_state.working_seed = dk_nba_lineups.copy()
                     elif slate_type_var1 == 'Showdown':
                         st.session_state.working_seed = dk_nba_sd_lineups.copy()
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         st.session_state.working_seed = dk_wnba_lineups.copy()
                     elif slate_type_var1 == 'Showdown':
                         st.session_state.working_seed = dk_wnba_sd_lineups.copy()
-            elif site_var1 == 'Fanduel':
-                if league_var2 == 'NBA':
+            elif site_var2 == 'Fanduel':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         st.session_state.working_seed = fd_nba_lineups.copy()
                     elif slate_type_var1 == 'Showdown':
                         st.session_state.working_seed = fd_nba_sd_lineups.copy()
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         st.session_state.working_seed = fd_wnba_lineups.copy()
                     elif slate_type_var1 == 'Showdown':
@@ -689,8 +696,8 @@ with tab2:
     with st.container():
         if 'working_seed' in st.session_state:
             # Create a new dataframe with summary statistics
-            if site_var1 == 'Draftkings':
-                if league_var2 == 'NBA':
+            if site_var2 == 'Draftkings':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         summary_df = pd.DataFrame({
                         'Metric': ['Min', 'Average', 'Max', 'STDdev'],
@@ -735,7 +742,7 @@ with tab2:
                                 np.std(st.session_state.working_seed[:,12])
                             ]
                         })
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         summary_df = pd.DataFrame({
                         'Metric': ['Min', 'Average', 'Max', 'STDdev'],
@@ -781,8 +788,8 @@ with tab2:
                             ]
                         })
                 
-            elif site_var1 == 'Fanduel':
-                if league_var2 == 'NBA':
+            elif site_var2 == 'Fanduel':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
                         summary_df = pd.DataFrame({
                             'Metric': ['Min', 'Average', 'Max', 'STDdev'],
@@ -827,7 +834,7 @@ with tab2:
                                 np.std(st.session_state.working_seed[:,12])
                             ]
                         })
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
                         summary_df = pd.DataFrame({
                             'Metric': ['Min', 'Average', 'Max', 'STDdev'],
@@ -888,27 +895,27 @@ with tab2:
         tab1, tab2 = st.tabs(["Display Frequency", "Seed Frame Frequency"])
         with tab1:
             if 'data_export_display' in st.session_state:
-                if league_var2 == 'NBA':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.data_export_display.iloc[:, :8]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.data_export_display.iloc[:, :9]
                     elif slate_type_var1 == 'Showdown':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.data_export_display.iloc[:, :5]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.data_export_display.iloc[:, :5]
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.data_export_display.iloc[:, :7]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.data_export_display.iloc[:, :8]
                     elif slate_type_var1 == 'Showdown':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.data_export_display.iloc[:, :5]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.data_export_display.iloc[:, :5]
                 
                 
@@ -941,27 +948,27 @@ with tab2:
                 )
         with tab2:
             if 'working_seed' in st.session_state:
-                if league_var2 == 'NBA':
+                if league_var == 'NBA':
                     if slate_type_var1 == 'Regular':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.working_seed[:, :8]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.working_seed[:, :9]
                     elif slate_type_var1 == 'Showdown':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.working_seed[:, :5]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.working_seed[:, :5]
-                elif league_var2 == 'WNBA':
+                elif league_var == 'WNBA':
                     if slate_type_var1 == 'Regular':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.working_seed[:, :7]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.working_seed[:, :8]
                     elif slate_type_var1 == 'Showdown':
-                        if site_var1 == 'Draftkings':
+                        if site_var2 == 'Draftkings':
                             player_columns = st.session_state.working_seed[:, :5]
-                        elif site_var1 == 'Fanduel':
+                        elif site_var2 == 'Fanduel':
                             player_columns = st.session_state.working_seed[:, :5]
                 
                 # Flatten the DataFrame and count unique values