Refactor player column handling in 'app.py' to utilize session state for dynamic column management, improving consistency in player filtering and analysis across various operations.

app.py

@@ -1103,6 +1103,7 @@ if selected_tab == 'Manage Portfolio':
                         del st.session_state['working_frame']
         
         excluded_cols = ['salary', 'median', 'Own', 'Finish_percentile', 'Dupes', 'Stack', 'Size', 'Win%', 'Lineup Edge', 'Weighted Own', 'Geomean', 'Diversity']
+        st.session_state['player_columns'] = [col for col in st.session_state['working_frame'].columns if col not in excluded_cols]
 
         if 'working_frame' not in st.session_state:
             st.session_state['settings_base'] = True
@@ -1274,24 +1275,21 @@ if selected_tab == 'Manage Portfolio':
                         parsed_frame = st.session_state['working_frame'].copy()
                         if player_remove:
                             # Create mask for lineups that contain any of the removed players
-                            player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
-                            remove_mask = parsed_frame[player_columns].apply(
+                            remove_mask = parsed_frame[st.session_state['player_columns']].apply(
                                 lambda row: not any(player in list(row) for player in player_remove), axis=1
                             )
                             parsed_frame = parsed_frame[remove_mask]
                         
                         if player_lock:
-                            # Create mask for lineups that contain all locked players
-                            player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
                             
-                            lock_mask = parsed_frame[player_columns].apply(
+                            lock_mask = parsed_frame[st.session_state['player_columns']].apply(
                                 lambda row: all(player in list(row) for player in player_lock), axis=1
                             )
                             parsed_frame = parsed_frame[lock_mask]
                         
                         if team_include:
                             # Create a copy of the frame with player names replaced by teams, excluding SP1 and SP2
-                            filtered_player_columns = [col for col in player_columns if col not in ['SP1', 'SP2']]
+                            filtered_player_columns = [col for col in st.session_state['player_columns'] if col not in ['SP1', 'SP2']]
                             team_frame = parsed_frame[filtered_player_columns].apply(
                                 lambda x: x.map(st.session_state['map_dict']['team_map'])
                             )
@@ -1303,7 +1301,7 @@ if selected_tab == 'Manage Portfolio':
                         
                         if team_remove:
                             # Create a copy of the frame with player names replaced by teams, excluding SP1 and SP2
-                            filtered_player_columns = [col for col in player_columns if col not in ['SP1', 'SP2']]
+                            filtered_player_columns = [col for col in st.session_state['player_columns'] if col not in ['SP1', 'SP2']]
                             team_frame = parsed_frame[filtered_player_columns].apply(
                                 lambda x: x.map(st.session_state['map_dict']['team_map'])
                             )
@@ -1322,24 +1320,21 @@ if selected_tab == 'Manage Portfolio':
                         parsed_frame = st.session_state['export_base'].copy()
                         if player_remove:
                             # Create mask for lineups that contain any of the removed players
-                            player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
-                            remove_mask = parsed_frame[player_columns].apply(
+                            remove_mask = parsed_frame[st.session_state['player_columns']].apply(
                                 lambda row: not any(player in list(row) for player in player_remove), axis=1
                             )
                             parsed_frame = parsed_frame[remove_mask]
                         
                         if player_lock:
-                            # Create mask for lineups that contain all locked players
-                            player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
                             
-                            lock_mask = parsed_frame[player_columns].apply(
+                            lock_mask = parsed_frame[st.session_state['player_columns']].apply(
                                 lambda row: all(player in list(row) for player in player_lock), axis=1
                             )
                             parsed_frame = parsed_frame[lock_mask]
                         
                         if team_include:
                             # Create a copy of the frame with player names replaced by teams, excluding SP1 and SP2
-                            filtered_player_columns = [col for col in player_columns if col not in ['SP1', 'SP2']]
+                            filtered_player_columns = [col for col in st.session_state['player_columns'] if col not in ['SP1', 'SP2']]
                             team_frame = parsed_frame[filtered_player_columns].apply(
                                 lambda x: x.map(st.session_state['map_dict']['team_map'])
                             )
@@ -1351,7 +1346,7 @@ if selected_tab == 'Manage Portfolio':
                         
                         if team_remove:
                             # Create a copy of the frame with player names replaced by teams, excluding SP1 and SP2
-                            filtered_player_columns = [col for col in player_columns if col not in ['SP1', 'SP2']]
+                            filtered_player_columns = [col for col in st.session_state['player_columns'] if col not in ['SP1', 'SP2']]
                             team_frame = parsed_frame[filtered_player_columns].apply(
                                 lambda x: x.map(st.session_state['map_dict']['team_map'])
                             )
@@ -1854,7 +1849,7 @@ if selected_tab == 'Manage Portfolio':
                             st.session_state['display_frame'] = st.session_state['export_base']
                 with recalc_div_col:
                     if st.button("Recalculate Diversity"):
-                        st.session_state['display_frame']['Diversity'] = recalc_diversity(st.session_state['display_frame'], player_columns)
+                        st.session_state['display_frame']['Diversity'] = recalc_diversity(st.session_state['display_frame'], st.session_state['player_columns'])
 
             total_rows = len(st.session_state['display_frame'])
             rows_per_page = 100
@@ -1922,7 +1917,6 @@ if selected_tab == 'Manage Portfolio':
         with player_stats_col:
             if st.button("Analyze Players", key='analyze_players'):
                 player_stats = []
-                player_columns = [col for col in st.session_state['display_frame'].columns if col not in excluded_cols]
                 
                 if st.session_state['settings_base'] and 'origin_player_exposures' in st.session_state and display_frame_source == 'Portfolio':
                     st.session_state['player_summary'] = st.session_state['origin_player_exposures']
@@ -1930,7 +1924,7 @@ if selected_tab == 'Manage Portfolio':
                     if type_var == 'Showdown':
                         if sport_var == 'GOLF':
                             for player in player_names:
-                                player_mask = st.session_state['display_frame'][player_columns].apply(
+                                player_mask = st.session_state['display_frame'][st.session_state['player_columns']].apply(
                                     lambda row: player in list(row), axis=1
                                 )
                                 
@@ -1950,7 +1944,7 @@ if selected_tab == 'Manage Portfolio':
                         else:
                             for player in player_names:
                                 # Create mask for lineups where this player is Captain (first column)
-                                cpt_mask = st.session_state['display_frame'][player_columns[0]] == player
+                                cpt_mask = st.session_state['display_frame'][st.session_state['player_columns'][0]] == player
                                 
                                 if cpt_mask.any():
                                     player_stats.append({
@@ -1967,7 +1961,7 @@ if selected_tab == 'Manage Portfolio':
                                     })
                                 
                                 # Create mask for lineups where this player is FLEX (other columns)
-                                flex_mask = st.session_state['display_frame'][player_columns[1:]].apply(
+                                flex_mask = st.session_state['display_frame'][st.session_state['player_columns'][1:]].apply(
                                     lambda row: player in list(row), axis=1
                                 )
                                 
@@ -1989,7 +1983,7 @@ if selected_tab == 'Manage Portfolio':
                             # Handle Captain positions
                             for player in player_names:
                                 # Create mask for lineups where this player is Captain (first column)
-                                cpt_mask = st.session_state['display_frame'][player_columns[0]] == player
+                                cpt_mask = st.session_state['display_frame'][st.session_state['player_columns'][0]] == player
                                 
                                 if cpt_mask.any():
                                     player_stats.append({
@@ -2006,7 +2000,7 @@ if selected_tab == 'Manage Portfolio':
                                     })
                                 
                                 # Create mask for lineups where this player is FLEX (other columns)
-                                flex_mask = st.session_state['display_frame'][player_columns[1:]].apply(
+                                flex_mask = st.session_state['display_frame'][st.session_state['player_columns'][1:]].apply(
                                     lambda row: player in list(row), axis=1
                                 )
                                 
@@ -2026,7 +2020,7 @@ if selected_tab == 'Manage Portfolio':
                         elif sport_var != 'CS2' and sport_var != 'LOL':
                             # Original Classic format processing
                             for player in player_names:
-                                player_mask = st.session_state['display_frame'][player_columns].apply(
+                                player_mask = st.session_state['display_frame'][st.session_state['player_columns']].apply(
                                     lambda row: player in list(row), axis=1
                                 )