siat 3.9.11__py3-none-any.whl → 3.9.21__py3-none-any.whl

siat/grafix.py

@@ -331,7 +331,11 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                     atpd=at
                     
                 if DEBUG: print(f"atpd={atpd}")
-                at_str=atpd.strftime('%Y-%m-%d')
+                    
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)
 
@@ -724,8 +728,11 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
 
                 if DEBUG:
                     print("atpd=",atpd)
-                
-                at_str=atpd.strftime('%Y-%m-%d')
+                    
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)        
 
     if not attention_point_area=='':
@@ -995,8 +1002,11 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
 
                 if DEBUG:
                     print("atpd=",atpd)
-                
-                at_str=atpd.strftime('%Y-%m-%d')
+                    
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)
 
@@ -1212,8 +1222,11 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
                     atpd=pd.to_datetime(at)
                 except:
                     atpd=at
-                
-                at_str=atpd.strftime('%Y-%m-%d')
+                    
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)        
 
     if not attention_point_area=='':
@@ -1463,7 +1476,10 @@ def plot_line2_LR(df01,ticker1,colname1,label1, \
                 except:
                     atpd=at
                     
-                at_str=atpd.strftime('%Y-%m-%d')
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))  
                 ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)        
 
@@ -1709,7 +1725,10 @@ def plot_line2_UD(df01,ticker1,colname1,label1, \
                 except:
                     atpd=at
                     
-                at_str=atpd.strftime('%Y-%m-%d')
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))  
                 ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)        
 
@@ -1952,7 +1971,10 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                 except:
                     atpd=at
                     
-                at_str=atpd.strftime('%Y-%m-%d')
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))    
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)        
 
@@ -2422,7 +2444,11 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 plt.arrow(atpd,yaxis_min,arrow_dx,arrow_dy,ls=':',lw=2,fc=color,ec=color,alpha=0.5,shape='full', \
                           width=0.05,length_includes_head=True)
                 """
-                at_str=atpd.strftime('%Y-%m-%d')
+                    
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
                 #plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)
 
@@ -2801,7 +2827,11 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 except:
                     atpd=at
                     
-                at_str=atpd.strftime('%Y-%m-%d')
+                try:
+                    at_str=atpd.strftime('%Y-%m-%d')
+                except:
+                    at_str=atpd
+                    
                 #plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))
                 plt.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+at_str)
 

siat/other_indexes.py

@@ -182,6 +182,201 @@ if __name__=='__main__':
     index_code='VNINDEX'
     start='2025-2-1'; end='2025-3-31'
     get_other_index(index_code,start,end)
+#==============================================================================
+if __name__=='__main__': 
+    ticker='AAPL'
+    ticker='Apple'
+    start='2025-4-1'; end='2025-4-30'
+    
+    get_prices_av(ticker,start,end)
+    
+def get_prices_av(ticker,start,end):
+    """
+    功能：从Alpha Vantage获取美股股价历史行情，使用Alpha Vantage
+    参数：
+    ticker：AV股票代码（假设与雅虎财经的股票代码相同），如不同可通过search_av获得准确代码
+    start：起始日期
+    end：结束日期
+    """
+    # 免费注册：wangdehong@bfsu.edu.cn，每日25次。
+    api_key='VTRR3TA7L9O2DIX6'  
+    
+    from alpha_vantage.timeseries import TimeSeries
+    ts = TimeSeries(key=api_key, output_format="pandas")
+    try:
+        dft, _ = ts.get_daily(symbol=ticker, outputsize="full")   
+    except:
+        pass
+        return None
+    
+    dft.sort_index(ascending=True,inplace=True)
+    dft.rename(columns={'1. open':'Open','2. high':'High','3. low':'Low', \
+                        '4. close':'Close','5. volume':'Volume'},inplace=True)
+    dft['Adj Close']=dft['Close']
+    dft['source']='Alpha Vantage'
+    dft['ticker']=ticker
+    dft['Name']=ticker
+
+    import pandas as pd
+    startpd=pd.to_datetime(start); endpd=pd.to_datetime(end)
+    df=dft[(dft.index >= startpd) & (dft.index <= endpd)]
+    
+    return df
+
+    
+#==============================================================================
+if __name__=='__main__': 
+    ticker='AAPL'
+    ticker='Apple'
+    start='2025-4-1'; end='2025-4-30'
+    
+    get_prices_av_pdr(ticker,start,end)
+    
+def get_prices_av_pdr(ticker,start,end):
+    """
+    功能：从Alpha Vantage获取美股股价历史行情，使用pandas_datareader
+    参数：
+    ticker：AV股票代码（可能与雅虎财经的股票代码不同），可以通过search_av获得准确代码
+    start：起始日期
+    end：结束日期
+    """
+    # 免费注册：wangdehong@bfsu.edu.cn，限每日25次。
+    api_key='VTRR3TA7L9O2DIX6' 
+    
+    import pandas_datareader.data as pdr
+    try:
+        dft = pdr.DataReader(ticker, "av-daily", api_key=api_key,start=start,end=end)
+        dft['ticker']=ticker
+        dft['Name']=ticker
+    except: # 拯救一次，查找字符串匹配的股票代码
+        firstcode,firstname,_=search_av(ticker,api_key)
+        if firstcode is None:
+            pass
+            return None
+        print(f"  Notice: matching keyword {ticker} to stock code {firstcode}({firstname})")
+        try:
+            dft = pdr.DataReader(firstcode, "av-daily", api_key=api_key,start=start,end=end)
+            dft['ticker']=firstcode
+            dft['Name']=firstname
+        except:
+            pass
+            return None
+    
+    if dft is None:
+        pass
+        return None
+    if len(dft) == 0:
+        pass
+        return None
+    
+    dft.rename(columns={'open':'Open','high':'High','low':'Low','close':'Close', \
+                        'volume':'Volume'},inplace=True)
+    dft['Adj Close']=dft['Close']
+    dft['source']='Alpha Vantage'
+    
+    import pandas as pd
+    dft['Date']=dft['date']=dft.index
+    dft['date']=dft['date'].apply(lambda x: pd.to_datetime(x))
+    dft.set_index('date',inplace=True)
+    
+    #startpd=pd.to_datetime(start); endpd=pd.to_datetime(end)
+    #df=dft[(dft.index >= startpd) & (dft.index <= endpd)]
+    df=dft
+    
+    return df
+    
+    
+#==============================================================================
+if __name__=='__main__': 
+    api_key='VTRR3TA7L9O2DIX6'
+    keyword='AAPL'
+    keyword='Apple'
+    
+    search_av("microsoft")
+    search_av("Apple")
+
+def search_av(keyword,api_key='VTRR3TA7L9O2DIX6'):
+    """
+    过程：给定上市公司关键名称或不带后缀的股票代码，找出Alpha Vantage的股票代码。
+    """
+    import requests
+    url = f"https://www.alphavantage.co/query?function=SYMBOL_SEARCH&keywords={keyword}&apikey={api_key}"
+    response = requests.get(url)
+    if response.status_code != 200:
+        pass
+        return None,None,None
+    
+    data = response.json()
+    if "bestMatches" in data:
+        firstcode=data["bestMatches"][0]['1. symbol']
+        firstname=data["bestMatches"][0]['2. name']
+    else:
+        if "Information" in data:
+            print(f"  Warning(search_av): exceeded the limit of max requests per day")
+        else:
+            print(f"  Warning(search_av): keyword {keyword} not found in Alpha Vantage")
+        #未找到可匹配的股票代码
+        return None,None,None
+    
+    return firstcode,firstname,data
+
+#==============================================================================
+if __name__=='__main__': 
+    ticker='AAPL'
+    start='2025-4-1'; end='2025-4-30'
+    
+    get_price_tiingo(ticker,start,end)
+    
+def get_price_tiingo(ticker,start,end):
+    """
+    功能：获取美股历史行情信息，基于TIINGO
+    """
+    DEBUG=False
+    
+    # 每日限1000次调用，基于wdehong2000@163.com
+    api_token='0892bdb0533f8114535f354db596e6c244f5618d'
+    
+    from tiingo import TiingoClient
+    
+    # 通过配置字典
+    config = {
+        'api_key': api_token,  # 替换为实际密钥
+        'session': True  # 启用HTTP会话复用，提升性能
+    }
+    client = TiingoClient(config)    
+
+    # 获取历史行情（默认返回DataFrame）
+    try:
+        dft = client.get_dataframe(
+            ticker,
+            startDate=start,
+            endDate=end,   
+            frequency='daily'
+        )
+    except Exception as e:
+        if DEBUG:
+            print(f"  #Error(get_price_tiingo): {e}")    
+        else:
+            print(f"  #Error(get_price_tiingo): {ticker} not found or exceeded max requests per day")
+        return None
+        
+    # 去掉时区
+    dft.index = dft.index.tz_localize(None)
+    
+    # 整理数据项
+    dft.rename(columns={'open':'Open','high':'High','low':'Low','close':'Close', \
+                        'volume':'Volume'},inplace=True)
+    
+    dft.rename(columns={'adjOpen':'Adj Open','adjHigh':'Adj High','adjLow':'Adj Low', \
+                        'adjClose':'Adj Close', \
+                        'adjVolume':'Adj Volume'},inplace=True)
+        
+    dft['source']='Tiingo'
+    dft['ticker']=ticker; dft['name']=ticker
+        
+    return dft
+        
+        
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/security_price2.py

@@ -192,11 +192,24 @@ def get_price_1ticker(ticker,fromdate,todate, \
     if source in ['auto','sina','em'] and found not in ['Found','Empty']:
         dft=get_other_index_ak(ticker1,fromdate,todate)
         found=df_have_data(dft)   
-    #数据源情形6：pandas_datareader，其他数据源，暂不支持
+        
+    #数据源情形7：Tiingo，每日限1000次调用
+    if source in ['auto','ti'] and found not in ['Found','Empty']:
+        dft=get_price_tiingo(ticker1,fromdate,todate)
+        found=df_have_data(dft)  
+        
+    #数据源情形8：alpha_vantage，每日限25次调用
+    if source in ['auto','av'] and found not in ['Found','Empty']:
+        dft=get_prices_av(ticker1,fromdate,todate)
+        found=df_have_data(dft)   
+        
+    #数据源情形9：Alpha Vantage, pandas_datareader, 可进行模糊匹配，但匹配准确度不确定！
+    if source in ['auto','av'] and found not in ['Found','Empty']:
+        dft=get_prices_av_pdr(ticker1,fromdate,todate)
+        found=df_have_data(dft)   
+    
     """
-    Tiingo：获取股票，共同基金和信息和交易所交易基金的信息，可以免费注册获得API_KEY
     IEX：获得投资交易信息，需要API_KEY
-    Alpha Vantage：美股信息，需要API_KEY
     Econdb：提供超过90家官方统计机构提供的经济数据，免费
     Enigma：交易数据，需要API
     Quandl：股价和基金交易数据，需要API_KEY

{siat-3.9.11.dist-info → siat-3.9.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.9.11
+Version: 3.9.21
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -40,6 +40,8 @@ Requires-Dist: nbconvert
 Requires-Dist: ipywidgets==8.1.6
 Requires-Dist: playwright
 Requires-Dist: yahooquery==2.3.7
+Requires-Dist: alpha_vantage
+Requires-Dist: tiingo[pandas]
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{siat-3.9.11.dist-info → siat-3.9.21.dist-info}/RECORD

@@ -64,7 +64,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=8aL8z5TF963T7GgW62iNL5h5P_HA_AxAVxmBJK3Os28,141240
+siat/grafix.py,sha256=z5XaWWxAaPWje8zXfFJoHHgRtAHUfFCyzQRtdU3NdSw,142074
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=uWRtMMJqKr-puQn26g6Fq5N3mFB70c0B99zLQug8hAo,30774
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -89,7 +89,7 @@ siat/option_china_test.py,sha256=UQ-YUHUjoGBQyanLcM-yzqeEIUQP_gCQIeT0W6rnUnA,163
 siat/option_pricing.py,sha256=vyQNgBsjcJi70Pa-fJTVVIGK_3jWh80tkd1ESnn3sE4,74069
 siat/option_pricing_test.py,sha256=eeorV5Ja5vjlRXnP6fWJHetGU5Vb8SnLopkC6RV3GfA,2203
 siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,5908
-siat/other_indexes.py,sha256=DXijuTBhXWj7xEAIGzeczbt1CcJlfxV0hQ_UIuqIdfk,6859
+siat/other_indexes.py,sha256=i-yj2wU7mErlSCoNSOSQjY3_HNcI_8gJBs7H0PhiE5U,13353
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
 siat/risk_adjusted_return.py,sha256=6F8CpKm-HKO4wfnndri0ew-D3lDAH1fs5O9K5cphoLg,55096
@@ -102,7 +102,7 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=9zjdORWx5ia_gUezidhOKWmCnVDwWcnnjjugHudelaQ,157411
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=2my4JgVIoQunQ-xDlHPGZRyBJ4KFuM6nVQTwqmauIK0,26966
+siat/security_price2.py,sha256=35AV6zcL-u26uM1MGtyO5bj9uY6CCrdk3MTff5Q-0rc,27465
 siat/security_prices.py,sha256=HoCZ7YPrQYZHgKC-LyXFeeBCTfRc3EMMEiEg52SVv2w,109073
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
@@ -145,8 +145,8 @@ siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.9.11.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.9.11.dist-info/METADATA,sha256=qWH6uFB65v5Tt0vrvTH9GXJ2Zzl3Ub2rBuFmAAFS1T8,8335
-siat-3.9.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.9.11.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.9.11.dist-info/RECORD,,
+siat-3.9.21.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.9.21.dist-info/METADATA,sha256=BlxRIjZzBPns5W-qJOwLmdZkrEvbSYlMHwXZT5AF51E,8396
+siat-3.9.21.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.9.21.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.9.21.dist-info/RECORD,,