siat 3.5.1__py3-none-any.whl → 3.5.9__py3-none-any.whl

siat/bond.py

@@ -2705,5 +2705,133 @@ def bond_malkiel(coupon_rate,maturity_years,ytm,coupon_times=2,par_value=100, \
 
 
 #==============================================================================
+if __name__ =="__main__":
+    start="MRY"; end="today"
+    term="1Y"
+    term=["1Y","5Y","10Y"]
+    
+    power=1
+    average_value=True
+    loc1="best"; loc2="best"
+    mark_top=False; mark_bottom=False; mark_end=False
+    twinx=False
+    
+    annotate=True; annotate_value=True
+    facecolor="papayawhip"
+
+    rates=treasury_yield_trend_china(term="1Y")
+    rates=treasury_yield_trend_china(term=["1Y","5Y","10Y"])
+
+def treasury_trend_china(term="1Y",start="MRY",end="today", \
+                               power=0, \
+                               average_value=False, \
+                               mark_top=False,mark_bottom=False,mark_end=False, \
+                               annotate=True,annotate_value=True, \
+                               twinx=False, \
+                               loc1="best",loc2="best", \
+                               facecolor="papayawhip"):
+    """
+    
+    功能：分析中国国债收益率走势，支持单个期限或多个期限进行对比
+    """
+    #检查国债期限
+    term_list=['3M','6M','1Y','3Y','5Y','7Y','10Y','30Y']
+    term_list_names=['3个月','6个月','1年期','3年期','5年期','7年期','10年期','30年期']
+    
+    start1,end1=start_end_preprocess(start,end)
+    #期间不能超过一年
+    import pandas as pd
+    date1=pd.to_datetime(start1)
+    date2=pd.to_datetime(end1)
+    days=days_between_dates(date1, date2) 
+    if days>=365:
+        days=365
+        start1=date_adjust(end1, adjust=-days)
+    
+    if isinstance(term,str):
+        if not term in term_list:
+            print("  #Warning(treasury_trend_china): unsupported treasury term",term)
+            print("  Supported terms:", end='')
+            print_list(term_list,leading_blanks=1,end='\n')
+            return None
+        termlist=[term]
+    elif isinstance(term,list):
+        for t in term:
+            if not t in term_list:
+                print("  #Warning(treasury_trend_china): unsupported treasury term",t)
+                term.remove(t)
+        termlist=term
+    else:
+        print("  #Warning(treasury_trend_china):",term," is unsupported")
+        print("  Supported terms:", end='')
+        print_list(term_list,leading_blanks=1,end='\n')
+        return None
+
+    print("  Searching treasury information in China ...")        
+    df=pd.DataFrame()
+    for t in termlist:
+        if len(termlist) > 1:
+            print_progress_percent2(t,termlist,steps=len(termlist),leading_blanks=4)
+        
+        dftmp=treasury_yields_china(start1,end1,term=t)
+        dftmp[t]=dftmp['rate']*100 #转换为百分数
+        dftmp1=pd.DataFrame(dftmp[t])
+        
+        if len(df)==0:
+            df=dftmp1
+        else:
+            df=pd.merge(df,dftmp1,left_index=True,right_index=True)
+            
+    #绘图
+    titletxt=text_lang("中国国债收益率走势","China Treasury Yield Trend")
+    ylabeltxt=text_lang('收益率%',"Yield%")
+    import datetime; todaydt = datetime.date.today()
+    footnote=text_lang("数据来源：中国债券信息网，","Data source: China Bond Info, ")+str(todaydt)
+
+    if len(termlist)==1: #单曲线
+        pos=term_list.index(termlist[0])
+        termname=term_list_names[pos]
+        ylabeltxt=text_lang(termname+ylabeltxt,termlist[0]+' '+ylabeltxt)
+        
+        plot_line(df,colname=termlist[0],collabel=termlist[0], \
+                  ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote, \
+                      power=power,average_value=average_value, \
+                      loc=loc1, \
+                      mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                      facecolor=facecolor)
+            
+    if len(termlist)==2: #两条曲线，twinx
+        bond1=termlist[0]; pos1=term_list.index(bond1); bond1name=term_list_names[pos1]
+        bond2=termlist[1]; pos2=term_list.index(bond2); bond2name=term_list_names[pos2]
 
+        df1=pd.DataFrame(df[bond1]); ticker1=''; colname1=bond1; label1=bond1name
+        df2=pd.DataFrame(df[bond2]); ticker2=''; colname2=bond2; label2=bond2name
+        
+        plot_line2(df1,ticker1,colname1,label1, \
+                   df2,ticker2,colname2,label2, \
+                   ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote, \
+                   power=power, \
+                   twinx=twinx, \
+                   loc1=loc1,loc2=loc2, \
+                   color1='red',color2='blue',facecolor=facecolor)
+    
+    if len(termlist) > 2: #多条曲线
+        df['date']=df.index
+        df.set_index("date",inplace=True)
+        
+        for t in termlist:
+            tpos=term_list.index(t); tname=term_list_names[tpos]
+            df.rename(columns={t:tname},inplace=True)
+        
+        draw_lines(df,y_label=ylabeltxt,x_label=footnote, \
+                   axhline_value=0,axhline_label='', \
+                   title_txt=titletxt, \
+                   data_label=False, \
+                   loc=loc1,annotate=annotate,annotate_value=annotate_value, \
+                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   facecolor=facecolor)
+    
+    return df
+    
+        
 #==============================================================================

siat/common.py

@@ -1361,38 +1361,45 @@ if __name__=='__main__':
     shibor_rate('2021-11-19',rate_period='ON')
 #==============================================================================        
 if __name__=='__main__':
-    start='2020-1-1'
-    end='2023-3-4'
+    start='2023-11-1'
+    end='2024-10-30'
     term='1Y'
+
+    treasury_yields_china(start,end,term='1Y')
     
-def treasury_yields_china(start,end,term='1Y'):
+def treasury_yields_china(start,end='today',term='1Y'):
     """
     功能：抓取指定期间和期限的国债收益率
     
     注意：这里得到的是年化利率，不带百分号，不是日利率！（日利率=年化利率/365）
     """
+    start,end=start_end_preprocess(start,end)
+    
     #检查日期期间
     valid,start1,end1=check_period(start,end)
     if not valid:
-        print("  #Error(treasury_yields_china): invalid date period from",start,"to",end)
+        print("  #Warning(treasury_yields_china): invalid date period from",start,"to",end)
         return None
     
     #检查利率期间有效性
     term_list=['3M','6M','1Y','3Y','5Y','7Y','10Y','30Y']
     if not (term in term_list):
-        print("  #Error(treasury_yields_china): invalid rate period",term)
+        print("  #Warning(treasury_yields_china): invalid rate period",term)
         print("  Supported rate periods:",term_list)
         return None
     
     #抓取中债国债收益率
     import akshare as ak
-    df = ak.bond_china_yield(start_date=start,end_date=end)
+    start2=start1.strftime("%Y%m%d")
+    end2=end1.strftime("%Y%m%d")
+    df = ak.bond_china_yield(start_date=start2,end_date=end2)
     if len(df)==0:
+        print("  #Warning(treasury_yields_china): empty data found, try again later")
         return None
     
     df1=df[df['曲线名称']=='中债国债收益率曲线']
     df1.columns=['curve','date']+term_list
-    df1.sort_values(by=['date'],ascending=['True'],inplace=True)
+    df1.sort_values(by=['date'],ascending=True,inplace=True)
     
     df1['Date']=pd.to_datetime(df1['date'])
     df1.set_index(['Date'],inplace=True)    
@@ -1401,6 +1408,7 @@ def treasury_yields_china(start,end,term='1Y'):
     df1['period']=term
     df2=df1[['date','rate','period']]
     
+    
     return df2
 
 if __name__=='__main__':
@@ -4236,7 +4244,133 @@ def list_intersection(lists=[],numberPerLine=5,printout=True,return_result=False
     else: return
                         
 #==============================================================================
+if __name__ == '__main__':
+    hpr=3.17
+    years=20
+    
+    annual_return1(hpr,years)
+    
+def annual_return1(hpr,years):
+    """
+    功能：计算年均复合增长率，1个
+    """
+    #text1="Holding period return for "+str(years)+" years: "+str(hpr*100)+'%'
+    text1=str(years)+"年的持有期收益率："+str(round(hpr*100,3))+'%'
+    print(text1,end='，')
+    
+    #text2="Annualized compound return:"
+    text2="年均复合收益率："+str(round((pow(1+hpr,1/years)-1)*100,3))+'%'
+    print(text2)
+    
+    return
+
+if __name__ == '__main__':
+    hpr=3.17
+    hpr=[3.17,2.5]
+    years=20
+    
+    annual_return(hpr,years)
+
+def annual_return(hpr,years):
+    """
+    功能：hpr可为多个
+    """
+    if isinstance(hpr,float) or isinstance(hpr,int):
+        hpr=[hpr]
+        
+    for h in hpr:
+        annual_return1(h,years)
+        
+    return
+
+if __name__ == '__main__':
+    df=security_trend(['801811.SW','801813.SW'],
+                      indicator='Exp Adj Ret%',
+                      start='L5Y',
+                      annotate=True,annotate_value=True)
+    
+    df_annual_return(df)
+    
+def df_annual_return(df):
+    """
+    功能：计算df1中每列的年复合收益率
+    """
+    
+    #计算年数
+    date1=df.index[0]
+    date2=df.index[-1]
+    delta=date2-date1
+    years=round(delta.days/365,2)
+    months=int(delta.days/30)
+
+    #计算每列的年均复合增长率   
+    collist=list(df)
+    for c in collist:
+        hpr=df[c][-1]
+        hpr1=hpr/100
+        annual_rate=str(round((pow(1+hpr1,1/years)-1)*100,3))+'%'
+        
+        if years >=1:
+            text=c+": "+str(years)+"年持有期收益率"+str(round(hpr,3))+'%，年均复合收益率'+annual_rate
+        else:
+            text=c+": "+str(months)+"个月持有期收益率"+str(round(hpr,3))+'%，年均复合收益率'+annual_rate
+        print(text)
+        
+    return
+
 #==============================================================================
+
+
+if __name__ == '__main__':
+    df=security_trend("600519.SS",graph=False)
+    option="save"
+    
+    df_save(df,file="moutai")
+    mt=df_restore(file="moutai")
+    
+def df_save(df,file="df"):
+    """
+    功能：保存df数据，适用于那些需要大量时间获取的df，以便使用时可以恢复
+    """
+    
+    if ".pkl" in file:
+        file_name=file
+    else:
+        file_name=file+'.pkl'
+    
+    try:        
+        df.to_pickle(file_name)
+        
+        import os; path=os.getcwd()
+        print("  Data is saved to file",path+"\\"+file_name)
+    except:
+        print("  #Error(df_save): failed to save data to file",file_name)
+        
+    return
+        
+def df_restore(file):
+    """
+    功能：从文件恢复df数据，适用于那些需要大量时间获取的df
+    """
+    
+    import pandas as pd
+    
+    if ".pkl" in file:
+        file_name=file
+    else:
+        file_name=file+'.pkl'
+    
+    try:
+        df=pd.read_pickle(file_name)
+        
+        import os; path=os.getcwd()
+        print("  Data is restored from file",path+"\\"+file_name)
+    except:
+        print("  #Error(df_restore): file not found for",file_name)
+        df=None
+    return df
+            
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/fund_china.py

@@ -762,7 +762,7 @@ def get_oef_rank_china():
     df3['基金类型']=df3['基金类型'].astype(str)
     df3['净值日期']=nvdate
 
-    print("Successfully retrieved",len(df3),"Chinese OEF products disclosing performance on",nvdate)
+    print("Successfully retrieved",len(df3),"OEF products on",nvdate)
 
     return df3
 
@@ -864,7 +864,10 @@ def oef_rank_china2(df,fund_type='全部类型',rank=5,indicator='单位净值')
         titletxt="中国开放式基金排名：累计净值"
     
     if indicator == '手续费':
-        df.sort_values(by=['手续费'],ascending=False,inplace=True)
+        try:
+            df['手续费'] = df['手续费'].astype(str)
+            df.sort_values(by=['手续费'],ascending=False,inplace=True)
+        except: pass
         #dfprint=df[['基金简称','基金代码','基金类型','手续费','申购状态','赎回状态']]
         dfprint=df[['基金简称','基金代码','基金类型','手续费','单位净值']]
         #print(texttranslate("\n===== 中国开放式基金排名：手续费 =====")) 
@@ -908,7 +911,7 @@ def oef_rank_china2(df,fund_type='全部类型',rank=5,indicator='单位净值')
     formatted_hour = time.strftime("%H", current_time)
     footnote5=''
     if (formatted_hour >= '18' or formatted_hour <= '06') and not is_weekend(todaydt):
-        footnote5="注意：此时可能为数据源更新时段，获取的信息可能不全\n"
+        footnote5="注意：此时若为数据源更新时段，获取的信息可能不全\n"
     
     footnote=footnote1+footnote2+footnote3+footnote4+footnote5
     
@@ -1146,7 +1149,7 @@ def oef_rank_china(indicator='单位净值',fund_type='全部类型',rank=5):
     formatted_hour = time.strftime("%H", current_time)
     footnote4=''
     if formatted_hour > '17':
-        footnote4="此时为数据源更新时段，获取的信息可能不全\n"
+        footnote4="此时若为数据源更新时段，获取的信息可能不全\n"
     
     footnote5="数据来源：新浪财经/天天基金"
     footnote=footnote1+footnote2+footnote3+footnote4+footnote5

siat/grafix.py

@@ -209,7 +209,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 #y1=round(y+high_low*0.01,2)
                 y1=y+high_low*0.01
                 #s='%.0f' if y >= 100 else '%.2f'
-                s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f' 
+                s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f' 
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='red')
                 """
                 s='%.0f' if y >= 100 else '%.2f'
@@ -224,7 +224,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                 y1=y-high_low*0.050 #标记位置对应y1的底部
                 #s='%.0f' if y >= 100 else '%.2f'
-                s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
                 #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='seagreen')
                 plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -236,7 +236,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         x_end = df_end[colname].idxmin() # 末端值的x坐标 
         
         #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-        y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3)) 
+        y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3)) 
         plt.annotate(text=' '+y1, 
                      xy=(x_end, y_end),
                      xytext=(x_end, y_end),fontsize=annotate_size)
@@ -1242,7 +1242,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-                y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
+                y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
                 plt.annotate(text=c+':'+y1, 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
@@ -1274,7 +1274,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y+high_low*0.01,2)
                     y1=y+high_low*0.01
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
@@ -1285,7 +1285,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                     y1=y-high_low*0.050 #标记位置对应y1的底部
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -1297,7 +1297,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
+            y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end),fontsize=annotate_size,
@@ -1471,7 +1471,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y+high_low*0.01,2)
                     y1=y+high_low*0.01
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
@@ -1482,7 +1482,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                     y1=y-high_low*0.050 #标记位置对应y1的底部
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.0f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
+                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.3f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -1513,7 +1513,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             x_end = df_end[c].idxmin() # 末端值的x坐标 
             
             #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
-            y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
+            y1=str(round(y_end,2)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
             plt.annotate(text=y1, 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end),fontsize=annotate_size,

siat/security_trend2.py

@@ -500,7 +500,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         return df
     
     
-    # 情形8：估值指标PE/PB/MV/ROE，仅针对股票，无需ticker_type====================
+    # 情形8：估值指标PE/PB/MV/ROE，仅针对股票/行业指数代码，无需ticker_type========
     if indicator_group3:
         df=security_valuation(tickers=tickers,indicators=measures,start=fromdate,end=todate, \
                               preprocess=preprocess,scaling_option=scaling_option, \

siat/stock.py

@@ -681,6 +681,10 @@ def security_indicator(ticker,indicator, \
                                                       adjust=adjust, \
                                                       todate=todate,source=source,ticker_type=ticker_type)           
 
+    if not found == "Found":
+        print("  #Error(security_indicator): no security info found for",ticker)
+        return None
+        
     # 去掉时区信息，避免日期时区冲突问题
     pricedf=df_index_timezone_remove(pricedf)
     """
@@ -1588,7 +1592,11 @@ def compare_security(tickers,measures,fromdate,todate, \
                                   source=source, \
                                   ticker_type=ticker_type, \
                                   graph=False)
-        pltdf1= df1tmp[[measure1]]
+        if df_have_data(df1tmp)=="Found":
+            pltdf1= df1tmp[[measure1]]
+        else:
+            print("  #Error(compare_security)：no info found for",ticker1,"on",measure1)
+            return None,None
         
         print("  Searching",ticker1,"for",measure2,"info ... ...")
         #复权价判断2
@@ -1604,7 +1612,11 @@ def compare_security(tickers,measures,fromdate,todate, \
                                   ticker_type=ticker_type, \
                                   graph=False)
  
-        pltdf2= df2tmp[[measure2]]
+        if df_have_data(df2tmp)=="Found":
+            pltdf2= df2tmp[[measure2]]
+        else:
+            print("  #Error(compare_security)：no info found for",ticker1,"on",measure2)
+            return None,None
         
         pltdf=pd.merge(pltdf1,pltdf2,left_index=True,right_index=True)
         pltdf['ticker']=ticker1
@@ -1635,14 +1647,22 @@ def compare_security(tickers,measures,fromdate,todate, \
                               source=source, \
                               ticker_type=ticker_type, \
                               graph=False) 
-        pltdf1=df1tmp[['ticker',measure1]]      
+        if df_have_data(df1tmp)=="Found":
+            pltdf1=df1tmp[['ticker',measure1]] 
+        else:
+            print("  #Error(compare_security)：no info found for",ticker1,"on",measure1)
+            return None,None
         
         df2tmp=security_indicator(ticker=ticker2,indicator=measure1,adjust=adjust, \
                               fromdate=fromdate,todate=todate, \
                               source=source, \
                               ticker_type=ticker_type, \
                               graph=False) 
-        pltdf2=df2tmp[['ticker',measure1]]   
+        if df_have_data(df2tmp)=="Found":
+            pltdf2=df2tmp[['ticker',measure1]]   
+        else:
+            print("  #Error(compare_security)：no info found for",ticker2,"on",measure1)
+            return None,None
         
         #绘制双证券单指标对比图
         if graph:

siat/valuation.py

@@ -718,11 +718,13 @@ if __name__=='__main__':
     tickers='光伏设备(申万)'
     tickers='中证500'
     tickers='801735.SW'
+    tickers='801853.SW'
     
     tickers=['PZU.PL','WIG.PL']
     tickers=['PZU.PL','JD','600519.SS','00700.HK','801735.SW','光伏设备(申万)','中证500']
     
     indicators='PE'
+    indicators='PB'
     indicators=['pe','pb']
     indicators=['pe','pb','mv']
     indicators='ROE'
@@ -802,8 +804,20 @@ def get_valuation(tickers,indicators,start,end):
                 dft=get_stock_valuation_pl(t1,indicators1,start,end)
             if dft is not None: gotit=True
 
-        # 申万指数代码？可能没有机会走到这里！
-        if not gotit and (result and suffix in ['SW']) and not ROE_flag:
+        # 行业指数代码？
+        suffix_list=['SW','SI',#申万行业
+                     'GI',#谷歌
+                     'CSI',#中证
+                     'CNI',#国证
+                     'SH','SZ','BJ',#沪深京交易所
+                     'WI',#万得
+                     'HI',#恒生
+                     'SPI',#标普
+                     'MI',#MSCI
+                     'BO',#孟买
+                     ]
+        if not gotit and (result and suffix in suffix_list) and not ROE_flag:
+            
             #dft=get_index_valuation_funddb(t1,indicators1,start,end)
             indicator1=indicators1[0]
             dft0=industry_valuation_history_sw(industry=t1,
@@ -981,7 +995,7 @@ def security_valuation(tickers,indicators,start,end, \
                 footnote1="注：市值金额：十亿，当地货币单位\n"
                 
         todaydt = datetime.date.today()
-        footnote9="数据来源: 综合baidu/stooq/funddb/swhysc，"+str(todaydt)
+        footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
         footnote=footnote1+footnote9
         
         draw_lines(df2,y_label=ylabeltxt,x_label=footnote, \
@@ -1009,7 +1023,7 @@ def security_valuation(tickers,indicators,start,end, \
                 footnote1="注：市值金额：十亿，当地货币单位\n"
                 
         todaydt = datetime.date.today()
-        footnote9="数据来源: 综合baidu/stooq/funddb/swhysc，"+str(todaydt)
+        footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
         footnote=footnote1+footnote9
         
         df2_1.rename(columns={i1:ectranslate(i1)},inplace=True)
@@ -1043,7 +1057,7 @@ def security_valuation(tickers,indicators,start,end, \
                 footnote1="注：市值金额：十亿，当地货币单位\n"
                 
         todaydt = datetime.date.today()
-        footnote9="数据来源: 综合baidu/stooq/funddb/swhysc，"+str(todaydt)
+        footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
         footnote=footnote1+footnote9
         
         colname1=i; label1=t1
@@ -1078,7 +1092,7 @@ def security_valuation(tickers,indicators,start,end, \
                 footnote1="注：市值金额：十亿，当地货币单位\n"
                 
         todaydt = datetime.date.today()
-        footnote9="数据来源: 综合baidu/stooq/funddb/swhysc，"+str(todaydt)
+        footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
         footnote=footnote1+footnote9
         
         #ylabeltxt=i
@@ -1123,7 +1137,7 @@ def security_valuation(tickers,indicators,start,end, \
                 footnote1="注：市值金额：十亿，当地货币单位\n"
             
         todaydt = datetime.date.today()
-        footnote9="数据来源: 综合baidu/stooq/funddb/swhysc，"+str(todaydt)
+        footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
         footnote=footnote1+footnote9
         
         #ylabeltxt=''

siat/valuation_china.py

@@ -432,10 +432,11 @@ if __name__=='__main__':
 #==============================================================================
 if __name__=='__main__':
     industry='食品饮料'
-    
     industry='生猪养殖'
-    
     industry='国防军工'
+    
+    industry='801853.SW'
+    
     start='2021-1-1'
     end='2022-11-15'
     vtype='PE'
@@ -443,12 +444,18 @@ if __name__=='__main__':
     graph=True
     loc='best'
     
+    df=industry_valuation_history_sw_daily(industry,start,end,vtype)
+    
 def industry_valuation_history_sw_daily(industry,start,end,vtype='PE', \
-                                  graph=True,loc='best'):
+                                  graph=True,loc='best', \
+                                  error_message=True):
     """
     功能：绘制一个申万行业的日历史估值趋势，不支持二级三级行业分类
     vtype: PE, PB, dividend
     
+    *** 注意：必须安装插件ipywidgets
+    如果出现下列错误信息：Error displaying widget: model not found
+    先卸载再重新安装插件ipywidgets
     """
     #检查日期期间
     result,start1,end1=check_period(start,end)
@@ -469,14 +476,35 @@ def industry_valuation_history_sw_daily(industry,start,end,vtype='PE', \
     pos=vtypelist.index(vtypeu)
     vtypes=typelist[pos]
 
+    # 适配industry名称/代码
+    industry_split=industry.split('.')
+    split1=industry.split('.')[0]
+    split1_name=industry_sw_code(split1)
+    
+    #industry情形1：无后缀，名称
+    if len(industry_split)==1 and not split1.isdigit():
+        
+        if not split1_name is None: #是申万名称
+            sindustry=industry+'(申万)'
+        else: #不是申万名称
+            sindustry=industry
+    #industry情形2：数字
+    else: 
+        if not split1_name is None: #是申万代码
+            sindustry=industry_sw_name(split1)+'(申万)'
+        else: #不是申万代码
+            index_val=ak.index_value_name_funddb()
+            sindustry=index_val[index_val['指数代码']==industry]['指数名称'].values[0]
+    
     # 获取行业估值历史数据
     import akshare as ak
-    sindustry=industry+'(申万)'
     try:
-        # 不支持申万三级行业
+        # symbol：指数名称，申万行业名称需要加后缀(申万)，仅支持申万一级行业和部分二级行业，不支持申万三级行业
+        # 支持的指数查看：ak.index_value_name_funddb()
         df = ak.index_value_hist_funddb(symbol=sindustry, indicator=vtypes)  
     except:
-        print("  #Warning(industry_valuation_history_sw_daily): failed to fetch industry info for",industry)
+        if error_message:
+            print("  #Warning(industry_valuation_history_sw_daily): failed to access index",sindustry)
         return None
 
     import pandas as pd
@@ -632,6 +660,7 @@ def industry_valuation_history_sw_weekly(industry,start,end,vtype='PE', \
     
     industry1=industry.split('.')[0]
     industry_name_flag=industry_code_flag=False
+    type_name=''
     try:
         type_name=sw_codes[sw_codes['name']==industry1]['type_name'].values[0]
         industry_name_flag=True
@@ -640,19 +669,20 @@ def industry_valuation_history_sw_weekly(industry,start,end,vtype='PE', \
             type_name=sw_codes[sw_codes['code']==industry1]['type_name'].values[0]
             industry_code_flag=True
         except:
-            print("  #Error(industry_valuation_history_sw_weekly): Shenwan industry not found for",industry)
-            return None
+            print("  #Warning(industry_valuation_history_sw_weekly): not a Shenwan index for",industry)
+            #return None
 
     if type_name=='三级行业':
-        print("  #Error(industry_valuation_history_sw_weekly): currently does not support Shenwan 3rd_level industry",industry)
+        print("  #Warning(industry_valuation_history_sw_weekly): currently does not support Shenwan 3rd_level industry",industry)
         return None
 
-    if not (type_name=='二级行业'):
+    if not (type_name in ['二级行业','风格指数']):
         df=industry_valuation_history_sw_daily(industry=industry,start=start,end=end,vtype=vtype, \
-                                          graph=graph,loc=loc)
-        return df
+                                               graph=graph,loc=loc,error_message=False)
+        if not (df is None):
+            return df
 
-    # 获取行业估值历史周数据
+    # 获取行业估值历史周数据：啰嗦方法，需要反复下载，容易出ipywidgets引起的错误，需要安装之或卸载后重新安装
     import pandas as pd
     import akshare as ak
     df=None
@@ -717,6 +747,9 @@ def industry_valuation_history_sw_weekly(industry,start,end,vtype='PE', \
 if __name__=='__main__':
     industry='食品饮料'
     industry='白酒Ⅱ'
+    industry='绩优股指数'
+    industry='801853.SW'
+    
     start='2023-10-1'
     end='2023-12-15'
     vtype='PE'
@@ -765,11 +798,12 @@ def industry_valuation_history_sw(industry,start,end,vtype='PE', \
     industry_name_flag=industry_code_flag=False
     try:
         type_name=sw_codes[sw_codes['name']==industry1]['type_name'].values[0]
-        industry_name_flag=True
+        industry_name_flag=True; industry_name=industry1
     except:
         try:
             type_name=sw_codes[sw_codes['code']==industry1]['type_name'].values[0]
             industry_code_flag=True
+            industry_name=sw_codes[sw_codes['code']==industry1]['name'].values[0]
         except:
             print("  #Error(industry_valuation_history_sw): Shenwan industry not found for",industry)
             return None
@@ -778,12 +812,14 @@ def industry_valuation_history_sw(industry,start,end,vtype='PE', \
         print("  #Error(industry_valuation_history_sw): currently does not support Shenwan 3rd_level industry",industry)
         return None
 
-    if not (type_name=='二级行业'):
+    #if not (type_name=='二级行业'):
+    if not (type_name in ['二级行业','风格指数']):
         df=industry_valuation_history_sw_daily(industry=industry,start=start,end=end,vtype=vtype, \
                                           graph=graph,loc=loc)
-        return df
+        if not (df is None):
+            return df
 
-    # 获取行业估值历史周数据
+    # 获取行业估值历史周数据：笨方法，反复下载。易出ipywidgets引起的错误，可卸载后重装
     import pandas as pd
     import akshare as ak
     start2=start1.strftime('%Y-%m-%d')
@@ -852,7 +888,7 @@ def industry_valuation_history_sw(industry,start,end,vtype='PE', \
         df2['平均值']=df2[vtypes].mean()
         df2['中位数']=df2[vtypes].median()
         
-        titletxt="行业估值趋势："+industry+'，'+vtypes   
+        titletxt="行业估值趋势："+industry_name+'，'+vtypes   
         
         footnote0="注：申万行业分类指数，"
         footnote1=''

{siat-3.5.1.dist-info → siat-3.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.5.1
+Version: 3.5.9
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.5.1.dist-info → siat-3.5.9.dist-info}/RECORD

@@ -9,7 +9,7 @@ siat/beta_adjustment.py,sha256=viJJE9O82SbA_VYuJtrs3HT0OWYhk4yvmoywskrAhaI,37287
 siat/beta_adjustment_china.py,sha256=QAVhTQxfV7NSakNPMfQtGMeRzEHVBC8JZQTqD5Owp2I,20802
 siat/beta_adjustment_test.py,sha256=nBhvQQfqxooCHjy5hL0a8V0ZC58BjuCZVFpqpWpHeF0,2467
 siat/blockchain.py,sha256=awF3GDtlwaJhku0a2kLuXOS8d3IzkjR_RyzlZWvD3L4,6032
-siat/bond.py,sha256=9dIj2MMGXByxHkqLuBpWhfEkcix9RzAtzQovLRQUCZA,103903
+siat/bond.py,sha256=BswqLEiOWbsfYD6ZDVLrvgQRQu2qGVzMDnf8y7RHQLU,109140
 siat/bond_base.py,sha256=KBm0hOQSE6fruXd9eJztY9pXCN19iv7aCXZZcnVM4yY,37637
 siat/bond_china.py,sha256=eYv-nMoWSS5fZ4VxnuJ29QFY9GUS6meGiIc0Xjm1fQI,3038
 siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=lUuCPVSxebkA2yye1PXu1V2Jd2UKEwD_kIA25DCIDTs,29750
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=4cQOWSaKFqiGgMVoub559lZcRRoNtz9r_gAPZ8x8pX8,155546
+siat/common.py,sha256=PFo30Yu2Vua1GEr02joJj-Wej-e47dAAqwCAVHjj40A,159050
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -53,14 +53,14 @@ siat/financials_test.py,sha256=HJ3CPo_Xckz2wXi3AEP6ZNWCF1Duc1pLi0Y10USiImc,23829
 siat/fred_test.py,sha256=KF50ssSbsfpa_kT6iuomD0vG4eXztAcOasZxg1OGX5w,1201
 siat/fund.py,sha256=wMDORsCBV8ZXfgwbtq-0bu3qqWY66dHnbqgllW0gWCo,24637
 siat/fund_china.pickle,sha256=x_nPPdwy7wzIhtZQOplgDyTSyyUdXy9lbNxWysq7N6k,2437771
-siat/fund_china.py,sha256=rPGnYSPkbZUqtBoJnxLZLIQ8MjD8vD3TovCMfletBP4,111839
+siat/fund_china.py,sha256=jRAibZiHXAjUwlHoIiXK_moFhEYvVzl2Q0FhfYRZiFk,111907
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
 siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=irpjbeRTDorDOwkJYv6wArtrdM-KrU27I7CjeKuHWqM,87857
+siat/grafix.py,sha256=9brQItikS7aHXO1mnwgEYCzfq1tjzOHWOCVgiFyaHNA,87873
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -102,10 +102,10 @@ siat/security_prices.py,sha256=M8Qflbd6cgIJAnXBn3Ifn2z8A0SWzw6Ns_VHn74v1O8,10803
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
-siat/security_trend2.py,sha256=1k8DWeEWecBG_RVz6Bvl5-YOxHsJvuFPg0B-uZFR4BM,26329
+siat/security_trend2.py,sha256=JHrO5zDBYMLbpvotdaqaUcFrxm2di60kMVOdeom8t8A,26336
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=rcL64oBPWPoPsLHsZUtHWyoe5FXBdT7VFgdB6ZoIbvY,154184
+siat/stock.py,sha256=-vhAVxaEjoF3jlU2geAI3Y_OT9-IsEz21DFSOy68QCA,155054
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -135,13 +135,13 @@ siat/translate.py,sha256=12-Qx2sqwANobFsh2k5qyE_idjHs0j2g5cTlh9by7co,240806
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
-siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
+siat/valuation.py,sha256=WCqL5zYkZ_Y3MLeoWXTu3G1CknwGdYzhpszbT6cEoYk,49255
+siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=9U_XfEeMlS3TrCrO3Bww21nuFgghbnO-cqDJMhQWqew,16193
-siat-3.5.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.5.1.dist-info/METADATA,sha256=g069GGhSmTRj8wW-XpeH9Tqq22oCF3DwLD--R2DGDys,8009
-siat-3.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.5.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.5.1.dist-info/RECORD,,
+siat-3.5.9.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.5.9.dist-info/METADATA,sha256=oEnRGAyy2ZxYebqnrDoiTgQE0OIEmVyc8kAtcOSExkA,8009
+siat-3.5.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+siat-3.5.9.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.5.9.dist-info/RECORD,,

{siat-3.5.1.dist-info → siat-3.5.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any