Refactor download options in app.py: comment out the previous download options logic for clarity, and implement a new selection mechanism for displaying either the portfolio or export base, enhancing user experience and functionality in data export processes.

app.py

@@ -1002,100 +1002,115 @@ with tab2:
                         st.session_state['export_merge'] = st.session_state['working_frame'].copy()
 
         with col2:
-            with st.expander("Download options"):
-                if stack_dict is not None:
-                    download_type = st.selectbox("Simple or Advanced Download?", options=['Simple', 'Advanced'], key='download_choice')
-                    if download_type == 'Simple':
-                        st.session_state['export_file'] = st.session_state['working_frame'].copy()
-                        for col in st.session_state['export_file'].columns:
-                                    if col not in excluded_cols:
-                                        st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
-                    else:
-                        with st.form(key='stack_form'):
-                            st.subheader("Stack Count Adjustments")
-                            st.info("This allows you to fine tune the stacks that you wish to export. If you want to make sure you don't export any of a specific stack you can 0 it out.")
-                            # Create a container for stack value inputs
-                            sort_container = st.container()
-                            with sort_container:
-                                sort_var = st.selectbox("Sort export portfolio by:", options=['median', 'Lineup Edge', 'Own'])
+            # with st.expander("Download options"):
+            #     if stack_dict is not None:
+            #         download_type = st.selectbox("Simple or Advanced Download?", options=['Simple', 'Advanced'], key='download_choice')
+            #         if download_type == 'Simple':
+            #             st.session_state['export_file'] = st.session_state['working_frame'].copy()
+            #             for col in st.session_state['export_file'].columns:
+            #                         if col not in excluded_cols:
+            #                             st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            #         else:
+            #             with st.form(key='stack_form'):
+            #                 st.subheader("Stack Count Adjustments")
+            #                 st.info("This allows you to fine tune the stacks that you wish to export. If you want to make sure you don't export any of a specific stack you can 0 it out.")
+            #                 # Create a container for stack value inputs
+            #                 sort_container = st.container()
+            #                 with sort_container:
+            #                     sort_var = st.selectbox("Sort export portfolio by:", options=['median', 'Lineup Edge', 'Own'])
                             
-                            # Get unique stack values
-                            unique_stacks = sorted(list(set(stack_dict.values())))
+            #                 # Get unique stack values
+            #                 unique_stacks = sorted(list(set(stack_dict.values())))
                             
-                            # Create a dictionary to store stack multipliers
-                            if 'stack_multipliers' not in st.session_state:
-                                st.session_state.stack_multipliers = {stack: 0.0 for stack in unique_stacks}
+            #                 # Create a dictionary to store stack multipliers
+            #                 if 'stack_multipliers' not in st.session_state:
+            #                     st.session_state.stack_multipliers = {stack: 0.0 for stack in unique_stacks}
                             
-                            # Create columns for the stack inputs
-                            num_cols = 6  # Number of columns to display
-                            for i in range(0, len(unique_stacks), num_cols):
-                                cols = st.columns(num_cols)
-                                for j, stack in enumerate(unique_stacks[i:i+num_cols]):
-                                    with cols[j]:
-                                        # Create a unique key for each number input
-                                        key = f"stack_count_{stack}"
-                                        # Get the current count of this stack in the portfolio
-                                        current_stack_count = len(st.session_state['working_frame'][st.session_state['working_frame']['Stack'] == stack])
-                                        # Create number input with current value and max value based on actual count
-                                        st.session_state.stack_multipliers[stack] = st.number_input(
-                                            f"{stack} count",
-                                            min_value=0.0,
-                                            max_value=float(current_stack_count),
-                                            value=0.0,
-                                            step=1.0,
-                                            key=key
-                                        )
+            #                 # Create columns for the stack inputs
+            #                 num_cols = 6  # Number of columns to display
+            #                 for i in range(0, len(unique_stacks), num_cols):
+            #                     cols = st.columns(num_cols)
+            #                     for j, stack in enumerate(unique_stacks[i:i+num_cols]):
+            #                         with cols[j]:
+            #                             # Create a unique key for each number input
+            #                             key = f"stack_count_{stack}"
+            #                             # Get the current count of this stack in the portfolio
+            #                             current_stack_count = len(st.session_state['working_frame'][st.session_state['working_frame']['Stack'] == stack])
+            #                             # Create number input with current value and max value based on actual count
+            #                             st.session_state.stack_multipliers[stack] = st.number_input(
+            #                                 f"{stack} count",
+            #                                 min_value=0.0,
+            #                                 max_value=float(current_stack_count),
+            #                                 value=0.0,
+            #                                 step=1.0,
+            #                                 key=key
+            #                             )
                             
-                            portfolio_copy = st.session_state['working_frame'].copy()
+            #                 portfolio_copy = st.session_state['working_frame'].copy()
                             
-                            submitted = st.form_submit_button("Submit")
-                            if submitted:
-                                # Create a list to store selected rows
-                                selected_rows = []
+            #                 submitted = st.form_submit_button("Submit")
+            #                 if submitted:
+            #                     # Create a list to store selected rows
+            #                     selected_rows = []
                                 
-                                # For each stack, select the top N rows based on the count value
-                                for stack in unique_stacks:
-                                    if stack in st.session_state.stack_multipliers:
-                                        count = int(st.session_state.stack_multipliers[stack])
-                                        # Get rows for this stack
-                                        stack_rows = portfolio_copy[portfolio_copy['Stack'] == stack]
-                                        # Sort by median and take top N rows
-                                        top_rows = stack_rows.nlargest(count, sort_var)
-                                        selected_rows.append(top_rows)
-
-                                # Combine all selected rows
-                                portfolio_concat = pd.concat(selected_rows)
+            #                     # For each stack, select the top N rows based on the count value
+            #                     for stack in unique_stacks:
+            #                         if stack in st.session_state.stack_multipliers:
+            #                             count = int(st.session_state.stack_multipliers[stack])
+            #                             # Get rows for this stack
+            #                             stack_rows = portfolio_copy[portfolio_copy['Stack'] == stack]
+            #                             # Sort by median and take top N rows
+            #                             top_rows = stack_rows.nlargest(count, sort_var)
+            #                             selected_rows.append(top_rows)
+
+            #                     # Combine all selected rows
+            #                     portfolio_concat = pd.concat(selected_rows)
                                 
-                                # Update export_file with filtered data
-                                st.session_state['export_file'] = portfolio_concat.copy()
-                                for col in st.session_state['export_file'].columns:
-                                    if col not in excluded_cols:
-                                        st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
-                                st.write('Export portfolio updated!')
-                else:
-                    st.session_state['export_file'] = st.session_state['working_frame'].copy()
-                    if 'export_base' not in st.session_state:
-                        st.session_state['export_base'] = pd.DataFrame(columns=st.session_state['working_frame'].columns)
-                    for col in st.session_state['export_file'].columns:
-                                    if col not in excluded_cols:
-                                        st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            #                     # Update export_file with filtered data
+            #                     st.session_state['export_file'] = portfolio_concat.copy()
+            #                     for col in st.session_state['export_file'].columns:
+            #                         if col not in excluded_cols:
+            #                             st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            #                     st.write('Export portfolio updated!')
+            #     else:
+            #         st.session_state['export_file'] = st.session_state['working_frame'].copy()
+            #         if 'export_base' not in st.session_state:
+            #             st.session_state['export_base'] = pd.DataFrame(columns=st.session_state['working_frame'].columns)
+            #         for col in st.session_state['export_file'].columns:
+            #                         if col not in excluded_cols:
+            #                             st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            if 'export_base' not in st.session_state:
+                    st.session_state['export_base'] = pd.DataFrame(columns=st.session_state['working_frame'].columns)
+            
+            display_frame_source = st.selectbox("Display:", options=['Portfolio', 'Export Base'], key='display_frame_source')
+            if display_frame_source == 'Portfolio':
+                display_frame = st.session_state['working_frame']
+                st.session_state['export_file'] = st.session_state['working_frame'].copy()
+                
+                for col in st.session_state['export_file'].columns:
+                    if col not in excluded_cols:
+                        st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            elif display_frame_source == 'Export Base':
+                display_frame = st.session_state['export_base']
+                st.session_state['export_file'] = st.session_state['working_frame'].copy()
+                
+                for col in st.session_state['export_file'].columns:
+                    if col not in excluded_cols:
+                        st.session_state['export_file'][col] = st.session_state['export_file'][col].map(st.session_state['export_dict'])
+            
             if 'export_file' in st.session_state:
-                download_port, merge_port, blank_export_col = st.columns([1, 1, 8])
+                download_port, merge_port, clear_export, blank_export_col = st.columns([1, 1, 1, 8])
                 with download_port:
                     st.download_button(label="Download Portfolio", data=st.session_state['export_file'].to_csv(index=False), file_name="portfolio.csv", mime="text/csv")
                 with merge_port:
-                    if st.button("Add to export"):
+                    if st.button("Add to Custom Export"):
                         st.session_state['export_base'] = pd.concat([st.session_state['export_base'], st.session_state['export_merge']])
                         st.session_state['export_base'] = st.session_state['export_base'].drop_duplicates()
                         st.session_state['export_base'] = st.session_state['export_base'].reset_index(drop=True)
-            else:
-                st.error("No portfolio to download")
-            
-            display_frame_source = st.selectbox("Display:", options=['Portfolio', 'Export Base'], key='display_frame_source')
-            if display_frame_source == 'Portfolio':
-                display_frame = st.session_state['working_frame']
-            elif display_frame_source == 'Export Base':
-                display_frame = st.session_state['export_base']
+                with clear_export:
+                    if st.button("Clear Custom Export"):
+                        st.session_state['export_base'] = pd.DataFrame(columns=st.session_state['working_frame'].columns)
+
             total_rows = len(display_frame)
             rows_per_page = 500
             total_pages = (total_rows + rows_per_page - 1) // rows_per_page  # Ceiling division