siat 3.5.10__py3-none-any.whl → 3.5.12__py3-none-any.whl

siat/common.py

@@ -2916,15 +2916,15 @@ def fix_package(file='stooq.py',package='pandas_datareader'):
         result=copyfile(srcfile,objfile)
     except IOError as e:
         print("  #Error(fix_package): Unable to copy file. %s" % e)
-        print("  Program failed most likely becos of incorrect source/target directories.")
+        print("  Program failed, most likely becos of incorrect source/target directories.")
         print("  Solution: manually copy the file",srcfile,"to the folder",objpath1)
         #exit(1)
     except:
         print("  #Error(fix_package): Unexpected error:", sys.exc_info())
         #exit(1) 
     else:
-        print("  Successfuly overrided",file,"of package",package)
-        print("  Please RESTART your Python kernel before continue to use siat")
+        print("  Overrided",file,"in",package)
+        print("  Please RESTART Python kernel before using siat")
     
     return    
 
@@ -3737,7 +3737,7 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
                    first_col_align='left',second_col_align='right', \
                    last_col_align='right',other_col_align='right', \
                    titile_font_size='16px',heading_font_size='15px', \
-                   data_font_size='15px'):
+                   data_font_size='14px',footnote_font_size='13px'):
     """
     功能：采样CSS式样显示df，适用于Jupyter环境，整齐紧凑，不挑浏览器
     注意：若facecolor不被支持，则自动改为papayawhip
@@ -3808,7 +3808,14 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
     display(style6)    
 
     if not footnote=='':
-        print(footnote)
+        #print(footnote)
+        
+        from IPython.display import display, HTML
+        ft_list=footnote.split('\n') #分行显示，因下列显示方式无法识别换行
+        for ft in ft_list:
+            # 使用HTML和CSS设置字体大小
+            html_code = f'<p style="font-size:{footnote_font_size};">{ft}</p>'
+            display(HTML(html_code))
     #print('') #空一行
 
     return
@@ -4376,13 +4383,15 @@ if __name__ == '__main__':
     column='Close'
     
     annual_compound_growth(df,"Close")
+    annual_compound_growth(df,"High")
     
 def annual_compound_growth(df,column="Close"):
     """
     
     功能：计算df[column]的简单年均复合增长率，假定df按照日期顺序升序排列
+    适用于计算长期股价/指数的年均复合增长率，不适用于收益率的年均复合增长率计算
     """
-    if not "Close" in list(df):
+    if not column in list(df):
         print("  Sorry, column",column,"not found in the dataframe")
         return
     
@@ -4392,10 +4401,11 @@ def annual_compound_growth(df,column="Close"):
     years=days / 365
     
     import numpy as np  
-    growth_rate=round((np.power(df[column][-1]/df[column][0],1/years)-1)*100,2)
+    growth_rate=round((np.power(df[column][-1]/df[column][0],1/years)-1)*100,3)
     rate_str=str(growth_rate)+'%'
     
-    print("Annual compound growth rate:",rate_str)
+    day1str=day1.strftime("%Y-%m-%d"); day2str=day2.strftime("%Y-%m-%d")
+    print("Annualized compound growth",rate_str,"from",day1str,"to",day2str)
     
     return 
 #==============================================================================

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='%.2f' 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 '%.4f' 
                 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='%.2f' 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 '%.4f'
                 #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(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)) 
+        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,4)) 
         plt.annotate(text=' '+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='%.2f' 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 '%.4f'
                     #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='%.2f' 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 '%.4f'
                     #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(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))
+            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,4))
             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='%.2f' 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 '%.4f'
                     #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='%.2f' 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 '%.4f'
                     #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)
@@ -1495,7 +1495,7 @@ def draw_lines2(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(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,4))
                 plt.annotate(text=c+':'+y1, 
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,

siat/security_price2.py

@@ -42,6 +42,8 @@ if __name__=='__main__':
     
     ticker='AAPL'
     
+    ticker="006257"
+    
     
     fromdate='2024-5-1'; todate='2024-5-20'
     
@@ -55,7 +57,10 @@ if __name__=='__main__':
     source='auto'
     #source='yahoo'
     
+    adjust=''
     adjust='qfq'
+    
+    fill=False
     fill=True
     
     price,found=get_price_1ticker(ticker=ticker,fromdate=fromdate,todate=todate, \

siat/security_prices.py

@@ -708,6 +708,9 @@ if __name__=='__main__':
     ticker='159990.SZ' #ETF基金
     ticker='169201.SZ' #LOF基金
     ticker='180801.SZ' #封闭式基金
+    
+    ticker="006257"
+    
     ticker_type='auto'
     
     ticker='sh019319' #国债
@@ -821,12 +824,22 @@ def get_price_ak_cn(ticker,fromdate,todate,adjust='',ticker_type='auto'):
                     df = exchange_bond_price(ticker2,fromdate,todate,graph=False,data_crop=False)
                     df['Date']=df.index
                 except: 
-                    #print("  #Error(get_price_ak_cn): failed to find prices for",ticker)
-                    return None
+                    try:
+                        #再次尝试抓取开放式基金单位净值
+                        df =get_price_oef_china(ticker2,fromdate,todate)
+                        df['Date']=df.index
+                        
+                        df['ticker']=ticker
+                        df['Adj Close']=df['Close']
+                        df['source']='Sina'
+                    except: 
+                        df=None
+                        #print("  #Error(get_price_ak_cn): failed to find prices for",ticker)
+                        return None
                 found=df_have_data(df)
                 
-                #已找到证券信息，但在规定时段无数据
-                if found=='Empty': return df
+                #已找到证券信息，或在规定时段无数据
+                if found in ['Empty','Found']: return df
         
         #债券优先，然后查找指数、股票和基金。因部分债券代码(特别是国债)与基金代码重合，需要甄别！
         #例如；sh010504既是"05国债⑷"也是"招商稳兴混合C"基金的代码:-(
@@ -2837,6 +2850,7 @@ def fetch_price_swindex(ticker,start,end,info_types=['Close','Volume'],adjust=-2
     info_types：信息测度，默认['Close']，还可以为['Close','Open','High','Low',
                                      'Volume','Adj Close']
     特点：为compare_indicator使用，包括指数名称
+    
     """
     df=None
     
@@ -2854,6 +2868,7 @@ def fetch_price_swindex(ticker,start,end,info_types=['Close','Volume'],adjust=-2
         ticker=ticker+'.SW'
     ticker6=ticker[:6]
     try:
+        # 注意：如果失败，尝试升级akshare
         prices= ak.index_hist_sw(symbol=ticker6,period="day")
     except: 
         try:

siat/stock.py

@@ -2571,12 +2571,23 @@ if __name__ =="__main__":
     fromdate="2021-1-1"
     todate="2022-9-26" 
 
-def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
+
+def security_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcolor='black'):
+    """
+    功能：套壳函数stock_dividend
+    """ 
+    df=stock_dividend(ticker,start,end,facecolor,fontcolor)
+    return df 
+    
+
+def stock_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcolor='black'):
     """
     功能：显示股票的分红历史
     输入：单一股票代码
     输出：分红历史
     """  
+    start,end=start_end_preprocess(start,end)
+    
     fromdate,todate=start,end
     
     print("  Searching for the dividend info of stock",ticker,"... ...")
@@ -2649,24 +2660,24 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     
     lang=check_language()
     tname=ticker_name(ticker,'stock')
-    fromdatey2md=startdt.strftime('%y/%m/%d')
-    todatey2md=enddt.strftime('%y/%m/%d')
+    fromdatey2md=startdt.strftime('%Y/%m/%d')
+    todatey2md=enddt.strftime('%Y/%m/%d')
 
-    titletxt=text_lang("股票分红历史","Stock Dividend")+': '+tname
-    periodtxt=text_lang("历史期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
+    titletxt=text_lang("证券分红","Stock Dividend")+': '+tname
+    periodtxt=text_lang("期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
     #sourcetxt=text_lang("数据来源: 雅虎财经,","Data source: Yahoo Finance,")
-    sourcetxt=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")
+    sourcetxt=text_lang("数据来源: Yahoo/Sina","Data source: Yahoo/Sina")
     footnote=periodtxt+'\n'+sourcetxt
     
     #修改列命为英文
-    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('每股股息','Dividend/share')]
+    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('每股(份)红利','Dividend/share')]
     
     """        
     print(divprt.to_string(index=False))   
     """
     #print('') #空一行
     
-    df_display_CSS(divprt,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+    df_display_CSS(divprt,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=4, \
                        first_col_align='center',second_col_align='center', \
                        last_col_align='right',other_col_align='center')
 
@@ -2701,13 +2712,23 @@ if __name__ =="__main__":
     fromdate='2019-1-1'
     todate='2020-6-30'
 
-#==============================================================================   
-def stock_split(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
+#==============================================================================
+def security_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor='black'):
+    """
+    功能：套壳函数stock_split
+    """  
+    df=stock_split(ticker,start,end,facecolor,fontcolor)
+    return df
+
+   
+def stock_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor='black'):
     """
     功能：显示股票的分拆历史
     输入：单一股票代码
     输出：分拆历史
     """   
+    start,end=start_end_preprocess(start,end)
+    
     fromdate,todate=start,end
     
     print("  Searching for the split info of stock",ticker,"... ...")
@@ -2803,15 +2824,15 @@ def stock_split(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     today = datetime.date.today()
     print('\n*** '+sourcetxt,today)
     """
-    fromdatey2md=startdt.strftime('%y/%m/%d')
-    todatey2md=enddt.strftime('%y/%m/%d')
+    fromdatey2md=startdt.strftime('%Y/%m/%d')
+    todatey2md=enddt.strftime('%Y/%m/%d')
     
-    titletxt=text_lang("股票分拆历史","Stock Split")+': '+tname
-    periodtxt=text_lang("历史期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
+    titletxt=text_lang("证券分拆","Stock Split")+': '+tname
+    periodtxt=text_lang("期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
     
     import datetime; todaydt=datetime.date.today(); todayy2md=str(todaydt.strftime('%y/%m/%d'))
     #sourcetxt=text_lang("数据来源: 雅虎财经, ","Data source: Yahoo Finance, ")+todayy2md
-    sourcetxt=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")
+    sourcetxt=text_lang("数据来源: Yahoo/Sina","Data source: Yahoo Finance")
     footnote=periodtxt+'\n'+ sourcetxt
     
     #修改列命为英文

siat/stooq.py

@@ -46,9 +46,10 @@ class StooqDailyReader(_DailyBaseReader):
                 pass
                 #symbol = ".".join([symbol, country])
             elif symbol_parts[1].lower() == "pl": #后缀为波兰
+                #pass
                 symbol = symbol_parts[0]
             else:
-                pass
+                #pass
                 if symbol_parts[1].lower() not in [
                     "de",
                     "hk",

siat/translate.py

@@ -819,7 +819,7 @@ def codetranslate0(code):
         ['VIPS','唯品会'],['Vipshop','唯品会'],
         ['PDD','拼多多'],['Pinduoduo','拼多多'],        
         ['BABA','阿里巴巴美股'],['Alibaba','阿里巴巴美股'],
-        ['JD','京东美股'],
+        ['JD','京东美股'],['MPNGY','美团美股'],
         ['SINA','新浪网'],['BIDU','百度'],['NTES','网易'],
         
         ['00700.HK','腾讯港股'],['TENCENT','腾讯控股'],
@@ -1083,7 +1083,8 @@ def codetranslate0(code):
         ['^OMXS','瑞典斯德哥尔摩指数'],['^DKDOW','道琼斯丹麦指数'],
         ['^HEX','芬兰赫尔辛基指数'],['^OMXV','立陶宛维尔纽斯指数'],
         ['^OMXR','拉脱维亚里加指数'],['^OMXT','爱沙尼亚塔林指数'],
-        ['^ICEX','冰岛综合指数'],['^FMIB','富时意大利米兰指数'],
+        ['^ICEX','冰岛综合指数'],['^OMXC25','丹麦哥本哈根25指数'],
+        ['^FMIB','富时意大利指数'],
         ['^IBEX','西班牙IBEX指数'],['^OSEAX','挪威奥斯陆指数'],
         ['^SMI','瑞士SMI指数'],['^MOEX','俄罗斯莫斯科指数(卢布计价)'],
         ['^UX','乌克兰UX指数'],['^RTS','俄罗斯市值加权指数(美元计价)'],
@@ -1129,9 +1130,11 @@ def codetranslate0(code):
         ['^BSESN','孟买敏感指数'],['^SNX','孟买敏感指数'],['^NSEI','印度国交50指数'],
         ['^FCHI','法国CAC40指数'],['^GDAXI','德国DAX指数'], 
         ['^CAC','法国CAC40指数'],['^DAX','德国DAX指数'], 
+        ['^ATX','奥地利ATX指数'],
         ['IMOEX.ME','俄罗斯MOEX指数'],['^MOEX','俄罗斯MOEX指数'], 
         ['^RTS','俄罗斯RTS指数（美元标价）'],
-        ['^TASI','沙特TASI指数'],['TA35.TA','以色列TA35指数'],
+        ['^TASI','沙特TASI指数'],
+        ['TA35.TA','以色列TA35指数'],['^TA125.TA','以色列TA125指数'],
         ['^BVSP','巴西BVSP指数'],['^JNX4.JO','南非40指数'],
         ['^KLSE','吉隆坡综合指数'],['^KLCI','吉隆坡综合指数'],
         ['^JCI','雅加达综合指数'],

siat/yf_name.py

@@ -94,6 +94,7 @@ if __name__=='__main__':
     ticker='600333.ss'
     ticker='600444.ss'
     ticker='600777.ss'
+    ticker='GC=F'
     
     yahoo_name1(ticker)
     
@@ -242,12 +243,129 @@ if __name__=='__main__':
     
     #发现问题后单独测试
     ticker='600088.SS'
+    ticker="ALI=F"
+    ticker="ZS=F"
+    ticker="ES=F"
+
+    ticker_info(ticker)
+    
     yahoo_name1(ticker)
     yahoo_name2(ticker)
     
     yahoo_name2(ticker,short_name=True)
     
     ticker_name(ticker)
+
+    numeric_to_date(1734652800)
+    
+def numeric_to_date(numeric):
+    # 数值转日期
+    from datetime import datetime, timedelta
+    epoch = datetime(1970, 1, 1)
+    return (epoch + timedelta(seconds=numeric)).strftime('%Y-%m-%d')
+
+if __name__=='__main__':
+    ticker="ES=F" #期货
+    ticker="VIX241120C00035000" #期权
+
+    ticker_info(ticker, info="interest")
+    ticker_info(ticker, info="open interest")
+    ticker_info(ticker, info="volume")
+    ticker_info(ticker, info="average volume")
+    ticker_info(ticker, info="REGULAR CLOSE")
+    ticker_info(ticker, info="day average")
+    
+    ticker_info(ticker, info=["regular close","fifty day average","two hundred day average"])
+
+def ticker_info(ticker,info="all"):
+    """
+    
+    功能：显示yahoo证券代码的信息，可多个信息类型
+    """   
+    if isinstance(info,str):
+        infos=[info]
+    elif isinstance(info,list):
+        infos=info
+    else:
+        print("  Sorry, unsupported info type:",info)
+        return
+    
+    first_time=True
+    for i in infos:
+        if first_time:
+            ticker_info1(ticker,info=i,test_access=True,print_title=True)
+            first_time=False
+        else:
+            ticker_info1(ticker,info=i,test_access=False,print_title=False)
+            
+    return
+
+if __name__=='__main__':
+    ticker="TSLA260618C00330000" 
+    
+    ticker_info1(ticker)
+    ticker_info1(ticker, info="open interest")
+    
+def ticker_info1(ticker,info="all",test_access=True,print_title=True):
+    """
+    
+    功能：显示yahoo证券代码的信息，1个信息类型
+    """    
+    #测试雅虎
+    if test_access:
+        if not test_yahoo_access():
+            print("  Sorry, data source Yahoo is currently not reachable")
+            return
+        
+    #去掉ticker中的.US后缀
+    ticker=ticker.upper()
+    ticker1=ticker.replace('.US', "")
+    
+    import yfinance as yf
+    ticker_info = yf.Ticker(ticker1)
+
+    import datetime
+    stoday = datetime.date.today().strftime("%Y-%m-%d")
+    
+    info_list=info.split(); found=False
+    """
+    info_yahoo=(info_list[0]).lower()
+    for i in info_list[1:]:
+        info_yahoo=info_yahoo+(i.lower()).capitalize()
+    """
+    
+    try:
+        t_info=ticker_info.info
+        
+        if print_title:
+            print("*** Ticker",ticker,'Information @'+stoday)
+        
+        if ('all' in info) or ('All' in info) or ('ALL' in info):
+            for k in t_info.keys():
+                if not 'Date' in k:
+                    print('  '+k+':',t_info[k])
+                else:
+                    print('  '+k+':',numeric_to_date(t_info[k]))
+            #display(t_info)
+        else:
+            for k in t_info.keys():
+                for i in info_list:
+                    if (not i.lower() in k) and (not (i.lower()).capitalize() in k):
+                        found=False; break
+                    else:
+                        found=True
+                if not found: continue
+             
+                if not 'Date' in k:
+                    print('  '+k+':',t_info[k])
+                else:
+                    print('  '+k+':',numeric_to_date(t_info[k]))
+
+    except:
+        print("  Sorry, ticker",ticker,"is not found in data source Yahoo")
+    
+    return
+        
     
 def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     """
@@ -256,7 +374,6 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     现存问题：需要访问雅虎，且耗时稍长
     """
     
-    
     #测试雅虎
     if not test_yahoo_access():
         return ticker
@@ -276,9 +393,16 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     
     try:
         if short_name:
-            t_name0=t_info['shortName']
+            try:
+                t_name0=t_info['shortName']
+            except:
+                t_name0=t_info['longName']
         else:
-            t_name0=t_info['longName']
+            try:
+                t_name0=t_info['longName']
+            except:
+                t_name0=t_info['shortName']
+                
             if len(t_name0) > maxlen:
                 t_name0=t_info['shortName']
     except:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.5.10
+Version: 3.5.12
 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.10.dist-info → siat-3.5.12.dist-info}/RECORD

@@ -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=fWeaJYg9sb_cvX_VDLlz_0ph3cXhnoTMd_R8UyArGTY,159842
+siat/common.py,sha256=dqvWnw2gyMVo7l2dMyhJeaJZJIyUCVcTMTXC1ryHQos,160442
 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
@@ -60,7 +60,7 @@ 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=9brQItikS7aHXO1mnwgEYCzfq1tjzOHWOCVgiFyaHNA,87873
+siat/grafix.py,sha256=rya9u6jzNnuw1Io4Ub6Da8h276DCzbyL3hjWpzHY0mY,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
@@ -97,15 +97,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=MX1pzqvHvmWD9qGAe8lnUoCXSWjwnjBK8HhAbijTirI,150761
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=cbskpPn0C7k0E3TTeXIFg6vrVsbJ6Xa18St6W-aR3Vk,26315
-siat/security_prices.py,sha256=M8Qflbd6cgIJAnXBn3Ifn2z8A0SWzw6Ns_VHn74v1O8,108034
+siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
+siat/security_prices.py,sha256=Zhn6pvwLy996mbBHDorbqWQdQw9RHdr9m0yzke3ya8M,108597
 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=JHrO5zDBYMLbpvotdaqaUcFrxm2di60kMVOdeom8t8A,26336
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=-vhAVxaEjoF3jlU2geAI3Y_OT9-IsEz21DFSOy68QCA,155054
+siat/stock.py,sha256=oUPX2yHGclBoO97d5XocvdSJ8grwpDoJ8aJtOlu4oas,155637
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -119,7 +119,7 @@ siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
 siat/stock_technical.py,sha256=urnbFubwsYcl8dEPLM6DfdBmsia4xQ1rvM-71VZTM88,136050
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
-siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
+siat/stooq.py,sha256=SiRnSUu92pfzIZQ8N4Yo-9VOVSwUSqQE0wqXhF-4y9g,2493
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/test2_graphviz.py,sha256=05w2YJuIBH0LsJjdA60EFn7rL0vCo-CA6EVJEQOXNE4,16648
 siat/test_graphviz.py,sha256=CETKpDL8PnysS-PD3fHkeAgagUxjaUl0CsXPiadQySg,16999
@@ -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=F_lG6sDPqXNNGGMUuJG5sKlbT5rHg-MbJv9Gj0Z78bg,241020
+siat/translate.py,sha256=wj9ct1j967u1KOjCJVoeopSaypWWWTxzEeJKeUACp4c,241177
 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=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,,
+siat/yf_name.py,sha256=7uLAcOc8XwfYDjuLqWDiUZHfdMpEbytW7E2ayNNT3f4,20069
+siat-3.5.12.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.5.12.dist-info/METADATA,sha256=Shgl7GEqy3CgeZ7j_sOjjmX34n1dkjSUh4rhQ_JCBfg,8010
+siat-3.5.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.5.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.5.12.dist-info/RECORD,,