Refactor position group selection in UI and update data filtering logic. Added functionality to filter by specific positions and improved team selection interface. Ensured unique player entries in the display.

app.py

@@ -26,6 +26,7 @@ player_roo_format = {'Top_finish': '{:.2%}','Top_5_finish': '{:.2%}', 'Top_10_fi
 dk_columns = ['SP1', 'SP2', 'C', '1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'salary', 'proj', 'Team', 'Team_count', 'Secondary', 'Secondary_count', 'Own']
 fd_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL', 'salary', 'proj', 'Team', 'Team_count', 'Secondary', 'Secondary_count', 'Own']
 
+
 @st.cache_resource(ttl = 60)
 def init_baselines():
     collection = db["Player_Range_Of_Outcomes"] 
@@ -156,7 +157,7 @@ def init_FD_lineups(type_var,slate_var):
 
                 raw_display = pd.DataFrame(list(cursor))
                 raw_display = raw_display[['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL', 'salary', 'proj', 'Team', 'Team_count', 'Secondary', 'Secondary_count', 'Own']]
-                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3']
+                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL']
                 # Map names
                 raw_display[dict_columns] = raw_display[dict_columns].apply(lambda x: x.map(names_dict))
             elif slate_var == 'Secondary':
@@ -170,7 +171,7 @@ def init_FD_lineups(type_var,slate_var):
 
                 raw_display = pd.DataFrame(list(cursor))
                 raw_display = raw_display[['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL', 'salary', 'proj', 'Team', 'Team_count', 'Secondary', 'Secondary_count', 'Own']]
-                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3']
+                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL']
                 # Map names
                 raw_display[dict_columns] = raw_display[dict_columns].apply(lambda x: x.map(names_dict))
             elif slate_var == 'Auxiliary':
@@ -184,7 +185,7 @@ def init_FD_lineups(type_var,slate_var):
             
                 raw_display = pd.DataFrame(list(cursor))
                 raw_display = raw_display[['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL', 'salary', 'proj', 'Team', 'Team_count', 'Secondary', 'Secondary_count', 'Own']]
-                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3']
+                dict_columns = ['P', 'C_1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3', 'UTIL']
                 # Map names
                 raw_display[dict_columns] = raw_display[dict_columns].apply(lambda x: x.map(names_dict))
 
@@ -272,33 +273,38 @@ with tab2:
         with st.container():
             slate_type_var2 = st.radio("Which slate type are you loading?", ('Regular', 'Showdown'), key='slate_type_var2')
             slate_var2 = st.radio("Which slate data are you loading?", ('Main', 'Secondary', 'Auxiliary'), key='slate_var2')
-            pos_var2 = st.radio("Which position group would you like to view?", ('All', 'Pitchers', 'Hitters'), key='pos_var2')
+            group_var2 = st.radio("Which position group would you like to view?", ('All', 'Pitchers', 'Hitters'), key='group_var2')
             team_var2 = st.selectbox("Which team would you like to view?",  ['All', 'Specific'], key='team_var2')
             if team_var2 == 'Specific':
-                team_select2 = st.multiselect("Which team would you like to view?", roo_data['Team'].unique(), key='team_select2')
+                team_select2 = st.multiselect("Select your team(s)", roo_data['Team'].unique(), key='team_select2')
             else:
                 team_select2 = None
+            pos_var2 = st.selectbox("Which position(s) would you like to view?",  ['All', 'Specific'], key='pos_var2')
+            if pos_var2 == 'Specific':
+                pos_select2 = st.multiselect("Select your position(s)", roo_data['Position'].unique(), key='pos_select2')
+            else:
+                pos_select2 = None
     if slate_type_var2 == 'Regular':
         if site_var == 'Draftkings':
         
             player_roo_raw = dk_roo.copy()
 
-            if pos_var2 == 'All':
+            if group_var2 == 'All':
                 pass
-            elif pos_var2 == 'Pitchers':
+            elif group_var2 == 'Pitchers':
                 player_roo_raw = player_roo_raw[player_roo_raw['pos_group'] == 'Pitchers']
-            elif pos_var2 == 'Hitters':
+            elif group_var2 == 'Hitters':
                 player_roo_raw = player_roo_raw[player_roo_raw['pos_group'] == 'Hitters']
 
         elif site_var == 'Fanduel':
             
             player_roo_raw = fd_roo.copy()
 
-            if pos_var2 == 'All':
+            if group_var2 == 'All':
                 pass
-            elif pos_var2 == 'Pitchers':
+            elif group_var2 == 'Pitchers':
                 player_roo_raw = player_roo_raw[player_roo_raw['pos_group'] == 'Pitchers']
-            elif pos_var2 == 'Hitters':
+            elif group_var2 == 'Hitters':
                 player_roo_raw = player_roo_raw[player_roo_raw['pos_group'] == 'Hitters']
         
         if slate_var2 == 'Main':
@@ -317,6 +323,9 @@ with tab2:
     
     if team_select2:
         player_roo_raw = player_roo_raw[player_roo_raw['Team'].isin(team_select2)]
+    if pos_select2:
+        position_mask = player_roo_raw['Position'].apply(lambda x: any(pos in x for pos in pos_select2))
+        player_roo_raw = player_roo_raw[position_mask]
     
     player_roo_disp = player_roo_raw
     
@@ -324,6 +333,8 @@ with tab2:
         player_roo_disp = player_roo_disp.drop(columns=['Site', 'Slate', 'pos_group', 'timestamp', 'player_ID'])
     elif slate_type_var2 == 'Showdown':
         player_roo_disp = player_roo_disp.drop(columns=['site', 'slate', 'version', 'timestamp'])
+    
+    player_roo_disp = player_roo_disp.drop_duplicates(subset=['Player'])
 
     if view_var == "Simple":
         try: