siat 3.10.24__py3-none-any.whl → 3.10.75__py3-none-any.whl

siat/bond.py

@@ -201,12 +201,14 @@ if __name__=='__main__':
     
 
 #==============================================================================
-def interbank_bond_quote(num,option='1'):
+def interbank_bond_quote(rank=10,option='1'):
     """
     功能：获得银行间债券市场现券报价
     输入：从头开始显示的个数num；选项option：默认1按照收益率从高到低排列，
     2按照发行时间从早到晚排列，3按照报价机构排列。其他选项按照默认排列。
     """
+    num=rank
+    
     #抓取银行间市场债券报价
     import akshare as ak
     try:
@@ -230,8 +232,8 @@ def interbank_bond_quote(num,option='1'):
         df.sort_values(by=['报价机构'],ascending=[True],inplace=True)
         optiontxt=texttranslate("报价机构排序")
     #重新索引
-    df.reset_index(drop=True)
-    
+    df.reset_index(drop=True,inplace=True)
+    """
     print("\n"+texttranslate("中国银行间市场债券现券即时报价")+"（"+optiontxt+texttranslate("，前")+str(num)+texttranslate("名）"))
     import pandas as pd
     pd.set_option('display.unicode.ambiguous_as_wide', True)
@@ -243,6 +245,14 @@ def interbank_bond_quote(num,option='1'):
     today = datetime.date.today().strftime("%Y-%m-%d")
     footnote="\n"+texttranslate("数据来源：中国银行间市场交易商协会(NAFMII)，")+today    
     print(footnote)
+    """
+    titletxt=texttranslate("中国银行间市场债券现券即时报价")+"（"+optiontxt+texttranslate("，前")+str(num)+texttranslate("名）")
+    import datetime
+    todaydt = datetime.date.today().strftime("%Y-%m-%d")
+    footnote="\n"+texttranslate("数据来源：中国银行间市场交易商协会(NAFMII)，")+str(todaydt)    
+    df_display_CSS(df.head(num),titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='left',second_col_align='left', \
+                       last_col_align='center',other_col_align='center')
     
     return df
 
@@ -383,7 +393,7 @@ if __name__=='__main__':
     num=10
     option='1'
     
-def interbank_bond_deal(num,option='1'):
+def interbank_bond_deal(rank=10,option='1'):
     """
     功能：获得银行间债券市场现券成交行情
     输入：从头开始显示的个数num；选项option：默认1按照收益率从高到低排列，
@@ -391,6 +401,8 @@ def interbank_bond_deal(num,option='1'):
     5按照涨跌幅从低到高。
     其他选项按照默认排列。
     """
+    num=rank
+    
     #抓取银行间市场债券报价，需要akshare-1.4.47版及以后
     import akshare as ak
     df=ak.bond_spot_deal()
@@ -492,17 +504,21 @@ def interbank_bond_deal(num,option='1'):
     else:
         df1=df[collist].tail(-num)
     
+    # 输出表格标题
     if lang == 'Chinese':
         if num > 0:
-            print("\n=== 全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，前"+str(num)+"名）\n")
+            #print("\n=== 全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，前"+str(num)+"名）\n")
+            titletxt="全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，前"+str(num)+"名）"
         else:
-            print("\n=== 全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，后"+str(-num)+"名）\n")
-            
+            #print("\n=== 全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，后"+str(-num)+"名）\n")
+            titletxt="全国银行间债券市场现券成交状况当前快照（"+optiontxt+"，后"+str(-num)+"名）"
     else:
         if num > 0:
-            print("\n=== Interbank Bond Market: Deal Price ("+optiontxt+", Top "+str(num)+")\n")
+            #print("\n=== Interbank Bond Market: Deal Price ("+optiontxt+", Top "+str(num)+")\n")
+            titletxt="Interbank Bond Market: Deal Price ("+optiontxt+", Top "+str(num)+")"
         else:
-            print("\n=== Interbank Bond Market: Deal Price ("+optiontxt+", Bottom "+str(-num)+")\n")
+            #print("\n=== Interbank Bond Market: Deal Price ("+optiontxt+", Bottom "+str(-num)+")\n")
+            titletxt="Interbank Bond Market: Deal Price ("+optiontxt+", Bottom "+str(-num)+")"
             
     """    
     import pandas as pd
@@ -524,18 +540,24 @@ def interbank_bond_deal(num,option='1'):
     df1.reset_index(drop=True,inplace=True)
     df1.index=df1.index + 1
     
+    """
     numOfCol=len(list(df1))
     alignlist=['right','left']+['center']*(numOfCol - 1)
     print(df1.to_markdown(index=True,tablefmt='plain',colalign=alignlist))
-    
+    """
     import datetime as dt
     nowstr0=str(dt.datetime.now())
     nowstr=nowstr0[:19]
     
     if lang == 'Chinese':
-        print("\n*** 数据来源：全国银行间同业拆借中心，统计时间,",nowstr)
+        #print("\n*** 数据来源：全国银行间同业拆借中心，统计时间,",nowstr)
+        footnote="数据来源：全国银行间同业拆借中心，统计时间, "+str(nowstr)
     else:
-        print("\n*** Data source：NAFMII. Delayed information,",nowstr)
+        #print("\n*** Data source：NAFMII. Delayed information,",nowstr)
+        footnote="Data source：NAFMII. Delayed information, "+str(nowstr)
+    df_display_CSS(df1,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='left',second_col_align='center', \
+                       last_col_align='center',other_col_align='center')    
     
     return df
 
@@ -564,15 +586,18 @@ if __name__=='__main__':
     num=10
     option='1'
 
-def exchange_bond_deal(num,option='1'):
+def exchange_bond_deal(rank=10,option='1'):
     """
     功能：获得沪深债券市场现券成交行情
-    输入：从头开始显示的个数num；选项option：默认1按照交易时间排列，
+    输入：从头开始显示的个数num；
+    选项option：默认1按照交易时间排列，
     2按照发行时间从早到晚排列，3按照发行时间从晚到早排列，4按照涨跌幅从高到低，
     5按照涨跌幅从低到高，6按照成交量从高到低排列，7按照成交量从低到高排列。
     其他选项按照默认排列。
     """
-    print(" Searching data, may take long time in low-speed network, please wait ...\n")
+    num=rank
+    
+    print("  Searching data, may take long time ...")
     #定义标准输出关闭类，在Spyder中无效
     import os, sys
     class HiddenPrints:
@@ -671,22 +696,31 @@ def exchange_bond_deal(num,option='1'):
                                 '涨跌幅':'Change%','昨收':'Last Close','成交量':'Volume'})
     
     if lang=='Chinese':
-        print("\n"+texttranslate("交易所市场债券成交价（")+optiontxt+texttranslate("，前")+str(num)+texttranslate("名）"))
+        #print("\n"+texttranslate("交易所市场债券成交价（")+optiontxt+texttranslate("，前")+str(num)+texttranslate("名）"))
+        titletxt=texttranslate("交易所市场债券成交价（")+optiontxt+texttranslate("，前")+str(num)+texttranslate("名）")
     else:
-        print("\nExchange Bond Market: Deal Price ("+optiontxt+", Top"+str(num)+")\n")
-        
+        #print("\nExchange Bond Market: Deal Price ("+optiontxt+", Top"+str(num)+")\n")
+        titletxt="Exchange Bond Market: Deal Price ("+optiontxt+", Top"+str(num)+")"
+    
+    """    
     pd.set_option('display.unicode.ambiguous_as_wide', True)
     pd.set_option('display.unicode.east_asian_width', True)
     pd.set_option('display.width', 200) # 设置打印宽度(**重要**)
     print(df2.head(num).to_string(index=False))
-    
+    """
     import datetime
-    today = datetime.date.today().strftime("%Y-%m-%d")
+    todaydt = datetime.date.today().strftime("%Y-%m-%d")
     if lang=='Chinese':
-        footnote="\n"+texttranslate("数据来源：新浪财经，")+today
+        #footnote="\n"+texttranslate("数据来源：新浪财经，")+today
+        footnote=texttranslate("数据来源：新浪财经，")+str(todaydt)
     else:
-        footnote="\n"+texttranslate("Source: Sina Finance, ")+today
-    print(footnote)
+        #footnote="\n"+texttranslate("Source: Sina Finance, ")+today
+        footnote=texttranslate("Source: Sina Finance, ")+str(todaydt)
+    #print(footnote)
+
+    df_display_CSS(df2.head(num),titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
+                       first_col_align='left',second_col_align='left', \
+                       last_col_align='center',other_col_align='center')
     
     return df1
 

siat/capm_beta.py

@@ -128,7 +128,7 @@ def prepare_capm_data(stkcd,mktidx,start,end):
     return R
 
 #==============================================================================
-def capm_beta(ticker,mktidx,start,end):
+def capm_beta(ticker,mktidx,start,end='today'):
     """
     函数功能：计算一只股票的静态CAPM模型贝塔系数
     输入参数：
@@ -140,6 +140,7 @@ def capm_beta(ticker,mktidx,start,end):
     显示CAPM市场模型回归的alpha, beta, 以及显著性和拟合优度
     无返回数据
     """
+    start,end=start_end_preprocess(start,end)
         
     #读取股价并准备好收益率数据
     R=prepare_capm_data(ticker,mktidx,start,end)

siat/capm_beta2.py

@@ -451,7 +451,7 @@ def compare_mticker_1beta(ticker,start,end, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom, \
                    mark_start=mark_start,mark_end=mark_end, \
-                   facecolor=facecolor,loc=loc)
+                   facecolor=facecolor,loc=loc,precision=4)
  
     return df
 
@@ -590,7 +590,8 @@ def compare_1ticker_mRF(ticker,start,end, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom, \
                    mark_start=mark_start,mark_end=mark_end, \
-                   facecolor=facecolor,loc=loc)
+                   facecolor=facecolor,loc=loc, \
+                       precision=4)
             
     return df
 
@@ -723,7 +724,7 @@ def compare_1ticker_mregression_period(ticker,start,end, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom, \
                    mark_start=mark_start,mark_end=mark_end, \
-                   facecolor=facecolor,loc=loc)
+                   facecolor=facecolor,loc=loc,precision=4)
             
     return df
 
@@ -749,6 +750,36 @@ if __name__=='__main__':
     
     betas=compare_beta_security(ticker,start,end,RF)
 
+def compare_beta(ticker,start,end, \
+                          adjust='qfq', \
+                          RF=0,regression_period=365, \
+                            attention_value='',attention_value_area='', \
+                            attention_point='',attention_point_area='', \
+                                band_area='', \
+                          graph=True,facecolor='whitesmoke', \
+                          annotate=False,annotate_value=False, \
+                          mark_high=False,mark_low=False, \
+                          mark_start=False,mark_end=False, \
+                          mktidx='auto',source='auto', \
+                          ticker_type='auto',loc="best"):
+    """
+    功能：组合情况，可能多只股票、多个投资组合或投资组合与股票的混合，多个无风险收益率
+    
+    """
+    df=compare_beta_security(ticker=ticker,start=start,end=end, \
+                adjust=adjust, \
+                RF=RF,regression_period=regression_period, \
+                  attention_value=attention_value,attention_value_area=attention_value_area, \
+                  attention_point=attention_point,attention_point_area=attention_point_area, \
+                      band_area=band_area, \
+                graph=graph,facecolor=facecolor, \
+                annotate=annotate,annotate_value=annotate_value, \
+                mark_top=mark_high,mark_bottom=mark_low, \
+                mark_start=mark_start,mark_end=mark_end, \
+                mktidx=mktidx,source=source, \
+                ticker_type=ticker_type,loc=loc)
+    
+    
 def compare_beta_security(ticker,start,end, \
                           adjust='qfq', \
                           RF=0,regression_period=365, \

siat/common.py

@@ -4918,7 +4918,13 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
     
     import os
     from nbconvert import HTMLExporter
-    from playwright.async_api import async_playwright
+    
+    try:
+        from playwright.async_api import async_playwright
+    except:
+        print("  #Warning(jupyter2pdf2): playwright seems not fully installed yet")
+        print("  [Solution] execute the command before re-run: playwright install")
+        return
     
     html_file = ""
     

siat/economy.py

@@ -1435,8 +1435,8 @@ def macro_trend(ticker,indicator,start='L10Y',end='today', \
         if 'YoY PPI' in indicator:
             attention_value=0
 
-        df=compare_economy(tickers=ticker,measures=indicator, \
-                           fromdate=fromdate,todate=todate, \
+        df=compare_economy(ticker=ticker,indicator=indicator, \
+                           start=fromdate,end=todate, \
                            power=power,twinx=twinx, \
                            yline=attention_value, \
                            loc1=loc1,loc2=loc2,facecolor=facecolor)
@@ -1451,7 +1451,7 @@ def macro_trend(ticker,indicator,start='L10Y',end='today', \
         if 'YoY PPI' in indicator:
             attention_value=0
         
-        df=economy_trend(start=fromdate,end=todate,scope=ticker,factor=indicator, \
+        df=economy_trend0(start=fromdate,end=todate,ticker=ticker,indicator=indicator, \
                          datatag=datatag,power=power, \
                          zeroline=zeroline,yline=attention_value,facecolor=facecolor)    
         # 计算增长率

siat/fama_french.py

@@ -32,14 +32,95 @@ if czxt in ['linux']: #website Jupyter
 # 解决保存图像时'-'显示为方块的问题
 plt.rcParams['axes.unicode_minus'] = False 
 #==============================================================================
+def convert2freq(df,new_freq='daily'):
+    """
+    功能：将月度或年度频度的数据均匀化为日度数据
+    """
+    dfcols=list(df)
+    
+    import pandas as pd
+    df['datetmp']=df.index
+    df['Date']=df['datetmp'].apply(lambda x: x.to_timestamp())
+    df.set_index('Date',inplace=True)
+    #df['Date']=df['date']
+    if not isinstance(df.index, pd.DatetimeIndex):
+        df.index = pd.to_datetime(df.index)
+    
+    if new_freq == 'daily':
+        df = df.asfreq('D')
+    elif new_freq == 'monthly':
+        df = df.asfreq('M')
+    else:
+        df = df.asfreq('Y')
+        
+    for c in dfcols:
+        df[c] = df[c].ffill()
+        df[c] = df[c].bfill()
+        
+    df.drop(columns=['datetmp'], inplace=True)
+    
+    #df=df[['Date']+dfcols]
+    
+    return df
+#==============================================================================
+
 if __name__=='__main__':
-    start='2016-1-1'
-    end='2020-12-31'
+    start='2025-1-1'
+    end='2025-6-13'
+    
     scope='Europe'
     factor='Mom'
     freq='yearly'
+        
+    scope='US'
+    factor='FF3'
+    freq='daily'
+    
+    ff3d=get_ff_factors(start,end,scope,factor,freq='daily')
+    ff3mth=get_ff_factors(start,end,scope,factor,freq='monthly')
+    ff3y=get_ff_factors(start,end,scope,factor,freq='yearly')
 
-def get_ff_factors(start,end,scope='US',factor='FF3',freq='yearly'):
+def get_ff_factors(start,end,scope='US',factor='FF3',freq='monthly'):
+    """
+    功能：套壳函数get_ff_factors0，应对freq='daily'经常失败的变通方法
+    """
+    import pandas as pd
+    startpd=pd.to_datetime(start)
+    endpd=pd.to_datetime(end)
+    
+    fff=get_ff_factors0(start=start,end=end,scope=scope,factor=factor,freq=freq)
+    if fff is None:
+        if freq == 'daily':
+            start1=date_adjust(start,adjust=-31)
+            end1=date_adjust(end,adjust=31)
+            fff=get_ff_factors0(start=start1,end=end1,scope=scope,factor=factor,freq='monthly')
+            if not (fff is None):
+                ff_factors0=convert2freq(fff,new_freq='daily')
+                ff_factors=ff_factors0[(ff_factors0.index >=startpd) & (ff_factors0.index <=endpd)]
+            else:
+                ff_factors=fff
+
+        elif freq == 'monthly':
+            start1=date_adjust(start,adjust=-365)
+            end1=date_adjust(end,adjust=365)
+            fff=get_ff_factors0(start=start1,end=end1,scope=scope,factor=factor,freq='yearly') 
+            if not (fff is None):
+                ff_factors=convert2freq(fff,new_freq='monthly')
+            else:
+                ff_factors=fff
+
+        else:
+            start1=date_adjust(start,adjust=-365)
+            end1=date_adjust(end,adjust=365)
+            fff=get_ff_factors0(start=start1,end=end1,scope=scope,factor=factor,freq='yearly')
+            ff_factors=fff
+    else:
+        ff_factors=fff            
+
+    return ff_factors
+
+
+def get_ff_factors0(start,end,scope='US',factor='FF3',freq='yearly'):
    """
    【支持的因子种类(factor)】
    FF3: FF3各个因子
@@ -167,7 +248,7 @@ def get_ff_factors(start,end,scope='US',factor='FF3',freq='yearly'):
    try:
         ds = web.DataReader(symbol, source, start, end)
    except:
-        print("  #Error(get_ff_factors): inaccessible to ff data source (time out)")        
+        print(f"  #Warning(get_ff_factors): time out to get {freq} data, working around ...")        
         return None
     
    #提取希望的资产定价因子
@@ -887,7 +968,14 @@ if __name__=='__main__':
 
 
 #==============================================================================
-
+if __name__=='__main__':
+    ticker='BIDU'
+    start='2025-1-1'
+    end='2025-5-30'
+    scope='US'
+    graph=True
+    
+    
 def reg_ff3_betas(ticker,start,end,scope='US',graph=True):
     """
     功能：测试一只股票对于FF3各个因子的系数大小、符号方向和显著性
@@ -1051,7 +1139,10 @@ def reg_ffc4_betas(ticker,start,end,scope='US',graph=True):
     #回归FF3模型
     import statsmodels.api as sm
     y=sample['dRet']
-    X=sample[['Mkt-RF','SMB','HML','MOM']]
+    try:
+        X=sample[['Mkt-RF','SMB','HML','MOM']]
+    except:
+        X=sample[['Mkt-RF','SMB','HML','Mom']]
     X1=sm.add_constant(X)
     results=sm.OLS(y,X1).fit() 
     
@@ -1061,7 +1152,7 @@ def reg_ffc4_betas(ticker,start,end,scope='US',graph=True):
     #输出结果并绘制横向柱状图
     gparms=parms.iloc[[1,2,3,4]]
     if graph == True:
-        #print("\n",parms)
+        print("\n",parms)
         title=ticker_name(ticker)+": FFC4模型的贝塔系数"
         plt.title(title,fontsize=12,fontweight='bold')
         plt.ylabel("贝塔系数",fontsize=12,fontweight='bold')
@@ -1178,7 +1269,7 @@ def reg_ff5_betas(ticker,start,end,scope='US',graph=True):
     #输出结果并绘制横向柱状图
     gparms=parms.iloc[[1,2,3,4,5]]
     if graph == True:
-        #print("\n",parms)
+        print("\n",parms)
         title=ticker_name(ticker)+"：FF5模型的贝塔系数"
         plt.title(title,fontsize=12,fontweight='bold')
         plt.ylabel("贝塔系数",fontsize=12,fontweight='bold')

siat/financials.py

@@ -61,14 +61,19 @@ if czxt in ['linux']: #website Jupyter
 plt.rcParams['axes.unicode_minus'] = False 
 #==============================================================================
 if __name__ == '__main__':
-    tickers=['AAPL','MSFT']
-    items=['Current Ratio','Quick Ratio']
+    ticker=['AAPL','MSFT']
+    indicator=['Current Ratio','Quick Ratio']
+    
+    ticker=['BABA','JD']
+    indicator='Cashflow per Share'
+    
     datatag=False
     power=0
     zeroline=False
     twinx=False
+    loc1=loc2='best'
 
-def compare_history(tickers,items, \
+def compare_history(ticker,indicator, \
                     datatag=False,power=0,zeroline=False,twinx=False, \
                     loc1='best',loc2='best',graph=True):
     """
@@ -77,6 +82,9 @@ def compare_history(tickers,items, \
     zeroline=False：不绘制水平零线
     twinx=False：单纵轴
     """
+    tickers=ticker
+    items=indicator
+    
     #检查power的范围是否合理
     if not (power in range(0,80)):
         print("  #Error(compare_history): invalid parameter, power =",power)
@@ -147,8 +155,12 @@ def compare_history(tickers,items, \
     #抓取数据
     info1=get_financial_rates(ticker1)
     if info1 is None:
-        print("  #Error(compare_history): failed to retrieved info for",ticker1)
-        return None,None
+        print(f"  #Warning(compare_history): unable to get data for {ticker1}, retrying ...")
+        sleep_random(max_sleep=30)
+        info1=get_financial_rates(ticker1)
+        if info1 is None:
+            print("  #Error(compare_history): failed to retrieved financials for",ticker1)
+            return None,None
     
     cols1=['ticker','endDate','periodType',item1]
     df1=info1[cols1]
@@ -166,14 +178,18 @@ def compare_history(tickers,items, \
         item2=item1
         info2=get_financial_rates(ticker2)
         if info2 is None:
-            print("  #Error(compare_history): failed to retrieved info for",ticker2)
-            return None,None        
+            print(f"  #Warning(compare_history): unable to get data for {ticker2}, retrying ...")
+            sleep_random(max_sleep=30)
+            info2=get_financial_rates(ticker2)
+            if info2 is None:
+                print("  #Error(compare_history): failed to retrieved financials for",ticker2)
+                return None,None        
         
         df2=info2[cols1]
         df2['date']=df2['endDate']
         df2.set_index('date',inplace=True)           
 
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     #绘图：T1I1，单折线
     if mode == 'T1I1'and graph:
         df=df1
@@ -183,7 +199,7 @@ def compare_history(tickers,items, \
         #titletxt=ticker_name(ticker1)+texttranslate(": 基于年(季)报的业绩历史")
         titletxt=ticker_name(ticker1)+": 财报业绩历史"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
-        footnote="数据来源: 雅虎财经,"+' '+str(today)
+        footnote="数据来源: 雅虎财经,"+' '+str(todaydt)
         
         plot_line(df,colname,collabel,ylabeltxt,titletxt,footnote, \
                   datatag=datatag,power=power,zeroline=zeroline,resample_freq='3M', \
@@ -245,10 +261,19 @@ def compare_history(tickers,items, \
         #titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+texttranslate(": 基于年(季)报的业绩历史对比")
         titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+": 财报业绩历史对比"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
-        footnote="数据来源: 雅虎财经,"+' '+str(today)
+        footnote="数据来源: 雅虎财经,"+' '+str(todaydt)
         
-        plot_line2(df1,ticker1,colname1,label1, \
-               df2,ticker2,colname2,label2, \
+        #克服双线绘制时第2条线错乱问题：两个df日期强制取齐，能解决问题，但原因不明
+        tname1=ticker_name(ticker1)
+        df1.rename(columns={item1:tname1},inplace=True)
+        tname2=ticker_name(ticker2)
+        df2.rename(columns={item2:ticker_name(ticker2)},inplace=True)
+        df12=pd.merge(df1,df2,how='inner',left_index=True,right_index=True)
+        df1t=df12[[tname1]]
+        df2t=df12[[tname2]]
+        
+        plot_line2(df1t,ticker1,tname1,label1, \
+               df2t,ticker2,tname2,label2, \
                ylabeltxt,titletxt,footnote, \
                power=power,zeroline=zeroline,twinx=twinx,resample_freq='3M', \
                    loc1=loc1,loc2=loc2)    
@@ -362,7 +387,7 @@ def compare_snapshot(ticker,indicator, \
     
     notfoundlist=[]
     total0=len(tickers)
-    print("  Searching",itemk,"for specified stocks ...")
+    print("  Searching",itemk,"for designated companies ...")
     for t in tickers:
         
         current=tickers.index(t)
@@ -1970,7 +1995,7 @@ def compare_dupont(tickerlist,fsdate='latest', \
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
     tickerlist：股票代码列表，建议在10只以内
-    fsdate：财报日期，默认为最新一期季报/年报，也可规定具体日期，格式：YYYY-MM-DD
+    fsdate：财报日期，默认为最新一期季报/年报，或具体日期，格式：YYYY-MM-DD
     scale1：用于放大销售净利率，避免与权益乘数数量级不一致导致绘图难看问题，可自行调整
     scale2：用于放大总资产周转率，避免与权益乘数数量级不一致导致绘图难看问题，可自行调整
     hatchlist：绘制柱状图的纹理，用于黑白打印时区分，可自定义，
@@ -2009,7 +2034,7 @@ def compare_dupont(tickerlist,fsdate='latest', \
     dpidflist,dpilist,fsdatelist,fstypelist=[],[],[],[]
     name1list,name2list,name3list,name4list,name5list,name6list=[],[],[],[],[],[]
     newtickerlist=[]
-    print("Working on DuPont factsheet for specified stocks ...")
+    print("  Working on DuPont factsheet for specified stocks ...")
     for t in tickerlist:
         try:
             with HiddenPrints():
@@ -2017,12 +2042,23 @@ def compare_dupont(tickerlist,fsdate='latest', \
         except:
             print("  #Warning(compare_dupont): lack of some accounting items for",t)
             continue
+        
+        #未出错，但未抓取到数据，再试
+        if dpidf is None:
+            print(f"  #Warning(compare_dupont): failed to get data for {t}, retrying ...")
+            sleep_random(max_sleep=30)
+            with HiddenPrints():
+                dpidf=calc_dupont(t)
+            
+            if dpidf is None: continue
+        
         if fsdate == 'latest': 
             try:
                 dpi=dpidf.tail(1)
             except:
-                print("  #Warning(compare_dupont): problem in some accounting items for",t)               
+                print("  #Warning(compare_dupont): got empty data for",t)               
                 continue
+            
         else: dpi=dpidf[dpidf['endDate']==fsdate]
         if len(dpi) == 0:
             print("  #Warning(compare_dupont): lack of some accounting items for",t,'@',fsdate)