Enhance load_contest_file function to accept portfolio data for improved data integration

- Updated the load_contest_file function to include an optional portfolio parameter, allowing for better integration of portfolio data during contest file processing.
- Adjusted the logic in app.py to utilize the new portfolio parameter, ensuring that relevant portfolio information is incorporated into the contest data.
- This change improves data management and aligns with ongoing efforts to enhance user experience and data accessibility.

app.py

@@ -190,14 +190,7 @@ with tab1:
             
 
     if 'Contest_file' in st.session_state:
-        if 'portfolio_df' in st.session_state:
-            combined_df = pd.concat([st.session_state['Contest'], st.session_state['portfolio_df']], ignore_index=True)
-            combined_df = combined_df.reset_index(drop=True)
-            st.session_state['Contest'], st.session_state['ownership_df'], st.session_state['actual_df'], st.session_state['entry_list'], check_lineups = load_contest_file(combined_df, type_var, st.session_state['player_info'], 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'], type_var, 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)
+        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'], type_var, st.session_state['player_info'], sport_select, st.session_state['portfolio_df'])
         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

@@ -3,7 +3,7 @@ import pandas as pd
 from rapidfuzz import process, fuzz
 from numpy import where as np_where
 
-def load_contest_file(upload, type, helper = None, sport = None):
+def load_contest_file(upload, type, helper = None, sport = None, portfolio = None):
     if upload is not None:
         try:
             try:
@@ -18,6 +18,8 @@ def load_contest_file(upload, type, helper = None, sport = None):
                 raw_df = upload
             if helper is not None:
                 helper_df = helper
+            if portfolio is not None:
+                portfolio_df = portfolio
 
             print('Made it through initial upload')
             
@@ -160,6 +162,13 @@ def load_contest_file(upload, type, helper = None, sport = None):
                 cleaned_df = cleaned_df[['BaseName', 'EntryCount', 'CPT', 'UTIL1', 'UTIL2', 'UTIL3', 'UTIL4', 'UTIL5']]
             
             print('Made it through check_lineups')
+
+            if portfolio is not None:
+                portfolio_df['BaseName'] = 'Backtesting_upload'
+                portfolio_df['EntryCount'] = len(portfolio_df)
+                original_columns = cleaned_df.columns.tolist()
+                portfolio_df = portfolio_df[original_columns]
+                cleaned_df = pd.concat([cleaned_df, portfolio_df], ignore_index=True)
             
             # Get unique entry names
             entry_list = list(set(df['BaseName'].dropna()))