siat 3.5.2__py3-none-any.whl → 3.5.10__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__':
@@ -4312,7 +4320,6 @@ def df_annual_return(df):
 
 #==============================================================================
 
-
 if __name__ == '__main__':
     df=security_trend("600519.SS",graph=False)
     option="save"
@@ -4329,15 +4336,20 @@ def df_save(df,file="df"):
         file_name=file
     else:
         file_name=file+'.pkl'
+    
+    try:        
+        df.to_pickle(file_name)
         
-    df.to_pickle(file_name)
-    print("  Data is saved in",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
+    功能：从文件恢复df数据，适用于那些需要大量时间获取的df
     """
     
     import pandas as pd
@@ -4349,13 +4361,42 @@ def df_restore(file):
     
     try:
         df=pd.read_pickle(file_name)
-        print("  Data is restored from",file_name)
+        
+        import os; path=os.getcwd()
+        print("  Data is restored from file",path+"\\"+file_name)
     except:
-        print("  #Warning(df_dump): file not found for",file_name)
+        print("  #Error(df_restore): file not found for",file_name)
         df=None
     return df
             
 
 #==============================================================================
+if __name__ == '__main__':
+    df=security_trend("600519.SS",start="L5Y",graph=False)
+    column='Close'
+    
+    annual_compound_growth(df,"Close")
+    
+def annual_compound_growth(df,column="Close"):
+    """
+    
+    功能：计算df[column]的简单年均复合增长率，假定df按照日期顺序升序排列
+    """
+    if not "Close" in list(df):
+        print("  Sorry, column",column,"not found in the dataframe")
+        return
+    
+    day1=df.index[0]; day2=df.index[-1]
+    days=days_between_dates(day1, day2)
+    
+    years=days / 365
+    
+    import numpy as np  
+    growth_rate=round((np.power(df[column][-1]/df[column][0],1/years)-1)*100,2)
+    rate_str=str(growth_rate)+'%'
+    
+    print("Annual compound growth rate:",rate_str)
+    
+    return 
 #==============================================================================
 #==============================================================================

siat/fund_china.py

@@ -911,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
     
@@ -1149,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/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)
     """

siat/translate.py

@@ -1112,15 +1112,17 @@ def codetranslate0(code):
         ['TRS5.UK','SPDR美债3-7年期ETF'],['TRSX.UK','SPDR美债7-10年期ETF'],
         ['LUTR.UK','SPDR美债10+年期ETF'],
         
+        # 除了^FTW5000，其他的貌似缺数据
         ['^FTW5000','威尔希尔5000全市场指数'],
-        
         ['^W4500','威尔希尔4500指数'],
         ['^FTW2500','威尔希尔2500指数'],
         ['^FTWUSG','威尔希尔美国巨型公司指数'],['^FTWUSL','威尔希尔美国大型公司指数'],
         ['^FTWUSD','威尔希尔美国中型公司指数'],['^FTWUSS','威尔希尔美国小型公司指数'],
         ['^FTWUSO','威尔希尔美国微型公司指数'],
         
-        ['FVTT.FGI','富时越南指数'],['^RUT','罗素2000指数'],
+        ['FVTT.FGI','富时越南指数'],['SWMCX','嘉信美国中盘股指数ETF'],
+        ['^RUT','罗素2000指数'],['^RUI','罗素1000指数'],
+        
         ['^HSI','恒生指数'],['^N225','日经225指数'],
         ['WIKOR.FGI','富时韩国指数'],['^KS11','韩国综合指数'],
         ['^KOSPI','韩国综合指数'],
@@ -1949,7 +1951,8 @@ def codetranslate1(code):
         ['000019.SS','SSE Governance Index'],['000048.SS','SSE CSR Index'],
         
         ['899050.BJ','BSE50 Index'],['^SPX','Standard & Poor 500 Index'],
-        ['^RUT','Russell 2000 Index'],['^NKX','Nikkei 225 Index'],
+        ['^RUT','Russell 2000 Index'],['^RUI','Russell 1000 Index'],
+        ['^NKX','Nikkei 225 Index'],
         ['^NDQ','NASDAQ Composite Index'],['^NDX','NASDAQ 100 Index'],
         ['IBM','IBM Corp'],
         
@@ -2000,7 +2003,8 @@ def codetranslate1(code):
         ['^SNX','India SENSEX 30 Index'],['^FTM','UK FTSE 250 Index'],
         ['^KLCI','Kuala Lumpur Composite Index'],['^KLSE','Kuala Lumpur Composite Index'],
         
-        ['FVTT.FGI','FTSE Viernam Index'],['^RUT','Russell 2000 Index'],
+        ['FVTT.FGI','FTSE Viernam Index'],
+        ['^RUT','Russell 2000 Index'],['^RUI','Russell 1000 Index'],
         ['^HSI','Hang Seng Index'],['^N225','Nikkei 225 Index'],
         ['WIKOR.FGI','FTSE Korea Index'],['^KS11','Korea Composite Index'],
         ['^KOSPI','Korea Composite Index'],['^BSESN','SENSEX Index'],

siat/yf_name.py

@@ -228,7 +228,9 @@ if __name__=='__main__':
     ticker='600777.ss'
     ticker='CPL.WA'
     
-    yahoo_name2(ticker)
+    ticker='SWMCX'
+    
+    yahoo_name1(ticker)
     
     #极端测试
     inamelist=[]
@@ -309,6 +311,8 @@ if __name__ == '__main__':
     stock_code='1155.KL'
     stock_code='MSFT'
     
+    stock_code='SWMCX'
+    
     yahoo_name1_direct(stock_code)
 
  
@@ -322,6 +326,7 @@ def yahoo_name1_direct(stock_code,add_suffix=True):
     stock_code1=stock_code.upper()
     
     #抓取证券名称
+    # https://finance.yahoo.com/quote/SWMCX/
     url = f"https://finance.yahoo.com/quote/{stock_code1}/"
     response = requests.get(url)
     if response.status_code == 200:
@@ -345,6 +350,7 @@ def yahoo_name1_direct(stock_code,add_suffix=True):
 if __name__=='__main__':
     original_name='Oponeo.pl SA'
     original_name='Apple Inc'
+    original_name='Schwab  US Mid-Cap Index'
     
     filter_stock_name(original_name)
     
@@ -352,6 +358,10 @@ def filter_stock_name(original_name):
     """
     功能：过滤从网站上抓取到的证券名称，去掉尾部的公司类别词汇，缩短长度，便于显示
     """
+        
+    #将字符串中的多个空格变为单个空格
+    original_name=replace_multiple_spaces(original_name)
+    
     #定义需要去掉的单词，注意顺序不要轻易颠倒！子串包含的，要长文在前！前置留空格的为避免误删
     remove_list=[' CORPORATION',' BERHAD',' BHD',' PLC',' INC',' AG ST',' NA O N', \
                  ' AKTIENGESELLSCHAFT','(PUBL)',' LLC', \
@@ -363,13 +373,11 @@ def filter_stock_name(original_name):
 
     #去掉逗号和句点
     name1=original_name.replace(',',' ')
+    name1=name1.replace('  ',' ')
     name2=name1.replace('.',' ')
     
-    #将字符串中的多个空格变为单个空格
-    name3=replace_multiple_spaces(name2)
-    
     #将字符串字母全部大写
-    name4=name3.upper()
+    name4=name2.upper()
     
     name5=name4
     for ss in remove_list:
@@ -377,7 +385,7 @@ def filter_stock_name(original_name):
 
     name6=name5.strip()
     
-    name7=original_name[:len(name6)]
+    name7=original_name[:len(name6)+1]
     
     shorter_name=name7
     return shorter_name

{siat-3.5.2.dist-info → siat-3.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.5.2
+Version: 3.5.10
 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.2.dist-info → siat-3.5.10.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=rWOQWvkkmLiOwj5XAagLLP-ii7VJNKYPSK5rimCUTfo,158534
+siat/common.py,sha256=fWeaJYg9sb_cvX_VDLlz_0ph3cXhnoTMd_R8UyArGTY,159842
 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=ocqQnDHdnQWnRmSQ0KTBC5FoBwKtualKZprtdMlPe_A,111907
+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
@@ -105,7 +105,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 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=8zOIiPDlzLCqHqvyLOLzmaAt6B1QOSW24r7giRc2jKc,154911
+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
@@ -131,7 +131,7 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=12-Qx2sqwANobFsh2k5qyE_idjHs0j2g5cTlh9by7co,240806
+siat/translate.py,sha256=F_lG6sDPqXNNGGMUuJG5sKlbT5rHg-MbJv9Gj0Z78bg,241020
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
@@ -139,9 +139,9 @@ 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.2.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.5.2.dist-info/METADATA,sha256=aR703O3uk2D33oAxA_vW9ozjcvFBQG2LrUBIbJK2EUA,8009
-siat-3.5.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.5.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.5.2.dist-info/RECORD,,
+siat/yf_name.py,sha256=b4nefqEEbbinCEJ60_EysDCF9JZRott3wwclosZdrH8,16404
+siat-3.5.10.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.5.10.dist-info/METADATA,sha256=VhLy7oNbXKyaSoco22mVNFWrHWnlE5sihNkMIZgU9Mk,8010
+siat-3.5.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.5.10.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.5.10.dist-info/RECORD,,