Refactor lineup filtering logic in app.py to streamline player selection process. Updated multiselect options for removing and including players, enhancing clarity and user experience. Improved filtering conditions to ensure accurate lineup management based on user selections.

app.py

@@ -1303,12 +1303,8 @@ with tab2:
                     for col in st.session_state['working_frame'].columns:
                         if col not in excluded_cols:
                             player_names.update(st.session_state['working_frame'][col].unique())
-                    conditional_var_1 = st.selectbox("Remove variable: ", options=['Players', 'Stacks'], key='conditional_var_1')
-                    conditional_var_2 = st.selectbox("Contains variable: ", options=['Players', 'Stacks'], key='conditional_var_2')
-                    conditional_remove_players = st.multiselect("If Remove variable is Players, remove lineups containing players:", options=sorted(list(player_names)), default=[])
-                    conditional_remove_stacks = st.multiselect("If Remove variable is Stacks, remove lineups containing stacks:", options=sorted(list(set(st.session_state['stack_dict'].values()))), default=[])
-                    conditional_include_players = st.multiselect("If Contains variable is Players, where lineups contain players:", options=sorted(list(player_names)), default=[])
-                    conditional_include_stacks = st.multiselect("If Contains variable is Stacks, where lineups contain stacks:", options=sorted(list(set(st.session_state['stack_dict'].values()))), default=[])
+                    conditional_remove_players = st.multiselect("Remove lineups containing player(s):", options=sorted(list(player_names)), default=[])
+                    conditional_include_players = st.multiselect("If they also contain player(s):", options=sorted(list(player_names)), default=[])
                     
                     submitted_col, export_col = st.columns(2)
                     st.info("Portfolio Button applies to your overall Portfolio, Export button applies to your Custom Export")
@@ -1319,31 +1315,37 @@ with tab2:
                     if reg_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['working_frame'].copy()
-                        if st.session_state['conditional_var_1'] == 'Players':
-                            if st.session_state['conditional_var_2'] == 'Players':
-                                parsed_frame = parsed_frame[~parsed_frame['player_names'].isin(conditional_remove_players)] & parsed_frame[parsed_frame['player_names'].isin(conditional_include_players)]
-                            elif st.session_state['conditional_var_2'] == 'Stacks':
-                                parsed_frame = parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)] & parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)]
-                        elif st.session_state['conditional_var_1'] == 'Stacks':
-                            if st.session_state['conditional_var_2'] == 'Players':
-                                parsed_frame = parsed_frame[parsed_frame['player_names'].isin(conditional_include_players)] & parsed_frame[~parsed_frame['player_names'].isin(conditional_remove_players)]
-                            elif st.session_state['conditional_var_2'] == 'Stacks':
-                                parsed_frame = parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)]
+                        
+                        # Filter rows that contain ALL conditional_include_players AND NONE of conditional_remove_players
+                        if conditional_include_players:
+                            include_mask = parsed_frame['player_names'].apply(lambda x: all(player in x for player in conditional_include_players))
+                        else:
+                            include_mask = True
+                            
+                        if conditional_remove_players:
+                            remove_mask = parsed_frame['player_names'].apply(lambda x: not any(player in x for player in conditional_remove_players))
+                        else:
+                            remove_mask = True
+                            
+                        parsed_frame = parsed_frame[include_mask & remove_mask]
                         st.session_state['working_frame'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
                         st.session_state['export_merge'] = st.session_state['working_frame'].copy()
                     elif exp_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['export_base'].copy()
-                        if st.session_state['conditional_var_1'] == 'Players':
-                            if st.session_state['conditional_var_2'] == 'Players':
-                                parsed_frame = parsed_frame[~parsed_frame['player_names'].isin(conditional_remove_players)] & parsed_frame[parsed_frame['player_names'].isin(conditional_include_players)]
-                            elif st.session_state['conditional_var_2'] == 'Stacks':
-                                parsed_frame = parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)] & parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)]
-                        elif st.session_state['conditional_var_1'] == 'Stacks':
-                            if st.session_state['conditional_var_2'] == 'Players':
-                                parsed_frame = parsed_frame[parsed_frame['player_names'].isin(conditional_include_players)] & parsed_frame[~parsed_frame['player_names'].isin(conditional_remove_players)]
-                            elif st.session_state['conditional_var_2'] == 'Stacks':
-                                parsed_frame = parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)]
+                        
+                        # Filter rows that contain ALL conditional_include_players AND NONE of conditional_remove_players
+                        if conditional_include_players:
+                            include_mask = parsed_frame['player_names'].apply(lambda x: all(player in x for player in conditional_include_players))
+                        else:
+                            include_mask = True
+                            
+                        if conditional_remove_players:
+                            remove_mask = parsed_frame['player_names'].apply(lambda x: not any(player in x for player in conditional_remove_players))
+                        else:
+                            remove_mask = True
+                            
+                        parsed_frame = parsed_frame[include_mask & remove_mask]
                         st.session_state['export_base'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
                         st.session_state['export_merge'] = st.session_state['export_base'].copy()