siat 2.14.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/stock.py

@@ -20,7 +20,7 @@ from siat.common import *
 from siat.translate import *
 from siat.grafix import *
 from siat.security_prices import *
-
+from siat.security_price2 import *
 
 #==============================================================================
 import matplotlib.pyplot as plt
@@ -468,7 +468,7 @@ def stock_price(ticker,fromdate,todate,adj=False, \
     df=get_price(ticker,fromdate,todate,adj=adj,source=source)
     
     if not (df is None):
-        tickername=codetranslate(ticker)
+        tickername=ticker_name(ticker)
 
         import datetime; today = datetime.date.today()
         lang=check_language()
@@ -527,7 +527,7 @@ if __name__ =="__main__":
     allind=all_calculate(pricedf,"AAPL",'2023-1-1','2023-6-16')
     list(allind)
     
-def all_calculate(pricedf,ticker1,fromdate,todate):
+def all_calculate(pricedf,ticker1,fromdate,todate,ticker_type='auto'):
     """
     功能：单纯计算所有基于证券价格的指标
     
@@ -546,13 +546,13 @@ def all_calculate(pricedf,ticker1,fromdate,todate):
     
     #加入价格波动指标
     #df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False)
-    df1b=price_volatility2(pricedf,ticker1,fromdate,todate,graph=False)
+    df1b=price_volatility2(pricedf,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
 
     #加入收益率波动指标
-    df1c=ret_volatility2(pricedf,ticker1,fromdate,todate,graph=False)
+    df1c=ret_volatility2(pricedf,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
 
     #加入收益率下偏标准差指标
-    df1d=ret_lpsd2(pricedf,ticker1,fromdate,todate,graph=False)
+    df1d=ret_lpsd2(pricedf,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
     
     # 横向拼接合并
     result=pd.concat([df1a,df1b,df1c,df1d],axis=1,join='outer')
@@ -605,14 +605,16 @@ def security_indicator(ticker,indicator,fromdate,todate, \
                        zeroline=False, \
                        average_value=False, \
                        datatag=False,power=0,graph=True,source='auto',
-                       mark_top=1,mark_bottom=1,mark_end=True):
+                       mark_top=True,mark_bottom=True,mark_end=True,ticker_type='auto'):
     """
     功能：单只证券的全部指标
     """
     fromdate1=date_adjust(fromdate,adjust=-365*3)
     
-    from siat.security_prices import get_price
-    pricedf=get_price(ticker,fromdate1,todate,source=source)
+    from siat.security_price2 import get_price_1ticker_mixed
+    #pricedf=get_prices_all(ticker,fromdate1,todate,source=source,ticker_type=ticker_type)
+    pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
+                                    todate=todate,source=source,ticker_type=ticker_type)
     if pricedf is None:
         print("  #Error(security_indicator): security info not found for",ticker)
         return None
@@ -625,7 +627,7 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     fromdate_pd=pd.to_datetime(fromdate)
     tmp_df=pricedf[pricedf.index >= fromdate_pd]
     if len(tmp_df)==0:
-        print("  #Error(security_indicator): no record from",fromdate,"for",ticker)
+        print("  #Warning(security_indicator): zero record exists from",fromdate,"for",ticker)
         return None
     
     erdf=all_calculate(pricedf,ticker,fromdate,todate)
@@ -646,18 +648,20 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     if not graph:
         return erdf3
     
-    #titletxt=texttranslate("证券指标运动趋势：")+codetranslate(ticker)
-    titletxt=texttranslate("证券趋势分析：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq/雅虎财经，")+str(today)
+    #titletxt=texttranslate("证券指标运动趋势：")+ticker_name(ticker)
+    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)
+    import datetime; todaydt = datetime.date.today()
+    footnote=texttranslate("数据来源：新浪/东方财富/stooq/雅虎财经，")+str(todaydt)
     collabel=ectranslate(indicator)
     
     ylabeltxt=ectranslate(indicator)
-    tickersplit=ticker.split('.')
-    if (len(tickersplit) > 1) and (indicator == 'Close'):
-        if tickersplit[1].upper() in ['M','B']:
-            ylabeltxt="stooq_MB" #特殊标志，告知绘图函数不显示某些标记
-    
+    try:
+        tickersplit=ticker.split('.')
+        if (len(tickersplit) > 1) and (indicator == 'Close'):
+            if tickersplit[1].upper() in ['M','B']:
+                ylabeltxt="stooq_MB" #特殊标志，告知绘图函数不显示某些标记
+    except: pass
+        
     if 'Ret%' in indicator:
         zeroline=True
     
@@ -669,7 +673,7 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     
     
 def stock_ret(ticker,fromdate,todate,rtype="Daily Ret%", \
-              datatag=False,power=0,graph=True,source='auto'):
+              datatag=False,power=0,graph=True,source='auto',ticker_type='auto'):
     """
     功能：绘制证券收益率折线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；收益率类型type；
@@ -681,10 +685,13 @@ def stock_ret(ticker,fromdate,todate,rtype="Daily Ret%", \
     fromdate1=date_adjust(fromdate, -732)
 
     #抓取证券价格
-    adj=False
-    if 'Adj' in rtype: adj=True
-    from siat.security_prices import get_price
-    pricedf=get_price(ticker,fromdate1,todate,adj=adj,source=source)
+    adj=False; adjust=''
+    if 'Adj' in rtype: adj=True; adjust='qfq'
+    from siat.security_price2 import get_price_1ticker_mixed
+    #pricedf=get_price(ticker,fromdate1,todate,adj=adj,source=source)
+    pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
+                                    todate=todate,adjust=adjust, \
+                                    source=source,ticker_type=ticker_type)
     if pricedf is None:
         print("  #Error(stock_ret): failed to find price info for",ticker,fromdate,todate)
         return None
@@ -715,11 +722,12 @@ def stock_ret(ticker,fromdate,todate,rtype="Daily Ret%", \
         print("  #Error(stock_ret)：only support return types of",colnames)
         return        
 
-    titletxt=texttranslate("证券指标运动趋势：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq/雅虎财经，")+str(today)
+    import datetime; todaydt = datetime.date.today()
+    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/雅虎财经，")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
+    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，收益率"
+
     pltdf=erdf[erdf.index >= fromdate]
     plot_line(pltdf,rtype,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
               power=power,zeroline=True)
@@ -758,7 +766,7 @@ def security_mindicators(ticker,measures,fromdate,todate, \
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
                          source='auto', \
-                         mark_top=1,mark_bottom=1):
+                         mark_top=True,mark_bottom=True,ticker_type='auto'):
     """
     功能：单个证券，多个指标对比
     date_range=False：指定开始结束日期绘图
@@ -781,8 +789,10 @@ def security_mindicators(ticker,measures,fromdate,todate, \
         measures=[measures]
     
     try:
-        from siat.security_prices import get_price
-        pricedf=get_price(ticker,fromdate1,todate,source=source)
+        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,source=source,ticker_type=ticker_type)
     except:
         print("  #Error(security_mindicators): price info not found for",ticker)
         return None
@@ -793,7 +803,7 @@ def security_mindicators(ticker,measures,fromdate,todate, \
         print("  #Warning(security_mindicators): price info unavailable for",ticker)
         return None
         
-    df=all_calculate(pricedf,ticker,fromdate,todate)
+    df=all_calculate(pricedf,ticker,fromdate,todate,ticker_type=ticker_type)
 
     # 检查指标是否存在
     colList=list(df)
@@ -807,8 +817,8 @@ def security_mindicators(ticker,measures,fromdate,todate, \
         df1.rename(columns={c:ectranslate(c)},inplace=True)
 
     y_label='证券指标'
-    import datetime; today = datetime.date.today()
-    x_label="数据来源：综合新浪/东方财富/stooq/雅虎财经，"+str(today)
+    import datetime; todaydt = datetime.date.today()
+    x_label="数据来源：综合新浪/东方财富/stooq/yahoo，"+str(todaydt)
 
     axhline_value=0
     axhline_label=''
@@ -817,7 +827,7 @@ def security_mindicators(ticker,measures,fromdate,todate, \
             axhline_value=0
             axhline_label='指标零线'
             break
-    title_txt="证券趋势对比："+codetranslate(ticker)            
+    title_txt="证券趋势分析："+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)
@@ -875,7 +885,7 @@ def stock_price_volatility(ticker,fromdate,todate,type="Weekly Price Volatility"
         print("  #Error(stock_price_volatility)：only support price risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券价格波动风险走势图：")+codetranslate(ticker)
+    titletxt=texttranslate("证券价格波动风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
     footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
     collabel=ectranslate(type)
@@ -898,7 +908,9 @@ if __name__ =="__main__":
     pv=stock_price_volatility("000002.SZ","2019-1-1","2020-3-16","Annual Exp Price Volatility")
 
 #==============================================================================
-def price_volatility2(pricedf,ticker,fromdate,todate,type="Weekly Price Volatility",datatag=False,power=4,graph=True):
+def price_volatility2(pricedf,ticker,fromdate,todate, \
+                      type="Weekly Price Volatility",datatag=False, \
+                      power=4,graph=True,ticker_type='auto'):
     """
     功能：绘制证券价格波动风险折线图。与函数price_volatility的唯一区别是不抓取股价。
     输入：股价数据集pricedf；证券代码ticker；开始日期fromdate，结束日期todate；期间类型type；
@@ -930,9 +942,9 @@ def price_volatility2(pricedf,ticker,fromdate,todate,type="Weekly Price Volatili
         print("  #Error(price_volatility2)：only support price risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券价格波动风险走势图：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，价格波动风险"
+    import datetime; todaydt = datetime.date.today()
+    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -989,7 +1001,7 @@ def stock_ret_volatility(ticker,fromdate,todate,type="Weekly Ret Volatility%",da
         print("  #Error(stock_ret_volatility)，only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券收益率波动风险走势图：")+codetranslate(ticker)
+    titletxt=texttranslate("证券收益率波动风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
     footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
     collabel=ectranslate(type)
@@ -1013,7 +1025,9 @@ if __name__ =="__main__":
 
 
 #==============================================================================
-def ret_volatility2(retdf,ticker,fromdate,todate,type="Weekly Ret Volatility%",datatag=False,power=4,graph=True):
+def ret_volatility2(retdf,ticker,fromdate,todate, \
+                    type="Weekly Ret Volatility%",datatag=False, \
+                    power=4,graph=True,ticker_type='auto'):
     """
     功能：绘制证券收益率波动风险折线图。与函数ret_volatility的唯一区别是不抓取股价。
     输入：股价数据集pricedf；证券代码ticker；开始日期fromdate，结束日期todate；期间类型type；
@@ -1047,9 +1061,9 @@ def ret_volatility2(retdf,ticker,fromdate,todate,type="Weekly Ret Volatility%",d
         print("  #Error(ret_volatility2): only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券收益率波动风险走势图：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，收益率波动风险"
+    import datetime; todaydt = datetime.date.today()
+    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1106,7 +1120,7 @@ def ret_lpsd(ticker,fromdate,todate,type="Weekly Ret Volatility%",datatag=False,
         print("  #Error(ret_lpsd): only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券收益率波动损失风险走势图：")+codetranslate(ticker)
+    titletxt=texttranslate("证券收益率波动损失风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
     footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
     collabel=ectranslate(type)
@@ -1129,7 +1143,9 @@ if __name__ =="__main__":
     pv=ret_lpsd("000002.SZ","2019-1-1","2020-3-16","Annual Exp Ret Volatility%")
 
 #==============================================================================
-def ret_lpsd2(retdf,ticker,fromdate,todate,rtype="Weekly Ret Volatility%",datatag=False,power=4,graph=True):
+def ret_lpsd2(retdf,ticker,fromdate,todate, \
+              rtype="Weekly Ret Volatility%",datatag=False, \
+              power=4,graph=True,ticker_type='auto'):
     """
     功能：绘制证券收益率波动损失风险折线图。与函数ret_lpsd的唯一区别是不抓取股价。
     输入：股价数据集pricedf；证券代码ticker；开始日期fromdate，结束日期todate；期间类型type；
@@ -1162,9 +1178,9 @@ def ret_lpsd2(retdf,ticker,fromdate,todate,rtype="Weekly Ret Volatility%",datata
         print("  #Error(ret_lpsd2): only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券收益率波动损失风险走势图：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"波动损失风险"
+    import datetime; todaydt = datetime.date.today()
+    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1185,7 +1201,9 @@ if __name__ =="__main__":
     pv=price_lpsd2(df,"000002.SZ","2019-1-1","2020-3-16","Annual Price Volatility")
     pv=price_lpsd2(df,"000002.SZ","2019-1-1","2020-3-16","Annual Exp Price Volatility")
 #==============================================================================
-def comp_1security_2measures(df,measure1,measure2,twinx=False,loc1='upper left',loc2='lower left',graph=True):
+def comp_1security_2measures(df,measure1,measure2,twinx=False, \
+                             loc1='upper left',loc2='lower left', \
+                             graph=True,ticker_type='auto'):
     """
     功能：对比绘制一只证券两个指标的折线图。
     输入：证券指标数据集df；行情类别measure1/2。
@@ -1220,16 +1238,12 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False,loc1='upper left',
     label2=ectranslate(measure2)
     ylabeltxt=""
     
-    lang=check_language()
-    if lang == 'English':
-        titletxt="Security Trend: "+codetranslate(ticker)
-    else:
-        titletxt=texttranslate("证券指标走势图：")+codetranslate(ticker)
-    import datetime; today = datetime.date.today()
-    if lang == 'English':
-        footnote="Source: sina/eastmoney/stooq, "+str(today)
-    else:
-        footnote=texttranslate("数据来源：sina/eastmoney/stooq，")+str(today)
+    tname=ticker_name(ticker,ticker_type=ticker_type)
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+tname
+    
+    import datetime; todaydt = datetime.date.today()
+    footnote1=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Source: integrating sina/eastmoney/stooq/yahoo, ")
+    footnote=footnote1+str(todaydt)
     
     #绘图
     plot_line2(df,ticker,measure1,label1,df,ticker,measure2,label2, \
@@ -1247,7 +1261,9 @@ if __name__ =="__main__":
     df=stock_ret(ticker,fromdate,todate,graph=False)
     comp_1security_2measures(df,measure1,measure2)
 #==============================================================================
-def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left',loc2='lower left',graph=True):
+def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
+                              loc2='lower left',graph=True, \
+                              ticker_type=['auto','auto']):
     """
     功能：对比绘制两只证券的相同指标折线图。
     输入：指标数据集df1/2；证券代码ticker1/2；指标类别measure。
@@ -1286,17 +1302,15 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left',loc2
     label=ectranslate(measure)
     ylabeltxt=ectranslate(measure)
 
-    lang=check_language()
-    if lang == 'English':
-        titletxt="Security Trend: "+codetranslate(ticker1)+" vs "+codetranslate(ticker2)
-    else:
-        titletxt=texttranslate("证券指标走势对比：")+codetranslate(ticker1)+" vs "+codetranslate(ticker2)
+    tname1=ticker_name(ticker1,ticker_type=ticker_type[0])
+    tname2=ticker_name(ticker2,ticker_type=ticker_type[1])
+    
+    titletxt1=text_lang("证券趋势分析：","Security Trend: ")
+    titletxt=titletxt1+tname1+" vs "+tname2
         
-    import datetime; today = datetime.date.today()
-    if lang == 'English':
-        footnote=texttranslate("Source: sina/eastmoney/stooq，")+str(today)
-    else:
-        footnote=texttranslate("数据来源：sina/eastmoney/stooq，")+str(today)
+    import datetime; todaydt = datetime.date.today()
+    footnote1=text_lang("数据来源：综合/东方财富/stooq/yahoo，","Source: integrating sina/eastmoney/stooq/yahoo，")
+    footnote=footnote1+str(todaydt)+"统计"
 
     plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
@@ -1315,7 +1329,8 @@ if __name__ =="__main__":
     comp_2securities_1measure(df1,df2,measure)
 #==============================================================================
 def compare_security(tickers,measures,fromdate,todate,twinx=False, \
-                     loc1='best',loc2='lower left',graph=True,source='auto'):
+                     loc1='best',loc2='lower left',graph=True,source='auto', \
+                     ticker_type='auto'):
     """
     功能：函数克隆compare_stock
     """
@@ -1324,12 +1339,14 @@ def compare_security(tickers,measures,fromdate,todate,twinx=False, \
     tickers=upper_ticker(tickers)
     result=compare_stock(tickers=tickers,measures=measures, \
                          fromdate=fromdate,todate=todate,twinx=twinx, \
-                         loc1=loc1,loc2=loc2,graph=graph,source=source)
+                         loc1=loc1,loc2=loc2,graph=graph,source=source, \
+                         ticker_type=ticker_type)
     return result
 
 #==============================================================================
 def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
-                  loc1='best',loc2='lower left',graph=True,source='auto'):    
+                  loc1='best',loc2='lower left',graph=True,source='auto', \
+                  ticker_type='auto'):    
     """
     功能：对比绘制折线图：一只证券的两种测度，或两只证券的同一个测度。
     输入：
@@ -1347,7 +1364,7 @@ def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
     #调试开关
     DEBUG=False
     # 应对导入失灵的函数
-    from siat.security_prices import upper_ticker
+    from siat.common import upper_ticker
     tickers=upper_ticker(tickers)
     
     #判断证券代码个数
@@ -1383,24 +1400,25 @@ def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
     #是否单一证券代码+两个测度指标
     if (security_num == 1) and (measure_num >= 2):
         #证券ticker1：抓取行情，并计算其各种期间的收益率
-        df1a=stock_ret(ticker1,fromdate,todate,graph=False,source=source)
+        df1a=stock_ret(ticker1,fromdate,todate,graph=False,source=source,ticker_type=ticker_type)
         if df1a is None: return None,None
         if DEBUG: print("compare|df1a first date:",df1a.index[0])
         #加入价格波动指标
-        df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False)
+        df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
         if DEBUG: print("compare|df1b first date:",df1b.index[0])
         #加入收益率波动指标
-        df1c=ret_volatility2(df1b,ticker1,fromdate,todate,graph=False)
+        df1c=ret_volatility2(df1b,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
         if DEBUG: print("compare|df1c first date:",df1c.index[0])
         #加入收益率下偏标准差指标
-        df1d=ret_lpsd2(df1c,ticker1,fromdate,todate,graph=False)
+        df1d=ret_lpsd2(df1c,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type)
         if DEBUG: print("compare|df1d first date:",df1d.index[0])
         
         #去掉开始日期以前的数据
         pltdf1=df1d[df1d.index >= fromdate]
         #绘制单个证券的双指标对比图
         if graph:
-            comp_1security_2measures(pltdf1,measure1,measure2,twinx=twinx,loc1=loc1,loc2=loc2,graph=graph)
+            comp_1security_2measures(pltdf1,measure1,measure2,twinx=twinx, \
+                                     loc1=loc1,loc2=loc2,graph=graph,ticker_type=ticker_type)
         
         try:
             result1=pltdf1[[measure1]]
@@ -1412,30 +1430,42 @@ def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
             return result1,None
         
     elif (security_num >= 2) and (measure_num >= 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:
+            ticker_type1=ticker_type[0]
+            ticker_type2=ticker_type[1]
+        ticker_type_list=[ticker_type1,ticker_type2]
+        
         #证券ticker1：抓取行情，并计算其各种期间的收益率
-        df1a=stock_ret(ticker1,fromdate,todate,graph=False,source=source)
+        df1a=stock_ret(ticker1,fromdate,todate,graph=False,source=source,ticker_type=ticker_type1)
         if df1a is None: return None,None
         #加入价格波动指标
-        df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False)
+        df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)
         #加入收益率波动指标
-        df1c=ret_volatility2(df1b,ticker1,fromdate,todate,graph=False)
+        df1c=ret_volatility2(df1b,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)
         #加入收益率下偏标准差指标
-        df1d=ret_lpsd2(df1c,ticker1,fromdate,todate,graph=False)        
+        df1d=ret_lpsd2(df1c,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)        
         #去掉开始日期以前的数据
         pltdf1=df1d[df1d.index >= fromdate]
         
         #证券ticker2：
-        df2a=stock_ret(ticker2,fromdate,todate,graph=False,source=source)
+        df2a=stock_ret(ticker2,fromdate,todate,graph=False,source=source,ticker_type=ticker_type2)
         if df2a is None: return None,None
-        df2b=price_volatility2(df2a,ticker2,fromdate,todate,graph=False)
-        df2c=ret_volatility2(df2b,ticker2,fromdate,todate,graph=False)
-        df2d=ret_lpsd2(df2c,ticker2,fromdate,todate,graph=False)
+        df2b=price_volatility2(df2a,ticker2,fromdate,todate,graph=False,ticker_type=ticker_type2)
+        df2c=ret_volatility2(df2b,ticker2,fromdate,todate,graph=False,ticker_type=ticker_type2)
+        df2d=ret_lpsd2(df2c,ticker2,fromdate,todate,graph=False,ticker_type=ticker_type2)
         pltdf2=df2d[df2d.index >= fromdate]
         
         #绘制双证券单指标对比图
         if graph:
-            comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx,loc1=loc1,loc2=loc2,graph=graph)
+            comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
+                                      loc1=loc1,loc2=loc2,graph=graph, \
+                                      ticker_type=ticker_type_list)
         
         try:
             result1=pltdf1[[measure1]]
@@ -1504,7 +1534,8 @@ def compare_msecurity(tickers,measure,start,end, \
                       annotate=False,annotate_value=False, \
                       smooth=True, \
                       source='auto', \
-                      mark_top=1,mark_bottom=1,mark_end=False):
+                      mark_top=True,mark_bottom=True,mark_end=False, \
+                      ticker_type='auto'):
     """
     功能：比较并绘制多条证券指标曲线（多于2条），个数可为双数或单数
     注意：
@@ -1524,7 +1555,7 @@ def compare_msecurity(tickers,measure,start,end, \
     
     """
     # 应对导入失灵的函数
-    from siat.security_prices import upper_ticker
+    from siat.common import upper_ticker
     tickers=upper_ticker(tickers)
     # 去掉重复代码：有必要，重复代码将导致后续处理出错KeyError: 0！
     tickers=list(set(tickers))
@@ -1553,11 +1584,22 @@ def compare_msecurity(tickers,measure,start,end, \
     import pandas as pd
     from functools import reduce
 
+    #预处理ticker_type成为列表ticker_type_list
+    if isinstance(ticker_type,str):
+        ticker_type_list=[ticker_type] * len(tickers)
+    if isinstance(ticker_type,list):
+        ticker_type_list=ticker_type
+        if len(ticker_type_list) < len(tickers): #延续最后项的ticker_type
+            ticker_type_list=ticker_type_list+[ticker_type_list[-1]]*(len(tickers)-len(ticker_type_list))
+
     dfs=pd.DataFrame()
     for t in tickers:
         print("  Looking security info for",t,'...')
+        pos=tickers.index(t)
+        tt=ticker_type_list[pos]
+        
         with HiddenPrints():
-            df_tmp=security_indicator(t,measure,start,end,graph=False,source=source)
+            df_tmp=security_indicator(t,measure,start,end,graph=False,source=source,ticker_type=tt)
         if df_tmp is None:
             print("  #Warning(compare_msecurity): security info not found for",t)
             continue
@@ -1566,7 +1608,7 @@ def compare_msecurity(tickers,measure,start,end, \
             continue
         
         df_tmp1=pd.DataFrame(df_tmp[measure])
-        df_tmp1.rename(columns={measure:codetranslate(t)},inplace=True)     
+        df_tmp1.rename(columns={measure:ticker_name(t,tt)},inplace=True)     
         if len(dfs)==0:
             dfs=df_tmp1
         else:
@@ -1580,87 +1622,6 @@ def compare_msecurity(tickers,measure,start,end, \
         return None
     
     dfs.sort_index(ascending=True,inplace=True)
-    
-    """    
-    loopn=int(len(tickers)/2)
-    colname=''
-    for i in range(0,loopn):
-        pair=tickers[i*2:i*2+2]
-        #print(i,pair)
-        with HiddenPrints():
-            dfi=compare_security(pair,measure,start,end,graph=False)
-
-        dfi1=dfi[0]
-        if dfi1 is None:
-            print("  #Warning(compare_msecurity): security info not found for either of",pair)
-            continue
-        
-        if colname == '':
-            try:
-                colname=list(dfi1)[0]
-            except:
-                print("  #Warning(compare_msecurity): security prices unavailable for either of",pair)
-                continue
-        
-        try:
-            dfi1.rename(columns={colname:codetranslate(tickers[i*2])},inplace=True)   
-        except:
-            print("  #Error(compare_msecurity): info not found for",pair[0])
-            return None
-            
-        dfi2=dfi[1]
-        if dfi2 is None:
-            print("  #Warning(compare_msecurity): info not found for",pair[1])
-        
-        try:
-            dfi2.rename(columns={colname:codetranslate(tickers[i*2+1])},inplace=True) 
-        except:
-            print("  #Error(compare_msecurity): info not found for",pair[1])
-            return None
-
-        # 去掉时区信息，避免合并中的日期时区冲突问题
-        import pandas as pd
-        dfi1.index = pd.to_datetime(dfi1.index)
-        dfi1.index = dfi1.index.tz_localize(None)
-        dfi2.index = pd.to_datetime(dfi2.index)
-        dfi2.index = dfi2.index.tz_localize(None)
-        
-        if len(dfs) == 0:
-            dflist=[dfi1,dfi2]
-        else:
-            dflist=[dfs,dfi1,dfi2]
-        dfs=reduce(lambda left,right:pd.merge(left,right,how='outer',left_index=True,right_index=True),dflist)
-
-    #判断是否偶数even
-    if (num % 2) == 0:
-        even=True
-    else:
-        even=False
-    i=loopn
-    if not even:    #非偶数
-        pair=[tickers[num-1],tickers[num-1]]  
-        with HiddenPrints():
-            dfi=compare_security(pair,measure,start,end,graph=False)
-
-        dfi1=dfi[0]
-        if dfi1 is None:
-            print("  #Warning(compare_msecurity): info not found for",pair[0])
-        
-        try:
-            #dfi1.rename(columns={colname:codetranslate(tickers[i*2])},inplace=True)   
-            dfi1.rename(columns={colname:codetranslate(tickers[-1])},inplace=True)
-        except:
-            print("  #Error(compare_msecurity): info not found for",pair[0])
-            return None
-
-        # 去掉时区信息，避免合并中的日期时区冲突问题
-        import pandas as pd
-        dfi1.index = pd.to_datetime(dfi1.index)
-        dfi1.index = dfi1.index.tz_localize(None)
-        
-        dflist=[dfs,dfi1]
-        dfs=reduce(lambda left,right:pd.merge(left,right,how='outer',left_index=True,right_index=True),dflist)
-    """
 
     # 若不绘图则返回原始数据
     if not graph:
@@ -1673,181 +1634,24 @@ def compare_msecurity(tickers,measure,start,end, \
         if tickersplit[1].upper() in ['M','B']:
             #y_label='指标'
             y_label=''
-        
-    import datetime; today = datetime.date.today()
     
-    lang=check_language()
-    if lang == 'English':
-        x_label="Source: sina/stooq/yahoo, "+str(today)
-        title_txt="Trend Analysis"
-    else:
-        x_label="数据来源: 综合新浪/东方财富/雅虎财经/stooq/FRED/OECD，"+str(today)
-        #title_txt="比较多只证券产品的指标走势"
-        #title_txt="趋势分析"
-        title_txt="证券趋势分析："+y_label
-        if preprocess == 'scaling' and scaling_option == 'change%':
-            title_txt="证券涨跌趋势分析："+y_label
+    x_label1cn="数据来源: 综合新浪/东方财富/stooq/yahoo等，"
+    x_label1en="Source: integrating sina/stooq/yahoo, "
+    x_label1=text_lang(x_label1cn,x_label1en)   
+    import datetime; todaydt = datetime.date.today()
+    x_label=x_label1+str(todaydt)  
+
+    title_txt1=text_lang("证券趋势分析：","Trend Analysis: ") 
+    title_txt=title_txt1+y_label
+    if preprocess == 'scaling' and scaling_option == 'change%':
+        title_txt2=text_lang("，涨跌幅度",", Changes")
+        title_txt=title_txt+title_txt2          
+    
 
     # 标准化处理
     dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \
-            axhline_label=axhline_label,x_label=x_label,y_label=y_label,lang=lang, \
+            axhline_label=axhline_label,x_label=x_label,y_label=y_label, \
             preprocess=preprocess,scaling_option=scaling_option)
-    
-    """
-    preprocess1=preprocess.lower()
-    preplist=['standardize','normalize','logarithm','scaling']
-    if preprocess1 in preplist:
-        dfs2=dfs.copy(deep=True)
-
-        collist=list(dfs2)
-        meanlist=[]
-        for c in collist:
-            
-            # 去掉缺失值
-            #dfs2[c].dropna(inplace=True)
-            
-            if preprocess1 == 'standardize':
-                cmean=dfs2[c].mean()
-                cstd=dfs2[c].std()
-                dfs2[c]=dfs2[c].apply(lambda x: (x-cmean)/cstd)
-                
-            if preprocess1 == 'normalize':
-                cmax=dfs2[c].max()
-                cmin=dfs2[c].min()
-                dfs2[c]=dfs2[c].apply(lambda x: (x-cmin)/(cmax-cmin))
-                
-            if preprocess1 == 'logarithm':
-                import numpy as np
-                dfs2[c]=dfs2[c].apply(lambda x: np.log(x) if x>0 else (0 if x==0 else -np.log(-x)))
-                
-            if preprocess1 == 'scaling':
-                scalinglist=['mean','min','start','percentage','change%']
-                if not (scaling_option in scalinglist):
-                    print("  #Error(compare_msecurity): invalid scaling option",scaling_option)
-                    print("  Valid scaling option:",scalinglist)
-                    return None
-                if scaling_option == 'mean':
-                    cmean=dfs2[c].mean()   #使用均值
-                    if lang == 'English':
-                        scalingOptionText='mean value'
-                    else:
-                        scalingOptionText='均值'
-                if scaling_option == 'min':
-                    cmean=dfs2[c].min()    #使用最小值
-                    if lang == 'English':
-                        scalingOptionText='min value'
-                    else:
-                        scalingOptionText='最小值'
-                #if scaling_option == 'start':
-                if scaling_option in ['start','percentage','change%']:
-                    # 从头寻找第一个非空数值
-                    import numpy as np
-                    for n in range(0,len(dfs2)):
-                        if np.isnan(dfs2[c][n]): 
-                            continue
-                        else:
-                            cmean=dfs2[c][n] #使用第一个非空值
-                            break
-                        
-                    if lang == 'English':
-                        scalingOptionText='starting value'
-                    else:
-                        scalingOptionText='起点值'
-                    
-                meanlist=meanlist+[cmean]
-            
-            #print(cmean,cstd,dfs2[c])
-
-        if (preprocess1 == 'scaling') and ('Exp Ret' not in measure):
-            # 加上后一个条件是为了防止出现division by zero错误
-            if len(meanlist)==0:
-                return None
-            
-            if scaling_option not in ['percentage','change%']:
-                meanlistmin=min(meanlist)
-                meanlist2= [x / meanlistmin for x in meanlist]
-                    
-                for c in collist:
-                    pos=collist.index(c)
-                    cfactor=meanlist2[pos]
-                    #dfs2[c]=dfs2[c].apply(lambda x: x/cfactor)
-                    dfs2[c]=dfs2[c].apply(lambda x: x/abs(cfactor))
-            elif scaling_option == 'percentage':
-                for c in collist:
-                    pos=collist.index(c)
-                    cfactor=meanlist[pos]
-                    #dfs2[c]=dfs2[c].apply(lambda x: round(x/cfactor*100,2))
-                    dfs2[c]=dfs2[c].apply(lambda x: round(x/abs(cfactor)*100,2))
-            elif scaling_option == 'change%':
-                plus_sign=True
-                for c in collist:
-                    pos=collist.index(c)
-                    cfactor=meanlist[pos]
-                    dfs2[c]=dfs2[c].apply(lambda x: round((x/cfactor-1)*100,2))
-                
-
-        if lang == 'English':
-            if preprocess1 == 'standardize':
-                std_notes="Note: for ease of comparison, data are standardized "
-                measure_suffix='(standardized)'
-            if preprocess1 == 'normalize':
-                std_notes="Note: for ease of comparison, data are normalized"
-                measure_suffix='(normalized)'
-            if preprocess1 == 'logarithm':
-                std_notes="Note: for ease of comparison, data are logarithmed"
-                measure_suffix='(logarithmed)'
-            if preprocess1 == 'scaling':
-                if scaling_option == 'mean':
-                    std_notes="Note: for ease of comparison, data are scaled by mean value"
-                    measure_suffix='(scaling by mean)'
-                elif scaling_option == 'min':
-                    std_notes="Note: for ease of comparison, data are scaled by min value"
-                    measure_suffix='(scaling by min)'
-                elif scaling_option == 'start':
-                    std_notes="Note: for ease of comparison, data are scaled by starting value"
-                    measure_suffix='(scaling by start)'
-                elif scaling_option == 'percentage':
-                    std_notes="Note: for ease of comparison, data are in percentage of starting value"
-                    measure_suffix='(in prcentage%)'
-                elif scaling_option == 'change%':
-                    std_notes="Note: for ease of comparison, data are in change % of starting value"
-                    measure_suffix='(change %)'                
-        else:
-            if preprocess1 == 'standardize':
-                std_notes="注意：为突出变化趋势，对数据进行了标准化处理"
-                measure_suffix='(标准化处理后)'
-            if preprocess1 == 'normalize':
-                std_notes="注意：为突出变化趋势，对数据进行了归一化处理"
-                measure_suffix='(归一化处理后)'
-            if preprocess1 == 'logarithm':
-                std_notes="注意：为突出变化趋势，对数据进行了对数处理"
-                measure_suffix='(对数处理后)'
-            if preprocess1 == 'scaling':
-                if scaling_option == 'mean':
-                    std_notes="注意：为突出变化趋势，按均值对原始数据进行了比例缩放"
-                    measure_suffix='(按均值比例缩放后，非原值)'
-                elif scaling_option == 'min':
-                    std_notes="注意：为突出变化趋势，按最小值对原始数据进行了比例缩放"
-                    measure_suffix='(按最小值比例缩放后，非原值)'
-                elif scaling_option == 'start':
-                    std_notes="注意：为突出变化趋势，按起点值对原始数据进行了比例缩放"
-                    measure_suffix='(按起点值比例缩放后，非原值)'
-                elif scaling_option == 'percentage':
-                    std_notes="注释：为突出变化趋势，期间起点数值=100%，其他数值为相对百分比"
-                    measure_suffix='(相对百分数%)'
-                elif scaling_option == 'change%':
-                    std_notes="注释：为突出变化趋势，图中数值为相对期间起点的增减百分比"
-                    measure_suffix='(增/减%)' 
-                    axhline_label='零线' #可以在security_trend中使用critical_value选项指定水平线位置，默认0
-                    #axhline_value=0
-                    
-        if 'Exp Ret' not in measure:
-            x_label=std_notes+'\n'+x_label
-            y_label=y_label+measure_suffix
-            
-    else:
-        dfs2=dfs
-    """
 
     # 填充非交易日的缺失值，使得绘制的曲线连续
     dfs2.fillna(axis=0,method='ffill',inplace=True)
@@ -1863,10 +1667,7 @@ def compare_msecurity(tickers,measure,start,end, \
     for c in colList:
         if 'Exp Ret%' in c:
             dfs2.loc[dfs2[dfs2.index==index1].index.tolist(),c]=0
-        """    
-        # 翻译证券名称
-        dfs2.rename(columns={c:codetranslate(c)},inplace=True)
-        """
+
     draw_lines(dfs2,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=False,resample_freq='H',smooth=smooth,linewidth=linewidth,loc=loc, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
@@ -2006,7 +1807,8 @@ def stock_Kline(ticker,start='default',end='default',volume=True,style='China',m
     return df
 
 
-def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
+def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
+                ticker_type='auto'):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -2016,6 +1818,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
     输出：绘制证券价格蜡烛图线图
     返回：证券价格数据表
     """
+    
     #找出mav的最长天数
     mav_max=0
     for mm in mav:
@@ -2063,53 +1866,39 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
             rc=mpfrc)        
     
     #抓取证券价格
-    from siat.security_prices import get_price
-    daily=get_price(stkcd,fromdate1,todate)
-    
+    """
+    from siat.security_prices import get_prices_all
+    daily=get_prices_all(stkcd,fromdate1,todate,ticker_type=ticker_type)
+    """
+    from siat.security_price2 import get_price_mticker_mixed
+    daily,found=get_price_1ticker_mixed(ticker=stkcd,fromdate=fromdate1, \
+                                  todate=todate,ticker_type=ticker_type)
+    """
     if daily is None:
-        print("  #Error(candlestick): failed to get price info of",stkcd,fromdate,todate)
+        print("  #Error(candlestick): failed to get price info of",stkcd)
         return
+    if len(daily) == 0:
+        print("  #Warning(candlestick): zero price info to draw K-line for",stkcd)
+        return   
+    """
+    if found == 'None':
+        print("  #Error(candlestick): failed to get price info of",stkcd)
+        return
+    if found == 'Empty':
+        print("  #Warning(candlestick): zero price info to draw K-line for",stkcd)
+        return   
     
     #如果抓取到的数据没有Volume字段，创造一个但填充为零
     if 'Volume' not in list(daily):
         daily['Volume']=0
     
     #绘制蜡烛图
-    lang=check_language()
-    if lang == 'English':
-        ylabel_txt='Price'
-        ylabel_lower_txt='Volume'
-    else:
-        ylabel_txt='价格'
-        ylabel_lower_txt='成交量'
+    ylabel_txt=text_lang('价格','Price')
+    ylabel_lower_txt=text_lang('成交量','Volume')
         
-    titletxt=codetranslate(stkcd)
-    """
-    if mav > 1: 
-        mpf.plot(daily,type='candle',
-             volume=volume,
-             style=s,
-             title=titletxt,
-             datetime_format='%Y-%m-%d',
-             tight_layout=True,
-             xrotation=15,
-             ylabel=texttranslate(ylabel_txt),
-             ylabel_lower=texttranslate(ylabel_lower_txt),
-             mav=mav,
-             figratio=(12.8,7.2))       
-    else: 
-        mpf.plot(daily,type='candle',
-             volume=volume,
-             style=s,
-             title=titletxt,
-             datetime_format='%Y-%m-%d',
-             tight_layout=True,
-             xrotation=15,
-             ylabel=texttranslate(ylabel_txt),
-             ylabel_lower=texttranslate(ylabel_lower_txt),
-             figratio=(12.8,7.2)
-             )
-    """
+    #titletxt=ticker_name(stkcd)
+    titletxt=ticker_name(stkcd,ticker_type=ticker_type)
+    
     fig, axlist = mpf.plot(daily,type='candle',
          volume=volume,
          show_nontrading=False,#自动剔除非交易日空白
@@ -2134,9 +1923,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
                         #style='italic',
                         #fontfamily='fantasy',
                         loc='center')
-
     fig.show()
-    
     reset_plt()
     
     return daily
@@ -2153,7 +1940,9 @@ if __name__ =="__main__":
     price=candlestick("000002.SZ","2020-2-1","2020-2-29")    
 
 #==============================================================================
-def candlestick_pro(stkcd,fromdate,todate,colorup='#00ff00',colordown='#ff00ff',style='nightclouds'):
+def candlestick_pro(stkcd,fromdate,todate, \
+                    colorup='#00ff00',colordown='#ff00ff',style='nightclouds', \
+                    ticker_type='auto'):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -2166,12 +1955,13 @@ def candlestick_pro(stkcd,fromdate,todate,colorup='#00ff00',colordown='#ff00ff',
     """
 
     #抓取证券价格
-    from siat.security_prices import get_price
-    daily=get_price(stkcd,fromdate,todate)
+    from siat.security_price2 import get_price_1ticker_mixed
+    daily,found=get_price_1ticker_mixed(ticker=stkcd,fromdate=fromdate, \
+                                        todate=todate,ticker_type=ticker_type)
     
-    if daily is None:
+    if found in ['None','Empty']:
         print("  #Error(candlestick_pro): failed to get price info of",stkcd,fromdate,todate)
-        return
+        return None
    
     #绘制蜡烛图
     #在原有的风格nightclouds基础上定制阳线和阴线柱子的色彩，形成自定义风格s
@@ -2180,8 +1970,10 @@ def candlestick_pro(stkcd,fromdate,todate,colorup='#00ff00',colordown='#ff00ff',
     #kwargs = dict(type='candle',mav=(2,4,6),volume=True,figratio=(10,8),figscale=0.75)
     #kwargs = dict(type='candle',mav=(2,4,6),volume=True,figscale=0.75)
     kwargs = dict(type='candle',mav=5,volume=True)
-    #titletxt=str(stkcd)
-    titletxt=codetranslate(stkcd)
+    
+    #titletxt=ticker_name(stkcd)
+    titletxt=ticker_name(stkcd,ticker_type=ticker_type)
+    
     mpf.plot(daily,**kwargs,
              style=s,
              datetime_format='%Y-%m-%d',
@@ -2193,6 +1985,7 @@ def candlestick_pro(stkcd,fromdate,todate,colorup='#00ff00',colordown='#ff00ff',
              figratio=(12.8,7.2)             
              )       
     reset_plt()
+    
     return daily
 
 if __name__ =="__main__":
@@ -2207,7 +2000,8 @@ if __name__ =="__main__":
     price=candlestick_pro("000002.SZ","2020-2-1","2020-2-29")    
 #==============================================================================
 def stock_Kline_demo(ticker,start='default',end='default', \
-                     colorup='red',colordown='green',width=0.5):
+                     colorup='red',colordown='green',width=0.5, \
+                     ticker_type='auto'):
     """
     套壳函数，为了与stock_Kline保持一致
     """
@@ -2233,7 +2027,8 @@ def stock_Kline_demo(ticker,start='default',end='default', \
             start=date_adjust(todate,adjust=-7)
     
     df=candlestick_demo(stkcd=ticker,fromdate=start,todate=end, \
-                        colorup=colorup,colordown=colordown,width=width)
+                        colorup=colorup,colordown=colordown,width=width, \
+                        ticker_type=ticker_type)
     
     return df
 
@@ -2245,7 +2040,9 @@ if __name__ =="__main__":
     
     colorup='red';colordown='green';width=0.7
     
-def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width=0.7):
+def candlestick_demo(stkcd,fromdate,todate, \
+                     colorup='red',colordown='green',width=0.7, \
+                     ticker_type='auto'):
     """
     功能：绘制证券价格K线图，叠加收盘价。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -2253,12 +2050,14 @@ def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width
     输出：绘制证券价格蜡烛图线图
     返回：证券价格数据表
     """
+    
     #抓取证券价格
-    from siat.security_prices import get_price
-    p=get_price(stkcd,fromdate,todate)    
-    if p is None:
-        print("  #Error(candlestick_demo): failed to get price info of",stkcd,fromdate,todate)
-        return    
+    from siat.security_price2 import get_price_1ticker_mixed
+    p,found=get_price_1ticker_mixed(ticker=stkcd,fromdate=fromdate, \
+                                    todate=todate,ticker_type=ticker_type)    
+    if found in ['None','Empty']:
+        print("  #Error(candlestick_demo): failed to get prices for:",stkcd,'\b,',fromdate,'-',todate)
+        return p 
     
     p['Date']=p.index
     
@@ -2275,18 +2074,11 @@ def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width
     fig,ax=plt.subplots()
     
     #绘制各个价格的折线图
-    lang=check_language()
-    if lang == 'English':   
-        open_txt='Open'
-        high_txt='High'
-        low_txt='Low'
-        close_txt='Close'
-    else:
-        open_txt='开盘价'
-        high_txt='最高价'
-        low_txt='最低价'
-        close_txt='收盘价'
-        
+    open_txt=text_lang('开盘价','Open')
+    high_txt=text_lang('最高价','High')
+    low_txt=text_lang('最低价','Low')
+    close_txt=text_lang('收盘价','Close')
+    
     plt.plot(p.index,p['Open'],color='green',ls="--",label=open_txt,marker='>',markersize=10,linewidth=2)
     plt.plot(p.index,p['High'],color='cyan',ls="-.",label=high_txt,marker='^',markersize=10,linewidth=2)
     plt.plot(p.index,p['Low'],color='k',ls=":",label=low_txt,marker='v',markersize=10,linewidth=2)
@@ -2308,14 +2100,10 @@ def candlestick_demo(stkcd,fromdate,todate,colorup='red',colordown='green',width
     ax.autoscale_view()
     fig.autofmt_xdate()
 
-    if lang == 'English':   
-        titletxt=texttranslate("Security Price Candlestick Demo: ")+codetranslate(str(stkcd))
-        price_txt='Price'
-        source_txt="Source: "
-    else:
-        titletxt=texttranslate("K线图/蜡烛图演示：")+codetranslate(str(stkcd))
-        price_txt='价格'
-        source_txt="数据来源: "
+    titletxt0=text_lang("K线图/蜡烛图演示：","Security Price Candlestick Demo: ")
+    titletxt=titletxt0 + ticker_name(str(stkcd),ticker_type=ticker_type)
+    price_txt=text_lang('价格','Price')
+    source_txt=text_lang("数据来源: 综合","Data source: integrating ")
 
     plt.title(titletxt,fontsize=title_txt_size,fontweight='bold')
     plt.ylabel(price_txt,fontsize=ylabel_txt_size)
@@ -2409,7 +2197,7 @@ def stock_dividend(ticker,fromdate,todate):
     lang=check_language()
     if lang == 'English':
         print('\n======== '+texttranslate("股票分红历史")+' ========')
-        print(texttranslate("股票:"),ticker,'\b,',codetranslate(ticker))
+        print(texttranslate("股票:"),ticker,'\b,',ticker_name(ticker))
         print(texttranslate("历史期间:"),fromdate,"-",todate)
         
         #修改列命为英文
@@ -2418,7 +2206,7 @@ def stock_dividend(ticker,fromdate,todate):
         sourcetxt=texttranslate("数据来源: 雅虎财经,")
     else:
         print('\n======== '+"股票分红历史"+' ========')
-        print("股票:",ticker,'\b,',codetranslate(ticker))
+        print("股票:",ticker,'\b,',ticker_name(ticker))
         print("历史期间:",fromdate,"-",todate)
         
         #修改列命为中文
@@ -2516,14 +2304,14 @@ def stock_split(ticker,fromdate,todate):
     lang=check_language()
     if lang == 'English':
         print('\n======== '+texttranslate("股票分拆历史")+' ========')
-        print(texttranslate("股票:"),ticker,'\b,',codetranslate(ticker))
+        print(texttranslate("股票:"),ticker,'\b,',ticker_name(ticker))
         print(texttranslate("历史期间:"),fromdate,"-",todate)
         divprt.columns=[texttranslate('序号'),texttranslate('日期'),texttranslate('星期'),texttranslate('分拆比例')]
         
         sourcetxt=texttranslate("数据来源: 雅虎财经,")
     else:
         print('\n======== '+"股票分拆历史"+' ========')
-        print("股票:",ticker,'\b,',codetranslate(ticker))
+        print("股票:",ticker,'\b,',ticker_name(ticker))
         print("历史期间:",fromdate,"-",todate)
         divprt.columns=['序号','日期','星期','分拆比例']
         
@@ -3137,14 +2925,14 @@ def get_stock_profile(ticker,info_type='basic',printout=True):
     name2=name1.split(',',1)[0] #仅取第一个符号,以前的字符串
     name3=name2.split('(',1)[0] #仅取第一个符号(以前的字符串
     #name4=name3.split(' ',1)[0] #仅取第一个空格以前的字符串
-    #name=codetranslate(name4)  #去掉空格有名字错乱风险
+    #name=ticker_name(name4)  #去掉空格有名字错乱风险
     name9=name3.strip()
-    name=codetranslate(name9)   #从短名字翻译
+    name=ticker_name(name9)   #从短名字翻译
     """
     if not printout: return info
     
     footnote=''
-    name=codetranslate(ticker)  #从股票代码直接翻译
+    name=ticker_name(ticker)  #从股票代码直接翻译
     if info_type in ['basic']:
         sub_info=stock_basic(info)
         info_text="公司基本信息"
@@ -3605,21 +3393,21 @@ def portfolio_esg2(portfolio):
     esg_ep=esgdf.sort_values(['EPscore'], ascending = True)
     p_ep=esg_ep['EPscore'][-1]
     p_ep_stock=esg_ep.index[-1]   
-    str_ep=texttranslate("   EP分数(基于")+str(p_ep_stock)+codetranslate(str(p_ep_stock))+")"
+    str_ep=texttranslate("   EP分数(基于")+str(p_ep_stock)+ticker_name(str(p_ep_stock))+")"
     len_ep=hzlen(str_ep)
 
     #木桶短板：CSRScore
     esg_csr=esgdf.sort_values(['CSRscore'], ascending = True)
     p_csr=esg_csr['CSRscore'][-1]
     p_csr_stock=esg_csr.index[-1] 
-    str_csr=texttranslate("   CSR分数(基于")+str(p_csr_stock)+codetranslate(str(p_csr_stock))+")"
+    str_csr=texttranslate("   CSR分数(基于")+str(p_csr_stock)+ticker_name(str(p_csr_stock))+")"
     len_csr=hzlen(str_csr)
     
     #木桶短板：CGScore
     esg_cg=esgdf.sort_values(['CGscore'], ascending = True)
     p_cg=esg_cg['CGscore'][-1]
     p_cg_stock=esg_cg.index[-1]     
-    str_cg=texttranslate("   CG分数(基于")+str(p_cg_stock)+codetranslate(str(p_cg_stock))+")"
+    str_cg=texttranslate("   CG分数(基于")+str(p_cg_stock)+ticker_name(str(p_cg_stock))+")"
     len_cg=hzlen(str_cg)
 
     str_esg=texttranslate("   ESG总评分数")
@@ -3736,10 +3524,10 @@ def compare_mmeasure(ticker,measures,fromdate,todate, \
     lang=check_language()
     if lang == 'English':
         x_label="Source: sina/stooq/yahoo, "+str(today)
-        title_txt="Compare A Security's Multiple Measurements: "+codetranslate(ticker)
+        title_txt="Compare A Security's Multiple Measurements: "+ticker_name(ticker)
     else:
         x_label="数据来源: 综合新浪/Yahoo/stooq，"+str(today)
-        title_txt="证券趋势分析："+codetranslate(ticker)
+        title_txt="证券趋势分析："+ticker_name(ticker)
         
     draw_lines(df3,y_label=y_label,x_label=x_label, \
                axhline_value=axhline_value,axhline_label=axhline_label, \