siat 3.10.25__py3-none-any.whl → 3.10.125__py3-none-any.whl

siat/sector_china.py

@@ -260,15 +260,20 @@ def sector_rank_sina(indicator="涨跌幅",category="新浪行业",rank=5):
     df=sector_rank_china(comp=indicator,indicator=category,num=rank)
     return df
 
-def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
+#def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
+def sector_rank_china(ticker="新浪行业",indicator="涨跌幅",rank=10):    
     """
     功能：按照比较指标降序排列
-    comp="涨跌幅",平均价格，公司家数
-    indicator="新浪行业","启明星行业","概念","地域","行业"
-    num：为正数时列出最高的前几名，为负数时列出最后几名
+    ticker="新浪行业","启明星行业","概念","地域","行业"
+    indicator="涨跌幅",平均价格，公司家数
+    rank：为正数时列出最高的前几名，为负数时列出最后几名
     
-    注意：公司家数字段最大值为100，是bug？
+    注意：公司家数字段最大值为100，超过100仅显示为100
     """
+    comp=indicator
+    indicator=ticker
+    num=rank
+    
     #检查选项是否支持
     #complist=["涨跌幅","成交量","平均价格","公司家数"]
     complist=["涨跌幅","平均价格","公司家数"]
@@ -421,12 +426,18 @@ def sector_detail_sina(sector="new_dlhy",indicator="涨跌幅",rank=5):
     return df
     
 
-def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
+#def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
+def sector_detail_china(ticker="new_dlhy",indicator="涨跌幅",rank=10):
     """
     功能：按照板块内部股票的比较指标降序排列
-    sector：板块代码
-    num：为正数时列出最高的前几名，为负数时列出最后几名
+    ticker：板块代码
+    indicator：默认"涨跌幅"，还可选"换手率"、"收盘价"、"市盈率"、"市净率"、"总市值"、"流通市值"
+    rank：为正数时列出最高的前几名，为负数时列出最后几名
     """
+    sector=ticker
+    comp=indicator
+    num=rank
+    
     debug=False
 
     #检查选项是否支持
@@ -741,8 +752,10 @@ def sector_position_china(ticker,sector="new_dlhy"):
 def invest_concept_china(num=10,max_sleep=30):
     """
     废弃！
-    功能：汇总投资概念股票名单，排行
+    功能：汇总新浪投资概念股票名单，排行
     来源网址：http://finance.sina.com.cn/stock/sl/#qmxindustry_1
+    
+    注意：网站有反爬虫，循环做不下去！
     """
     print("\nWarning: This function might cause your IP address banned by data source!")
     print("Searching stocks with investment concepts in China, it may take long time ...")
@@ -786,8 +799,8 @@ def invest_concept_china(num=10,max_sleep=30):
     print("...Searching completed.")
     
     if len(totaldf) == 0:
-        print("#Error(sector_rank_china): data source tentatively banned your access:-(")
-        print("Solutions:1) try an hour later, or 2) switch to another IP address.")
+        print("  #Error(sector_concept_china): data source tentatively banned your access:-(")
+        print("  Solutions:1) try a bit later, or 2) switch to another IP address.")
         return None
     
     #分组统计

siat/security_price2.py

@@ -70,6 +70,10 @@ if __name__=='__main__':
     ticker="XAUUSD"
     ticker="^NSEI"
     fromdate='2024-5-1'; todate='2024-5-20'
+    
+    ticker="BMW.DE"
+    fromdate='2022-6-1'; todate='2025-6-15'
+    
     ticker_type='auto';source='auto'
     adjust='';fill=False
     
@@ -91,6 +95,10 @@ def get_price_1ticker(ticker,fromdate,todate, \
     简化使用者判断
     fill：为现有数据开始结束日期之间的工作日填充=True
     """ 
+    #设置雅虎yfinance开关
+    YF=False
+    #设置雅虎pandas_datareader开关，避免在此花费时间
+    PDR_yahoo=False
     
     #返回值初始状态，确保各种情况下都有返回值
     df=None
@@ -177,13 +185,15 @@ def get_price_1ticker(ticker,fromdate,todate, \
             
             #数据源情形3b：yahoo, yfinance, 需要访问yahoo，直接为复权价
             if found not in ['Found','Empty']:
-                dft=get_price_yf(ticker1,fromdate,todate)
-                found=df_have_data(dft) 
+                if YF:
+                    dft=get_price_yf(ticker1,fromdate,todate)
+                    found=df_have_data(dft) 
         
             #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，似乎不工作了！
             if found not in ['Found','Empty']:
-                dft=get_prices_yahoo(ticker1,fromdate,todate)
-                found=df_have_data(dft) 
+                if PDR_yahoo:
+                    dft=get_prices_yahoo(ticker1,fromdate,todate)
+                    found=df_have_data(dft) 
         else:
             if source in ['yahoo']:
                 print("  #Warning(get_price_1ticker): sorry, yahoo is currently inaccessible")
@@ -660,6 +670,11 @@ if __name__=='__main__':
     
     fromdate='2021-1-1'
     todate='2024-5-30'
+    
+    ticker='BMW.DE'
+    fromdate='2024-6-2'
+    todate='2025-6-15'
+    
     adjust=''
     source='auto'
     fill=True

siat/security_prices.py

@@ -131,12 +131,17 @@ if __name__=='__main__':
     ticker=['600519','000858']
     ticker_type='bond'
     
-    fromdate="2024-1-1"
-    todate="2024-4-1"
+    ticker='GEM25.CME'
+    
+    ticker=['^SPX']
+    
+    fromdate="2025-1-1"
+    todate="2025-6-1"
     adj=False
     retry_count=3
     pause=1
     source='auto'
+    ticker_type='auto'
 
     prices=get_prices(ticker,fromdate,todate,ticker_type=ticker_type)
 
@@ -151,6 +156,12 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
     retry_count：网络失败时的重试次数，仅用于雅虎
     pause：每次重试前的间隔秒数，仅用于雅虎
     """
+    # yfinance可用性
+    YF=False
+    # pandas_datareader对yahoo可用性
+    PDR_yahoo=False
+    
+    prices=None
     
     #检查日期期间的合理性
     result,start,end=check_period(fromdate,todate)
@@ -178,6 +189,7 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
                     return prices
                 else:
                     prices2=remove_timezone(prices)
+                    #prices2=remove_df_index_timezone(prices)
                     return prices2 #找到有效数据就返回，否则继续       
 
     if source in ['auto','stooq']:
@@ -185,7 +197,7 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
         #注意stooq代码与新浪/stooq的不同
         print("  Trying to capture info from stooq for",ticker)
         try:
-            prices=get_price_stooq(ticker,fromdate,todate) #仅支持单只证券
+            prices=get_prices_stooq(ticker,fromdate,todate) #仅支持单只证券
             #prices=get_prices_stooq(ticker,fromdate,todate)?
         except:
             print("    #Warning(get_prices): info retrieving failed from stooq for",ticker)
@@ -198,6 +210,7 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
                     print("    #Warning(get_prices): zero record found for",ticker)
                 else:
                     prices2=remove_timezone(prices)
+                    #prices2=remove_df_index_timezone(prices)
                     return prices2 #找到有效数据就返回，否则继续      
 
     if source in ['auto','yahoo']:
@@ -205,8 +218,13 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
         #由于雅虎无法访问，建议暂时关闭，2021-10-24
         #抓取证券（列表）价格，需要调整收盘价：yfinance优先，线程极易出错，先尝试关闭线程
         try:
-            print("  Trying to capture info from Yahoo Finance using non-threads")
-            prices=get_prices_yf(ticker,start,end,threads=False) #支持多个证券
+            if YF:
+                print("  Trying to capture info from Yahoo Finance using non-threads")
+                prices=get_prices_yf(ticker,start,end,threads=False) #支持多个证券
+            else:
+                print("  Trying to capture info from Yahoo Finance ...")
+                prices=get_prices_yq(ticker,start,end)
+                
         except:
             print("    #Warning(get_prices): retrieving using non-threads failed from yahoo")
         else:
@@ -218,12 +236,14 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
                     print("    #Warning(get_prices): zero record found")
                 else:
                     prices2=remove_timezone(prices)
+                    #prices2=remove_df_index_timezone(prices)
                     return prices2 #找到有效数据就返回，否则继续      
 
         #抓取证券（列表）价格，需要调整收盘价：yfinance优先，尝试打开线程
         try:
-            print("  Trying to capture info from Yahoo Finance using threads")
-            prices=get_prices_yf(ticker,start,end,threads=True) #支持多个证券
+            if YF:
+                print("  Trying to capture info from Yahoo Finance using threads")
+                prices=get_prices_yf(ticker,start,end,threads=True) #支持多个证券
         except:
             print("    #Warning(get_prices): retrieving using threads failed from yahoo")
         else:
@@ -235,12 +255,14 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
                     print("    #Warning(get_prices): zero record found")
                 else:
                     prices2=remove_timezone(prices)
+                    #prices2=remove_df_index_timezone(prices)
                     return prices2 #找到有效数据就返回，否则继续        
     
         #抓取证券（列表）价格，不考虑是否需要调整收盘价：pandas_datareader，使用雅虎
         try:    
             print("  Trying to capture info from Yahoo Finance traditionally")
-            prices=get_prices_yahoo(ticker,start,end,retry_count=retry_count,pause=pause)
+            if PDR_yahoo:
+                prices=get_prices_yahoo(ticker,start,end,retry_count=retry_count,pause=pause)
         except:    
             print("    #Warning(get_prices): info retrieving failed from Yahoo traditionally")    
             return None    
@@ -254,6 +276,7 @@ def get_prices(ticker,fromdate,todate,adj=False,source='auto', \
                 else:
                     #print("  Successfully retrieved",num,"records for",ticker)
                     prices2=remove_timezone(prices)
+                    #prices2=remove_df_index_timezone(prices)
                     return prices2        
     
     #若能够抓取到数据均已提前返回，到达此处时表面未能抓取到任何数据
@@ -280,6 +303,7 @@ def get_price(ticker,fromdate,todate,adj=False,source='auto',ticker_type='auto')
     df=get_prices(ticker,fromdate,todate,adj=adj,source=source,ticker_type=ticker_type)
     
     df2=remove_timezone(df)
+    #df2=remove_df_index_timezone(df)
     
     return df2
 
@@ -340,9 +364,15 @@ if __name__=='__main__':
     ticker='430047.BJ'
     ticker='600519.SS'
     ticker='000001.SZ'
-    fromdate='2022-11-1'
-    todate='2022-12-15'
-    adjust=''
+    
+    ticker='GEM25.CME'
+    
+    fromdate='2025-1-1'
+    todate='2025-6-15'
+    
+    adjust=''; ticker_type='auto'
+    
+    get_price_ak_em(ticker,fromdate,todate)
 
 #在common中定义SUFFIX_LIST_CN
 
@@ -564,9 +594,14 @@ if __name__=='__main__':
     ticker='XAUUSD' #一盎司黄金的现货美元价格
     
     ticker=['AAPL','MSFT']
-    
     start='2025-6-1'; end='2025-6-1' 
     
+    ticker='BMW.DE'
+    start='2022-6-1'; end='2025-6-15' 
+    
+    ticker='GEM25.CME'
+    start='2024-6-1'; end='2025-6-15' 
+    
     p=get_price_stooq(ticker,start,end)
 
 def get_price_stooq(ticker,start,end):
@@ -645,6 +680,88 @@ if __name__=='__main__':
     get_price_stooq('^N225','2021-11-1','2021-11-5')
     get_price_stooq('^DJI','2021-11-1','2021-11-5')    
 
+#==============================================================================
+if __name__=='__main__':
+    ticker=['AAPL','MSFT']
+    ticker=['^SPX']
+    fromdate,todate='2025-1-1','2025-1-31'
+    
+    prices=get_prices_stooq(ticker,fromdate,todate)
+
+def get_prices_stooq(ticker,fromdate,todate):
+    """
+    功能：获取stooq股票或指数的历史行情，多个股票
+    注意：stooq不能抓取深交所和北交所的股票
+    """
+    #检查是否为多个证券:单个证券代码
+    if isinstance(ticker,str):
+        if security_in_China(ticker):
+            df=get_price_ak(ticker,fromdate,todate)
+        else:
+            df=get_price_stooq(ticker,fromdate,todate)
+        return df
+    
+    #检查是否为多个证券:空的列表
+    if isinstance(ticker,list) and len(ticker) == 0:
+        pass
+        return None        
+    
+    #检查是否为多个证券:列表中只有一个代码
+    if isinstance(ticker,list) and len(ticker) == 1:
+        ticker1=ticker[0]
+        #抓取单个证券
+        if security_in_China(ticker1):
+            df=get_price_ak(ticker1,fromdate,todate)
+        else:
+            df=get_price_stooq(ticker1,fromdate,todate)
+        return df       
+    
+    import pandas as pd
+    #处理列表中的第一个证券
+    i=0
+    df=None
+    while df is None:
+        #注意列表序号超界
+        if i <= len(ticker)-1:
+            t=ticker[i]
+        else:
+            return df
+
+        #抓取单个证券
+        if security_in_China(t):
+            df=get_price_ak(t,fromdate,todate)
+        else:
+            df=get_price_stooq(t,fromdate,todate)
+            
+        if not (df is None):
+            columns=create_tuple_for_columns(df,t)
+            df.columns=pd.MultiIndex.from_tuples(columns)
+        else:
+            i=i+1
+            
+    if (i+1) == len(ticker):
+        pass
+        #已经到达代码列表末尾
+        return df
+        
+    #处理列表中的其余证券
+    if i+1 <= len(ticker)-1:
+        for t in ticker[(i+1):]:
+            #抓取单个证券
+            if security_in_China(t):
+                df=get_price_ak(t,fromdate,todate)
+            else:
+                df=get_price_stooq(t,fromdate,todate)
+                
+            if not (dft is None):
+                columns=create_tuple_for_columns(dft,t)
+                dft.columns=pd.MultiIndex.from_tuples(columns)
+            
+                df=pd.merge(df,dft,how='inner',left_index=True,right_index=True)
+     
+    return df
+
+
 #==============================================================================
 if __name__=='__main__':
     ticker='600340.SS'
@@ -981,8 +1098,9 @@ if __name__=='__main__':
 #==============================================================================
 if __name__=='__main__':
     symbol='AAPL'
+    symbol='GEM25.CME'
     fromdate='2024-5-1'
-    todate='2024-5-20'
+    todate='2025-5-20'
     adjust="qfq"
     
     get_price_ak_us(symbol, fromdate, todate, adjust)
@@ -1187,7 +1305,11 @@ def get_prices_ak(ticker,fromdate,todate,adjust='none',ticker_type='auto'):
     i=0
     df=None
     while df is None:
-        t=ticker[i]
+        if i <= len(ticker)-1:
+            t=ticker[i]
+        else:
+            return df
+
         #抓取单个证券
         df=get_price_ak(t,fromdate,todate,adjust=adjust,ticker_type=ticker_type)
         if not (df is None):
@@ -1200,14 +1322,15 @@ def get_prices_ak(ticker,fromdate,todate,adjust='none',ticker_type='auto'):
         return df
         
     #处理列表中的其余证券
-    for t in ticker[(i+1):]:
-        #抓取单个证券
-        dft=get_price_ak(t,fromdate,todate,adjust=adjust,ticker_type=ticker_type)
-        if not (dft is None):
-            columns=create_tuple_for_columns(dft,t)
-            dft.columns=pd.MultiIndex.from_tuples(columns)
-        
-        df=pd.merge(df,dft,how='inner',left_index=True,right_index=True)
+    if i+1 <= len(ticker)-1:
+        for t in ticker[(i+1):]:
+            #抓取单个证券
+            dft=get_price_ak(t,fromdate,todate,adjust=adjust,ticker_type=ticker_type)
+            if not (dft is None):
+                columns=create_tuple_for_columns(dft,t)
+                dft.columns=pd.MultiIndex.from_tuples(columns)
+            
+            df=pd.merge(df,dft,how='inner',left_index=True,right_index=True)
      
     return df
 
@@ -1387,7 +1510,7 @@ if __name__=='__main__':
 
 def get_prices_yf(ticker,start,end,threads=False):
     """
-    功能：从新浪/stooq抓取股价，使用yfinance(对非美股抓取速度快，但有时不太稳定)
+    功能：抓取股价，使用yfinance(对非美股抓取速度快，但有时不太稳定)
     输入：股票代码或股票代码列表，开始日期，结束日期
     ticker: 股票代码或股票代码列表。大陆股票代码加上后缀.SZ或.SS或.BJ，港股代码去掉前导0加后缀.HK
     start: 样本开始日期，尽量远的日期，以便取得足够多的原始样本，yyyy-mm-dd
@@ -1462,6 +1585,9 @@ if __name__=='__main__':
     ticker='AAPL'
     start='2020-12-1'; end='2025-1-31'
 
+    ticker='GEM25.CME'
+    start='2025-1-1'; end='2025-5-30'
+    
     p=get_price_yq(ticker,start,end)
     
 def get_price_yq(ticker,start,end):
@@ -1539,6 +1665,78 @@ def get_price_yq(ticker,start,end):
     return p
 
 #==============================================================================
+if __name__=='__main__':
+    ticker=['600519.SS','000858.SZ']
+    fromdate='2020-12-1'
+    todate='2021-1-31'
+    
+    ticker=['ICBC','SNP','HNP']
+    fromdate,todate='2025-6-1','2025-6-20'    
+
+    
+    prices=get_prices_yq(ticker,fromdate,todate)
+
+def get_prices_yq(ticker,fromdate,todate):
+    """
+    功能：获取yahooquery股票或指数的历史行情，多个股票
+    """
+    #检查是否为多个证券:单个证券代码
+    if isinstance(ticker,str):
+        df=get_price_yq(ticker,fromdate,todate)
+        return df
+    
+    #检查是否为多个证券:空的列表
+    if isinstance(ticker,list) and len(ticker) == 0:
+        pass
+        return None        
+    
+    #检查是否为多个证券:列表中只有一个代码
+    if isinstance(ticker,list) and len(ticker) == 1:
+        ticker1=ticker[0]
+        #抓取单个证券
+        df=get_price_yq(ticker1,fromdate,todate)
+        return df       
+    
+    import pandas as pd
+    #处理列表中的第一个证券
+    i=0
+    df=None
+    while df is None:
+        if i <= len(ticker)-1:
+            t=ticker[i]
+        else:
+            return df
+        
+        #抓取单个证券
+        df=get_price_yq(t,fromdate,todate)
+        if not (df is None):
+            columns=create_tuple_for_columns(df,t)
+            df.columns=pd.MultiIndex.from_tuples(columns)
+        else:
+            i=i+1
+            
+    if (i+1) == len(ticker):
+        pass
+        #已经到达代码列表末尾
+        return df
+        
+    #处理列表中的其余证券
+    if i+1 <= len(ticker)-1:
+        for t in ticker[(i+1):]:
+            #抓取单个证券
+            dft=get_price_yq(t,fromdate,todate)
+            if not (dft is None):
+                columns=create_tuple_for_columns(dft,t)
+                dft.columns=pd.MultiIndex.from_tuples(columns)
+            
+            df=pd.merge(df,dft,how='inner',left_index=True,right_index=True)
+     
+    return df
+
+if __name__=='__main__':
+    dfm=get_prices_yq(['600519.SS','000858.SZ'],'2020-12-1','2021-1-31')
+    dfm2=get_prices_yq(['600519.SS','AAPL'],'2020-12-1','2021-1-31')
+#==============================================================================
 if __name__=='__main__':
     ticker='AMZN'
     ticker='AAPL'
@@ -2412,6 +2610,7 @@ if __name__ =="__main__":
     portfolio={'Market':('US','^GSPC'),'AAPL':1}
     portfolio={'Market':('China','^HSI'),'0823.HK':1.0}
     portfolio={'Market':('China','000001.SS'),'000661.SZ':2,'603392.SS':3,'300601.SZ':4}
+    portfolio={'Market':('US','^SPX'),'^SPX':1}
     
     fromdate='2019-7-19'
     todate='2020-7-20'
@@ -2427,7 +2626,7 @@ if __name__ =="__main__":
     
     df=get_portfolio_prices(portfolio,fromdate,todate,adj=False,source='auto')
 
-def get_portfolio_prices(portfolio,fromdate,todate,adj=False,source='auto'):
+def get_portfolio_prices(portfolio,fromdate,todate,adj=True,source='auto',RF=0):
     """
     功能：抓取投资组合portfolio的每日价值和FF3各个因子
     输入：投资组合portfolio，开始日期，结束日期
@@ -2506,16 +2705,17 @@ def get_portfolio_prices(portfolio,fromdate,todate,adj=False,source='auto'):
         pf4=p
     """
     pf4['Ret%']=pf4['Close'].pct_change()*100.0
+    pf4['Ret-RF']=pf4['Ret%'] - RF*100/365
 
-    #获得期间的市场收益率：假设无风险收益率非常小，可以忽略
+    #获得期间的市场收益率
     try:
         m=get_prices(mktidx,fromdate,todate)
     except:
         print("  #Error(get_portfolio_prices): info inaccesible for market index",mktidx)
         return None
     
-    m['Mkt-RF']=m['Close'].pct_change()*100.0
-    m['RF']=0.0
+    m['Mkt-RF']=m['Close'].pct_change()*100.0 - RF*100/365
+    m['RF']=RF*100/365
     rf_df=m[['Mkt-RF','RF']]
     
     #合并pf4与rf_df
@@ -2539,7 +2739,7 @@ def get_portfolio_prices(portfolio,fromdate,todate,adj=False,source='auto'):
     
     pfdf=prices[['Portfolio','Shares','Date','Weekday', \
                  'Open','Close','Adj Close','Adjustment', \
-                'Volume','Amount','Ret%','Mkt-RF','RF']]  
+                'Volume','Amount','Ret%','Ret-RF','Mkt-RF','RF']]  
 
     return pfdf      
 

siat/security_trend2.py

@@ -289,7 +289,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
             fromdate=date_adjust(todate,adjust=-60)
         if not isinstance(mav,list):
             mav=[mav]
-        df=candlestick(stkcd=tickers[0],fromdate=fromdate,todate=todate,mav=mav, \
+        df=candlestick(stkcd=tickers[0],start=fromdate,end=todate,mav=mav, \
                        ticker_type=ticker_type,facecolor=facecolor,loc=loc1)
         return df
 
@@ -301,7 +301,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         if start in ['default']:
             fromdate=date_adjust(todate,adjust=-7)
         
-        df=candlestick_demo(tickers[0],fromdate=fromdate,todate=todate, \
+        df=candlestick_demo(tickers[0],start=fromdate,end=todate, \
                             ticker_type=ticker_type,facecolor=facecolor)
         return df
 
@@ -570,7 +570,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
             print("attention_point=",attention_point)
         
         # ret_type要使用复权价
-        df=compare_rar_security(ticker=tickers,start=fromdate,end=todate,rar=measures, \
+        df=compare_rar_security(ticker=tickers,start=fromdate,end=todate,indicator=measures, \
                                  ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                      attention_value=attention_value,attention_value_area=attention_value_area, \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
@@ -594,17 +594,17 @@ def security_trend(ticker,indicator='Close',adjust='', \
             adjust='qfq'
             
         df=compare_beta_security(ticker=tickers,start=fromdate,end=todate, \
-                                 adjust=adjust, \
-                                 RF=RF,regression_period=regression_period, \
-                                     attention_value=attention_value,attention_value_area=attention_value_area, \
-                                     attention_point=attention_point,attention_point_area=attention_point_area, \
-                                         band_area=band_area, \
-                                 graph=graph,facecolor=facecolor,loc=loc1, \
-                                 annotate=annotate,annotate_value=annotate_value, \
-                                 mark_top=mark_top,mark_bottom=mark_bottom, \
-                                 mark_start=mark_start,mark_end=mark_end, \
-                                 mktidx=market_index,source=source, \
-                                 ticker_type=ticker_type)
+                adjust=adjust, \
+                RF=RF,regression_period=regression_period, \
+                    attention_value=attention_value,attention_value_area=attention_value_area, \
+                    attention_point=attention_point,attention_point_area=attention_point_area, \
+                        band_area=band_area, \
+                graph=graph,facecolor=facecolor,loc=loc1, \
+                annotate=annotate,annotate_value=annotate_value, \
+                mark_top=mark_top,mark_bottom=mark_bottom, \
+                mark_start=mark_start,mark_end=mark_end, \
+                mktidx=market_index,source=source, \
+                ticker_type=ticker_type)
         
         return df