Refactor contest data handling in app.py and load_contest_file.py for improved clarity and functionality

- Updated app.py to ensure player information is retrieved before contest data, enhancing the flow of data processing.
- Simplified the load_contest_file function by removing the helper_var parameter, streamlining the return values for better clarity.
- Introduced a new manual_contest_upload.py file to encapsulate the grab_contest_data function, improving code organization and maintainability.
- Maintained existing functionality while enhancing the structure and readability of contest data handling.

app.py

@@ -105,8 +105,8 @@ with tab1:
                 del st.session_state['Contest_file']
             if 'Contest_file' not in st.session_state:
                 if st.button('Load Contest Data', key='load_contest_data'):
-                    st.session_state['Contest_file'] = grab_contest_data(sport_select, contest_name_var, contest_id_map, date_select, date_select2)
                     st.session_state['player_info'], st.session_state['info_maps'] = grab_contest_player_info(db, sport_select, type_var, date_select)
+                    st.session_state['Contest_file'] = grab_contest_data(sport_select, contest_name_var, contest_id_map, date_select, date_select2)
             else:
                 pass
     with col2:
@@ -118,16 +118,13 @@ with tab1:
                 del st.session_state['Contest_file']
             if 'Contest_file' not in st.session_state:
                 st.session_state['Contest_upload'] = st.file_uploader("Upload Contest File (CSV or Excel)", type=['csv', 'xlsx', 'xls'])
+                st.session_state['player_info'], st.session_state['info_maps'] = grab_contest_player_info(db, sport_select, type_var, date_select)
                 st.session_state['Contest_file'] = pd.read_csv(st.session_state['Contest_upload'])
-                st.session_state['Contest_file_helper'] = grab_contest_data(sport_select, contest_name_var, contest_id_map, date_select, date_select2)
             else:
                 pass
 
     if 'Contest_file' in st.session_state:
-        if 'Contest_file_helper' in st.session_state:
-            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['pos_df'], st.session_state['entry_list'], check_lineups = load_contest_file(st.session_state['Contest_file'], 1, st.session_state['Contest_file_helper'], sport_select)
-        else:
-            st.session_state['Contest'], st.session_state['ownership_df'], st.session_state['actual_df'], st.session_state['entry_list'], check_lineups = load_contest_file(st.session_state['Contest_file'], 0, st.session_state['player_info'], sport_select)
+        st.session_state['Contest'], st.session_state['ownership_df'], st.session_state['actual_df'], st.session_state['entry_list'], check_lineups = load_contest_file(st.session_state['Contest_file'], st.session_state['player_info'], 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:

global_func/load_contest_file.py

@@ -2,7 +2,7 @@ import streamlit as st
 import pandas as pd
 from rapidfuzz import process, fuzz
 
-def load_contest_file(upload, helper_var, helper = None, sport = None):
+def load_contest_file(upload, helper = None, sport = None):
     if upload is not None:
         try:
             try:
@@ -132,10 +132,7 @@ def load_contest_file(upload, helper_var, helper = None, sport = None):
             entry_list = list(set(df['BaseName'].dropna()))
             entry_list.sort()
 
-            if helper_var == 1:
-                return cleaned_df, ownership_df, fpts_df, salary_df, team_df, pos_df, entry_list, check_lineups
-            else:
-                return cleaned_df, ownership_df, fpts_df, entry_list, check_lineups
+            return cleaned_df, ownership_df, fpts_df, entry_list, check_lineups
             
         except Exception as e:
             st.error(f'Error loading file: {str(e)}')

global_func/manual_contest_upload.py

@@ -0,0 +1,75 @@
+import pandas as pd
+import requests
+
+def grab_contest_data(sport, contest_file):
+
+    def format_lineup_string(lineup_hash, positions):
+        """Replaces colons in a lineup hash with sequential positions."""
+        # Remove the leading colon and split by the remaining colons
+        # Only split on colons that are between numbers
+        player_ids = [pid for pid in lineup_hash.lstrip(':').split(':') if pid.isdigit() or pid == '-1']
+        
+        # Get the actual positions needed for this lineup
+        actual_positions = positions[:len(player_ids)]
+        
+        # Check if the number of IDs matches the number of positions
+        if len(player_ids) != len(actual_positions):
+            print(f"Warning: Mismatch for hash {lineup_hash}. IDs: {len(player_ids)}, Positions: {len(actual_positions)}")
+            return lineup_hash
+
+        # Combine positions and player IDs, only for valid player IDs
+        combined_parts = []
+        for pos, pid in zip(actual_positions, player_ids):
+            if pid == '-1':  # Handle empty slots
+                combined_parts.append(pos + '')
+            else:
+                combined_parts.append(pos + pid_map.get(pid, pid))
+        
+        # # Just combine positions and PIDs without name mapping
+        # combined_parts = [pos + pid for pos, pid in zip(actual_positions, player_ids)]
+        
+        # Join them into a single string
+        return "".join(combined_parts)
+
+    lineup_data = []
+    player_data = []
+    position_inserts = ['1B ', ' 2B ', ' 3B ', ' C ', ' OF ', ' OF ', ' OF ', ' P ', ' P ', ' SS ']
+
+    for players, player_info in data_json['players'].items():
+        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']
+        })
+
+    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', '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():
+        lineup_data.append({
+            'lineupHash': lineup_hash,
+            'points': lineup_info['points'],
+            'entryNameList': lineup_info['entryNameList'][0]
+        })
+
+    lineups_df = pd.DataFrame(lineup_data)
+    lineups_df = lineups_df.sort_values(by='points', ascending=False)
+    lineups_df = lineups_df.reset_index()
+    lineups_df['index'] = lineups_df.index + 1
+    lineups_df['TimeRemaining'] = str(0)
+    lineups_df['EntryId'] = lineups_df['index'].astype(str) + lineups_df['entryNameList'].astype(str)
+    lineups_df['lineupHash'] = ':' + lineups_df['lineupHash']
+    lineups_df = lineups_df.rename(columns={'index': 'Rank', 'points': 'Points', 'entryNameList': 'EntryName', 'lineupHash': 'Lineup'})
+    lineups_df['EntryName'] = lineups_df['EntryName'] + ' (1/1)'
+    lineups_df['Lineup'] = lineups_df['Lineup'].apply(lambda x: format_lineup_string(x, position_inserts))
+    lineups_df = lineups_df[['Rank', 'EntryId', 'EntryName', 'TimeRemaining', 'Points', 'Lineup']]
+
+    total_data = lineups_df.merge(players_df, how='left', left_index=True, right_index=True)
+    
+    return total_data