Enhance contest data handling in app.py and related functions for improved functionality

- Updated the load_contest_file function to include 'Salary' and 'Team' columns, enhancing the data structure for contest entries.
- Modified the grab_contest_data function to capture additional player information, including salary and current team, improving data completeness.
- Adjusted app.py to utilize the new data structures, ensuring that session state variables are populated with the latest contest data.
- These changes contribute to ongoing efforts to improve data integrity and user experience within the application.

app.py

@@ -86,7 +86,7 @@ with tab1:
                 del st.session_state['Contest']
 
         if 'Contest_file' in st.session_state and 'Adj_Contest' not in st.session_state:
-            st.session_state['Contest'], st.session_state['ownership_df'], st.session_state['actual_df'], st.session_state['entry_list'] = load_contest_file(st.session_state['Contest_file'], sport_select)
+            st.session_state['Contest'], st.session_state['ownership_df'], st.session_state['actual_df'], st.session_state['salary_df'], st.session_state['team_df'], st.session_state['entry_list'] = load_contest_file(st.session_state['Contest_file'], sport_select)
             st.session_state['Contest'] = st.session_state['Contest'].dropna(how='all')
             st.session_state['Contest'] = st.session_state['Contest'].reset_index(drop=True)
             if st.session_state['Contest'] is not None:
@@ -96,8 +96,12 @@ with tab1:
     if 'Contest_file' in st.session_state:
         st.session_state['ownership_dict'] = dict(zip(st.session_state['ownership_df']['Player'], st.session_state['ownership_df']['Own']))
         st.session_state['actual_dict'] = dict(zip(st.session_state['actual_df']['Player'], st.session_state['actual_df']['FPTS']))
+        st.session_state['salary_dict'] = dict(zip(st.session_state['salary_df']['Player'], st.session_state['salary_df']['Salary']))
+        st.session_state['team_dict'] = dict(zip(st.session_state['team_df']['Player'], st.session_state['team_df']['Team']))
         st.write(st.session_state['ownership_dict'])
         st.write(st.session_state['actual_dict'])
+        st.write(st.session_state['salary_dict'])
+        st.write(st.session_state['team_dict'])
 
 
 with tab2:

global_func/grab_contest_data.py

@@ -37,6 +37,8 @@ def grab_contest_data(sport, contest_name, contest_id_map, contest_date):
         player_data.append({
             'fullName': player_info['fullName'],
             'playerId': player_info['playerId'],
+            'salary': player_info['salary'],
+            'currentTeam': player_info['currentTeam'],
             'rosterPosition': player_info['rosterPosition'],
             'ownership': player_info['ownership'],
             'actualPoints': player_info['actualPoints']
@@ -44,7 +46,7 @@ def grab_contest_data(sport, contest_name, contest_id_map, contest_date):
 
     players_df = pd.DataFrame(player_data)
     players_df = players_df.sort_values(by='ownership', ascending=False).reset_index(drop=True)
-    players_df = players_df.rename(columns={'fullName': 'Player', 'rosterPosition': 'Roster Position', 'ownership': '%Drafted', 'actualPoints': 'FPTS'})
+    players_df = players_df.rename(columns={'fullName': 'Player', 'rosterPosition': 'Roster Position', 'ownership': '%Drafted', 'actualPoints': 'FPTS', 'salary': 'Salary', 'currentTeam': 'Team'})
     pid_map = dict(zip(players_df['playerId'].astype(str), players_df['Player']))
 
     for lineup_hash, lineup_info in lineups_json['lineups'].items():

global_func/load_contest_file.py

@@ -17,7 +17,7 @@ def load_contest_file(upload, sport):
             except:
                 raw_df = upload
             
-            df = raw_df[['EntryId', 'EntryName', 'TimeRemaining', 'Points', 'Lineup', 'Player', 'Roster Position', '%Drafted', 'FPTS']]
+            df = raw_df[['EntryId', 'EntryName', 'TimeRemaining', 'Points', 'Lineup', 'Player', 'Roster Position', '%Drafted', 'FPTS', 'Salary', 'Team']]
             df = df.rename(columns={'Roster Position': 'Pos', '%Drafted': 'Own'})
             
             # Split EntryName into base name and entry count
@@ -52,12 +52,14 @@ def load_contest_file(upload, sport):
                 df['Own'] = df['Own'].astype(float)
             ownership_df = df[['Player', 'Own']]
             fpts_df = df[['Player', 'FPTS']]
-            cleaned_df = df.drop(columns=['EntryId', 'EntryName', 'TimeRemaining', 'Points', 'Lineup', 'Player', 'Pos', 'Own', 'FPTS'])
+            salary_df = df[['Player', 'Salary']]
+            team_df = df[['Player', 'Team']]
+            cleaned_df = df.drop(columns=['EntryId', 'EntryName', 'TimeRemaining', 'Points', 'Lineup', 'Player', 'Pos', 'Own', 'FPTS', 'Salary', 'Team'])
             cleaned_df = cleaned_df[['BaseName', 'EntryCount', 'SP1', 'SP2', 'C', '1B', '2B', '3B', 'SS', 'OF1', 'OF2', 'OF3']]
             entry_list = list(set(df['BaseName']))
             entry_list.sort()
             
-            return cleaned_df, ownership_df, fpts_df, entry_list
+            return cleaned_df, ownership_df, fpts_df, salary_df, team_df, entry_list
         except Exception as e:
             st.error(f'Error loading file: {str(e)}')
             return None