siat 3.2.51__py3-none-any.whl → 3.2.52__py3-none-any.whl

siat/security_prices.py

@@ -960,7 +960,7 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     """
     抓取单个美股股价，不能处理股指
     """
-    import pandas as pd
+    import pandas as pd #此处需要，去掉会出错！
     DEBUG=False
     
     #检查日期期间
@@ -975,26 +975,25 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     import akshare as ak
     if DEBUG:
         print("  Searching info in Sina for",symbol,"... ...")
-    #try:
-    if adjust=='':
-        df=ak.stock_us_daily(symbol=symbol,adjust=adjust)
-    elif adjust=='Adj_only':
-        df=ak.stock_us_daily(symbol=symbol,adjust='qfq')
-        df['Adj Close']=df['close']
-
-    else:
-        #分别获取收盘价和复权价，并合成
-        dffqno=ak.stock_us_daily(symbol=symbol,adjust='')
-        dffq=ak.stock_us_daily(symbol=symbol,adjust='qfq')
-        dffq.rename(columns={'close':'Adj Close'},inplace=True)
-        
-        df=pd.merge(dffqno,dffq[['date','Adj Close']],on=['date'])
-    """
+    try:
+        if adjust=='':
+            df=ak.stock_us_daily(symbol=symbol,adjust=adjust)
+        elif adjust=='Adj_only':
+            df=ak.stock_us_daily(symbol=symbol,adjust='qfq')
+            df['Adj Close']=df['close']
+    
+        else:
+            #分别获取收盘价和复权价，并合成
+            dffqno=ak.stock_us_daily(symbol=symbol,adjust='')
+            dffq=ak.stock_us_daily(symbol=symbol,adjust='qfq')
+            dffq.rename(columns={'close':'Adj Close'},inplace=True)
+            
+            df=pd.merge(dffqno,dffq[['date','Adj Close']],on=['date'])
     except:
         if DEBUG:
             print("  #Error(get_price_ak_us): no info found for",symbol)
         return None
-    """
+    
     #去掉可能出现的时区信息，必须使用datetime中的tz_localize
     df['date']=pd.to_datetime(df['date'])
     #df['date']=df['date'].tz_localize(None)

siat/stock_technical.py

@@ -867,7 +867,7 @@ def security_MACD(ticker,start='default',end='default', \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     套壳函数：可用于股票、交易所债券、交易所基金、部分期货期权(限美股)
     """
@@ -878,7 +878,7 @@ def security_MACD(ticker,start='default',end='default', \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
                  graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
-                 price_line_color=price_line_color)
+                 price_line_color=price_line_color,facecolor=facecolor)
     return df
     
     
@@ -888,7 +888,7 @@ def stock_MACD(ticker,start='default',end='default', \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     功能：计算股票的技术分析指标MACD
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -991,7 +991,7 @@ def stock_MACD(ticker,start='default',end='default', \
         
         print("  Rendering graphics ...")
         draw_lines(df2,y_label,x_label,axhline_value,axhline_label,title_txt, \
-                   data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2)        
+                   data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2,facecolor=facecolor)        
     
         if printout:
             if len(dft3)!=0:            
@@ -1046,7 +1046,7 @@ def stock_MACD(ticker,start='default',end='default', \
         df3.rename(columns={'Close':text_lang('收盘价','Close')},inplace=True)
         title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，指数移动平均线","Exponential MA Line")
         draw_lines(df3,y_label,x_label,axhline_value,axhline_label,title_txt, \
-                   data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2)        
+                   data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2,facecolor=facecolor)        
 
         if printout:
             if len(dft3)!=0:            
@@ -1120,7 +1120,8 @@ def stock_MACD(ticker,start='default',end='default', \
         # 设置绘图区的背景颜色为黑色
         fig=plt.figure()
         ax=fig.add_subplot(111)
-        ax.patch.set_facecolor('black')
+        #ax.patch.set_facecolor('black')
+        ax.patch.set_facecolor(color=facecolor)
         
         # 绘制曲线
         ax.plot(df4['快线DIF'],label=text_lang('快线DIF','DIF(Fast line)'),linewidth=linewidth*2,color='white')
@@ -1241,7 +1242,7 @@ def security_RSI(ticker,start='default',end='default', \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     套壳函数，除了股票，还可用于交易所债券和交易所基金（如ETF和REITS）
     """
@@ -1250,7 +1251,7 @@ def security_RSI(ticker,start='default',end='default', \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
                  graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
-                 price_line_color=price_line_color)
+                 price_line_color=price_line_color,facecolor=facecolor)
     return df
 
     
@@ -1259,7 +1260,7 @@ def stock_RSI(ticker,start='default',end='default', \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     功能：计算股票的技术分析指标RSI
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1368,7 +1369,7 @@ def stock_RSI(ticker,start='default',end='default', \
         # 设置绘图区的背景颜色为黑色
         fig=plt.figure()
         ax=fig.add_subplot(111)
-        ax.patch.set_facecolor('black')
+        ax.patch.set_facecolor(color=facecolor)
         
         # 绘制曲线
         if ('RSI1' in graph) or ('ALL' in graph):
@@ -1379,7 +1380,8 @@ def stock_RSI(ticker,start='default',end='default', \
             ax.plot(df4['RSI3'],label=text_lang('慢速(月)线RSI3','RSI3(1 month, Slow line)'),linewidth=linewidth*2,color='white')
         
         # 绘制水平辅助线
-        hl_linestyle_list=['dashed','-.','dotted']
+        #hl_linestyle_list=['dashed','-.','dotted']
+        hl_linestyle_list=['dotted','dotted','dotted','dotted','dotted','dotted']
         #plt.axhline(y=0,label='指标零线',color='cyan',linestyle=':',linewidth=linewidth*2) 
         for hl in RSI_lines:
             pos=RSI_lines.index(hl)
@@ -1489,7 +1491,7 @@ def security_KDJ(ticker,start='default',end='default', \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     套壳函数
     """
@@ -1498,7 +1500,7 @@ def security_KDJ(ticker,start='default',end='default', \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
                  graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
-                 price_line_color=price_line_color)
+                 price_line_color=price_line_color,facecolor=facecolor)
     return df
 
     
@@ -1507,7 +1509,7 @@ def stock_KDJ(ticker,start='default',end='default', \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
              graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red',facecolor='k'):
     """
     功能：计算股票的技术分析指标KDJ
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1637,7 +1639,7 @@ def stock_KDJ(ticker,start='default',end='default', \
         # 设置绘图区的背景颜色为黑色
         fig=plt.figure()
         ax=fig.add_subplot(111)
-        ax.patch.set_facecolor('black')
+        ax.patch.set_facecolor(color=facecolor)
         
         # 绘制曲线
         if ('K' in graph) or ('ALL' in graph):
@@ -1658,8 +1660,13 @@ def stock_KDJ(ticker,start='default',end='default', \
         minJ=df4['J'].min()
         minKDJ=min(minK,minD,minJ)
         
+        """
         hl_linestyle_list=['dashed','dashed','-.','dotted','dotted']
         hl_color_list=['red','red','white','cyan','cyan']
+        """
+        hl_linestyle_list=['dotted','dotted','dotted','dotted','dotted']
+        hl_color_list=['cyan','cyan','cyan','cyan','cyan']
+        
         #plt.axhline(y=0,label='指标零线',color='cyan',linestyle=':',linewidth=linewidth*2) 
         for hl in KDJ_lines:
             draw=True
@@ -2159,20 +2166,20 @@ if __name__ =="__main__":
 def security_Bollinger(ticker,start='default',end='default',boll_days=20, \
                          graph=True,smooth=True,loc='best', \
                          date_range=False,date_freq=False,annotate=False, \
-                         ticker_type='auto',source='auto'):
+                         ticker_type='auto',source='auto',facecolor='white'):
     """
     套壳函数，为了与security_MACD/RSI/KDJ保持相似
     """
     df=stock_Bollinger(ticker=ticker,start=start,end=end,boll_days=boll_days, \
                              graph=graph,smooth=smooth,loc=loc, \
                              date_range=date_range,date_freq=date_freq, \
-                             annotate=annotate,ticker_type=ticker_type,source=source)
+                             annotate=annotate,ticker_type=ticker_type,source=source,facecolor=facecolor)
     return df
 
 def stock_Bollinger(ticker,start='default',end='default',boll_days=20, \
                          graph=True,smooth=True,loc='best', \
                          date_range=False,date_freq=False,annotate=False, \
-                         mark_end=True,ticker_type='auto',source='auto'):
+                         mark_end=True,ticker_type='auto',source='auto',facecolor='white'):
     """
     套壳函数，为了与stock_MACD/RSI/KDJ保持相似
     """
@@ -2200,14 +2207,14 @@ def stock_Bollinger(ticker,start='default',end='default',boll_days=20, \
     df=security_bollinger(ticker=ticker,fromdate=start,todate=end,boll_days=boll_days, \
                              graph=graph,smooth=smooth,loc=loc, \
                              date_range=date_range,date_freq=date_freq,annotate=annotate, \
-                             mark_end=mark_end,ticker_type=ticker_type,source=source)
+                             mark_end=mark_end,ticker_type=ticker_type,source=source,facecolor=facecolor)
     return df
 
 
 def security_bollinger(ticker,fromdate,todate,boll_days=20, \
                          graph=True,smooth=True,loc='best', \
                          date_range=False,date_freq=False,annotate=False, \
-                         mark_end=True,ticker_type='auto',source='auto'):
+                         mark_end=True,ticker_type='auto',source='auto',facecolor='white'):
     """
     功能：单个证券，绘制布林带
     date_range=False：指定开始结束日期绘图
@@ -2267,7 +2274,8 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                colorlist=colorlist,lslist=lslist,lwlist=lwlist, \
-               band_area=[text_lang('上(压力)线','Upper Line'),text_lang('下(支撑)线','Lower Line')],mark_end=mark_end,loc=loc)
+               band_area=[text_lang('上(压力)线','Upper Line'),text_lang('下(支撑)线','Lower Line')], \
+               mark_end=mark_end,loc=loc,facecolor=facecolor)
 
     return df1
 
@@ -2291,7 +2299,7 @@ def security_Bubble(ticker,start='default',end='default',boll_years=7, \
                     indicator='MV', \
                     graph=True,smooth=True,loc='best', \
                     date_range=False,date_freq=False,annotate=False, \
-                    mark_end=True):
+                    mark_end=True,facecolor='whitesmoke'):
     """
     套壳函数，为了与security_MACD/RSI/KDJ保持相似
     """
@@ -2320,7 +2328,7 @@ def security_Bubble(ticker,start='default',end='default',boll_years=7, \
                        indicator=indicator, \
                        graph=graph,smooth=smooth,loc=loc, \
                        date_range=date_range,date_freq=date_freq,annotate=annotate, \
-                       mark_end=mark_end)
+                       mark_end=mark_end,facecolor=facecolor)
     return df
 
 if __name__ =="__main__":
@@ -2335,7 +2343,7 @@ def security_bubble(ticker,fromdate,todate,boll_years=7, \
                     indicator='MV', \
                     graph=True,smooth=True,loc='best', \
                     date_range=False,date_freq=False,annotate=False, \
-                    mark_end=True):
+                    mark_end=True,facecolor='whitesmoke'):
     """
     功能：单个证券，绘制估值布林带(MV, PE, PB)
     date_range=False：指定开始结束日期绘图
@@ -2444,7 +2452,7 @@ def security_bubble(ticker,fromdate,todate,boll_years=7, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                colorlist=colorlist,lslist=lslist,lwlist=lwlist, \
                band_area=['上(压力)线','下(支撑)线'],loc=loc, \
-               mark_end=mark_end)
+               mark_end=mark_end,facecolor=facecolor)
 
     return df1
 
@@ -2478,7 +2486,8 @@ def security_technical(ticker,start='default',end='default', \
              date_range=False,date_freq=False,annotate=False, \
              technical=['MACD'],indicator='Close', \
              ticker_type='auto',source='auto', \
-             price_line_color='red'):
+             price_line_color='red', \
+             facecolor='k'):
     
     """
     功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
@@ -2538,7 +2547,7 @@ def security_technical(ticker,start='default',end='default', \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
              graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
-             price_line_color=price_line_color)
+             price_line_color=price_line_color,facecolor=facecolor)
        
     if 'RSI' in technical1:
         df=security_RSI(ticker=ticker,start=fromdate,end=todate, \
@@ -2546,7 +2555,7 @@ def security_technical(ticker,start='default',end='default', \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
              graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
-             price_line_color=price_line_color)
+             price_line_color=price_line_color,facecolor=facecolor)
 
     if 'KDJ' in technical1:
         df=security_KDJ(ticker=ticker,start=fromdate,end=todate, \
@@ -2554,13 +2563,13 @@ def security_technical(ticker,start='default',end='default', \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
              graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
-             price_line_color=price_line_color)
+             price_line_color=price_line_color,facecolor=facecolor)
 
     if 'Bollinger' in technical1 and 'Close' in indicator1:
         df=security_Bollinger(ticker=ticker,start=fromdate,end=todate,boll_days=boll_days, \
                          graph=True,smooth=smooth,loc=loc1, \
                          date_range=date_range,date_freq=date_freq,annotate=annotate, \
-                         ticker_type=ticker_type,source=source)
+                         ticker_type=ticker_type,source=source,facecolor=facecolor)
 
     """
     if 'Bollinger' in technical1 and 'MV' in indicator1:
@@ -2596,7 +2605,7 @@ def security_technical(ticker,start='default',end='default', \
             df=security_Bubble(ticker=ticker,start=fromdate,end=todate,boll_years=boll_years, \
                                 indicator=val, \
                                 graph=True,smooth=smooth,loc=loc1, \
-                                date_range=date_range,date_freq=date_freq,annotate=annotate)
+                                date_range=date_range,date_freq=date_freq,annotate=annotate,facecolor=facecolor)
     
     return df
 

{siat-3.2.51.dist-info → siat-3.2.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.51
+Version: 3.2.52
 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.51.dist-info → siat-3.2.52.dist-info}/RECORD

@@ -98,7 +98,7 @@ siat/sector_china.py,sha256=nP6kfYsnaQWZj8dK-zklwSDW8FDS-obZWp_zL0ec2Ig,118603
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=4xvc9AzRhLKJMu6AxVzIqcn1-NrHoeCF2Ao2p9nwYjU,25978
-siat/security_prices.py,sha256=WXC-UNLnuZ69MtC5oLIXbFKX5UeJ_52wRiqHj4LfJW0,105797
+siat/security_prices.py,sha256=LqTrS20mTmM_ACENOXU5qrLmxczGtxnuziAdAynSG_Q,105871
 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
@@ -117,7 +117,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=qhXOsZ9gowLtWviMgpTPjIfkgIfDWSRXVPZq4mYL5kM,133336
+siat/stock_technical.py,sha256=GsW1lciBEH-OEndXyFCUI6BB8uo12RwhAnuS7ND0mgg,134190
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -138,7 +138,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=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
-siat-3.2.51.dist-info/METADATA,sha256=3PAMtgmDyOlUvGAb41VpjG5L2_ZVWfKGjN7qau9xKTc,7310
-siat-3.2.51.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.51.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.51.dist-info/RECORD,,
+siat-3.2.52.dist-info/METADATA,sha256=cbql3N27Ey8OhncmGulNMr8S7kVrcY92OQAwrz5w-8g,7310
+siat-3.2.52.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.52.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.52.dist-info/RECORD,,