Enhance optimal lineup filtering by replacing mapping logic and reintroducing projection and ownership inputs for user customization.

src/streamlit_app.py

@@ -519,8 +519,9 @@ def normalize_special_characters(text):
 
 @st.cache_data
 def map_mask_parse(df: pd.DataFrame, map: dict, threshold: float):
-    df = df.map(map)
-    mask = (df >= threshold).all(axis=1)
+    proj_df = df.iloc[:, :-7].replace(map).astype(float)
+    print(proj_df.head(10))
+    mask = (proj_df >= threshold).all(axis=1)
     df = df[mask]
     return df
 
@@ -1095,8 +1096,6 @@ if selected_tab == 'Optimals':
         with optimals_macro_col:
             lineup_num_var = st.number_input("How many lineups do you want to display?", min_value=1, max_value=1000, value=150, step=1, key='lineup_num_var_input')
             player_var2 = st.multiselect('Query for lineups including:', options = raw_baselines['Player'].unique(), key='player_var2_multiselect', default=[])
-            projection_var = st.number_input("Minimum projection used", min_value=0.0, max_value=100.0, value=0.0, step=1.0, key='projection_var_input')
-            ownership_var = st.number_input("Minimum ownership used", min_value=0.0, max_value=100.0, value=0.0, step=1.0, key='ownership_var_input')
         
         if type_var == 'Regular':
             if site_var == 'Draftkings':
@@ -1116,6 +1115,7 @@ if selected_tab == 'Optimals':
             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_fd')
                 salary_max_var = st.number_input("Maximum salary used", min_value = 0, max_value = 60000, value = 60000, step = 100, key = 'salary_max_var_fd')
+            projection_var = st.number_input("Minimum projection used", min_value=0.0, max_value=100.0, value=0.0, step=1.0, key='projection_var_input')
         with optimals_stacks_col:
             if site_var == 'Draftkings':
                 min_stacks_var = st.number_input("Minimum stacks used", min_value = 0, max_value = 5, value = 1, step = 1, key = 'min_stacks_var_dk')
@@ -1123,6 +1123,7 @@ if selected_tab == 'Optimals':
             elif site_var == 'Fanduel':
                 min_stacks_var = st.number_input("Minimum stacks used", min_value = 0, max_value = 4, value = 1, step = 1, key = 'min_stacks_var_fd')
                 max_stacks_var = st.number_input("Maximum stacks used", min_value = 0, max_value = 4, value = 4, step = 1, key = 'max_stacks_var_fd')
+            ownership_var = st.number_input("Minimum ownership used", min_value=0.0, max_value=100.0, value=0.0, step=1.0, key='ownership_var_input')
         
         
         if site_var == 'Draftkings':