siat 3.5.11__py3-none-any.whl → 3.6.1__py3-none-any.whl

siat/stock.py

@@ -630,7 +630,9 @@ if __name__ =="__main__":
 def security_indicator(ticker,indicator, \
                        fromdate,todate,adjust='', \
                        zeroline=False, \
+                           attention_value='', \
                        average_value=False, \
+                           attention_point='', \
                        datatag=False,power=0,graph=True,source='auto', \
                        mark_top=True,mark_bottom=True,mark_end=True, \
                        ticker_type='auto',facecolor='whitesmoke'):
@@ -739,7 +741,10 @@ def security_indicator(ticker,indicator, \
         zeroline=True
     
     plot_line(erdf3,indicator,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
-              power=power,zeroline=zeroline,average_value=average_value, \
+              power=power,zeroline=zeroline, \
+              attention_value=attention_value, \
+              average_value=average_value, \
+                  attention_point=attention_point, \
               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                   facecolor=facecolor)
     
@@ -860,6 +865,8 @@ if __name__ =="__main__":
 
 def security_mindicators(ticker,measures,
                          fromdate,todate, \
+                            attention_value='', \
+                            attention_point='', \
                          adjust='', \
                          band_area='', \
                          graph=True,smooth=True,loc='best',facecolor='whitesmoke', \
@@ -969,6 +976,8 @@ def security_mindicators(ticker,measures,
         draw_lines2(df,y_label,x_label,axhline_value,axhline_label,titletxt, \
                    data_label=False,resample_freq='6H',smooth=smooth, \
                    date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
+                                    attention_value=attention_value, \
+                                    attention_point=attention_point, \
                    annotate=annotate,annotate_value=annotate_value, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
                    band_area=band_area,loc=loc)
@@ -1337,6 +1346,8 @@ if __name__ =="__main__":
     pv=price_lpsd2(df,"000002.SZ","2019-1-1","2020-3-16","Annual Exp Price Volatility")
 #==============================================================================
 def comp_1security_2measures(df,measure1,measure2,twinx=False, \
+                             attention_value='', \
+                             attention_point='', \
                              loc1='upper left',loc2='lower left', \
                              graph=True,facecolor='whitesmoke', \
                                  ticker_type='auto'):
@@ -1346,6 +1357,8 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
     输出：绘制证券行情双折线图，基于twinx判断使用单轴或双轴坐标
     返回：无
     """
+    DEBUG=False
+    
     #筛选证券指标，检验是否支持指标
     dfcols=list(df)
     #nouselist=['date','Weekday','ticker']
@@ -1382,8 +1395,15 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
     footnote=footnote1+str(todaydt)
     
     #绘图
+    if DEBUG:
+        print("plot_line2")
+        print("attention_value=",attention_value)
+        print("attention_point=",attention_point)
+    
     plot_line2(df,ticker,measure1,label1,df,ticker,measure2,label2, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
+                       yline=attention_value, \
+                       xline=attention_point, \
                        loc1=loc1,loc2=loc2,facecolor=facecolor)
 
     return 
@@ -1398,6 +1418,8 @@ if __name__ =="__main__":
     comp_1security_2measures(df,measure1,measure2)
 #==============================================================================
 def comp_2securities_1measure(df1,df2,measure,twinx=False, \
+                              attention_value='', \
+                              attention_point='', \
                               loc1='best',loc2='best',graph=True, \
                               ticker_type=['auto','auto'],facecolor='whitesmoke'):
     """
@@ -1459,6 +1481,8 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False, \
 
     plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
+                       yline=attention_value, \
+                       xline=attention_point, \
                        loc1=loc1,loc2=loc2,facecolor=facecolor)
 
     return 
@@ -1498,6 +1522,8 @@ if __name__ =="__main__":
 def compare_security(tickers,measures,fromdate,todate, \
                      adjust='', \
                      twinx=False, \
+                         attention_value='', \
+                         attention_point='', \
                      loc1='best',loc2='lower left',graph=True,source='auto', \
                      ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -1519,6 +1545,7 @@ def compare_security(tickers,measures,fromdate,todate, \
     """
     #调试开关
     DEBUG=False
+    
     # 应对导入失灵的函数
     from siat.common import upper_ticker
     tickers=upper_ticker(tickers)
@@ -1589,6 +1616,8 @@ def compare_security(tickers,measures,fromdate,todate, \
             #security_indicator未能做到同时获得Close和Adj Close
             df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust1, \
                                   fromdate=fromdate,todate=todate, \
+                                      attention_value=attention_value, \
+                                      attention_point=attention_point, \
                                   source=source, \
                                   ticker_type=ticker_type, \
                                   graph=False)
@@ -1608,6 +1637,8 @@ def compare_security(tickers,measures,fromdate,todate, \
             #security_indicator未能做到同时获得Close和Adj Close
             df2tmp=security_indicator(ticker=ticker1,indicator=measure2,adjust=adjust2, \
                                   fromdate=fromdate,todate=todate, \
+                                      attention_value=attention_value, \
+                                      attention_point=attention_point, \
                                   source=source, \
                                   ticker_type=ticker_type, \
                                   graph=False)
@@ -1623,7 +1654,15 @@ def compare_security(tickers,measures,fromdate,todate, \
             
         #绘制单个证券的双指标对比图
         if graph:
+            if DEBUG:
+                print("In compare_security:")
+                print("Going to comp_1security_2measures ...")
+                print("attention_value=",attention_value)
+                print("attention_point=",attention_point)
+            
             comp_1security_2measures(pltdf,measure1,measure2,twinx=twinx, \
+                                     attention_value=attention_value, \
+                                     attention_point=attention_point, \
                                      loc1=loc1,loc2=loc2,graph=graph, \
                                      ticker_type=ticker_type[0],facecolor=facecolor)
         
@@ -1644,6 +1683,8 @@ def compare_security(tickers,measures,fromdate,todate, \
 
         df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust, \
                               fromdate=fromdate,todate=todate, \
+                                  attention_value=attention_value, \
+                                  attention_point=attention_point, \
                               source=source, \
                               ticker_type=ticker_type, \
                               graph=False) 
@@ -1655,6 +1696,8 @@ def compare_security(tickers,measures,fromdate,todate, \
         
         df2tmp=security_indicator(ticker=ticker2,indicator=measure1,adjust=adjust, \
                               fromdate=fromdate,todate=todate, \
+                                  attention_value=attention_value, \
+                                  attention_point=attention_point, \
                               source=source, \
                               ticker_type=ticker_type, \
                               graph=False) 
@@ -1666,7 +1709,15 @@ def compare_security(tickers,measures,fromdate,todate, \
         
         #绘制双证券单指标对比图
         if graph:
+            if DEBUG:
+                print("In compare_security ...")
+                print("Going to comp_2securities_1measure")
+                print("attention_value=",attention_value)
+                print("attention_point=",attention_point)
+            
             comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
+                                      attention_value=attention_value, \
+                                      attention_point=attention_point, \
                                       loc1=loc1,loc2=loc2,graph=graph, \
                                       ticker_type=ticker_type_list,facecolor=facecolor)
         
@@ -1683,7 +1734,7 @@ def compare_security(tickers,measures,fromdate,todate, \
         return result1,result2
             
     else:
-        print("  #Warning(compare_secuirty)：only support the situations of 1 ticker + 2 measures or 2 tickers + 1 measure.")
+        print("  #Warning(compare_secuirty)：only support 1 ticker + 2 measures or 2 tickers + 1 measure.")
         return None,None
     
     
@@ -1899,6 +1950,8 @@ if __name__ =="__main__":
     
     
 def compare_msecurity(tickers,measure,start,end, \
+                        attention_value='', \
+                        attention_point='', \
                       adjust='', \
                       axhline_value=0,axhline_label='', \
                       preprocess='none',linewidth=1.5, \
@@ -1925,7 +1978,7 @@ def compare_msecurity(tickers,measure,start,end, \
         scaling：缩放处理，五种选项scaling_option
         （mean均值，min最小值，start开始值，percentage相对每条曲线起点值的百分比，
         change%相对每条曲线起点值变化的百分比）
-        start方式的图形更接近于持有收益率(Exp Ret%)，设为默认的缩放方式。
+        change%方式的图形更接近于持有收益率(Exp Ret%)，设为默认的缩放方式。
     
     """
     DEBUG=False
@@ -2078,6 +2131,8 @@ def compare_msecurity(tickers,measure,start,end, \
 
     draw_lines(dfs2,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=False,resample_freq='H',smooth=smooth,linewidth=linewidth,loc=loc, \
+                attention_value=attention_value, \
+                attention_point=attention_point, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
 
@@ -2571,12 +2626,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 +2715,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 +2767,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 +2879,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','腾讯控股'],
@@ -1072,7 +1072,7 @@ def codetranslate0(code):
         ['^FTSE','英国富时100指数'],['^FTM','英国富时250指数'],
         ['^NKX','日经225指数'],['^N100','泛欧100指数'],
         ['^FMIB','富时意大利指数'],
-        ['^TSX','多伦多综合指数'],['^MXX','墨西哥IPC指数'],
+        ['^GSPTSE','多伦多综合指数'],['^MXX','墨西哥IPC指数'],
         ['^NDX','纳斯达克100指数'],['^NDQ','纳斯达克综合指数'],
         ['^BET','罗马尼亚布加勒斯特指数'],
         ['^BUX','匈牙利布达佩斯指数'],['^PX','捷克布拉格PX指数'],
@@ -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,6 +1130,7 @@ 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指数'],

siat/valuation.py

@@ -942,6 +942,8 @@ def security_valuation(tickers,indicators,start,end, \
                        preprocess='none',scaling_option='start', \
                        twinx=False,loc1='best',loc2='best', \
                        graph=True,facecolor='whitesmoke', \
+                                             attention_value='', \
+                                             attention_point='', \
                        annotate=False,annotate_value=False, \
                        mark_top=False,mark_bottom=False,mark_end=False):
     """
@@ -992,7 +994,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1001,7 +1003,10 @@ def security_valuation(tickers,indicators,start,end, \
         draw_lines(df2,y_label=ylabeltxt,x_label=footnote, \
                    axhline_value=0,axhline_label='', \
                    title_txt=titletxt,data_label=False, \
-                   resample_freq='D',loc=loc1,facecolor=facecolor,
+                   resample_freq='D',loc=loc1,facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
+                    annotate=annotate,annotate_value=annotate_value, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df
@@ -1015,12 +1020,12 @@ def security_valuation(tickers,indicators,start,end, \
         df2_1.rename(columns={t:i1},inplace=True)
         df2_2.rename(columns={t:i2},inplace=True)
         
-        titletxt="证券估值走势对比："+t   
+        titletxt="证券估值走势："+t   
         
         footnote1=""
         if i1=='MV' or i2=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1037,7 +1042,11 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue',facecolor=facecolor)
+                   color1='red',color2='blue',facecolor=facecolor, \
+                                             yline=attention_value, \
+                                             xline=attention_point
+                 )
+            
         return df
    
     # 绘制双线: 两只证券，一个指标。twinx双轴绘图
@@ -1048,13 +1057,13 @@ def security_valuation(tickers,indicators,start,end, \
         df2_1.rename(columns={t1:i},inplace=True)
         df2_2.rename(columns={t2:i},inplace=True)
         
-        #titletxt="证券估值走势对比："+i
-        titletxt="证券估值走势对比："+ectranslate(i)
+        #titletxt="证券估值走势："+i
+        titletxt="证券估值走势："+ectranslate(i)
         
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1074,7 +1083,10 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue',facecolor=facecolor)
+                   color1='red',color2='blue',facecolor=facecolor, \
+                                             yline=attention_value, \
+                                             xline=attention_point
+                 )
 
         return df                
    
@@ -1089,7 +1101,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1110,11 +1122,13 @@ def security_valuation(tickers,indicators,start,end, \
                    annotate=annotate,annotate_value=annotate_value, \
                    plus_sign=plus_sign, \
                    facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df        
    
-    # 绘制多线：一只证券，多个指标。简单多线绘图
+    # 绘制多线：一只证券，多个指标。简单多线绘图。可能数量级差异较大，意义有限
     if name_num == 1 and indicator_num >= 2 and not twinx: 
         t=names1[0]
         df2=None
@@ -1134,7 +1148,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=''
         if 'MV' in indicators1:
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
             
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1154,6 +1168,9 @@ def security_valuation(tickers,indicators,start,end, \
                    resample_freq='D',loc=loc1,plus_sign=plus_sign, \
                    annotate=annotate,annotate_value=annotate_value, \
                    facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
+                       
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df 

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.11.dist-info → siat-3.6.1.dist-info}/METADATA

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