Refactor portfolio file loading logic to ensure proper handling of uploaded files and optimize data types for memory efficiency

app.py

@@ -859,54 +859,55 @@ if selected_tab == 'Data Load':
 
         if 'portfolio' not in st.session_state:
             if st.session_state['portfolio_loaded']:
-                if upload_toggle == 'Paydirt DB':
-                    portfolio_file = st.session_state['db_portfolio_file']
-                    st.session_state['export_portfolio'], st.session_state['portfolio'] = load_file(portfolio_file, site_var, type_var, sport_var, 'portfolio')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
+                if portfolio_file is not None:
+                    if upload_toggle == 'Paydirt DB':
+                        portfolio_file = st.session_state['db_portfolio_file']
+                        st.session_state['export_portfolio'], st.session_state['portfolio'] = load_file(portfolio_file, site_var, type_var, sport_var, 'portfolio')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
 
-                    st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
-                    st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
+                        st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
+                        st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
 
-                elif upload_toggle == 'SaberSim (Just IDs)':
-                    st.session_state['export_portfolio'], st.session_state['portfolio'] = load_ss_file(portfolio_file, st.session_state['csv_file'], site_var, type_var, sport_var)
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
+                    elif upload_toggle == 'SaberSim (Just IDs)':
+                        st.session_state['export_portfolio'], st.session_state['portfolio'] = load_ss_file(portfolio_file, st.session_state['csv_file'], site_var, type_var, sport_var)
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
 
-                    st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
-                    st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
+                        st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
+                        st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
 
-                elif upload_toggle == 'Draftkings/Fanduel (Names + IDs)':
-                    st.session_state['export_portfolio'], st.session_state['portfolio'] = load_dk_fd_file(portfolio_file, st.session_state['csv_file'], site_var, type_var, sport_var)
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
+                    elif upload_toggle == 'Draftkings/Fanduel (Names + IDs)':
+                        st.session_state['export_portfolio'], st.session_state['portfolio'] = load_dk_fd_file(portfolio_file, st.session_state['csv_file'], site_var, type_var, sport_var)
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
 
-                    st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
-                    st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
+                        st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
+                        st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
 
-                else:
-                    st.session_state['export_portfolio'], st.session_state['portfolio'] = load_file(portfolio_file, site_var, type_var, sport_var, 'portfolio')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
-                    st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
+                    else:
+                        st.session_state['export_portfolio'], st.session_state['portfolio'] = load_file(portfolio_file, site_var, type_var, sport_var, 'portfolio')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
+                        st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
 
-                    st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
-                    st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
-                if st.session_state['portfolio'] is not None:
+                        st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')
+                        st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
+                    if st.session_state['portfolio'] is not None:
 
-                    # Optimize data types early for memory efficiency
-                    st.session_state['portfolio'] = optimize_dataframe_dtypes(st.session_state['portfolio'])
-                    
-                    st.success('Portfolio file loaded successfully!')
-                    for col in st.session_state['portfolio'].select_dtypes(include=['object', 'category']).columns:
-                        if st.session_state['portfolio'][col].dtype == 'category':
-                            # Handle categorical columns
-                            st.session_state['portfolio'][col] = st.session_state['portfolio'][col].cat.rename_categories(
-                                lambda x: player_right_names_mlb.get(x, x) if x in player_wrong_names_mlb else x
-                            )
-                        else:
-                            # Handle object columns
-                            st.session_state['portfolio'][col] = st.session_state['portfolio'][col].replace(player_wrong_names_mlb)
-                    st.dataframe(st.session_state['portfolio'].head(10))
+                        # Optimize data types early for memory efficiency
+                        st.session_state['portfolio'] = optimize_dataframe_dtypes(st.session_state['portfolio'])
+                        
+                        st.success('Portfolio file loaded successfully!')
+                        for col in st.session_state['portfolio'].select_dtypes(include=['object', 'category']).columns:
+                            if st.session_state['portfolio'][col].dtype == 'category':
+                                # Handle categorical columns
+                                st.session_state['portfolio'][col] = st.session_state['portfolio'][col].cat.rename_categories(
+                                    lambda x: player_right_names_mlb.get(x, x) if x in player_wrong_names_mlb else x
+                                )
+                            else:
+                                # Handle object columns
+                                st.session_state['portfolio'][col] = st.session_state['portfolio'][col].replace(player_wrong_names_mlb)
+                        st.dataframe(st.session_state['portfolio'].head(10))
 
     with col3:
         st.subheader("Projections File")