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

siat/common.py

@@ -3720,13 +3720,20 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
     """
     功能：采样CSS式样显示df，适用于Jupyter环境，整齐紧凑，不挑浏览器
     注意：若facecolor不被支持，则自动改为papayawhip
+    
+    特别注意：运行show_df()后将发生格式错乱（表格位置自动居中，标题从表格上方移到下方，原脚注仍然居左）
+    因此，不要轻易使用show_df()
     """
+    import pandas as pd
+    import numpy as np
+
+    # 重置为Pandas默认样式, 无效！
+    pd.reset_option('all')
+
     #检查df是否为空
     if len(df)==0: return
     
     #替换nan和inf
-    import pandas as pd
-    import numpy as np
     df.replace([np.inf, -np.inf],'-', inplace=True)
     df.replace([np.nan],'-', inplace=True)
 
@@ -3959,9 +3966,13 @@ if __name__=='__main__':
 def show_df(data,search_mode=False):
     """
     功能：在Jupyter中查看dataframe，并可下载成Excel
+    注意：将改变Jupyter中pandas的显示式样，谨慎使用
     """
     
     import pandas as pd
+    # 设置列对齐方式为靠左
+    pd.set_option('display.align', 'left')
+    
     if not isinstance(data,pd.DataFrame):
         print("#Warning: the first parameter must be a dataframe")
         return
@@ -3996,6 +4007,9 @@ def show_df(data,search_mode=False):
                  "criteria":[{"data":firstCol,"condition":"=","value":firstValue}]
              }})
     
+    # 重置为Pandas默认样式, 无效！
+    pd.reset_option('all')
+    
     return
 
 #==============================================================================

siat/security_price2.py

@@ -38,7 +38,8 @@ if __name__=='__main__':
     
     ticker='801010.SW' #申万
     
-    fromdate='2024-1-1'; todate='2024-4-6'
+    ticker='AAPL'
+    fromdate='2024-5-1'; todate='2024-5-20'
     
     ticker_type='auto'
     ticker_type='bond'
@@ -50,7 +51,7 @@ if __name__=='__main__':
     source='auto'
     source='yahoo'
     
-    adjust=''
+    adjust='qfq'
     fill=True
     
     price,found=get_price_1ticker(ticker=ticker,fromdate=fromdate,todate=todate, \

siat/security_prices.py

@@ -411,7 +411,7 @@ def get_price_ak_em(ticker,fromdate,todate,adjust='',ticker_type='auto'):
                        '成交量':'Volume','成交额':'Amount','换手率':'Turnover'},inplace=True)
     df1=df[['Open','Close','High','Low','Volume','Amount','Turnover']]
     
-    df1['source']='东方财富'
+    df1['source']=text_lang('东方财富','EM')
     df1['ticker']=str(ticker)
     df1['Adj Close']=df1['Close']
     df1['footnote']=adjust   
@@ -601,7 +601,7 @@ def get_price_stooq(ticker,start,end):
         #prices.dropna(inplace=True)
         
         prices['Adj Close']=prices['Close']
-        prices['source']='stooq'
+        prices['source']='Stooq'
         prices['ticker']=str(ticker)
         prices['footnote']=''
         
@@ -950,14 +950,18 @@ if __name__=='__main__':
 #==============================================================================
 if __name__=='__main__':
     symbol='AAPL'
-    fromdate='2020-12-1'
-    todate='2021-1-31'
-    adjust=""
+    fromdate='2024-5-1'
+    todate='2024-5-20'
+    adjust="qfq"
+    
+    get_price_ak_us(symbol, fromdate, todate, adjust)
 
 def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     """
     抓取单个美股股价，不能处理股指
     """
+    import pandas as pd #此处需要，去掉会出错！
+    DEBUG=False
     
     #检查日期期间
     result,start,end=check_period(fromdate,todate)
@@ -969,27 +973,28 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     #printmsg=str(symbol)+" from "+fromdate+" to "+todate    
 
     import akshare as ak
-    #print("  Searching info in Sina for",symbol,"... ...")
+    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'])
-
     except:
-        #print("  #Error(get_price_ak_us): no info found for",symbol)
+        if DEBUG:
+            print("  #Error(get_price_ak_us): no info found for",symbol)
         return None
     
     #去掉可能出现的时区信息，必须使用datetime中的tz_localize
-    import pandas as pd
     df['date']=pd.to_datetime(df['date'])
     #df['date']=df['date'].tz_localize(None)
     
@@ -1040,6 +1045,8 @@ def get_price_ak_hk(symbol,fromdate,todate,adjust=""):
     """
     抓取单个港股股价，不能处理股指，股指无.HK后缀
     """
+    import pandas as pd
+    
     DEBUG=False
     if DEBUG:
         print("Start searching HK stock prices for",symbol,"...")
@@ -1292,7 +1299,7 @@ def get_prices_yahoo(ticker,start,end,retry_count=3,pause=1):
     
         p['ticker']=ticker
         #p['Adj Close']=p['Close']
-        p['source']='雅虎'
+        p['source']=text_lang('雅虎','Yahoo')
     
         ptname=ticker_name(ticker,'stock')
         if ptname == ticker: ptname=''
@@ -1379,7 +1386,7 @@ def get_prices_yf(ticker,start,end,threads=False):
         if 'Adj Close' not in list(p):
             p['Adj Close']=p['Close']  
         p['ticker']=ticker
-        p['source']='雅虎'
+        p['source']=text_lang('雅虎','Yahoo')
         
         if len(p) > 0:
             ptname=ticker_name(ticker1,'stock')

siat/stock.py

@@ -602,6 +602,17 @@ if __name__ =="__main__":
     
     fromdate='2024-1-1'; todate='2024-5-25'
     
+    # 测试组4
+    ticker='AAPL'
+    indicator='Adj Close'
+    fromdate='2024-5-1'; todate='2024-5-20'
+    adjust=''
+    zeroline=False; average_value=False; datatag=False; power=0; graph=True
+    source='auto'
+    mark_top=True; mark_bottom=True; mark_end=True
+    ticker_type='auto'
+    facecolor='whitesmoke'
+    
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 
@@ -621,7 +632,9 @@ def security_indicator(ticker,indicator, \
         print("  #Warning(security_indicator): invalid adjust",adjust)
         print("  Supported adjust:",adjust_list)
         adjust='qfq'
-        
+
+    if ('Adj' not in indicator):
+        adjust=''            
     if ('Adj' in indicator) and (adjust == ''):
         adjust='qfq'
     
@@ -806,12 +819,27 @@ if __name__ =="__main__":
     ticker='600519.SS'
     ticker='OR.PA'
     measures=['Monthly Ret%','Quarterly Ret%','Annual Ret%','XYZ']
-    fromdate='2023-1-1'
-    todate='2023-6-25'
+    
+    ticker='NVDA'
+    measures=['Close','Adj Close']
+    
+    fromdate='2024-5-20'
+    todate='2024-6-20'
+    adjust=''
+    band_area=''
     graph=True
-    smooth=False
+    smooth=True
     loc='best'
+    facecolor='whitesmoke'
+    date_range=False
+    date_freq=False
     annotate=False
+    annotate_value=False
+    source='auto'
+    mark_top=True; mark_bottom=True; mark_end=True
+    ticker_type='auto'
+    
+    df=security_mindicators(ticker,measures,fromdate,todate)
 
 def security_mindicators(ticker,measures,
                          fromdate,todate, \
@@ -832,60 +860,69 @@ def security_mindicators(ticker,measures,
     smooth：样本数目超过一定数量就默认忽略
     """
     # 提前开始日期
-    fromdate1=date_adjust(fromdate,adjust=-365*3)
+    #fromdate1=date_adjust(fromdate,adjust=-365*3)
     
+    #处理ticker，允许1个
     if isinstance(ticker,list):
-        if len(ticker) == 1:
+        if len(ticker) >= 1:
             ticker=ticker[0]
         else:
-            print("  #Error(security_mindicators): need 1 ticker only in",ticker)
+            print("  #Error(security_mindicators): need a ticker for proceed")
             return None
 
+    #处理measures，允许多个
     if isinstance(measures,str):
         measures=[measures]
 
-    #判断复权价
-    adjust_list=['','qfq','hfq']
-    if adjust not in adjust_list:
-        print("  #Warning(security_mindicators): invalid adjust",adjust)
-        print("  Supported adjust:",adjust_list)
-        adjust='qfq'  
-        
-    if adjust =='':        
-        for m in measures:
-            if 'Adj' in m:
-                adjust='qfq'
-                break
+    #屏蔽函数内print信息输出的类
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
 
-    #抓取股价
-    try:
-        from siat.security_price2 import get_price_1ticker_mixed
-        #pricedf=get_price(ticker,fromdate1,todate,source=source)
-        pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1,todate=todate, \
-                                              adjust=adjust, \
-                                              source=source,ticker_type=ticker_type)
-    except:
-        print("  #Error(security_mindicators): price info not found for",ticker)
-        return None
-    if pricedf is None:
-        print("  #Error(security_mindicators): none of price info found for",ticker)
-        return None
-    if len(pricedf) ==0:
-        print("  #Warning(security_mindicators): price info unavailable for",ticker)
-        return None
-        
-    df=all_calculate(pricedf,ticker,fromdate,todate,ticker_type=ticker_type)
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout
 
-    # 检查指标是否存在
-    colList=list(df)
-    for c in measures:
-        if not (c in colList):
-            print("  #Warning(security_mindicators): unsupported security measure",c)
-            measures.remove(c)
-    df1=df[measures]
-    
-    for c in list(df1):
-        df1.rename(columns={c:ectranslate(c)},inplace=True)
+    df=pd.DataFrame()
+    for m in measures:
+        print("  Searching",ticker,"for",m,"info ... ...")
+        #复权价判断
+        adjustm=adjust
+        if ('Adj' in m) and (adjust ==''):
+            adjustm='qfq'
+
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            dftmp=security_indicator(ticker=ticker,indicator=m,adjust=adjustm, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+        if dftmp is None:
+            print("  #Error(security_mindicators): info not found for",ticker)
+            return None
+        if len(dftmp) ==0:
+            print("  #Error(security_mindicators): empty record found for",ticker)
+            return None            
+
+        try:            
+            dftmp1= dftmp[[m]]
+        except:
+            print("  #Error(security_mindicators): unsupported measure for",m)
+            return None            
+            
+        if len(df)==0:
+            df=dftmp1
+        else:
+            df=pd.merge(df,dftmp1,left_index=True,right_index=True)
+
+    df['ticker']=ticker
+
+    # 翻译指标名称
+    for c in list(df):
+        df.rename(columns={c:ectranslate(c)},inplace=True)
 
     y_label=text_lang('证券指标',"Indicator")
     import datetime; todaydt = datetime.date.today()
@@ -898,19 +935,17 @@ def security_mindicators(ticker,measures,
             axhline_value=0
             axhline_label='零线'
             break
-    title_txt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)           
-    """
-    draw_lines(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
-               data_label=False,resample_freq='H',smooth=smooth,loc=loc,annotate=annotate)
-    """
-    draw_lines2(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
+        
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)       
+    
+    draw_lines2(df,y_label,x_label,axhline_value,axhline_label,titletxt, \
                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, \
                band_area=band_area,loc=loc)
 
-    return df1
+    return df
 
 #==============================================================================
 def stock_price_volatility(ticker,fromdate,todate,type="Weekly Price Volatility", \
@@ -1411,8 +1446,12 @@ if __name__ =="__main__":
     tickers='MSFT'
     measures=['Annual Ret Volatility%','Annual Ret%']
     
-    fromdate='2023-1-1'
-    todate='2023-12-31'
+    tickers='NVDA'
+    tickers='AAPL'
+    measures=['Close','Adj Close']   
+    
+    fromdate='2024-5-1'
+    todate='2024-5-30'
     adjust=''
     twinx=False
     loc1='best'
@@ -1459,11 +1498,12 @@ def compare_security(tickers,measures,fromdate,todate, \
     #如果tickers是一个列表
     if isinstance(tickers,list): 
         security_num = len(tickers)
-        if security_num == 0:
+        if security_num != 0:
+            if security_num >= 1: ticker1 = tickers[0]
+            if security_num >= 2: ticker2 = tickers[1]
+        else:
             print("  #Error(compare_security)：security code/codes needed.")
             return None,None
-        if security_num >= 1: ticker1 = tickers[0]
-        if security_num >= 2: ticker2 = tickers[1]
             
     #判断测度个数
     #如果measures只是一个字符串
@@ -1474,43 +1514,67 @@ def compare_security(tickers,measures,fromdate,todate, \
     #如果measures是一个列表
     if isinstance(measures,list): 
         measure_num = len(measures)
-        if measure_num == 0:
+        if measure_num != 0:
+            if measure_num >= 1: measure1 = measures[0]
+            if measure_num >= 2: measure2 = measures[1]
+        else:
             print("  #Error(compare_security)： a measurement indicator needed.")
             return None,None
-        if measure_num >= 1: measure1 = measures[0]
-        if measure_num >= 2: measure2 = measures[1]
 
     #解析ticker_type
     if isinstance(ticker_type,str):
         ticker_type1=ticker_type2=ticker_type
     if isinstance(ticker_type,list) and len(ticker_type)==1:
         ticker_type1=ticker_type2=ticker_type[0]
-    if isinstance(ticker_type,list) and len(ticker_type) > 1:
+    if isinstance(ticker_type,list) and len(ticker_type) >= 2:
         ticker_type1=ticker_type[0]
         ticker_type2=ticker_type[1]
     ticker_type_list=[ticker_type1,ticker_type2]
+    
+    #屏蔽函数内print信息输出的类
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout    
 
     #单一证券代码+两个测度指标
     if (security_num == 1) and (measure_num >= 2):
-        #复权价判断
-        if (('Adj' in measure1) or ('Adj' in measure2)) and (adjust ==''):
-            adjust='qfq'
+        
+        print("  Searching",ticker1,"for",measure1,"info ... ...")
+        #复权价判断1
+        adjust1=adjust
+        if ('Adj' in measure1) and (adjust1 ==''):
+            adjust1='qfq'
 
-        pltdf1=compare_msecurity(tickers=ticker1,measure=measure1, \
-                      start=fromdate,end=todate, \
-                      adjust=adjust, \
-                      graph=False, \
-                      source=source, \
-                      ticker_type=ticker_type_list[0])        
-        pltdf1.rename(columns={list(pltdf1)[0]:measure1},inplace=True) 
-
-        pltdf2=compare_msecurity(tickers=ticker1,measure=measure2, \
-                      start=fromdate,end=todate, \
-                      adjust=adjust, \
-                      graph=False, \
-                      source=source, \
-                      ticker_type=ticker_type_list[0])              
-        pltdf2.rename(columns={list(pltdf2)[0]:measure2},inplace=True)
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust1, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+        pltdf1= df1tmp[[measure1]]
+        
+        print("  Searching",ticker1,"for",measure2,"info ... ...")
+        #复权价判断2
+        adjust2=adjust
+        if ('Adj' in measure2) and (adjust2 ==''):
+            adjust2='qfq'
+
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            df2tmp=security_indicator(ticker=ticker1,indicator=measure2,adjust=adjust2, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+ 
+        pltdf2= df2tmp[[measure2]]
         
         pltdf=pd.merge(pltdf1,pltdf2,left_index=True,right_index=True)
         pltdf['ticker']=ticker1
@@ -1522,60 +1586,55 @@ def compare_security(tickers,measures,fromdate,todate, \
                                      ticker_type=ticker_type[0],facecolor=facecolor)
         
         try:
-            result1=pltdf1[[measure1]]
+            result1=pltdf[['ticker',measure1]]
         except:
-            return None,None
+            result1=None
         try:
-            result2=pltdf1[[measure2]]
+            result2=pltdf[['ticker',measure2]]
         except:
-            return result1,None
-        else:
-            return result1,result2
+            result2=None
+        return result1,result2
         
     elif (security_num >= 2) and (measure_num >= 1):
         #双证券+单个测度指标 
         if ('Adj' in measure1) and (adjust ==''):
             adjust='qfq'
 
-        pltdf1=compare_msecurity(tickers=ticker1,measure=measure1, \
-                      start=fromdate,end=todate, \
-                      adjust=adjust, \
-                      graph=False, \
-                      source=source, \
-                      ticker_type=ticker_type_list[0])
-        pltdf1.rename(columns={list(pltdf1)[0]:measure1},inplace=True)    
-        pltdf1['ticker']=ticker1        
+        df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust, \
+                              fromdate=fromdate,todate=todate, \
+                              source=source, \
+                              ticker_type=ticker_type, \
+                              graph=False) 
+        pltdf1=df1tmp[['ticker',measure1]]      
         
-        pltdf2=compare_msecurity(tickers=ticker2,measure=measure1, \
-                      start=fromdate,end=todate, \
-                      adjust=adjust, \
-                      graph=False, \
-                      source=source, \
-                      ticker_type=ticker_type_list[1])
-        pltdf2.rename(columns={list(pltdf2)[0]:measure1},inplace=True)
-        pltdf2['ticker']=ticker2 
+        df2tmp=security_indicator(ticker=ticker2,indicator=measure1,adjust=adjust, \
+                              fromdate=fromdate,todate=todate, \
+                              source=source, \
+                              ticker_type=ticker_type, \
+                              graph=False) 
+        pltdf2=df2tmp[['ticker',measure1]]   
         
         #绘制双证券单指标对比图
         if graph:
-            
             comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
                                       loc1=loc1,loc2=loc2,graph=graph, \
                                       ticker_type=ticker_type_list,facecolor=facecolor)
         
         try:
             result1=pltdf1[[measure1]]
+        except:
+            print("  #Error(compare_secuirty): measure",measure1,"not found for",ticker1)
+            result1=None
+        try:
             result2=pltdf2[[measure1]]
         except:
-            print("  #Error(compare_secuirty): measure",measure1,"not found")
-            return None,None
-        else:
-            return result1,result2
+            print("  #Error(compare_secuirty): measure",measure1,"not found for",ticker2)
+            result2=None
+        return result1,result2
             
     else:
-        print("  #Error(compare_secuirty)：no idea on what to compare.")
+        print("  #Warning(compare_secuirty)：only support the situations of 1 ticker + 2 measures or 2 tickers + 1 measure.")
         return None,None
-
-    return result1,result2
     
     
 #==============================================================================
@@ -2526,16 +2585,23 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
 
     titletxt=text_lang("股票分红历史","Stock Dividend")+': '+tname
     periodtxt=text_lang("历史期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
-    sourcetxt=text_lang("数据来源: 雅虎财经,","Data source: Yahoo Finance,")
+    #sourcetxt=text_lang("数据来源: 雅虎财经,","Data source: Yahoo Finance,")
+    sourcetxt=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")
+    footnote=periodtxt+'\n'+sourcetxt
     
     #修改列命为英文
-    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('股息','Dividend')]
+    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('每股股息','Dividend/share')]
     
     """        
     print(divprt.to_string(index=False))   
     """
-    print(' ') #空一行
+    #print('') #空一行
     
+    df_display_CSS(divprt,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='center',second_col_align='center', \
+                       last_col_align='right',other_col_align='center')
+
+    """
     disph=divprt.style.hide() #不显示索引列
     dispp=disph.format(precision=4) #设置带有小数点的列精度调整为小数点后2位
     #设置标题/列名对齐
@@ -2556,6 +2622,7 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     import datetime; todaydt=datetime.date.today(); todayy2md=todaydt.strftime('%y/%m/%d')
     #print('\n*** '+sourcetxt,today)
     print(sourcetxt,todayy2md)
+    """
     
     return divdf
     

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.46.dist-info → siat-3.2.52.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=bag64Mm_b09lxtnlvtQnIMeTtjNFZlzjShRxr5m3OwI,150142
+siat/common.py,sha256=-0zmR2N_t2xaTyYedwztT7HcHKG39DwaoLoX1u5Wm7s,150656
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -97,15 +97,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 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=NKlk5VRA-WeSK8dU960PRfWUOzj4BQ4HbUw3t4j9cv8,25955
-siat/security_prices.py,sha256=E4lYVHKtepPS_oymYHUKn2tZj-LyFa-hMMPNgdbvTj0,105569
+siat/security_price2.py,sha256=4xvc9AzRhLKJMu6AxVzIqcn1-NrHoeCF2Ao2p9nwYjU,25978
+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
 siat/security_trend2.py,sha256=WOygSyWSynNmk5gpOA8n1738-nWqfDzuyMjwriB3eP4,25284
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=klgcv0v54uDN7iEg1NXhM08qDOS1G54wyquTQBJodFM,150367
+siat/stock.py,sha256=cIEVxAZ6vPhpICWk4p4tqpeyidLjxZHO2fF_HClaxHw,152530
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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.46.dist-info/METADATA,sha256=gZ8jTNIstNWw0UbcwTQ9S41tm9_aUi65_Pqhiu9pH8M,7310
-siat-3.2.46.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siat-3.2.46.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.46.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,,

{siat-3.2.46.dist-info → siat-3.2.52.dist-info}/WHEEL

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