Update page/complete_backtest.py

page/complete_backtest.py

@@ -76,23 +76,24 @@ def complete_backtest():
     # Button to run the analysis
     if st.button("Run"):
         start = time.time()
-        st.session_state.results = complete_test(stock_list, strategy, period, interval, multiprocess,
+        results = complete_test(stock_list, strategy, period, interval, multiprocess,
                                         swing_hl=swing_hl, ema1=ema1, ema2=ema2,
                                         close_on_crossover=close_on_crossover, cash=initial_cash,
                                         commission=commission/100)
+        results['Select'] = False
+        st.session_state.categorized_results = categorize_df(results, 'Sector', 'Return [%]')
         st.success(f"Analysis finished in {round(time.time()-start, 2)} seconds")
 
-    if "results" in st.session_state:
+    if "categorized_results" in st.session_state:
         # st.write("⬇️ Select a row in index column to get detailed information of the respective stock run.")
         st.markdown(f"""
                     ---
                     ### :orange[{stock_list} stocks backtest result by using {strategy} strategy]
                      ⬇️ Select rows in 'Select' column to get backtest plots of the selected stocks.
                     """)
-        st.session_state.results['Select'] = False
 
         cols = ['Select', 'Stock', 'Sector', 'Start', 'End', 'Return [%]', 'Equity Final [₹]', 'Buy & Hold Return [%]', '# Trades', 'Win Rate [%]', 'Best Trade [%]', 'Worst Trade [%]', 'Avg. Trade [%]']
-        st.session_state.categorized_results = categorize_df(st.session_state.results, 'Sector', 'Return [%]')
+        
 
         st.session_state.categorized_results_dict = {}
         st.session_state.selected_stocks = {}
@@ -124,12 +125,12 @@ def complete_backtest():
                             """)
                 break
 
-        for selected_rows in st.session_state.selected_stocks.values():
-            for row in selected_rows:
-                ticker = st.session_state.results['Stock'].values[row]
-                plot = st.session_state.results['plot'].values[row]
-                color = "green" if st.session_state.results['Return [%]'].values[row] > 0 else "red"
-                with st.expander(f":{color}[{ticker} backtest plot] 📊"):
-                    components.html(plot, height=900)
+        # for selected_rows in st.session_state.selected_stocks.values():
+        #     for row in selected_rows:
+        #         ticker = st.session_state.results['Stock'].values[row]
+        #         plot = st.session_state.results['plot'].values[row]
+        #         color = "green" if st.session_state.results['Return [%]'].values[row] > 0 else "red"
+        #         with st.expander(f":{color}[{ticker} backtest plot] 📊"):
+        #             components.html(plot, height=900)
 
 complete_backtest()