siat 3.1.22__py3-none-any.whl → 3.1.28__py3-none-any.whl

siat/markowitz2.py

@@ -252,6 +252,23 @@ if __name__=='__main__':
     printout=True 
     graph=False
     
+    #测试3
+    Market={'Market':('China','000300.SS','锂电池1号')}
+    Stocks={'300750.SZ':0.4,#宁德时代
+            '002594.SZ':0.3,#比亚迪
+            '300014.SZ':0.2,#亿纬锂能
+            '300207.SZ':0.1,#欣旺达
+            }
+    portfolio=dict(Market,**Stocks)
+
+    indicator='Adj Close'
+    adjust='qfq'; source='auto'; ticker_type='bond'
+    thedate='2024-6-19'
+    pastyears=2
+    printout=True 
+    graph=False
+    
+    
     pf_info=portfolio_build(portfolio,thedate,pastyears,printout,graph)
 
 """
@@ -260,12 +277,30 @@ def portfolio_cumret(portfolio,thedate,pastyears=1, \
                      printout=True,graph=True):
 """
 def portfolio_build(portfolio,thedate='default',pastyears=1, \
+                    indicator='Adj Close', \
+                    adjust='qfq',source='auto',ticker_type='auto', \
                     printout=True,graph=False):    
     """
     功能：收集投资组合成份股数据，绘制收益率趋势图，并与等权和期间内交易额加权策略组合比较
     注意：此处无需RF，待到优化策略时再指定
     printout=True控制获取股价时是否逐个显示
+    
+    特别注意：若ticker_type='fund'可能导致无法处理股票的复权价！
+    若要指定特定的证券为债券，则需要使用列表逐一指定证券的类型（股票，债券，基金）
     """
+    #判断复权标志
+    indicator_list=['Close','Adj Close']
+    if indicator not in indicator_list:
+        print("  Warning(portfolio_build): invalid indicator",indicator)
+        print("  Supported indicator:",indicator_list)
+        indicator='Adj Close'
+    
+    adjust_list=['','qfq','hfq']
+    if adjust not in adjust_list:
+        print("  Warning(portfolio_build): invalid indicator",adjust)
+        print("  Supported adjust:",adjust_list)
+        adjust='qfq'
+    
     import datetime
     stoday = datetime.date.today()
     if thedate=='default':
@@ -329,18 +364,23 @@ def portfolio_build(portfolio,thedate='default',pastyears=1, \
     
     # 抓取投资组合股价
     #prices=get_prices(tickerlist,start,thedate)
-    
+    #判断是否赚取复权价
+    if indicator == 'Adj Close' and adjust == '':
+        adjust='qfq'
+    if indicator == 'Close' and adjust != '':
+        indicator = 'Adj Close'
+        
     if printout:
         #prices=get_prices_simple(tickerlist,start,thedate) #有待改造？
         #债券优先
         prices,found=get_price_mticker(tickerlist,start,thedate, \
-                              adjust='',source='auto',ticker_type='bond',fill=False)
+                              adjust=adjust,source=source,ticker_type=ticker_type,fill=False)
     else:
         with HiddenPrints():
             #prices=get_prices_simple(tickerlist,start,thedate) #有待改造？
             prices,found=get_price_mticker(tickerlist,start,thedate, \
-                                  adjust='',source='auto',ticker_type='bond',fill=False)
-            
+                                  adjust=adjust,source=source,ticker_type=ticker_type,fill=False)
+                
     if found == 'Found':
         ntickers=len(list(prices['Close']))
         nrecords=len(prices)
@@ -360,6 +400,14 @@ def portfolio_build(portfolio,thedate='default',pastyears=1, \
         print("  #Error(portfolio_build): retrieved empty prices for",pname)
         return None
     #..........................................................................
+    #判断是否使用复权价：若是，使用Adj Close直接覆盖Close。方法最简单，且兼容后续处理！
+    if (indicator =='Adj Close') or (adjust !=''):
+        prices_collist=list(prices) 
+        for pc in prices_collist:
+            pc1=pc[0]; pc2=pc[1]
+            if pc1=='Close':
+                pc_adj=('Adj Close',pc2)
+                prices[pc]=prices[pc_adj]
     
     # 取各个成份股的收盘价
     aclose=prices['Close']    

siat/sector_china.py

@@ -1161,7 +1161,7 @@ if __name__=='__main__':
     period="day"
     industry_list='all'    
     
-def get_industry_sw(itype='1',period="day",industry_list='all'):
+def get_industry_sw(itype='1',period="day",industry_list='all',max_sleep=8):
     """
     功能：遍历某类申万指数，下载数据
     itype: F表征指数，n=1/2/3行业指数，S风格指数，B大类风格，C金创类
@@ -1174,7 +1174,7 @@ def get_industry_sw(itype='1',period="day",industry_list='all'):
     if not (itype in typelist):
         print("  #Error(get_industry_sw): unsupported industry category",itype)
         print("  Supported industry category",typelist)
-        print("  F: Featured, n-Level n Industry, S-Styled, B- Big Styled, C- Financial Innovation, A-All (more time))")
+        print("  F: Featured, n-Level n industry, S-Styled, B- Big Styled, C- Financial Innovation, A-All (more time))")
         return None
     
     #获得指数代码
@@ -1192,10 +1192,10 @@ def get_industry_sw(itype='1',period="day",industry_list='all'):
     #循环获取指标
     import pandas as pd
     import akshare as ak
-    import datetime
+    import datetime; import random; import time
     df=pd.DataFrame()
 
-    print("  Searching industry information, please wait ...")
+    print("  Start searching industry data, it takes time, please wait ...")
     num=len(ilist)
     if num <= 10:
         steps=5
@@ -1205,7 +1205,7 @@ def get_industry_sw(itype='1',period="day",industry_list='all'):
     total=len(ilist)
     fail_list=[]
     for i in ilist:
-        
+        print_progress_percent2(i,ilist,steps=5,leading_blanks=4)
         #print("  Retrieving information for industry",i)
         
         #抓取指数价格
@@ -1235,7 +1235,11 @@ def get_industry_sw(itype='1',period="day",industry_list='all'):
             df=df._append(dft2)
         
         current=ilist.index(i)
-        print_progress_percent(current,total,steps=steps,leading_blanks=2)
+        #print_progress_percent(current,total,steps=steps,leading_blanks=2)
+        
+        #生成随机数睡眠，试图防止被反爬虫，不知是否管用！
+        random_int=random.randint(1,max_sleep)
+        time.sleep(random_int)        
     
     #num=list(set(list(df['ticker'])))
     if len(fail_list)==0: 
@@ -1266,7 +1270,7 @@ if __name__=='__main__':
     industry_list=['850831.SW','801785.SW','801737.SW','801194.SW',
                    '801784.SW','801783.SW','801782.SW']    
     
-def get_industry_sw2(industry_list,period="day"):
+def get_industry_sw2(industry_list,period="day",max_sleep=8):
     """
     功能：遍历指定的申万指数列表，下载数据
     period="day"; choice of {"day", "week", "month"}
@@ -1280,10 +1284,10 @@ def get_industry_sw2(industry_list,period="day"):
     #循环获取指标
     import pandas as pd
     import akshare as ak
-    import datetime
+    import datetime; import random; import time
     df=pd.DataFrame()
 
-    print("Searching industry information, please wait ...")
+    print("  Searching industry information, it takes time, please wait ...")
     ilist=industry_list
     num=len(ilist)
     if num <= 10:
@@ -1323,6 +1327,10 @@ def get_industry_sw2(industry_list,period="day"):
         
         current=ilist.index(i)
         print_progress_percent(current,total,steps=steps,leading_blanks=2)
+        
+        #生成随机数睡眠，试图防止被反爬虫，不知是否管用！
+        random_int=random.randint(1,max_sleep)
+        time.sleep(random_int)        
     
     #num=list(set(list(df['ticker'])))
     if len(fail_list) > 0:

siat/security_price2.py

@@ -231,6 +231,17 @@ if __name__=='__main__':
     source='auto'
     fill=True
     
+    #测试复权价
+    ticker=['300750.SZ','300014.SZ']
+    fromdate="2023-4-20"
+    todate="2023-4-30"
+    ticker_type='fund'
+    
+    adjust='qfq'
+    source='auto'
+    fill=False
+    
+    
     prices,found=get_price_mticker(ticker,fromdate,todate,adjust,source,ticker_type,fill)
 
 def get_price_mticker(ticker,fromdate,todate, \

siat/stock_technical.py

@@ -183,7 +183,10 @@ def calc_technical(df,start,end, \
                    CCI_days=14, \
                    WR_days=[10,6], \
                    ROC_day=12,ROC_madays=6, \
-                   DMI_DIdays=14,DMI_ADXdays=6):
+                   DMI_DIdays=14,DMI_ADXdays=6, \
+                       
+                   indicator='Close', \
+                   more_details=False):
     """
     功能：计算股票的技术分析指标
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -191,7 +194,14 @@ def calc_technical(df,start,end, \
     支持的指标：
     RSI、OBV、MACD、 KDJ、 SAR、  VOL、 PSY、 ARBR、 CR、 EMV、 
     BOLL、 TRIX、 DMA、 BIAS、 CCI、 W%R、 ROC、 DMI
+    
+    注意：indicator='Close'为不使用复权价，'Adj Close'为前复权价（需要指定source='yahoo'）
     """
+    if indicator not in ['Close','Adj Close']:
+        print("  #Error(calc_technical): unsupported indicator",indicator)
+        print("  Supported indicator: Close, Adj Close")
+        
+        return None
     
     # 导入需要的包
     try:
@@ -221,7 +231,8 @@ def calc_technical(df,start,end, \
     if not isinstance(RSI_days,list):
         RSI_days=[RSI_days]
     for d in RSI_days:
-        df['rsi'+str(d)] = talib.RSI(df['Close'], timeperiod=d)
+        df['rsi'+str(d)] = talib.RSI(df[indicator], timeperiod=d)
+    #注意：rsi1没有意义
     
     #=========== OBV：能量潮
     """
@@ -252,14 +263,15 @@ def calc_technical(df,start,end, \
     因此，对于那些达到涨跌停板的股票，OBV指标也无法正常发挥作用。    
     
     """
-    df['obv'] = talib.OBV(df['Close'],df['Volume'])
+    df['obv'] = talib.OBV(df[indicator],df['Volume'])
     
     if not isinstance(OBV_days,list):
         OBV_days=[OBV_days]
     for d in OBV_days:    
         df['obv_ma'+str(d)] = talib.MA(df['obv'],timeperiod=d)
-        
-    df.drop(columns = ['obv'],inplace=True)
+    
+    if not more_details:    
+        df.drop(columns = ['obv'],inplace=True)
     
     #=========== MA: 简单、加权移动平均
     """
@@ -274,8 +286,8 @@ def calc_technical(df,start,end, \
         MA_days=[MA_days]
     
     for d in MA_days:
-        df['ma'+str(d)] = talib.MA(df['Close'],timeperiod=d)
-        df['ema'+str(d)] = talib.EMA(df['Close'],timeperiod=d)
+        df['ma'+str(d)] = talib.MA(df[indicator],timeperiod=d)
+        df['ema'+str(d)] = talib.EMA(df[indicator],timeperiod=d)
     
     #=========== MACD：指数平滑异同平均线
     """
@@ -305,7 +317,7 @@ def calc_technical(df,start,end, \
         3. MACD绿转红：MACD值由负变正，市场由空头转为多头。
         4. MACD红转绿：MACD值由正变负，市场由多头转为空头。        
     """
-    df['DIF'],df['DEA'],df['MACD']=talib.MACD(df['Close'], \
+    df['DIF'],df['DEA'],df['MACD']=talib.MACD(df[indicator], \
                                 fastperiod=MACD_fastperiod, \
                                 slowperiod=MACD_slowperiod, \
                                 signalperiod=MACD_signalperiod)
@@ -371,7 +383,7 @@ def calc_technical(df,start,end, \
     PSY(N) = A/N × 100
     说明：N为天数，A为在这N天之中股价上涨的天数    
     """
-    df['ext_0'] = df['Close']-df['Close'].shift(1)
+    df['ext_0'] = df[indicator]-df[indicator].shift(1)
     df['ext_1'] = 0
     df.loc[df['ext_0']>0,'ext_1'] = 1
     
@@ -435,7 +447,11 @@ def calc_technical(df,start,end, \
     for d in CR_madays:
         df['cr_ma'+str(d)] = talib.MA(df['cr'],timeperiod=d)
     
-    df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum','cr'],inplace=True) 
+    if more_details:
+        #保留cr
+        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum'],inplace=True) 
+    else:
+        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum','cr'],inplace=True) 
     
     #=========== EMV: 简易波动指标
     """
@@ -492,7 +508,7 @@ def calc_technical(df,start,end, \
         这条带状区的宽窄，随着股价波动幅度的大小而变化，股价涨跌幅度加大时，带状区变宽，
         涨跌幅度狭小盘整时，带状区则变窄。    
     """
-    df['upper'],df['mid'],df['lower'] = talib.BBANDS(df['Close'], \
+    df['upper'],df['mid'],df['lower'] = talib.BBANDS(df[indicator], \
                 timeperiod=BULL_days, \
                 nbdevup=BULL_nbdevup,nbdevdn=BULL_nbdevdn,matype=BULL_matype)                     
     
@@ -500,14 +516,16 @@ def calc_technical(df,start,end, \
     """
     
     """
-    df['trix'] = talib.TRIX(df['Close'],timeperiod=TRIX_day)
+    df['trix'] = talib.TRIX(df[indicator],timeperiod=TRIX_day)
     
     if not isinstance(TRIX_madays,list):
         TRIX_madays=[TRIX_madays]
     for d in TRIX_madays:    
         df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
-        
-    df.drop(columns = ['trix'],inplace=True) 
+    
+    if not more_details:
+        #不保留TRIX
+        df.drop(columns = ['trix'],inplace=True) 
 
     #=========== DMA: 平均线差
     """
@@ -521,14 +539,15 @@ def calc_technical(df,start,end, \
     2）求DDD的10日移动平均数值
     DMA(10) = DDD(10)÷10
     """   
-    df['ma_shortperiod'] = talib.MA(df['Close'],timeperiod=DMA_fastperiod)
-    df['ma_longperiod'] = talib.MA(df['Close'],timeperiod=DMA_slowperiod)
+    df['ma_shortperiod'] = talib.MA(df[indicator],timeperiod=DMA_fastperiod)
+    df['ma_longperiod'] = talib.MA(df[indicator],timeperiod=DMA_slowperiod)
     df['ddd'] = df['ma_shortperiod'] - df['ma_longperiod']
     
     if not isinstance(DMA_madays,list):
         DMA_madays=[DMA_madays]
     for d in DMA_madays:    
         df['dma'+str(d)] = talib.MA(df['ddd'],timeperiod=d)    
+    #注意：dma1似乎没有意义
     
     df.drop(columns = ['ma_shortperiod','ma_longperiod','ddd'],inplace=True) 
     
@@ -544,8 +563,8 @@ def calc_technical(df,start,end, \
     if not isinstance(BIAS_days,list):
         BIAS_days=[BIAS_days]
     for d in BIAS_days:  
-        df['ma'] = talib.MA(df['Close'],timeperiod=d)
-        df['bias'+str(d)] = ((df['Close']-df['ma'])/df['ma'])*100
+        df['ma'] = talib.MA(df[indicator],timeperiod=d)
+        df['bias'+str(d)] = ((df[indicator]-df['ma'])/df['ma'])*100
     
     df.drop(columns = ['ma'],inplace=True) 
 
@@ -559,7 +578,7 @@ def calc_technical(df,start,end, \
         CCI_days=[CCI_days]
     for d in CCI_days:    
         df['cci'+str(d)] = talib.CCI(df['High'],df['Low'],df['Close'],timeperiod=d)
-
+            
     #=========== W%R: 威廉指标   
     """
     N日W%R = [(Hn-Ct)/(Hn-Ln)]*100
@@ -593,14 +612,17 @@ def calc_technical(df,start,end, \
     ROCMA = ROC的M日数值之和÷M
     说明：M一般取值为6日    
     """
-    df['roc'] = talib.ROC(df['Close'],timeperiod=ROC_day)
+    df['roc'] = talib.ROC(df[indicator],timeperiod=ROC_day)
     
     if not isinstance(ROC_madays,list):
         ROC_madays=[ROC_madays]
     for d in ROC_madays:    
         df['roc_ma'+str(d)] = talib.MA(df['roc'],timeperiod=d)  
+    
+    if not more_details:
+        #不保留roc
+        df.drop(columns = ['roc'],inplace=True) 
         
-    df.drop(columns = ['roc'],inplace=True) 
     #=========== DMI: 趋向指标
     """
 
@@ -657,7 +679,7 @@ def security_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     套壳函数：可用于股票、交易所债券、交易所基金、部分期货期权(限美股)
     """
@@ -667,7 +689,7 @@ def security_MACD(ticker,start='default',end='default', \
                  MACD_signalperiod=MACD_signalperiod, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
     return df
     
     
@@ -676,7 +698,7 @@ def stock_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     功能：计算股票的技术分析指标MACD
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -721,7 +743,7 @@ def stock_MACD(ticker,start='default',end='default', \
     start1=date_adjust(start,adjust=-max_days * 3)
     
     #df=get_price(ticker,start1,end)
-    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type)
+    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type,source=source)
     if df is None:
         print("  #Error(stock_MACD): no info found for",ticker,"from",start,"to",end)
         return None
@@ -1028,7 +1050,7 @@ def security_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     套壳函数，除了股票，还可用于交易所债券和交易所基金（如ETF和REITS）
     """
@@ -1036,7 +1058,7 @@ def security_RSI(ticker,start='default',end='default', \
                  RSI_days=RSI_days,RSI_lines=RSI_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
     return df
 
     
@@ -1044,7 +1066,7 @@ def stock_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     功能：计算股票的技术分析指标RSI
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1089,7 +1111,7 @@ def stock_RSI(ticker,start='default',end='default', \
     start1=date_adjust(start,adjust=-max_days * 3)
     
     #df=get_price(ticker,start1,end)
-    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type)
+    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type,source=source)
     if df is None:
         print("  #Error(stock_RSI): no info found for",ticker,"from",start,"to",end)
         return None
@@ -1269,7 +1291,7 @@ def security_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     套壳函数
     """
@@ -1277,7 +1299,7 @@ def security_KDJ(ticker,start='default',end='default', \
                  KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
     return df
 
     
@@ -1285,7 +1307,7 @@ def stock_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
     """
     功能：计算股票的技术分析指标KDJ
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1330,7 +1352,7 @@ def stock_KDJ(ticker,start='default',end='default', \
     start1=date_adjust(start,adjust=-max_days * 3)
     
     #df=get_price(ticker,start1,end)
-    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type)
+    df,found=get_price_1ticker_mixed(ticker=ticker,fromdate=start1,todate=end,ticker_type=ticker_type,source=source)
     if df is None:
         print("  #Error(stock_RSI): no info found for",ticker,"from",start,"to",end)
         return None
@@ -1937,20 +1959,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'):
+                         ticker_type='auto',source='auto'):
     """
     套壳函数，为了与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)
+                             annotate=annotate,ticker_type=ticker_type,source=source)
     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'):
+                         mark_end=True,ticker_type='auto',source='auto'):
     """
     套壳函数，为了与stock_MACD/RSI/KDJ保持相似
     """
@@ -1978,14 +2000,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)
+                             mark_end=mark_end,ticker_type=ticker_type,source=source)
     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'):
+                         mark_end=True,ticker_type='auto',source='auto'):
     """
     功能：单个证券，绘制布林带
     date_range=False：指定开始结束日期绘图
@@ -2004,7 +2026,7 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
     try:
         #pricedf=get_price(ticker,fromdate1,todate)
         pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
-                                        todate=todate,ticker_type=ticker_type)
+                                        todate=todate,ticker_type=ticker_type,source=source)
     except:
         print("  #Error(security_bollinger): price info not found for",ticker)
         return None
@@ -2253,10 +2275,18 @@ def security_technical(ticker,start='default',end='default', \
              graph=['ALL'],printout=False, \
              date_range=False,date_freq=False,annotate=False, \
              technical=['MACD'],indicator='Close', \
-             ticker_type='auto'):
+             ticker_type='auto',source='auto'):
     
     """
-    套壳函数security_MACD/RSI/KDJ/Bollinger
+    功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
+    支持的产品：全球股票，债券（限中国内地的上市债券），基金（支持中国和美国的上市基金）。
+    ticker：证券代码
+    start/end：起止日期。支持简洁方式，仅需使用start指定近期的期间长度。
+    简洁方式：mrw（近1周），l2w（近2周），l3w（近3周），mrm（近1个月），l2m（近2个月），
+    mrq（近3个月），mrh（近6个月），mry（近1年），l2y（近2年），l3y（近3年），
+    l5y（近5年），l8y（近8年），l10y（近10年），l20y（近20年），l30y（近30年），ytd（今年以来）
+    
+    其他说明：套壳函数security_MACD/RSI/KDJ/Bollinger
     """
     
     # 检查日期：如有错误自动更正
@@ -2304,27 +2334,27 @@ def security_technical(ticker,start='default',end='default', \
              MACD_fastperiod=MACD_fastperiod,MACD_slowperiod=MACD_slowperiod,MACD_signalperiod=MACD_signalperiod, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
        
     if 'RSI' in technical1:
         df=security_RSI(ticker=ticker,start=fromdate,end=todate, \
              RSI_days=RSI_days,RSI_lines=RSI_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
 
     if 'KDJ' in technical1:
         df=security_KDJ(ticker=ticker,start=fromdate,end=todate, \
              KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
 
     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)
+                         ticker_type=ticker_type,source=source)
 
     """
     if 'Bollinger' in technical1 and 'MV' in indicator1:
@@ -2449,12 +2479,13 @@ def security_technical2(ticker,start='default',end='default', \
                 technical=['MACD'],indicator='Close', \
                 graph=['ALL'],printout=False, \
                 loc1='best',loc2='best', \
-                ticker_type='auto', \
+                ticker_type='auto',source='auto', \
                     
                 attention_values=[0,30,50,80], \
-                facecolor='papayawhip',price_line_color='red'):
+                facecolor='papayawhip',price_line_color='red', \
+                
+                more_details=False):
     """
-    
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
     
     支持的探索指标：仅供探索使用
@@ -2500,7 +2531,7 @@ def security_technical2(ticker,start='default',end='default', \
     #抓取抓取价格数据
     fromdate1=date_adjust(fromdate,adjust=-ahead_days)
     price,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
-                                        todate=todate,ticker_type=ticker_type,fill=False)
+                                        todate=todate,ticker_type=ticker_type,fill=False,source=source)
 
     if found not in ['Found']:
         print("  #Warning(security_technical2): no prices found for",ticker,'as type',ticker_type)
@@ -2542,7 +2573,10 @@ def security_technical2(ticker,start='default',end='default', \
                        CCI_days=CCI_days, \
                        WR_days=WR_days, \
                        ROC_day=ROC_day,ROC_madays=ROC_madays, \
-                       DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays)
+                       DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
+                       
+                       indicator=indicator, \
+                       more_details=more_details)
 
     #技术指标的绘图线
     tech_line_default={'RSI':['rsi'],