siat 3.2.20__py3-none-any.whl → 3.2.30__py3-none-any.whl

siat/security_trend2.py

@@ -100,6 +100,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                    ret_type='Annual Ret%',RF=0,regression_period=365,market_index="auto", \
                    sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
                        
+                   band_area='', \
                    graph=True,twinx=False,loc1='best',loc2='best', \
                    datatag=False,power=0, \
                    smooth=True,date_range=False,date_freq=False, \
@@ -220,7 +221,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         if not isinstance(mav,list):
             mav=[mav]
         df=candlestick(stkcd=tickers[0],fromdate=fromdate,todate=todate,mav=mav, \
-                       ticker_type=ticker_type,facecolor=facecolor)
+                       ticker_type=ticker_type,facecolor=facecolor,loc=loc1)
         return df
 
     if kline and kline_demo:
@@ -388,7 +389,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         df=security_mindicators(ticker=tickers[0],measures=measures, \
                                 adjust=adjust, \
                                 fromdate=fromdate,todate=todate, \
-                                graph=graph,smooth=smooth,loc=loc1, \
+                                graph=graph,smooth=smooth,band_area=band_area,loc=loc1, \
                                 date_range=date_range,date_freq=date_freq, \
                                 annotate=annotate,annotate_value=annotate_value, \
                                 source=source,

siat/stock.py

@@ -814,6 +814,7 @@ if __name__ =="__main__":
 def security_mindicators(ticker,measures,
                          fromdate,todate, \
                          adjust='', \
+                         band_area='', \
                          graph=True,smooth=True,loc='best',facecolor='whitesmoke', \
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
@@ -904,7 +905,8 @@ def security_mindicators(ticker,measures,
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                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_end=mark_end,facecolor=facecolor, \
+               band_area=band_area,loc=loc)
 
     return df1
 
@@ -1651,7 +1653,7 @@ def compare_msecurity(tickers,measure,start,end, \
         print("  #Error(compare_msecurity): support only one measure")
         return None
     
-    print("  Searching for multiple security information for",measure,"\b, it may take great time ...") 
+    print("  Searching for multiple security for",measure,"...") 
     #屏蔽函数内print信息输出的类
     import os, sys
     class HiddenPrints:
@@ -1738,10 +1740,15 @@ def compare_msecurity(tickers,measure,start,end, \
             title_txt=title_txt+': '+title_txt2
 
     # 标准化处理
-    dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \
-            axhline_label=axhline_label,x_label=x_label,y_label=y_label, \
-            preprocess=preprocess,scaling_option=scaling_option)
-
+    try:
+        dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \
+                axhline_label=axhline_label,x_label=x_label,y_label=y_label, \
+                preprocess=preprocess,scaling_option=scaling_option)
+    except:
+        print("  #Error(compare_msecurity): preprocess failed, returning dfs for further check")
+        #df_display_CSS(dfs,titletxt='Unexpected Data in dfs')
+        return dfs
+        
     # 填充非交易日的缺失值，使得绘制的曲线连续
     dfs2.fillna(axis=0,method='ffill',inplace=True)
     #dfs2.fillna(axis=0,method='bfill',inplace=True)
@@ -1900,9 +1907,21 @@ def stock_Kline(ticker,start='default',end='default',volume=True, \
     
     return df
 
-
+if __name__ =="__main__":
+    stkcd="BABA"
+    fromdate="2024-5-1"
+    todate="2024-6-20"
+    volume=True
+    style='China'
+    mav=[5,10]
+    ticker_type='auto'
+    facecolor='whitesmoke'
+    loc='best'
+    
+    
+    
 def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
-                ticker_type='auto',facecolor='whitesmoke'):
+                ticker_type='auto',facecolor='whitesmoke',loc='best'):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -1929,7 +1948,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
 
     #延长开始日期，以便绘制长期均线
     #fromdate1=date_adjust(fromdate, adjust=-mav_max*2)
-    fromdate1=date_adjust(fromdate, adjust=-mav_max)
+    fromdate1=fromdate
     
     #检查命令参数
     stylelist=['binance','China','blueskies','brasil','charles','checkers','classic','default', \
@@ -1949,14 +1968,14 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
             wick="inherit"  # 蜡烛图影线的颜色 
             )        
         s = mpf.make_mpf_style(
-            gridaxis='both',
-            gridstyle='-.',
+            #gridaxis='both',
+            #gridstyle='-.',
             y_on_right=True,
             marketcolors=mc,
             edgecolor='black',
             figcolor='white',
             facecolor=facecolor, 
-            gridcolor='cyan',
+            #gridcolor='cyan',
             rc=mpfrc)        
     
     #抓取证券价格
@@ -1993,6 +2012,9 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
     #titletxt=ticker_name(stkcd)
     titletxt=ticker_name(stkcd,ticker_type=ticker_type)
     
+    #空一行
+    print('')
+    
     fig, axlist = mpf.plot(daily,type='candle',
          volume=volume,
          show_nontrading=False,#自动剔除非交易日空白
@@ -2017,6 +2039,17 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
                         #style='italic',
                         #fontfamily='fantasy',
                         loc='center')
+    
+    #设置图例，注意前两个为图中期间开始日期的线和柱子
+    mav_labels=['期间首日线','期间首日柱']
+    for d in mav:
+        mav_labels=mav_labels+[str(d)+"日移动均线"]
+    axlist[0].legend(mav_labels,loc=loc)
+    """
+    #去掉前两个无用的图例
+    handles, labels = axlist[0].get_legend_handles_labels()
+    axlist[0].legend(handles=handles[2:],labels=labels[2:],loc=loc)
+    """
     fig.show()
     reset_plt()