Refactor app.py to enhance user input handling for slate types and player selection, improving layout with columns and ensuring accurate lineup generation based on selected parameters.

app.py

@@ -452,26 +452,39 @@ with tab2:
 with tab3:
     st.header("Optimals")
     with st.expander("Info and Filters"):
-        with st.container():
+        col1, col2, col3 = st.columns(3)
+        with col1:
             slate_type_var3 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'), key='slate_type_var3')
+            if slate_type_var3 == 'Regular':
+                raw_baselines = roo_data
+            elif slate_type_var3 == 'Showdown':
+                raw_baselines = sd_roo_data
             slate_var3 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'), key='slate_var3')
-
-        if slate_type_var3 == 'Regular':
-            if site_var == 'Draftkings':
-                dk_lineups = init_DK_lineups(slate_type_var3, slate_var3)
-            elif site_var == 'Fanduel':
-                fd_lineups = init_FD_lineups(slate_type_var3, slate_var3)
-        elif slate_type_var3 == 'Showdown':
+            if slate_type_var3 == 'Regular':
+                if site_var == 'Draftkings':
+                    dk_lineups = init_DK_lineups(slate_type_var3, slate_var3)
+                elif site_var == 'Fanduel':
+                    fd_lineups = init_FD_lineups(slate_type_var3, slate_var3)
+            elif slate_type_var3 == 'Showdown':
+                if site_var == 'Draftkings':
+                    dk_lineups = init_DK_lineups(slate_type_var3, slate_var3)
+                elif site_var == 'Fanduel':
+                    fd_lineups = init_FD_lineups(slate_type_var3, slate_var3)
+        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)
+            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 col3:
             if site_var == 'Draftkings':
-                dk_lineups = init_DK_lineups(slate_type_var3, slate_var3)
+                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_var == 'Fanduel':
-                fd_lineups = init_FD_lineups(slate_type_var3, 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)
+                salary_min_var = st.number_input("Minimum salary used", min_value = 0, max_value = 35000, value = 34000, step = 100, key = 'salary_min_var')
+                salary_max_var = st.number_input("Maximum salary used", min_value = 0, max_value = 35000, value = 35000, step = 100, key = 'salary_max_var')
         
-        if slate_type_var3 == 'Regular':
-            raw_baselines = roo_data
-        elif slate_type_var3 == 'Showdown':
-            raw_baselines = sd_roo_data
         
         if site_var == 'Draftkings':
             if slate_type_var3 == 'Regular':
@@ -485,12 +498,6 @@ with tab3:
             min_own = np.min(dk_lineups[:,12])
             max_own = np.max(dk_lineups[:,12])
             
-            
-            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()
                     
         elif site_var == 'Fanduel':
             raw_baselines = hold_display
@@ -504,15 +511,8 @@ with tab3:
             # Get the minimum and maximum ownership values from dk_lineups
             min_own = np.min(fd_lineups[:,11])
             max_own = np.max(fd_lineups[:,11])
-            
-            
-            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()
 
-        if st.button("Prepare data export", key='data_export'):
+        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_var == 'Draftkings':
@@ -575,7 +575,8 @@ with tab3:
             elif player_var1 == 'Full Slate':
                 st.session_state.working_seed = fd_lineups.copy()
             st.session_state.data_export_display = pd.DataFrame(st.session_state.working_seed[0:lineup_num_var], columns=column_names)
-
+    st.session_state.data_export_display = st.session_state.data_export_display[st.session_state.data_export_display['Salary'] >= salary_min_var]
+    st.session_state.data_export_display = st.session_state.data_export_display[st.session_state.data_export_display['Salary'] <= salary_max_var]
     export_file = st.session_state.data_export_display.copy()
     name_export = st.session_state.data_export_display.copy()
     if site_var == 'Draftkings':