Refactor team filtering logic in 'app.py' to utilize mapping for team names, improving clarity and consistency in Showdown mode while maintaining performance.

app.py

@@ -1280,7 +1280,7 @@ if selected_tab == 'Manage Portfolio':
                             if type_var == 'Showdown':
                                 if cpt_flex_focus == 'CPT':
                                     remove_mask = parsed_frame.iloc[:, 0].apply(
-                                        lambda row: not any(player in list(row) for player in player_remove), axis=1
+                                        lambda player: not any(remove_player in str(player) for remove_player in player_remove)
                                     )
                                 elif cpt_flex_focus == 'FLEX':
                                     remove_mask = parsed_frame.iloc[:, 1:].apply(
@@ -1301,7 +1301,7 @@ if selected_tab == 'Manage Portfolio':
                             if type_var == 'Showdown':
                                 if cpt_flex_focus == 'CPT':
                                     lock_mask = parsed_frame.iloc[:, 0].apply(
-                                        lambda row: all(player in list(row) for player in player_lock), axis=1
+                                        lambda player: any(lock_player in str(player) for lock_player in player_lock)
                                     )
                                 elif cpt_flex_focus == 'FLEX':
                                     lock_mask = parsed_frame.iloc[:, 1:].apply(
@@ -1320,15 +1320,24 @@ if selected_tab == 'Manage Portfolio':
                         if team_include:
                             if type_var == 'Showdown':
                                 if cpt_flex_focus == 'CPT':
-                                    include_mask = parsed_frame.iloc[:, 0].apply(
+                                    team_frame = parsed_frame.iloc[:, 0].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    include_mask = team_frame.apply(
                                         lambda row: any(team in list(row) for team in team_include), axis=1
                                     )
                                 elif cpt_flex_focus == 'FLEX':
-                                    include_mask = parsed_frame.iloc[:, 1:].apply(
+                                    team_frame = parsed_frame.iloc[:, 1:].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    include_mask = team_frame.apply(
                                         lambda row: any(team in list(row) for team in team_include), axis=1
                                     )
                                 elif cpt_flex_focus == 'Overall':
-                                    include_mask = parsed_frame[st.session_state['player_columns']].apply(
+                                    team_frame = parsed_frame[st.session_state['player_columns']].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    include_mask = team_frame.apply(
                                         lambda row: any(team in list(row) for team in team_include), axis=1
                                     )
                             else:
@@ -1346,15 +1355,24 @@ if selected_tab == 'Manage Portfolio':
                         if team_remove:
                             if type_var == 'Showdown':
                                 if cpt_flex_focus == 'CPT':
-                                    remove_mask = parsed_frame.iloc[:, 0].apply(
+                                    team_frame = parsed_frame.iloc[:, 0].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    remove_mask = team_frame.apply(
                                         lambda row: not any(team in list(row) for team in team_remove), axis=1
                                     )
                                 elif cpt_flex_focus == 'FLEX':
-                                    remove_mask = parsed_frame.iloc[:, 1:].apply(
+                                    team_frame = parsed_frame.iloc[:, 1:].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    remove_mask = team_frame.apply(
                                         lambda row: not any(team in list(row) for team in team_remove), axis=1
                                     )
                                 elif cpt_flex_focus == 'Overall':
-                                    remove_mask = parsed_frame[st.session_state['player_columns']].apply(
+                                    team_frame = parsed_frame[st.session_state['player_columns']].apply(
+                                        lambda x: x.map(st.session_state['map_dict']['team_map'])
+                                    )
+                                    remove_mask = team_frame.apply(
                                         lambda row: not any(team in list(row) for team in team_remove), axis=1
                                     )
                             else: