pd.merge replace pd.concat

performance.py

@@ -14,7 +14,7 @@ Calculate annual, trailing, cumumlative, and CAGR returns for multiple stocks.
 
 Author: Gang Luo
 '''
-script_version = '(2024-01-24.6)'
+script_version = '(2024-01-24.7)'
 import gradio as gr
 import yfinance as yf
 import pandas as pd
@@ -36,10 +36,10 @@ tickers_lists = [["spy", "vfv.to","xiu.to"], #0
       "slf.to", "gwo.to", "bce.to", "t.to", "rci-b.to", "enb.to", "trp.to", "zlb.to", "cp.to"], #1
     ["spy","vfv.to", "xiu.to", "zeb.to", "xfn.to", "na.to","ry.to", "bmo.to","bns.to", "td.to", "cm.to", "cwb.to",
       "slf.to", "gwo.to", "bce.to", "t.to", "rci-b.to", "enb.to", "trp.to", "xdv.to","cdz.to","vdy.to"],  #2
-    ["^GSPC","spy", "vfv.to", "vgg.to", "zlu.to","goog", "msft", "meta", "tsla","AMZN", "AAPL", "shop.to"],   #3
+    ["spy", "vfv.to", "vgg.to", "zlu.to","goog", "msft", "meta", "tsla","AMZN", "AAPL", "shop.to"],   #3
     ["^GSPC","spy","voo","ivv", "vfv.to", "zsp.to","xus.to", "xsp.to","^IXIC","qqq","hxq.to","^GSPTSE","xic.to","xiu.to","xfn.to", "fie.to"], #4
     ["^IXIC","ONEQ","CIBR","QQJG", "qqq", "spy", "vfv.to", "HXQ.to", "ZQQ.to", "XQQ.to", "QQC.to"],  #5
-    ["goog", "msft", "spy"]
+    ["goog", "msft", "^GSPC"]
 ]
 
 #==============================================================================
@@ -135,9 +135,15 @@ def get_annual_returns_tickers_common_df(tickers, calculation_end_date_str, annu
             if all_tickers_returns_df.empty:
                 all_tickers_returns_df = ticker_returns_df
             else:
-                #all_tickers_returns_df = pd.concat([all_tickers_returns_df, ticker_returns_df],axis=1, join='outer')  # Concatenate DataFrames
-                #all_tickers_returns_df.sort_index() # index may be changed when running in huggingface
-                all_tickers_returns_df = pd.merge(all_tickers_returns_df, ticker_returns_df, left_index=True, right_index=True, how='outer')
+                '''
+                When running in  huggingface, pd.concat changed the index order of ticker_returns_df 
+                when ticker_returns_df has more rows than all_tickers_returns_df. However, it is ok
+                running in colab.  Therefore, use pd.merge to replace pd.concat.
+                all_tickers_returns_df = pd.concat([all_tickers_returns_df, ticker_returns_df],axis=1,join='outer')  # Concatenate DataFrames
+                all_tickers_returns_df.sort_index() # index may be changed when running in huggingface
+                '''
+                all_tickers_returns_df = pd.merge(all_tickers_returns_df, ticker_returns_df, 
+                        left_index=True, right_index=True, how='outer')
         else:
             # New column with NaN values
             new_column_name = ticker
@@ -473,3 +479,4 @@ def calculation_response(message, history):
 
 demo = gr.ChatInterface(calculation_response)
 demo.launch(debug=False, share=False)
+