Refactor lineup filtering logic in app.py to improve clarity and maintainability. Updated variable names for multiselect options to enhance user understanding when managing player and stack filters, ensuring a more intuitive experience.

app.py

@@ -1304,14 +1304,10 @@ with tab2:
                             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')
-                    if st.session_state['conditional_var_1'] == 'Players':
-                        conditional_remove = st.multiselect("If Remove variable is Players, remove lineups containing players:", options=sorted(list(player_names)), default=[])
-                    elif st.session_state['conditional_var_1'] == 'Stacks':
-                        conditional_remove = st.multiselect("If Remove variable is Stacks, remove lineups containing stacks:", options=sorted(list(set(st.session_state['stack_dict'].values()))), default=[])
-                    if st.session_state['conditional_var_2'] == 'Players':
-                        conditional_include = st.multiselect("If Contains variable is Players, where lineups contain players:", options=sorted(list(player_names)), default=[])
-                    elif st.session_state['conditional_var_2'] == 'Stacks':
-                        conditional_include = 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("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=[])
                     
                     submitted_col, export_col = st.columns(2)
                     st.info("Portfolio Button applies to your overall Portfolio, Export button applies to your Custom Export")
@@ -1324,14 +1320,14 @@ with tab2:
                         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)] & parsed_frame[parsed_frame['player_names'].isin(conditional_include)]
+                                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)] & parsed_frame[parsed_frame['Stack'].isin(conditional_include)]
+                                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)] & parsed_frame[~parsed_frame['player_names'].isin(conditional_remove)]
+                                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)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove)]
+                                parsed_frame = parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)]
                         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:
@@ -1339,14 +1335,14 @@ with tab2:
                         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)] & parsed_frame[parsed_frame['player_names'].isin(conditional_include)]
+                                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)] & parsed_frame[parsed_frame['Stack'].isin(conditional_include)]
+                                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)] & parsed_frame[~parsed_frame['player_names'].isin(conditional_remove)]
+                                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)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove)]
+                                parsed_frame = parsed_frame[parsed_frame['Stack'].isin(conditional_include_stacks)] & parsed_frame[~parsed_frame['Stack'].isin(conditional_remove_stacks)]
                         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()