Refactor portfolio loading logic to remove redundant checks and optimize memory management. The code now clears session state objects only when not sourced from the database, ensuring necessary data persistence while improving overall efficiency.

app.py

@@ -716,24 +716,6 @@ if selected_tab == 'Data Load':
                 st.dataframe(projections.head(10))
 
     if st.session_state['portfolio_loaded'] and projections_file:
-        # Ensure portfolio exists, reload from database if needed
-        if 'portfolio' not in st.session_state and upload_toggle == 'Paydirt DB' and 'db_portfolio_file' in st.session_state:
-            st.session_state['export_portfolio'], st.session_state['portfolio'] = load_file(st.session_state['db_portfolio_file'], site_var, type_var, sport_var, 'portfolio')
-            st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all').reset_index(drop=True)
-            st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all').reset_index(drop=True)
-            
-            # Optimize data types early for memory efficiency
-            st.session_state['portfolio'] = optimize_dataframe_dtypes(st.session_state['portfolio'])
-            
-            # Clean player names
-            for col in st.session_state['portfolio'].select_dtypes(include=['object', 'category']).columns:
-                if st.session_state['portfolio'][col].dtype == 'category':
-                    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:
-                    st.session_state['portfolio'][col] = st.session_state['portfolio'][col].replace(player_wrong_names_mlb)
-        
         if st.session_state['portfolio'] is not None and projections is not None:
         
             st.subheader("Name Matching Analysis")
@@ -811,11 +793,10 @@ if selected_tab == 'Data Load':
             st.session_state['portfolio'].to_parquet(buffer, compression='snappy')
             st.session_state['origin_portfolio'] = buffer.getvalue()
             
-            # Clear large objects from session state to free memory, but preserve db_portfolio_file for reloading
-            if 'portfolio' in st.session_state:
-                del st.session_state['portfolio']
-            if 'export_portfolio' in st.session_state:
-                del st.session_state['export_portfolio']
+            # Clear large objects from session state to free memory
+            # Don't delete portfolio if it came from database (needs to persist)
+            if upload_toggle != 'Paydirt DB':
+                del st.session_state['portfolio'], st.session_state['export_portfolio']
 
 # with tab2:
 #     if st.button('Clear data', key='reset2'):