Refactor player selection logic in Handbuilder tab of app.py to improve eligibility checks based on position limits. Update the DataFrame to include a 'Slot' column for better lineup management and ensure players are only added to available positions, enhancing user experience and data integrity.

app.py

@@ -3,6 +3,7 @@ import numpy as np
 import pandas as pd
 import gspread
 import pymongo
+import re
 
 st.set_page_config(layout="wide")
 
@@ -802,28 +803,27 @@ with tab3:
 with tab4:
     st.header("Handbuilder")
 
+    # --- POSITION LIMITS ---
+    position_limits = {
+        'SP': 2,
+        'C': 1,
+        '1B': 1,
+        '2B': 1,
+        '3B': 1,
+        'SS': 1,
+        'OF': 3,
+        # Add more as needed
+    }
+
     # --- LINEUP STATE ---
     if 'handbuilder_lineup' not in st.session_state:
         st.session_state['handbuilder_lineup'] = pd.DataFrame(columns=['Player', 'Position', 'Team', 'Salary', 'Median', 'Own%'])
     if 'handbuilder_select_key' not in st.session_state:
         st.session_state['handbuilder_select_key'] = 0
 
-    # --- POSITION LIMITS ---
-    position_limits = {
-        'SP': 2,
-        # Add other positions and their limits as needed
-        # e.g. 'C': 1, '1B': 1, '2B': 1, '3B': 1, 'SS': 1, 'OF': 3
-    }
-
     # Count positions in the current lineup
     lineup = st.session_state['handbuilder_lineup']
-    position_counts = lineup['Position'].value_counts() if not lineup.empty else {}
-
-    # Build a set of positions that have reached their max
-    positions_at_max = set()
-    for pos, max_count in position_limits.items():
-        if position_counts.get(pos, 0) >= max_count:
-            positions_at_max.add(pos)
+    slot_counts = lineup['Slot'].value_counts() if not lineup.empty else {}
 
     # --- TEAM FILTER UI ---
     all_teams = sorted(dk_roo['Team'].unique())
@@ -847,9 +847,16 @@ with tab4:
     else:
         player_select_df = dk_roo[['Player', 'Position', 'Team', 'Salary', 'Median', 'Order', 'Hand', 'Own%']].drop_duplicates(subset=['Player', 'Team']).copy()
 
-    # Remove players whose position is at max
-    if positions_at_max:
-        player_select_df = player_select_df[~player_select_df['Position'].isin(positions_at_max)]
+    # --- FILTER OUT PLAYERS WHOSE ALL ELIGIBLE POSITIONS ARE FILLED ---
+    def is_player_eligible(row):
+        eligible_positions = re.split(r'[/, ]+', row['Position'])
+        # Player is eligible if at least one of their positions is not at max
+        for pos in eligible_positions:
+            if slot_counts.get(pos, 0) < position_limits.get(pos, 0):
+                return True
+        return False
+
+    player_select_df = player_select_df[player_select_df.apply(is_player_eligible, axis=1)]
 
     col1, col2 = st.columns([1, 2])
     with col2:
@@ -866,23 +873,32 @@ with tab4:
         # If a row is selected, add that player to the lineup and reset selection
         if event and "rows" in event.selection and len(event.selection["rows"]) > 0:
             idx = event.selection["rows"][0]
-            player_row = player_select_df.iloc[[idx]][['Player', 'Position', 'Team', 'Salary', 'Median', 'Own%']]
-            # Avoid duplicates
-            if not player_row['Player'].iloc[0] in st.session_state['handbuilder_lineup']['Player'].values:
-                st.session_state['handbuilder_lineup'] = pd.concat(
-                    [st.session_state['handbuilder_lineup'], player_row],
-                    ignore_index=True
-                )
-            # Change the key to reset the selection
-            st.session_state['handbuilder_select_key'] += 1
-            st.rerun()
+            player_row = player_select_df.iloc[[idx]]
+            eligible_positions = re.split(r'[/, ]+', player_row['Position'].iloc[0])
+            # Find the first eligible slot that is not full
+            slot_to_fill = None
+            for pos in eligible_positions:
+                if slot_counts.get(pos, 0) < position_limits.get(pos, 0):
+                    slot_to_fill = pos
+                    break
+            if slot_to_fill is not None:
+                # Avoid duplicates
+                if not player_row['Player'].iloc[0] in st.session_state['handbuilder_lineup']['Player'].values:
+                    # Add the slot info
+                    player_row = player_row.assign(Slot=slot_to_fill)
+                    st.session_state['handbuilder_lineup'] = pd.concat(
+                        [st.session_state['handbuilder_lineup'], player_row[['Player', 'Position', 'Team', 'Salary', 'Median', 'Own%', 'Slot']]],
+                        ignore_index=True
+                    )
+                st.session_state['handbuilder_select_key'] += 1
+                st.rerun()
 
     with col1:
         st.subheader("Lineup")
         st.dataframe(
-            st.session_state['handbuilder_lineup'],
+            st.session_state['handbuilder_lineup'][['Player', 'Slot', 'Position', 'Team', 'Salary', 'Median', 'Own%']],
             use_container_width=True,
-            height=500,
+            height=450,
             hide_index=True
         )
 
@@ -896,13 +912,14 @@ with tab4:
 
             summary_row = pd.DataFrame({
                 'Player': ['TOTAL'],
-                'Position': ['ALL'],
+                'Slot': [''],
+                'Position': [''],
                 'Team': [most_common_team],
                 'Salary': [total_salary],
                 'Median': [total_median],
                 'Own%': [total_own]
             })
-            summary_row = summary_row[lineup.columns]
+            summary_row = summary_row[lineup[['Player', 'Slot', 'Position', 'Team', 'Salary', 'Median', 'Own%']].columns]
 
             st.dataframe(
                 summary_row,
@@ -913,5 +930,5 @@ with tab4:
 
     # Optionally, add a button to clear the lineup
     if st.button("Clear Lineup", key='clear_lineup'):
-        st.session_state['handbuilder_lineup'] = pd.DataFrame(columns=['Player', 'Team', 'Salary', 'Median', 'Own%'])
+        st.session_state['handbuilder_lineup'] = pd.DataFrame(columns=['Player', 'Position', 'Team', 'Salary', 'Median', 'Own%', 'Slot'])
         st.rerun()