siat 3.10.1__py3-none-any.whl → 3.10.12__py3-none-any.whl

siat/capm_beta2.py

@@ -335,7 +335,7 @@ if __name__=='__main__':
     betas=compare_mticker_1beta(ticker,start,end)
 
 def compare_mticker_1beta(ticker,start,end, \
-                         adjust='', \
+                         adjust='qfq', \
                          RF=0,regression_period=365, \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
@@ -343,7 +343,8 @@ def compare_mticker_1beta(ticker,start,end, \
                              band_area='', \
                          graph=True,facecolor='whitesmoke',loc='best', \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto',ticker_type='auto'):
     """
     功能：多只股票，对比其贝塔系数
@@ -448,7 +449,8 @@ def compare_mticker_1beta(ticker,start,end, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                             band_area=band_area, \
                    annotate=annotate,annotate_value=annotate, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,    
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc)
  
     return df
@@ -473,7 +475,7 @@ if __name__=='__main__':
     betas=compare_1ticker_mRF(ticker,start,end,RF)
 
 def compare_1ticker_mRF(ticker,start,end, \
-                        adjust='', \
+                        adjust='qfq', \
                         RF=[0,0.02,0.05], \
                         regression_period=365, \
                             attention_value='',attention_value_area='', \
@@ -482,7 +484,8 @@ def compare_1ticker_mRF(ticker,start,end, \
                             band_area='', \
                         graph=True,facecolor='whitesmoke',loc='best', \
                         annotate=False,annotate_value=False, \
-                        mark_top=False,mark_bottom=False,mark_end=False, \
+                        mark_top=False,mark_bottom=False, \
+                        mark_start=False,mark_end=False, \
                         mktidx='auto',source='auto', \
                         ticker_type='auto'):
     """
@@ -585,7 +588,8 @@ def compare_1ticker_mRF(ticker,start,end, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                             band_area=band_area, \
                    annotate=annotate,annotate_value=annotate, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc)
             
     return df
@@ -608,7 +612,7 @@ if __name__=='__main__':
     betas=compare_1ticker_mregression_period(ticker,start,end,RF,regression_period)
 
 def compare_1ticker_mregression_period(ticker,start,end, \
-                         adjust='', \
+                         adjust='qfq', \
                          RF=0, \
                          regression_period=[183,365,730], \
                             attention_value='',attention_value_area='', \
@@ -617,7 +621,8 @@ def compare_1ticker_mregression_period(ticker,start,end, \
                              band_area='', \
                          graph=True,facecolor='whitesmoke',loc='best', \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          ticker_type='auto'):
     """
@@ -716,7 +721,8 @@ def compare_1ticker_mregression_period(ticker,start,end, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                             band_area=band_area, \
                    annotate=annotate,annotate_value=annotate, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc)
             
     return df
@@ -751,7 +757,8 @@ def compare_beta_security(ticker,start,end, \
                                 band_area='', \
                           graph=True,facecolor='whitesmoke', \
                           annotate=False,annotate_value=False, \
-                          mark_top=False,mark_bottom=False,mark_end=False, \
+                          mark_top=False,mark_bottom=False, \
+                          mark_start=False,mark_end=False, \
                           mktidx='auto',source='auto', \
                           ticker_type='auto',loc="best"):
     """
@@ -773,7 +780,8 @@ def compare_beta_security(ticker,start,end, \
                                             band_area=band_area, \
                                      graph=graph,facecolor=facecolor,loc=loc, \
                                      annotate=annotate,annotate_value=annotate, \
-                                     mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                     mark_top=mark_top,mark_bottom=mark_bottom, \
+                                     mark_start=mark_start,mark_end=mark_end, \
                                      mktidx=mktidx,source=source, \
                                      ticker_type=ticker_type)
             return df
@@ -792,7 +800,8 @@ def compare_beta_security(ticker,start,end, \
                                             band_area=band_area, \
                                    graph=graph,facecolor=facecolor,loc=loc, \
                                    annotate=annotate,annotate_value=annotate, \
-                                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                                   mark_start=mark_start,mark_end=mark_end, \
                                    mktidx=mktidx,source=source, \
                                    ticker_type=ticker_type)
             return df
@@ -811,7 +820,8 @@ def compare_beta_security(ticker,start,end, \
                                             band_area=band_area, \
                                      graph=graph,facecolor=facecolor,loc=loc, \
                                      annotate=annotate,annotate_value=annotate, \
-                                     mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                     mark_top=mark_top,mark_bottom=mark_bottom, \
+                                     mark_start=mark_start,mark_end=mark_end, \
                                      mktidx=mktidx,source=source, \
                                      ticker_type=ticker_type)
             return df
@@ -828,7 +838,8 @@ def compare_beta_security(ticker,start,end, \
                                     band_area=band_area, \
                              graph=graph,facecolor=facecolor,loc=loc, \
                              annotate=annotate,annotate_value=annotate, \
-                             mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                             mark_top=mark_top,mark_bottom=mark_bottom, \
+                             mark_start=mark_start,mark_end=mark_end, \
                              mktidx=mktidx,source=source, \
                              ticker_type=ticker_type)
         

siat/other_indexes.py

@@ -185,6 +185,7 @@ if __name__=='__main__':
 #==============================================================================
 if __name__=='__main__': 
     ticker='AAPL'
+    ticker='^TVX'
     ticker='Apple'
     start='2025-4-1'; end='2025-4-30'
     
@@ -300,6 +301,8 @@ def search_av(keyword,api_key='VTRR3TA7L9O2DIX6'):
     """
     过程：给定上市公司关键名称或不带后缀的股票代码，找出Alpha Vantage的股票代码。
     """
+    DEBUG=False
+    
     import requests
     url = f"https://www.alphavantage.co/query?function=SYMBOL_SEARCH&keywords={keyword}&apikey={api_key}"
     response = requests.get(url)
@@ -313,15 +316,17 @@ def search_av(keyword,api_key='VTRR3TA7L9O2DIX6'):
             firstcode=data["bestMatches"][0]['1. symbol']
             firstname=data["bestMatches"][0]['2. name']
         except:
-            print(f"  #Warning(search_av): no contents found for {keyword} in Alpha Vantage")
+            if DEBUG:
+                print(f"  #Warning(search_av): no contents found for {keyword} in Alpha Vantage")
             #未找到可匹配的股票代码
             return None,None,None
             
     else:
-        if "Information" in data:
-            print(f"  #Warning(search_av): exceeded limit of requests per day in Alpha Vantage")
-        else:
-            print(f"  #Warning(search_av): keyword {keyword} not found in Alpha Vantage")
+        if DEBUG:
+            if "Information" in data:
+                print(f"  #Warning(search_av): exceeded limit of requests per day in Alpha Vantage")
+            else:
+                print(f"  #Warning(search_av): keyword {keyword} not found in Alpha Vantage")
         #未找到可匹配的股票代码
         return None,None,None
     
@@ -330,6 +335,7 @@ def search_av(keyword,api_key='VTRR3TA7L9O2DIX6'):
 #==============================================================================
 if __name__=='__main__': 
     ticker='AAPL'
+    ticker='^TVX'
     start='2025-4-1'; end='2025-4-30'
     
     get_price_tiingo(ticker,start,end)
@@ -344,7 +350,6 @@ def get_price_tiingo(ticker,start,end):
     api_token='0892bdb0533f8114535f354db596e6c244f5618d'
     
     from tiingo import TiingoClient
-    
     # 通过配置字典
     config = {
         'api_key': api_token,  # 替换为实际密钥
@@ -352,18 +357,18 @@ def get_price_tiingo(ticker,start,end):
     }
     client = TiingoClient(config)    
 
+
     # 获取历史行情（默认返回DataFrame）
     try:
         dft = client.get_dataframe(
-            ticker,
-            startDate=start,
-            endDate=end,   
-            frequency='daily'
-        )
+                                    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
         

siat/risk_adjusted_return2.py

@@ -816,7 +816,8 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto',ticker_type='auto'):
     """
     功能：一只股票，对比其多个rar，支持股票和投资组合
@@ -923,7 +924,8 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
                        band_area=band_area, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
     #制表
@@ -988,7 +990,8 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          style_print=True,ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -1116,7 +1119,8 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                             band_area=band_area, \
                    annotate=annotate,annotate_value=annotate, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
     #制表
@@ -1177,7 +1181,8 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
                          axhline_value=0,axhline_label='', \
                          printout=True,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -1209,7 +1214,8 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
                                  printout=printout,sortby=sortby, \
                                  trailing=trailing,trend_threshhold=trend_threshhold, \
                                  annotate=annotate,annotate_value=annotate, \
-                                 mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                 mark_top=mark_top,mark_bottom=mark_bottom, \
+                                 mark_start=mark_start,mark_end=mark_end, \
                                  mktidx=mktidx,source=source,style_print=True, \
                                  ticker_type=ticker_type,loc1=loc1)        
         if df_tmp is None:
@@ -1386,7 +1392,8 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto',ticker_type='auto'):
     """
     功能：一只股票，同一个rar，对比其不同的收益率类型，支持股票和投资组合
@@ -1486,7 +1493,8 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
                        band_area=band_area, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
     #制表
@@ -1548,7 +1556,8 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto',ticker_type='auto'):
     """
     功能：一只股票，相同的rar，相同的收益率类型，不同的无风险收益率
@@ -1643,7 +1652,8 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
                        band_area=band_area, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
     #制表
@@ -1722,7 +1732,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
                          annotate=False,annotate_value=False, \
-                         mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False, \
+                         mark_start=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          ticker_type='auto'):
     """
@@ -1757,7 +1768,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             printout=printout, \
                             sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                             annotate=annotate,annotate_value=annotate, \
-                            mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                            mark_top=mark_top,mark_bottom=mark_bottom, \
+                            mark_start=mark_start,mark_end=mark_end, \
                             mktidx=mktidx,source=source, \
                             ticker_type=ticker_type,facecolor=facecolor)
                 return df
@@ -1774,7 +1786,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             printout=printout, \
                             sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                             annotate=annotate,annotate_value=annotate, \
-                            mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                            mark_top=mark_top,mark_bottom=mark_bottom, \
+                            mark_start=mark_start,mark_end=mark_end, \
                             mktidx=mktidx,source=source, \
                             ticker_type=ticker_type,facecolor=facecolor)
                 return df            
@@ -1800,7 +1813,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             printout=printout,facecolor=facecolor, \
                             sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                             annotate=annotate,annotate_value=annotate, \
-                            mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                            mark_top=mark_top,mark_bottom=mark_bottom, \
+                            mark_start=mark_start,mark_end=mark_end, \
                             mktidx=mktidx,source=source, \
                             ticker_type=ticker_type)
             return df
@@ -1824,7 +1838,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             printout=printout, \
                             sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                             annotate=annotate,annotate_value=annotate, \
-                            mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                            mark_top=mark_top,mark_bottom=mark_bottom, \
+                            mark_start=mark_start,mark_end=mark_end, \
                             mktidx=mktidx,source=source, \
                             ticker_type=ticker_type,facecolor=facecolor)
             return df
@@ -1846,7 +1861,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             printout=printout,facecolor=facecolor, \
                             sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                             annotate=annotate,annotate_value=annotate, \
-                            mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                            mark_top=mark_top,mark_bottom=mark_bottom, \
+                            mark_start=mark_start,mark_end=mark_end, \
                             mktidx=mktidx,source=source, \
                             ticker_type=ticker_type)
             return df
@@ -1864,7 +1880,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                              printout=printout,sortby=sortby, \
                              trailing=trailing,trend_threshhold=trend_threshhold, \
                              annotate=annotate,annotate_value=annotate, \
-                             mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                             mark_top=mark_top,mark_bottom=mark_bottom, \
+                             mark_start=mark_start,mark_end=mark_end, \
                              mktidx=mktidx,source=source, \
                              ticker_type=ticker_type,facecolor=facecolor)
         

siat/security_prices.py

@@ -449,7 +449,8 @@ def cvt_stooq_suffix(symbol):
     """
     import pandas as pd
     suffix=pd.DataFrame([
-        ['SS','CN'], ['SH','CN'], ['SZ','CN'], ['BJ','CN'], ['T','JP'], 
+        ['SS','CN'], ['SH','CN'], ['SZ','CN'], ['BJ','CN'], 
+        ['T','JP'],['L','UK'], 
         
         ], columns=['yahoo','stooq'])
 
@@ -496,10 +497,14 @@ if __name__=='__main__':
     cvt_stooq_symbol('^GSPC')
     cvt_stooq_symbol('^IXIC')
     cvt_stooq_symbol('000001.SS')
+    cvt_stooq_symbol('600619.SS')
+    
 #==================================================================================
 if __name__=='__main__':
     ticker='600519.SS'
-    ticker='0LNG.UK'
+    ticker='0LNG.L'
+    
+    cvt_stooq_ticker(ticker)
 
 def cvt_stooq_ticker(ticker):
     """
@@ -509,7 +514,7 @@ def cvt_stooq_ticker(ticker):
     """
     #直接转换
     result,ticker_stooq=cvt_stooq_symbol(ticker)
-    if result:
+    if not result:
         return ticker_stooq
     
     #拆分前缀后缀
@@ -552,6 +557,7 @@ if __name__=='__main__':
     ticker='INPYCN.M'
     ticker='TRBNCN.M'
     ticker='RSAYCN.M'
+    ticker='600519.SS'
     
     ticker='GC.F'   #无法下载
     ticker='XAUCNY' #一盎司黄金的现货人民币价格
@@ -559,8 +565,7 @@ if __name__=='__main__':
     
     ticker=['AAPL','MSFT']
     
-    start='2023-1-1'
-    end='2024-2-19' 
+    start='2025-6-1'; end='2025-6-1' 
     
     p=get_price_stooq(ticker,start,end)
 
@@ -1468,14 +1473,30 @@ def get_price_yq(ticker,start,end):
     
     输出：指定收盘价格序列，最新日期的股价排列在前
     """
+    DEBUG=False
+    
     p=None
 
     #支持多个证券
     import yahooquery as yq
     ticker1,islist=cvt_yftickerlist(ticker)
-    if not islist:
-        #下载单一股票的股价
+    
+    try:
+        #下载单一股票的股价；下载股票列表的股价，与单股票情况相同，但需注意MultiInex结构
         stock=yq.Ticker(ticker1, asynchronous=True)
+    except:
+        if DEBUG:
+            print("  Yahoo api is tentatively inaccessible, recovering ...")
+        sleep_random(max_sleep=60)
+        try:
+            stock=yq.Ticker(ticker1, asynchronous=True)
+        except:
+            if DEBUG:
+                print(f"  Sorry, failed to retrieve info from Yahoo for {ticker}")
+            p=None
+            return p
+        
+    if not islist:
         try:
             p=stock.history(start=start,end=end)
             #仅针对雅虎情况
@@ -1484,8 +1505,6 @@ def get_price_yq(ticker,start,end):
         except:
             p=None
     else: 
-        #下载股票列表的股价，与但股票情况相同，但需注意MultiInex结构
-        stock=yq.Ticker(ticker1, asynchronous=True)
         try:
             p=stock.history(start=start,end=end)
             #仅针对雅虎情况

siat/security_trend2.py

@@ -150,7 +150,9 @@ def security_trend(ticker,indicator='Close',adjust='', \
                    preprocess='none',scaling_option='change%', \
                        
                    annotate=False,annotate_value=False, \
-                   mark_top=False,mark_bottom=False,mark_end=False, \
+                   mark_top=False,mark_bottom=False, \
+                       mark_high=False,mark_low=False, \
+                   mark_start=False,mark_end=False, \
                        
                    printout=False,source='auto', \
                    ticker_type='auto', \
@@ -235,9 +237,13 @@ def security_trend(ticker,indicator='Close',adjust='', \
                   indicator='Exp Ret%',
                   start='MRY')
     """    
-    
     DEBUG=False
     
+    if mark_high: mark_top=True
+    if mark_low: mark_bottom=True  
+        
+    print(f"  Looking for info of specified securities ...")
+    
     #critical_value=attention_value
         
     portfolio_flag=False #标志：ticker中是否含有投资组合
@@ -436,7 +442,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                               datatag=datatag,power=power,graph=graph, \
                               source=source,loc=loc1, \
                               mark_top=mark_top,mark_bottom=mark_bottom, \
-                              mark_end=mark_end,ticker_type=ticker_type, \
+                              mark_start=mark_start,mark_end=mark_end, \
+                              ticker_type=ticker_type, \
                               facecolor=facecolor)
         return df
     
@@ -472,7 +479,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                 date_range=date_range,date_freq=date_freq, \
                                 annotate=annotate,annotate_value=annotate_value, \
                                 source=source,
-                                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                mark_top=mark_top,mark_bottom=mark_bottom, \
+                                mark_start=mark_start,mark_end=mark_end, \
                                 ticker_type=ticker_type,facecolor=facecolor)
         return df
     
@@ -528,7 +536,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                       annotate=annotate,annotate_value=annotate_value, \
                       smooth=smooth, \
                       source=source, \
-                      mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                      mark_top=mark_top,mark_bottom=mark_bottom, \
+                      mark_start=mark_start,mark_end=mark_end, \
                       ticker_type=ticker_type,facecolor=facecolor)
         return df
 
@@ -552,7 +561,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                  printout=printout, \
                                  sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                  annotate=annotate,annotate_value=annotate_value, \
-                                 mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                 mark_top=mark_top,mark_bottom=mark_bottom, \
+                                 mark_start=mark_start,mark_end=mark_end, \
                                  mktidx=market_index,source=source, \
                                  ticker_type=ticker_type,facecolor=facecolor)  
         return df
@@ -572,7 +582,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                          band_area=band_area, \
                                  graph=graph,facecolor=facecolor,loc=loc1, \
                                  annotate=annotate,annotate_value=annotate_value, \
-                                 mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                 mark_top=mark_top,mark_bottom=mark_bottom, \
+                                 mark_start=mark_start,mark_end=mark_end, \
                                  mktidx=market_index,source=source, \
                                  ticker_type=ticker_type)
         
@@ -589,7 +600,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
                                          band_area=band_area, \
                               annotate=annotate,annotate_value=annotate_value, \
-                              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+                              mark_top=mark_top,mark_bottom=mark_bottom, \
+                              mark_start=mark_start,mark_end=mark_end)
         return df
     
     # 其他未预料情形

siat/stock.py

@@ -656,7 +656,8 @@ def security_indicator(ticker,indicator, \
                            attention_point='',attention_point_area='', \
                        average_value=False, \
                        datatag=False,power=0,graph=True,source='auto', \
-                       mark_top=True,mark_bottom=True,mark_end=True, \
+                       mark_top=True,mark_bottom=True, \
+                       mark_start=True,mark_end=True, \
                        ticker_type='auto',facecolor='whitesmoke',loc='best'):
     """
     功能：单只证券的全部指标
@@ -767,7 +768,8 @@ def security_indicator(ticker,indicator, \
               average_value=average_value, \
                   attention_value=attention_value,attention_value_area=attention_value_area, \
                   attention_point=attention_point,attention_point_area=attention_point_area, \
-              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+              mark_top=mark_top,mark_bottom=mark_bottom, \
+              mark_start=mark_start,mark_end=mark_end, \
               facecolor=facecolor,loc=loc)
     
     return erdf3
@@ -895,7 +897,8 @@ def security_mindicators(ticker,measures,
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
                          source='auto', \
-                         mark_top=True,mark_bottom=True,mark_end=True, \
+                         mark_top=True,mark_bottom=True, \
+                         mark_start=True,mark_end=True, \
                          ticker_type='auto'):
     """
     功能：单个证券，多个指标对比
@@ -1001,7 +1004,9 @@ def security_mindicators(ticker,measures,
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate_value, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end, \
+                       facecolor=facecolor, \
                    band_area=band_area,loc=loc)
 
     return df
@@ -1977,7 +1982,8 @@ def compare_msecurity(tickers,measure,start,end, \
                       annotate=False,annotate_value=False, \
                       smooth=True, \
                       source='auto', \
-                      mark_top=True,mark_bottom=True,mark_end=False, \
+                      mark_top=True,mark_bottom=True, \
+                      mark_start=False,mark_end=False, \
                       ticker_type='auto'):
     """
     功能：比较并绘制多条证券指标曲线（多于2条），个数可为双数或单数
@@ -2160,7 +2166,8 @@ def compare_msecurity(tickers,measure,start,end, \
                     attention_point=attention_point,attention_point_area=attention_point_area, \
                band_area=band_area, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
+               mark_top=mark_top,mark_bottom=mark_bottom, \
+               mark_start=mark_start,mark_end=mark_end,facecolor=facecolor)
 
     return dfs2
 

siat/stooq.py

@@ -60,6 +60,7 @@ class StooqDailyReader(_DailyBaseReader):
                     "f",
                     "b",
                     "m",
+                    "cn",
                 ]:
                     symbol = ".".join([symbol, "US"])
 

siat/valuation.py

@@ -946,7 +946,8 @@ def security_valuation(tickers,indicators,start,end, \
                             attention_point='',attention_point_area='', \
                                 band_area='', \
                        annotate=False,annotate_value=False, \
-                       mark_top=False,mark_bottom=False,mark_end=False):
+                       mark_top=False,mark_bottom=False, \
+                       mark_start=False,mark_end=False):
     """
     功能：绘制估值走势
     """
@@ -1030,7 +1031,8 @@ def security_valuation(tickers,indicators,start,end, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate_value, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end)        
         
         return df
         
@@ -1148,7 +1150,8 @@ def security_valuation(tickers,indicators,start,end, \
                    facecolor=facecolor, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end)        
         
         return df        
    
@@ -1195,7 +1198,8 @@ def security_valuation(tickers,indicators,start,end, \
                    facecolor=facecolor, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
-                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
+                   mark_top=mark_top,mark_bottom=mark_bottom, \
+                   mark_start=mark_start,mark_end=mark_end)        
         
         return df 
                 

{siat-3.10.1.dist-info → siat-3.10.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: siat
-Version: 3.10.1
+Version: 3.10.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
@@ -8,15 +8,15 @@ Author-email: wdehong2000@163.com
 License: Copyright (C) WANG Dehong, 2024. For educational purpose only!
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas_datareader
+Requires-Dist: pandas-datareader
 Requires-Dist: yfinance
 Requires-Dist: tqdm
-Requires-Dist: plotly_express
+Requires-Dist: plotly-express
 Requires-Dist: akshare
 Requires-Dist: urllib3
 Requires-Dist: mplfinance
 Requires-Dist: statsmodels
-Requires-Dist: yahoo_earnings_calendar
+Requires-Dist: yahoo-earnings-calendar
 Requires-Dist: pypinyin
 Requires-Dist: seaborn
 Requires-Dist: numpy
@@ -32,24 +32,16 @@ Requires-Dist: graphviz
 Requires-Dist: luddite
 Requires-Dist: pendulum
 Requires-Dist: itables
-Requires-Dist: py_trans
+Requires-Dist: py-trans
 Requires-Dist: bottleneck
 Requires-Dist: translate
 Requires-Dist: translators
 Requires-Dist: nbconvert
-Requires-Dist: ipywidgets==8.1.6
+Requires-Dist: ipywidgets ==8.1.6
 Requires-Dist: playwright
-Requires-Dist: yahooquery==2.3.7
-Requires-Dist: alpha_vantage
+Requires-Dist: yahooquery ==2.3.7
+Requires-Dist: alpha-vantage
 Requires-Dist: tiingo[pandas]
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 
 # What is siat?

{siat-3.10.1.dist-info → siat-3.10.12.dist-info}/RECORD

@@ -16,7 +16,7 @@ siat/bond_china.py,sha256=WzUhjYYk8tsr3BDWLQcpuj9DqNxTzBSIi_wuAOZ48kY,3082
 siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
 siat/bond_zh_sina.py,sha256=26BohGcS120utwqg9dJvdGm5OkuNpNu5bco80uOuQpU,4423
 siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
-siat/capm_beta2.py,sha256=wGF_HmK_AiGWjpSAx79XHIxDghtI_ueYozvh06-2JEQ,33707
+siat/capm_beta2.py,sha256=LmrfFhm4A-HLGolJ5rdlZFDGJkClS2I3Wv7gaHM3Tdw,34275
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
 siat/common.py,sha256=J0qSvKtPS1gAfb2_GJNKxFkWJJaNbkQzg4fzaBvKwjM,183440
@@ -89,11 +89,11 @@ 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=zIUOcaytf0e2NnGU9Bkyiu3z_GaR_-T8nVGCZ4s4Bws,13615
+siat/other_indexes.py,sha256=vx9am_kqogvKiJ82qrw5vqv-4wG4qdvHI0XCdAW9n7s,13842
 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
-siat/risk_adjusted_return2.py,sha256=92GXCpJPVVsYpQ-X3WXaADZvCqxsuJXQN5vG5trVX9I,86296
+siat/risk_adjusted_return2.py,sha256=VzW3GOumNAoHcZL-0eOdsQma9w6JRTmBKU7gXdsl5DQ,87136
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=HK6U2G85-AxjSoeARbmTuiCNwTVdPdB9Znfgvslo0Os,76455
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -103,14 +103,14 @@ 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=uC-wA6w3IlA9ZOJYINqIB7LexCbrnnqTkHTPuCSCwpo,27697
-siat/security_prices.py,sha256=MD1pANBD4E_dppLHxgoc7QoceGmKO3huOr2IQpU_eiQ,111570
+siat/security_prices.py,sha256=QD5ane5AqxuBtTLI986fRflQKHB1Q22lrIehncnOcCM,112061
 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=8-Z-PWaX8fjnyAyfxEp3qXdVllgDpRISOASKEn7Zeoc,30706
+siat/security_trend2.py,sha256=F52KQbW5y7j5Ltmsy_YIddA0Jqb34IkBym7IfD-8PwI,31282
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=ixl9NWhFS-z9cQUnBOaQ_u2gqsCiG02zZZrLVBSqPwQ,159941
+siat/stock.py,sha256=ZTsewPKh_sDz-nd4GxR9af7V1ajTSqTAYUop_sf3PcM,160225
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -124,7 +124,7 @@ siat/stock_profile.py,sha256=BuvdrQ3bqIAUCaM2GxPR6_rUhigQQa_YMeUov2zY6Y0,26084
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
 siat/stock_technical.py,sha256=1P4FkOTPknG2m18NTgwMxN-NgwIAdW3qR09VoFz00Hc,140928
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
-siat/stooq.py,sha256=SiRnSUu92pfzIZQ8N4Yo-9VOVSwUSqQE0wqXhF-4y9g,2493
+siat/stooq.py,sha256=TTLjAAp-TcoEezgCPu6eM_5naI4yCshp1S7V3pyc-og,2519
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/test2_graphviz.py,sha256=05w2YJuIBH0LsJjdA60EFn7rL0vCo-CA6EVJEQOXNE4,16648
 siat/test_graphviz.py,sha256=CETKpDL8PnysS-PD3fHkeAgagUxjaUl0CsXPiadQySg,16999
@@ -140,13 +140,13 @@ siat/translate.py,sha256=m8mDVHilsw9nSIGBcvl_pS-aMy3W7UVKEZsLwhfuIEg,263300
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/valuation.py,sha256=K7epQC_UtELjRR5cyjJp4gskSyJMxXy-jHIAS0SUEj8,51801
+siat/valuation.py,sha256=xGizcKJZ3ADLWWHm2TFQub18FxiDv2doQwBwbEqyqz0,51980
 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.10.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.10.1.dist-info/METADATA,sha256=45hmgtcQRU3Qq-7X7UlCGRDQrV-_c-VNt8Oec76xNBQ,8396
-siat-3.10.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.10.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.10.1.dist-info/RECORD,,
+siat-3.10.12.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.10.12.dist-info/METADATA,sha256=O87EdZttW9eSHY50pNz2z7eJGnNR3DC-1Y8fF7DtZrw,8222
+siat-3.10.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.10.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.10.12.dist-info/RECORD,,

{siat-3.10.1.dist-info → siat-3.10.12.dist-info}/WHEEL

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