siat 3.7.10__py3-none-any.whl → 3.7.12__py3-none-any.whl

siat/grafix.py

@@ -365,7 +365,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
-    plt.legend(loc=loc,fontsize=legend_txt_size)
+    if haveLegend:
+        plt.legend(loc=loc,fontsize=legend_txt_size)
+        
     plt.show()
     plt.close()
     

siat/risk_free_rate.py

@@ -211,7 +211,7 @@ def get_rf_capm(ticker,mktidx,fromdate,todate,window=240,sharelist=[]):
         try:
             rf=alpha/(1-beta)
         except:
-            rf=np.NaN    
+            rf=np.nan    
         
         row=pd.Series({'date':sdate2,'Beta':beta,'alpha':alpha, \
             'R-sqr':r_value**2,'p-value':p_value,'sig':sig,'Rf':rf,'ticker':ticker,'footnote':footnote})

siat/security_prices.py

@@ -2100,7 +2100,7 @@ def lpsd(ds):
     """
     import numpy as np
     #若序列长度为0则直接返回数值型空值
-    if len(ds) == 0: return np.NaN
+    if len(ds) == 0: return np.nan
     
     #求均值
     import numpy as np
@@ -2116,8 +2116,8 @@ def lpsd(ds):
     #下偏标准差
     if ctr > 1:
         result=np.sqrt(sum/(ctr-1))
-    elif ctr == 1: result=np.NaN
-    else: result=np.NaN
+    elif ctr == 1: result=np.nan
+    else: result=np.nan
         
     return result
     

siat/stock_china.py

@@ -201,7 +201,7 @@ def slog(x):
     功能：对x取对数，正数直接取对数，负数先变为正数再取对数加负号，零不操作
     '''
     import numpy as np
-    if x == np.NaN: return np.NaN
+    if x == np.nan: return np.nan
     if x == 0: return 0
     if x > 0: return np.log(x)
     if x < 0: return -np.log(-x)

siat/stock_technical.py

@@ -4,7 +4,7 @@
 所属工具包：证券投资分析工具SIAT 
 SIAT：Security Investment Analysis Tool
 创建日期：2023年1月27日
-最新修订日期：2023年1月27日
+最新修订日期：2025年1月31日
 作者：王德宏 (WANG Dehong, Peter)
 作者单位：北京外国语大学国际商学院
 作者邮件：wdehong2000@163.com
@@ -2483,22 +2483,23 @@ if __name__ =="__main__":
     technical='Bollinger'
     indicator='PE'
 
-def security_technical(ticker,start='default',end='default', \
-             MA_days=[5,20],EMA_days=[5,20], \
-             MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
-                 
-             #RSI参数个数必须为3个，否则出错
-             RSI_days=[6,12,24],RSI_lines=[20,50,80], \
-             KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
-             boll_days=20,boll_years=7, \
-             resample_freq='6H',smooth=True,linewidth=1.5, \
-             loc1='best',loc2='best', \
-             graph=['ALL'],printout=False, \
-             date_range=False,date_freq=False,annotate=False, \
-             technical=['MACD'],indicator='Close', \
-             ticker_type='auto',source='auto', \
-             price_line_color='red', \
-             facecolor='k'):
+def security_technical(ticker,technical=['MACD'],indicator='Close', \
+                       start='default',end='default', \
+                         MA_days=[5,20],EMA_days=[5,20], \
+                         MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+                             
+                         #RSI参数个数必须为3个，否则出错
+                         RSI_days=[6,12,24],RSI_lines=[20,50,80], \
+                         KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
+                         boll_days=20,boll_years=7, \
+                             
+                         resample_freq='6H',smooth=True,linewidth=1.5, \
+                         loc1='best',loc2='best', \
+                         graph=['ALL'],printout=False, \
+                         date_range=False,date_freq=False,annotate=False, \
+                         ticker_type='auto',source='auto', \
+                         price_line_color='red', \
+                         facecolor='k'):
     
     """
     功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
@@ -2529,6 +2530,7 @@ def security_technical(ticker,start='default',end='default', \
         if t not in technical_list:
             print("  Warning(security_technical): unsupported technical pattern",t)
             print("  Supported patterns:",technical_list)
+            return None
     
     #检查布林带的指标
     if isinstance(indicator,str):
@@ -2544,6 +2546,7 @@ def security_technical(ticker,start='default',end='default', \
         if t not in indicator_list1:
             print("  Warning(security_technical): unsupported Bollinger indicator",t)
             print("  Supported Bollinger indicator:",indicator_list1) 
+            return None
     
     # 检查绘图种类
     if isinstance(graph,str):

{siat-3.7.10.dist-info → siat-3.7.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: siat
-Version: 3.7.10
+Version: 3.7.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: yahooquery
 Requires-Dist: pypinyin
 Requires-Dist: seaborn
@@ -33,10 +33,18 @@ 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
+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.7.10.dist-info → siat-3.7.12.dist-info}/RECORD

@@ -62,7 +62,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=WH_-a-R-zyKhT4t4NM24gYZWKyvIexN9LfXVQf-1zxA,110166
+siat/grafix.py,sha256=SU5cZTGrz_Twacjj70bWq50wSobkmjoMdvk2DuUfpM4,110200
 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
@@ -94,13 +94,13 @@ siat/risk_adjusted_return2.py,sha256=59YDzhbvr8PRRzb1Ew_8fuGqV4lEitm6itpk54xEb48
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
-siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
+siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
 siat/sector_china.py,sha256=Mxx5Zd5qvhLdwutedwoPRoXlAopTsPww4rRhOgpRmb8,150762
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
-siat/security_prices.py,sha256=i_4ZA7sRb9gMRVOgTT-XxQ1Jrz9eHDjZznsoXPDhh0Y,108859
+siat/security_prices.py,sha256=cIplEWi6TJEIDI6xANaVf0YrOb1CPqvxULGIShoGa2s,108859
 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
@@ -110,7 +110,7 @@ siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuY
 siat/stock.py,sha256=AO_ntNoinjXpzzs4eA1iMlsqGFoN1KvgHV6Z_ECVy-M,158658
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
-siat/stock_china.py,sha256=vm_BslG0gJm4R0-O5bNtENkMMfDP-u1TYKCKzLH9Nkk,93460
+siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
 siat/stock_info.pickle,sha256=XqcFwQrXoBXAzZnE6rnfpI7zETXZS2usqzsx2ff7MEg,1319005
 siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
@@ -119,7 +119,7 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 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_technical.py,sha256=VX6qSBotTOzXaX1XHyDz3KBYEHlaxcPdBIOacB8T9no,136309
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=SiRnSUu92pfzIZQ8N4Yo-9VOVSwUSqQE0wqXhF-4y9g,2493
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -142,8 +142,8 @@ 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=r0Q67cSMMlfebEkI9h9pdGlJCooEq7hw_3M5IUs4cSI,20081
-siat-3.7.10.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.10.dist-info/METADATA,sha256=nY3QaZF7WEgmuQ6z6eucsLYyrHlhX-BiCYsY97jrMEQ,8064
-siat-3.7.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.10.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.10.dist-info/RECORD,,
+siat-3.7.12.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.12.dist-info/METADATA,sha256=GeMpx_zpeBDdWN5pRB9YV-lCbOIXkppk3XtAG0BjmNM,8241
+siat-3.7.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.7.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.12.dist-info/RECORD,,

{siat-3.7.10.dist-info → siat-3.7.12.dist-info}/WHEEL

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