siat 3.2.3__py3-none-any.whl → 3.2.5__py3-none-any.whl

siat/__init__.py

@@ -20,12 +20,24 @@ InteractiveShell.ast_node_interactivity='all'
 try:
     import pkg_resources
     current_version=pkg_resources.get_distribution("siat").version
+    current_list=current_version.split('.')
     print("Successfully imported siat version",current_version)
 
     import luddite
     latest_version=luddite.get_version_pypi("siat")
+    latest_list=latest_version.split('.')
     
-    if latest_version != current_version:
+    newest=True
+    if current_list[0] < latest_list[0]:
+        newest=False
+    elif current_list[1] < latest_list[1]:
+        newest=False
+    elif current_list[2] < latest_list[2]:
+        newest=False  
+    else:
+        pass
+    
+    if not newest:
         print("The latest version of siat is",latest_version,'\n')
         print("*** If you expect to upgrade siat in Anaconda Prompt, use the instruction below:")
         print("    pip install siat --upgrade")
@@ -35,7 +47,7 @@ try:
         print("    pip uninstall siat")
         print("    pip install siat",'\n')
         
-        print("*** If you have a slow internet connection, use an option after the instruction above:")
+        print("*** If you have a slow internet connection, use an option trailing the instruction above:")
         print("    -i https://mirrors.aliyun.com/pypi/simple/",'\n')
     
         print("If you have done any of the above, restart the Python (eg. restarting the kernel)")

siat/stock_technical.py

@@ -2435,7 +2435,7 @@ if __name__ =="__main__":
     
     start='2024-3-1'; end='2024-4-12'; ahead_days=30*3
     
-    technical='EMV'; indicator='Close'
+    technical='ARBR'; indicator='Close'
     
     attention_values=[0,25,50,75]
     more_details=False
@@ -2448,7 +2448,7 @@ if __name__ =="__main__":
         
     facecolor=['whitesmoke','papayawhip']
     price_line_style='dotted'; price_line_color='red'; price_line_width=5; price_line_marker='.'
-    
+    marker_sizes=[30,120,250]
     
     df=security_technical2(ticker,start,end,technical=technical,marker_sizes=[20,150,300])
     
@@ -2505,20 +2505,28 @@ def security_technical2(ticker,start='default',end='default', \
                         #price_line_style=(0,(1,1)), \
                         price_line_style='dotted', \
                         price_line_color=['red','green'], \
-                        price_line_width=5,price_line_marker='o', \
+                        price_line_width=1,price_line_marker='o', \
                         marker_sizes=[30,120,250], \
                         ):
     """
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
     
-    支持的探索指标：仅供探索使用
+    支持的技术分析指标：
     OBV、SAR、VOL、PSY、ARBR、CR、EMV、TRIX、DMA、BIAS、CCI、W%R、ROC、DMI
     支持的其他指标：不如单独的指令功能强
     MACD、RSI、KDJ、BOLL
     
-    关注的阈值：默认[0,30,50,80]，attention_values=[0,30,50,80], 可以自定义，但0线一般建议保留。
+    关注的阈值：默认[0,25,50,75,100]，attention_values=[0,25,50,75,100], 可以自定义。
     收盘价折线：默认红色虚线，price_line_color='red'
     """
+    # 检查ta-lib是否安装，避免浪费后续的处理
+    try:
+        import talib  
+    except:
+        print("  #Error(security_technical2): lack of necessary package - talib")
+        talib_install_method()
+        return None
+    
     #检查证券代码
     if not isinstance(ticker,str):
         print("  #Warning(security_technical2): not a security code for",ticker)
@@ -2615,6 +2623,13 @@ def security_technical2(ticker,start='default',end='default', \
                        
                        indicator=indicator, \
                        more_details=more_details)
+    #未安装talib
+    if df is None:
+        return None
+    
+    if len(df) == 0:
+        print("  #Warning(security_technical2): zero records calculated for",technical,"using indicator",indicator)
+        return None
 
     #技术指标的绘图线
     tech_line_default={'RSI':['rsi'],
@@ -2692,9 +2707,14 @@ def security_technical2(ticker,start='default',end='default', \
     
     #字段排序
     tech_line_collist.sort()
-    df1=df[tech_line_collist+[indicator,'Volume','up_down','marker_size']]
+    if 'marker_size' in tech_line_collist:
+        df1=df[tech_line_collist+[indicator,'Volume','up_down']]
+    else: 
+        df1=df[tech_line_collist+[indicator,'Volume','up_down','marker_size']]
     
     #绘图----------------------------------------------------------------------
+    print('') #距离上条信息空一行
+    
     import matplotlib.pyplot as plt
     import matplotlib.dates as mdates
     #import matplotlib.gridspec as gridspec
@@ -2765,6 +2785,8 @@ def security_technical2(ticker,start='default',end='default', \
     attention_draws=[False] * len(attention_values)
 
     for l in tech_line_collist:
+        if l == 'marker_size': continue
+        
         labeltxt=l.upper()
         if labeltxt =='DEA':
             labeltxt='慢线(DEA)'
@@ -2780,7 +2802,7 @@ def security_technical2(ticker,start='default',end='default', \
             pos=attention_values.index(al)
             
             line_al=False
-            if lmax >= al >= lmin: 
+            if (lmax >= al) and (al >= lmin): 
                 line_al=True
             
             #如果需要绘制关注线，且尚未绘制过，则绘制
@@ -2872,10 +2894,10 @@ def security_technical2(ticker,start='default',end='default', \
     ax3.bar(df1up.index,df1up['Volume'],color=price_line_color1)
     ax3.bar(df1down.index,df1down['Volume'],color=price_line_color2)
     
-    ax3.set_ylabel("交易量(百万)",fontsize=ylabel_txt_size -4)
+    ax3.set_ylabel("交易量(百万股)",fontsize=ylabel_txt_size -4)
     
     footnote1="\n注：快线自下而上穿过慢线为金叉，自上而下穿过慢线为死叉。"
-    footnote2="价格曲线上端点的大中小对应当日涨跌幅度三分位数的高中低部分。\n"
+    footnote2="价格曲线端点大中小对应当日涨跌幅度的高中低情形。\n"
     footnote3="横轴日期上的空白处为非交易日（周末或公共节假日）。"
     
     import datetime; todaydt = str(datetime.date.today())

{siat-3.2.3.dist-info → siat-3.2.5.dist-info}/METADATA

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

{siat-3.2.3.dist-info → siat-3.2.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-siat/__init__.py,sha256=2c0GKq4KaxA0vfdvMeyCPiNR6wODmH6CGj8n5UDOywY,2182
+siat/__init__.py,sha256=0N9ER3IIQkOVCLiX2nvfOmYfaYpt4OMd-r0Hbh2DSJc,2496
 siat/allin.py,sha256=f1VWxZLvPLR57ilk9GOziZMWjyAYOYLXbvQI4z38r50,2708
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=deAJ60YcqMUgrXY7jy7BfzLutoy4uOEtfXqqMSujCRo,28889
@@ -115,7 +115,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=I7AeesRFKAK_8MZcqtV1ppvnqsTZfQYgxU3iTAUzMiQ,122806
+siat/stock_technical.py,sha256=vewfR1NXFCn60QUEcTPJNSB8Ndq2-TJEfOyHVDGPHKE,123502
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -136,7 +136,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.2.3.dist-info/METADATA,sha256=GB36cl3udD6IE5Vaaah6WH_nNbjjruc60CRXLHwliB8,1447
-siat-3.2.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.3.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.3.dist-info/RECORD,,
+siat-3.2.5.dist-info/METADATA,sha256=zmB_udFs6LIEZPb7Cw7Ku0bQ4GHlA_6gOzWuwaWjmU4,1447
+siat-3.2.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.5.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.5.dist-info/RECORD,,