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

siat/common.py

@@ -3720,13 +3720,20 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
     """
     功能：采样CSS式样显示df，适用于Jupyter环境，整齐紧凑，不挑浏览器
     注意：若facecolor不被支持，则自动改为papayawhip
+    
+    特别注意：运行show_df()后将发生格式错乱（表格位置自动居中，标题从表格上方移到下方，原脚注仍然居左）
+    因此，不要轻易使用show_df()
     """
+    import pandas as pd
+    import numpy as np
+
+    # 重置为Pandas默认样式, 无效！
+    pd.reset_option('all')
+
     #检查df是否为空
     if len(df)==0: return
     
     #替换nan和inf
-    import pandas as pd
-    import numpy as np
     df.replace([np.inf, -np.inf],'-', inplace=True)
     df.replace([np.nan],'-', inplace=True)
 
@@ -3790,7 +3797,7 @@ if __name__=='__main__':
 
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
                  'yfinance','yahooquery','urllib3','tabulate','twine', \
-                 'mplfinance','openpyxl','pip'], \
+                 'mplfinance','openpyxl','pip','bottleneck'], \
                  pipcmd="pip install --upgrade",alternative=""):
     """
     功能：一次性升级siat及其相关插件
@@ -3952,17 +3959,29 @@ if __name__=='__main__':
     
     show_df(data,search_mode=False)
     show_df(data,search_mode=True)
+    
+    x=5
+    show_df(x)
 
 def show_df(data,search_mode=False):
     """
     功能：在Jupyter中查看dataframe，并可下载成Excel
+    注意：将改变Jupyter中pandas的显示式样，谨慎使用
     """
-    df=data.copy()
     
     import pandas as pd
+    # 设置列对齐方式为靠左
+    pd.set_option('display.align', 'left')
+    
+    if not isinstance(data,pd.DataFrame):
+        print("#Warning: the first parameter must be a dataframe")
+        return
+    
     import datetime
     from itables import init_notebook_mode, show
     init_notebook_mode(all_interactive=True)
+
+    df=data.copy()
     
     if not search_mode:
         show(df, buttons=["copyHtml5", "csvHtml5", "excelHtml5"])
@@ -3988,6 +4007,9 @@ def show_df(data,search_mode=False):
                  "criteria":[{"data":firstCol,"condition":"=","value":firstValue}]
              }})
     
+    # 重置为Pandas默认样式, 无效！
+    pd.reset_option('all')
+    
     return
 
 #==============================================================================

siat/security_price2.py

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

siat/security_prices.py

@@ -411,7 +411,7 @@ def get_price_ak_em(ticker,fromdate,todate,adjust='',ticker_type='auto'):
                        '成交量':'Volume','成交额':'Amount','换手率':'Turnover'},inplace=True)
     df1=df[['Open','Close','High','Low','Volume','Amount','Turnover']]
     
-    df1['source']='东方财富'
+    df1['source']=text_lang('东方财富','EM')
     df1['ticker']=str(ticker)
     df1['Adj Close']=df1['Close']
     df1['footnote']=adjust   
@@ -601,7 +601,7 @@ def get_price_stooq(ticker,start,end):
         #prices.dropna(inplace=True)
         
         prices['Adj Close']=prices['Close']
-        prices['source']='stooq'
+        prices['source']='Stooq'
         prices['ticker']=str(ticker)
         prices['footnote']=''
         
@@ -950,14 +950,18 @@ if __name__=='__main__':
 #==============================================================================
 if __name__=='__main__':
     symbol='AAPL'
-    fromdate='2020-12-1'
-    todate='2021-1-31'
-    adjust=""
+    fromdate='2024-5-1'
+    todate='2024-5-20'
+    adjust="qfq"
+    
+    get_price_ak_us(symbol, fromdate, todate, adjust)
 
 def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     """
     抓取单个美股股价，不能处理股指
     """
+    import pandas as pd
+    DEBUG=False
     
     #检查日期期间
     result,start,end=check_period(fromdate,todate)
@@ -969,27 +973,29 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     #printmsg=str(symbol)+" from "+fromdate+" to "+todate    
 
     import akshare as ak
-    #print("  Searching info in Sina for",symbol,"... ...")
-    try:
-        if adjust=='':
-            df=ak.stock_us_daily(symbol=symbol,adjust=adjust)
-        elif adjust=='Adj_only':
-            df=ak.stock_us_daily(symbol=symbol,adjust='qfq')
-            df['Adj Close']=df['close']
-
-        else:
-            dffqno=ak.stock_us_daily(symbol=symbol,adjust='')
-            dffq=ak.stock_us_daily(symbol=symbol,adjust='qfq')
-            dffq.rename(columns={'close':'Adj Close'},inplace=True)
-            
-            df=pd.merge(dffqno,dffq[['date','Adj Close']],on=['date'])
+    if DEBUG:
+        print("  Searching info in Sina for",symbol,"... ...")
+    #try:
+    if adjust=='':
+        df=ak.stock_us_daily(symbol=symbol,adjust=adjust)
+    elif adjust=='Adj_only':
+        df=ak.stock_us_daily(symbol=symbol,adjust='qfq')
+        df['Adj Close']=df['close']
 
+    else:
+        #分别获取收盘价和复权价，并合成
+        dffqno=ak.stock_us_daily(symbol=symbol,adjust='')
+        dffq=ak.stock_us_daily(symbol=symbol,adjust='qfq')
+        dffq.rename(columns={'close':'Adj Close'},inplace=True)
+        
+        df=pd.merge(dffqno,dffq[['date','Adj Close']],on=['date'])
+    """
     except:
-        #print("  #Error(get_price_ak_us): no info found for",symbol)
+        if DEBUG:
+            print("  #Error(get_price_ak_us): no info found for",symbol)
         return None
-    
+    """
     #去掉可能出现的时区信息，必须使用datetime中的tz_localize
-    import pandas as pd
     df['date']=pd.to_datetime(df['date'])
     #df['date']=df['date'].tz_localize(None)
     
@@ -1011,7 +1017,7 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     df2['ticker']=symbol
     if 'Adj Close' not in list(df2):
         df2['Adj Close']=df2['Close']
-    df2['source']='新浪'
+    df2['source']=text_lang('新浪','Sina')
     df2['footnote']=adjust   
     
     ptname=ticker_name(symbol,'stock')
@@ -1040,6 +1046,8 @@ def get_price_ak_hk(symbol,fromdate,todate,adjust=""):
     """
     抓取单个港股股价，不能处理股指，股指无.HK后缀
     """
+    import pandas as pd
+    
     DEBUG=False
     if DEBUG:
         print("Start searching HK stock prices for",symbol,"...")
@@ -1097,7 +1105,7 @@ def get_price_ak_hk(symbol,fromdate,todate,adjust=""):
     df2['ticker']=symbol
     if 'Adj Close' not in list(df2):
         df2['Adj Close']=df2['Close']
-    df2['source']='新浪'
+    df2['source']=text_lang('新浪','Sina')
     
     ptname=ticker_name(symbol,'stock')
     if ptname == symbol: ptname=''
@@ -1292,7 +1300,7 @@ def get_prices_yahoo(ticker,start,end,retry_count=3,pause=1):
     
         p['ticker']=ticker
         #p['Adj Close']=p['Close']
-        p['source']='雅虎'
+        p['source']=text_lang('雅虎','Yahoo')
     
         ptname=ticker_name(ticker,'stock')
         if ptname == ticker: ptname=''
@@ -1379,7 +1387,7 @@ def get_prices_yf(ticker,start,end,threads=False):
         if 'Adj Close' not in list(p):
             p['Adj Close']=p['Close']  
         p['ticker']=ticker
-        p['source']='雅虎'
+        p['source']=text_lang('雅虎','Yahoo')
         
         if len(p) > 0:
             ptname=ticker_name(ticker1,'stock')
@@ -2343,15 +2351,15 @@ def recent_stock_split(ticker):
     
     divprt=divdf[['Seq','Split Date','Weekday','Splits']]
     
-    print("\n=== 近期股票分拆历史 ===")
-    print("股票:",ticker,'\b,',ticker)
-    print("期间:",fromdate,"to",today)
-    divprt.columns=['序号','日期','星期','分拆比例']
+    print(text_lang("\n=== 近期股票分拆历史 ===","\n=== Recent Stock Split ==="))
+    print(text_lang("股票:","Stock:"),ticker,'\b,',ticker)
+    print(text_lang("期间:","Period:"),fromdate,"to",today)
+    divprt.columns=[text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('分拆比例','Split Ratio')]
     print(divprt.to_string(index=False))   
     
     import datetime
     today = datetime.date.today()
-    print("数据来源: 综合新浪/yahoo,",today)
+    print(text_lang("数据来源: 综合新浪/yahoo,","Data source: Yahoo Finance,"),today)
     
     return divdf
     

siat/stock.py

@@ -602,6 +602,17 @@ if __name__ =="__main__":
     
     fromdate='2024-1-1'; todate='2024-5-25'
     
+    # 测试组4
+    ticker='AAPL'
+    indicator='Adj Close'
+    fromdate='2024-5-1'; todate='2024-5-20'
+    adjust=''
+    zeroline=False; average_value=False; datatag=False; power=0; graph=True
+    source='auto'
+    mark_top=True; mark_bottom=True; mark_end=True
+    ticker_type='auto'
+    facecolor='whitesmoke'
+    
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 
@@ -621,7 +632,9 @@ def security_indicator(ticker,indicator, \
         print("  #Warning(security_indicator): invalid adjust",adjust)
         print("  Supported adjust:",adjust_list)
         adjust='qfq'
-        
+
+    if ('Adj' not in indicator):
+        adjust=''            
     if ('Adj' in indicator) and (adjust == ''):
         adjust='qfq'
     
@@ -806,12 +819,27 @@ if __name__ =="__main__":
     ticker='600519.SS'
     ticker='OR.PA'
     measures=['Monthly Ret%','Quarterly Ret%','Annual Ret%','XYZ']
-    fromdate='2023-1-1'
-    todate='2023-6-25'
+    
+    ticker='NVDA'
+    measures=['Close','Adj Close']
+    
+    fromdate='2024-5-20'
+    todate='2024-6-20'
+    adjust=''
+    band_area=''
     graph=True
-    smooth=False
+    smooth=True
     loc='best'
+    facecolor='whitesmoke'
+    date_range=False
+    date_freq=False
     annotate=False
+    annotate_value=False
+    source='auto'
+    mark_top=True; mark_bottom=True; mark_end=True
+    ticker_type='auto'
+    
+    df=security_mindicators(ticker,measures,fromdate,todate)
 
 def security_mindicators(ticker,measures,
                          fromdate,todate, \
@@ -832,60 +860,69 @@ def security_mindicators(ticker,measures,
     smooth：样本数目超过一定数量就默认忽略
     """
     # 提前开始日期
-    fromdate1=date_adjust(fromdate,adjust=-365*3)
+    #fromdate1=date_adjust(fromdate,adjust=-365*3)
     
+    #处理ticker，允许1个
     if isinstance(ticker,list):
-        if len(ticker) == 1:
+        if len(ticker) >= 1:
             ticker=ticker[0]
         else:
-            print("  #Error(security_mindicators): need 1 ticker only in",ticker)
+            print("  #Error(security_mindicators): need a ticker for proceed")
             return None
 
+    #处理measures，允许多个
     if isinstance(measures,str):
         measures=[measures]
 
-    #判断复权价
-    adjust_list=['','qfq','hfq']
-    if adjust not in adjust_list:
-        print("  #Warning(security_mindicators): invalid adjust",adjust)
-        print("  Supported adjust:",adjust_list)
-        adjust='qfq'  
-        
-    if adjust =='':        
-        for m in measures:
-            if 'Adj' in m:
-                adjust='qfq'
-                break
+    #屏蔽函数内print信息输出的类
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
 
-    #抓取股价
-    try:
-        from siat.security_price2 import get_price_1ticker_mixed
-        #pricedf=get_price(ticker,fromdate1,todate,source=source)
-        pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1,todate=todate, \
-                                              adjust=adjust, \
-                                              source=source,ticker_type=ticker_type)
-    except:
-        print("  #Error(security_mindicators): price info not found for",ticker)
-        return None
-    if pricedf is None:
-        print("  #Error(security_mindicators): none of price info found for",ticker)
-        return None
-    if len(pricedf) ==0:
-        print("  #Warning(security_mindicators): price info unavailable for",ticker)
-        return None
-        
-    df=all_calculate(pricedf,ticker,fromdate,todate,ticker_type=ticker_type)
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout
 
-    # 检查指标是否存在
-    colList=list(df)
-    for c in measures:
-        if not (c in colList):
-            print("  #Warning(security_mindicators): unsupported security measure",c)
-            measures.remove(c)
-    df1=df[measures]
-    
-    for c in list(df1):
-        df1.rename(columns={c:ectranslate(c)},inplace=True)
+    df=pd.DataFrame()
+    for m in measures:
+        print("  Searching",ticker,"for",m,"info ... ...")
+        #复权价判断
+        adjustm=adjust
+        if ('Adj' in m) and (adjust ==''):
+            adjustm='qfq'
+
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            dftmp=security_indicator(ticker=ticker,indicator=m,adjust=adjustm, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+        if dftmp is None:
+            print("  #Error(security_mindicators): info not found for",ticker)
+            return None
+        if len(dftmp) ==0:
+            print("  #Error(security_mindicators): empty record found for",ticker)
+            return None            
+
+        try:            
+            dftmp1= dftmp[[m]]
+        except:
+            print("  #Error(security_mindicators): unsupported measure for",m)
+            return None            
+            
+        if len(df)==0:
+            df=dftmp1
+        else:
+            df=pd.merge(df,dftmp1,left_index=True,right_index=True)
+
+    df['ticker']=ticker
+
+    # 翻译指标名称
+    for c in list(df):
+        df.rename(columns={c:ectranslate(c)},inplace=True)
 
     y_label=text_lang('证券指标',"Indicator")
     import datetime; todaydt = datetime.date.today()
@@ -898,19 +935,17 @@ def security_mindicators(ticker,measures,
             axhline_value=0
             axhline_label='零线'
             break
-    title_txt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)           
-    """
-    draw_lines(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
-               data_label=False,resample_freq='H',smooth=smooth,loc=loc,annotate=annotate)
-    """
-    draw_lines2(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
+        
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)       
+    
+    draw_lines2(df,y_label,x_label,axhline_value,axhline_label,titletxt, \
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                annotate=annotate,annotate_value=annotate_value, \
                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
                band_area=band_area,loc=loc)
 
-    return df1
+    return df
 
 #==============================================================================
 def stock_price_volatility(ticker,fromdate,todate,type="Weekly Price Volatility", \
@@ -1350,7 +1385,7 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
     #for c in nouselist: dfcols.remove(c)
     
     if not (measure in dfcols):
-        print("  #Error(comp_2securities_1measure)： only support measurement types of",dfcols)
+        print("  #Error(comp_2securities_1measure)：only support measurement types of",dfcols)
         return        
 
     #判断是否绘制水平0线
@@ -1404,13 +1439,37 @@ if __name__ =="__main__":
     df2=stock_ret(ticker2,fromdate,todate,graph=False)
     comp_2securities_1measure(df1,df2,measure)
 #==============================================================================
+if __name__ =="__main__":
+    tickers=['MSFT','AAPL']
+    measures='Annual Ret Volatility%'
+    
+    tickers='MSFT'
+    measures=['Annual Ret Volatility%','Annual Ret%']
+    
+    tickers='NVDA'
+    tickers='AAPL'
+    measures=['Close','Adj Close']   
+    
+    fromdate='2024-5-1'
+    todate='2024-5-30'
+    adjust=''
+    twinx=False
+    loc1='best'
+    loc2='lower left'
+    graph=True
+    source='auto'
+    ticker_type='auto'
+    facecolor='whitesmoke'
+
 def compare_security(tickers,measures,fromdate,todate, \
                      adjust='', \
                      twinx=False, \
                      loc1='best',loc2='lower left',graph=True,source='auto', \
                      ticker_type='auto',facecolor='whitesmoke'):
     """
-    功能：函数克隆compare_stock
+    功能：函数克隆compare_stock，只能处理两个ticker一个measure，或一个ticker两个measure
+    可以处理twinx=True
+    """
     """
     # 应对导入失灵的函数
     from siat.security_prices import upper_ticker
@@ -1421,9 +1480,179 @@ def compare_security(tickers,measures,fromdate,todate, \
                          twinx=twinx, \
                          loc1=loc1,loc2=loc2,graph=graph,source=source, \
                          ticker_type=ticker_type,facecolor=facecolor)
+    
     return result
+    """
+    #调试开关
+    DEBUG=False
+    # 应对导入失灵的函数
+    from siat.common import upper_ticker
+    tickers=upper_ticker(tickers)
+    
+    #判断证券代码个数
+    #如果tickers只是一个字符串
+    security_num = 0
+    if isinstance(tickers,str): 
+        security_num = 1
+        ticker1 = tickers
+    #如果tickers是一个列表
+    if isinstance(tickers,list): 
+        security_num = len(tickers)
+        if security_num != 0:
+            if security_num >= 1: ticker1 = tickers[0]
+            if security_num >= 2: ticker2 = tickers[1]
+        else:
+            print("  #Error(compare_security)：security code/codes needed.")
+            return None,None
+            
+    #判断测度个数
+    #如果measures只是一个字符串
+    measure_num = 0
+    if isinstance(measures,str): 
+        measure_num = 1
+        measure1 = measures
+    #如果measures是一个列表
+    if isinstance(measures,list): 
+        measure_num = len(measures)
+        if measure_num != 0:
+            if measure_num >= 1: measure1 = measures[0]
+            if measure_num >= 2: measure2 = measures[1]
+        else:
+            print("  #Error(compare_security)： a measurement indicator needed.")
+            return None,None
+
+    #解析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) >= 2:
+        ticker_type1=ticker_type[0]
+        ticker_type2=ticker_type[1]
+    ticker_type_list=[ticker_type1,ticker_type2]
+    
+    #屏蔽函数内print信息输出的类
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout    
+
+    #单一证券代码+两个测度指标
+    if (security_num == 1) and (measure_num >= 2):
+        
+        print("  Searching",ticker1,"for",measure1,"info ... ...")
+        #复权价判断1
+        adjust1=adjust
+        if ('Adj' in measure1) and (adjust1 ==''):
+            adjust1='qfq'
 
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust1, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+        pltdf1= df1tmp[[measure1]]
+        
+        print("  Searching",ticker1,"for",measure2,"info ... ...")
+        #复权价判断2
+        adjust2=adjust
+        if ('Adj' in measure2) and (adjust2 ==''):
+            adjust2='qfq'
+
+        with HiddenPrints():
+            #security_indicator未能做到同时获得Close和Adj Close
+            df2tmp=security_indicator(ticker=ticker1,indicator=measure2,adjust=adjust2, \
+                                  fromdate=fromdate,todate=todate, \
+                                  source=source, \
+                                  ticker_type=ticker_type, \
+                                  graph=False)
+ 
+        pltdf2= df2tmp[[measure2]]
+        
+        pltdf=pd.merge(pltdf1,pltdf2,left_index=True,right_index=True)
+        pltdf['ticker']=ticker1
+            
+        #绘制单个证券的双指标对比图
+        if graph:
+            comp_1security_2measures(pltdf,measure1,measure2,twinx=twinx, \
+                                     loc1=loc1,loc2=loc2,graph=graph, \
+                                     ticker_type=ticker_type[0],facecolor=facecolor)
+        
+        try:
+            result1=pltdf[['ticker',measure1]]
+        except:
+            result1=None
+        try:
+            result2=pltdf[['ticker',measure2]]
+        except:
+            result2=None
+        return result1,result2
+        
+    elif (security_num >= 2) and (measure_num >= 1):
+        #双证券+单个测度指标 
+        if ('Adj' in measure1) and (adjust ==''):
+            adjust='qfq'
+
+        df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust, \
+                              fromdate=fromdate,todate=todate, \
+                              source=source, \
+                              ticker_type=ticker_type, \
+                              graph=False) 
+        pltdf1=df1tmp[['ticker',measure1]]      
+        
+        df2tmp=security_indicator(ticker=ticker2,indicator=measure1,adjust=adjust, \
+                              fromdate=fromdate,todate=todate, \
+                              source=source, \
+                              ticker_type=ticker_type, \
+                              graph=False) 
+        pltdf2=df2tmp[['ticker',measure1]]   
+        
+        #绘制双证券单指标对比图
+        if graph:
+            comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
+                                      loc1=loc1,loc2=loc2,graph=graph, \
+                                      ticker_type=ticker_type_list,facecolor=facecolor)
+        
+        try:
+            result1=pltdf1[[measure1]]
+        except:
+            print("  #Error(compare_secuirty): measure",measure1,"not found for",ticker1)
+            result1=None
+        try:
+            result2=pltdf2[[measure1]]
+        except:
+            print("  #Error(compare_secuirty): measure",measure1,"not found for",ticker2)
+            result2=None
+        return result1,result2
+            
+    else:
+        print("  #Warning(compare_secuirty)：only support the situations of 1 ticker + 2 measures or 2 tickers + 1 measure.")
+        return None,None
+    
+    
 #==============================================================================
+if __name__ =="__main__":
+    tickers=['MSFT','AAPL']
+    measures='Annual Ret Volatility%'
+    fromdate='2023-1-1'
+    todate='2023-12-31'
+    adjust=''
+    twinx=False
+    loc1='best'
+    loc2='lower left'
+    graph=True
+    source='auto'
+    ticker_type='auto'
+    facecolor='whitesmoke'
+
+
 def compare_stock(tickers,measures,fromdate,todate, \
                   adjust='', \
                   twinx=False, \
@@ -1442,6 +1671,8 @@ def compare_stock(tickers,measures,fromdate,todate, \
     开始日期fromdate，结束日期todate。
     输出：绘制证券价格折线图，手动指定是否使用单轴或双轴坐标。
     返回：无
+    
+    打算废弃？
     """
     #调试开关
     DEBUG=False
@@ -1479,27 +1710,30 @@ def compare_stock(tickers,measures,fromdate,todate, \
         if measure_num >= 1: measure1 = measures[0]
         if measure_num >= 2: measure2 = measures[1]
 
+    #延伸开始日期
+    fromdate1=date_adjust(fromdate,adjust=-365)
+
     #单一证券代码+两个测度指标
     if (security_num == 1) and (measure_num >= 2):
         if (('Adj' in measure1) or ('Adj' in measure2)) and (adjust ==''):
             adjust='qfq'
         
         #证券ticker1：抓取行情，并计算其各种期间的收益率
-        df1a=stock_ret(ticker1,fromdate,todate,adjust=adjust,graph=False,source=source,ticker_type=ticker_type)
+        df1a=stock_ret(ticker1,fromdate1,todate,adjust=adjust,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,ticker_type=ticker_type)
+        df1b=price_volatility2(df1a,ticker1,fromdate1,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,ticker_type=ticker_type)
+        df1c=ret_volatility2(df1b,ticker1,fromdate1,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,ticker_type=ticker_type)
+        df1d=ret_lpsd2(df1c,ticker1,fromdate1,todate,graph=False,ticker_type=ticker_type)
         if DEBUG: print("compare|df1d first date:",df1d.index[0])
         
         #去掉开始日期以前的数据
-        pltdf1=df1d[df1d.index >= fromdate]
+        pltdf1=df1d[df1d.index >= fromdate1]
         #绘制单个证券的双指标对比图
         if graph:
             comp_1security_2measures(pltdf1,measure1,measure2,twinx=twinx, \
@@ -1531,24 +1765,24 @@ def compare_stock(tickers,measures,fromdate,todate, \
         ticker_type_list=[ticker_type1,ticker_type2]
         
         #证券ticker1：抓取行情，并计算其各种期间的收益率
-        df1a=stock_ret(ticker1,fromdate,todate,adjust=adjust,graph=False,source=source,ticker_type=ticker_type1)
+        df1a=stock_ret(ticker1,fromdate1,todate,adjust=adjust,graph=False,source=source,ticker_type=ticker_type1)
         if df1a is None: return None,None
         #加入价格波动指标
-        df1b=price_volatility2(df1a,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)
+        df1b=price_volatility2(df1a,ticker1,fromdate1,todate,graph=False,ticker_type=ticker_type1)
         #加入收益率波动指标
-        df1c=ret_volatility2(df1b,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)
+        df1c=ret_volatility2(df1b,ticker1,fromdate1,todate,graph=False,ticker_type=ticker_type1)
         #加入收益率下偏标准差指标
-        df1d=ret_lpsd2(df1c,ticker1,fromdate,todate,graph=False,ticker_type=ticker_type1)        
+        df1d=ret_lpsd2(df1c,ticker1,fromdate1,todate,graph=False,ticker_type=ticker_type1)        
         #去掉开始日期以前的数据
-        pltdf1=df1d[df1d.index >= fromdate]
+        pltdf1=df1d[df1d.index >= fromdate1]
         
         #证券ticker2：
-        df2a=stock_ret(ticker2,fromdate,todate,adjust=adjust,graph=False,source=source,ticker_type=ticker_type2)
+        df2a=stock_ret(ticker2,fromdate1,todate,adjust=adjust,graph=False,source=source,ticker_type=ticker_type2)
         if df2a is None: return None,None
-        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]
+        df2b=price_volatility2(df2a,ticker2,fromdate1,todate,graph=False,ticker_type=ticker_type2)
+        df2c=ret_volatility2(df2b,ticker2,fromdate1,todate,graph=False,ticker_type=ticker_type2)
+        df2d=ret_lpsd2(df2c,ticker2,fromdate1,todate,graph=False,ticker_type=ticker_type2)
+        pltdf2=df2d[df2d.index >= fromdate1]
         
         #绘制双证券单指标对比图
         if graph:
@@ -1647,16 +1881,19 @@ def compare_msecurity(tickers,measure,start,end, \
     # 应对导入失灵的函数
     from siat.common import upper_ticker
     tickers=upper_ticker(tickers)
+    if not isinstance(tickers,list):
+        tickers=[tickers]
+    
     # 去掉重复代码：有必要，重复代码将导致后续处理出错KeyError: 0！
     tickers=list(set(tickers))
+    """
     num=len(tickers)
     if num <2:
         print("  #Error(compare_msecurity): need more tickers")
         return None
-
-    if not isinstance(measure,str): 
-        print("  #Error(compare_msecurity): support only one measure")
-        return None
+    """
+    if isinstance(measure,list):
+        measure=measure[0]
     
     print("  Searching for multiple security for",measure,"...") 
     #屏蔽函数内print信息输出的类
@@ -2329,7 +2566,10 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     divdf['Weekdayiso']= divdf['Index Date'].apply(weekdayfmt)
     #wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
     #wdlist=['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']
-    wdlist=['星期一','星期二','星期三','星期四','星期五','星期六','星期日']
+    #wdlist=['星期一','星期二','星期三','星期四','星期五','星期六','星期日']
+    wdlist=[text_lang('星期一','Mon'),text_lang('星期二','Tue'),text_lang('星期三','Wed'), \
+            text_lang('星期四','Thu'),text_lang('星期五','Fri'),text_lang('星期六','Sat'),text_lang('星期日','Sun')]
+    
     wdfmt=lambda x : wdlist[x-1]
     divdf['Weekday']= divdf['Weekdayiso'].apply(wdfmt)
     
@@ -2343,25 +2583,25 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     fromdatey2md=startdt.strftime('%y/%m/%d')
     todatey2md=enddt.strftime('%y/%m/%d')
 
-    if lang == 'English':
-        titletxt=texttranslate("股票分红历史")+': '+tname
-        periodtxt=texttranslate("历史期间:")+' '+fromdatey2md+"-"+todatey2md
-        sourcetxt=texttranslate("数据来源: 雅虎财经,")
-        
-        #修改列命为英文
-        divprt.columns = [texttranslate('序号'),texttranslate('日期'),texttranslate('星期'),texttranslate('股息')]
-    else:
-        titletxt="股票分红历史："+tname
-        periodtxt="期间: "+fromdatey2md+"-"+todatey2md
-        sourcetxt="数据来源: 雅虎,"
-        
-        #修改列命为中文
-        divprt.columns = ['序号','日期','星期','每股派息']
+    titletxt=text_lang("股票分红历史","Stock Dividend")+': '+tname
+    periodtxt=text_lang("历史期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
+    #sourcetxt=text_lang("数据来源: 雅虎财经,","Data source: Yahoo Finance,")
+    sourcetxt=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")
+    footnote=periodtxt+'\n'+sourcetxt
+    
+    #修改列命为英文
+    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('每股股息','Dividend/share')]
+    
     """        
     print(divprt.to_string(index=False))   
     """
-    print(' ') #空一行
+    #print('') #空一行
     
+    df_display_CSS(divprt,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='center',second_col_align='center', \
+                       last_col_align='right',other_col_align='center')
+
+    """
     disph=divprt.style.hide() #不显示索引列
     dispp=disph.format(precision=4) #设置带有小数点的列精度调整为小数点后2位
     #设置标题/列名对齐
@@ -2382,6 +2622,7 @@ def stock_dividend(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     import datetime; todaydt=datetime.date.today(); todayy2md=todaydt.strftime('%y/%m/%d')
     #print('\n*** '+sourcetxt,today)
     print(sourcetxt,todayy2md)
+    """
     
     return divdf
     
@@ -2454,7 +2695,8 @@ def stock_split(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     weekdayfmt=lambda x : x.isoweekday()
     divdf['Weekdayiso']= divdf['Index Date'].apply(weekdayfmt)
     #wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
-    wdlist=['星期一','星期二','星期三','星期四','星期五','星期六','星期日']
+    wdlist=[text_lang('星期一','Mon'),text_lang('星期二','Tue'),text_lang('星期三','Wed'), \
+            text_lang('星期四','Thu'),text_lang('星期五','Fri'),text_lang('星期六','Sat'),text_lang('星期日','Sun')]
     wdfmt=lambda x : wdlist[x-1]
     divdf['Weekday']= divdf['Weekdayiso'].apply(wdfmt)
     
@@ -2495,25 +2737,25 @@ def stock_split(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     fromdatey2md=startdt.strftime('%y/%m/%d')
     todatey2md=enddt.strftime('%y/%m/%d')
     
-    if lang == 'English':
-        titletxt=texttranslate("股票分拆历史")+': '+tname
-        periodtxt=texttranslate("历史期间:")+' '+fromdatey2md+"-"+todatey2md
-        sourcetxt=texttranslate("数据来源: 雅虎财经,")
-        
-        #修改列命为英文
-        divprt.columns = [texttranslate('序号'),texttranslate('日期'),texttranslate('星期'),texttranslate('股息')]
-    else:
-        titletxt="股票分拆历史："+tname
-        periodtxt="期间: "+fromdatey2md+"-"+todatey2md
-        sourcetxt="数据来源: 雅虎,"
-        
-        #修改列命为中文
-        divprt.columns = ['序号','日期','星期','分拆比例']
+    titletxt=text_lang("股票分拆历史","Stock Split")+': '+tname
+    periodtxt=text_lang("历史期间:","Period:")+' '+fromdatey2md+"-"+todatey2md
+    
+    import datetime; todaydt=datetime.date.today(); todayy2md=str(todaydt.strftime('%y/%m/%d'))
+    #sourcetxt=text_lang("数据来源: 雅虎财经, ","Data source: Yahoo Finance, ")+todayy2md
+    sourcetxt=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")
+    footnote=periodtxt+'\n'+ sourcetxt
+    
+    #修改列命为英文
+    divprt.columns = [text_lang('序号','No.'),text_lang('日期','Date'),text_lang('星期','Weekday'),text_lang('分拆比例','Split Ratio')]
     """        
     print(divprt.to_string(index=False))   
     """
     print(' ') #空一行
     
+    df_display_CSS(divprt,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='center',second_col_align='center', \
+                       last_col_align='right',other_col_align='center')
+    """
     disph=divprt.style.hide() #不显示索引列
     dispp=disph.format(precision=4) #设置带有小数点的列精度调整为小数点后2位
     #设置标题/列名
@@ -2534,6 +2776,7 @@ def stock_split(ticker,start,end,facecolor='whitesmoke',fontcolor='black'):
     import datetime; todaydt=datetime.date.today(); todayy2md=todaydt.strftime('%y/%m/%d')
     #print('\n*** '+sourcetxt,today)
     print(sourcetxt,todayy2md)
+    """
     
     return divdf
     

siat/translate.py

@@ -58,9 +58,9 @@ def ectranslate_c(eword):
         ['Quarterly Ret%','季度收益率%'],['Quarterly Adj Ret','季度调整收益率'],
         ['Quarterly Adj Ret%','季度调整收益率%'],['Annual Ret','年收益率'],
         ['Annual Ret%','年收益率%'],['Annual Adj Ret','年调整收益率'],
-        ['Annual Adj Ret%','年调整收益率%'],['Exp Ret','投资收益率'],
-        ['Exp Ret%','投资收益率%'],['Exp Adj Ret','持有调整收益率'],
-        ['Exp Adj Ret%','持有调整收益率%'],
+        ['Annual Adj Ret%','年调整收益率%'],['Exp Ret','持有期资本利得率'],
+        ['Exp Ret%','持有期资本利得%'],['Exp Adj Ret','持有期收益率'],
+        ['Exp Adj Ret%','持有期收益率%'],
         
         ['Weekly Price Volatility','周股价波动风险'],
         ['Weekly Adj Price Volatility','周调整股价波动风险'],
@@ -70,8 +70,8 @@ def ectranslate_c(eword):
         ['Quarterly Adj Price Volatility','季调整股价波动风险'],
         ['Annual Price Volatility','年股价波动风险'],
         ['Annual Adj Price Volatility','年调整股价波动风险'],  
-        ['Exp Price Volatility','持有股价波动风险'], 
-        ['Exp Adj Price Volatility','持有调整股价波动风险'],
+        ['Exp Price Volatility','持有期股价波动风险'], 
+        ['Exp Adj Price Volatility','持有期复权价波动风险'],
         
         ['Weekly Ret Volatility','周收益率波动风险'],
         ['Weekly Ret Volatility%','周收益率波动风险%'],
@@ -89,31 +89,31 @@ def ectranslate_c(eword):
         ['Annual Ret Volatility%','年收益率波动风险%'],
         ['Annual Adj Ret Volatility','年调整收益率波动风险'], 
         ['Annual Adj Ret Volatility%','年调整收益率波动风险%'], 
-        ['Exp Ret Volatility','投资收益率波动风险'], 
-        ['Exp Ret Volatility%','投资收益率波动风险%'],
-        ['Exp Adj Ret Volatility','调整投资收益率波动风险'],        
-        ['Exp Adj Ret Volatility%','调整投资收益率波动风险%'],
-        
-        ['Weekly Ret LPSD','周收益率波动损失风险'],
-        ['Weekly Ret LPSD%','周收益率波动损失风险%'],
-        ['Weekly Adj Ret LPSD','周调整收益率波动损失风险'],
-        ['Weekly Adj Ret LPSD%','周调整收益率波动损失风险%'],
-        ['Monthly Ret LPSD','月收益率波动损失风险'],
-        ['Monthly Ret LPSD%','月收益率波动损失风险%'],
-        ['Monthly Adj Ret LPSD','月调整收益波动损失风险'],
-        ['Monthly Adj Ret LPSD%','月调整收益波动损失风险%'],
-        ['Quarterly Ret LPSD','季收益率波动损失风险'],
-        ['Quarterly Ret LPSD%','季收益率波动损失风险%'],
-        ['Quarterly Adj Ret LPSD','季调整收益率波动损失风险'],
-        ['Quarterly Adj Ret LPSD%','季调整收益率波动损失风险%'],
-        ['Annual Ret LPSD','年收益率波动损失风险'],
-        ['Annual Ret LPSD%','年收益率波动损失风险%'],
-        ['Annual Adj Ret LPSD','年调整收益率波动损失风险'], 
-        ['Annual Adj Ret LPSD%','年调整收益率波动损失风险%'], 
-        ['Exp Ret LPSD','投资损失风险'], 
-        ['Exp Ret LPSD%','投资损失风险%'],
-        ['Exp Adj Ret LPSD','调整投资损失风险'],        
-        ['Exp Adj Ret LPSD%','调整投资损失风险%'],
+        ['Exp Ret Volatility','持有期资本利得风险'], 
+        ['Exp Ret Volatility%','持有期资本利得风险%'],
+        ['Exp Adj Ret Volatility','持有期收益率风险'],        
+        ['Exp Adj Ret Volatility%','持有期收益率风险%'],
+        
+        ['Weekly Ret LPSD','周收益损失风险'],
+        ['Weekly Ret LPSD%','周收益损失风险%'],
+        ['Weekly Adj Ret LPSD','周复权收益损失风险'],
+        ['Weekly Adj Ret LPSD%','周复权收益损失风险%'],
+        ['Monthly Ret LPSD','月收益损失风险'],
+        ['Monthly Ret LPSD%','月收益损失风险%'],
+        ['Monthly Adj Ret LPSD','月复权收益损失风险'],
+        ['Monthly Adj Ret LPSD%','月复权收益损失风险%'],
+        ['Quarterly Ret LPSD','季收益损失风险'],
+        ['Quarterly Ret LPSD%','季收益损失风险%'],
+        ['Quarterly Adj Ret LPSD','季复权收益损失风险'],
+        ['Quarterly Adj Ret LPSD%','季复权收益损失风险%'],
+        ['Annual Ret LPSD','年收益损失风险'],
+        ['Annual Ret LPSD%','年收益损失风险%'],
+        ['Annual Adj Ret LPSD','年复权收益损失风险'], 
+        ['Annual Adj Ret LPSD%','年复权收益损失风险%'], 
+        ['Exp Ret LPSD','持有期资本损失风险'], 
+        ['Exp Ret LPSD%','持有期资本损失风险%'],
+        ['Exp Adj Ret LPSD','持有期收益损失风险'],        
+        ['Exp Adj Ret LPSD%','持有期收益损失风险%'],
         
         ['roll_spread','罗尔价差比率'],['amihud_illiquidity','阿米胡德非流动性'],
         ['ps_liquidity','P-S流动性'],    
@@ -353,9 +353,9 @@ def ectranslate_e(eword):
         ['Quarterly Ret%','Quarterly Return%'],['Quarterly Adj Ret','Quarterly Adjusted Return'],
         ['Quarterly Adj Ret%','Quarterly Adjusted Return%'],['Annual Ret','Annual Return'],
         ['Annual Ret%','Annual Return%'],['Annual Adj Ret','Annual Adjusted Return'],
-        ['Annual Adj Ret%','Annual Adjusted Return%'],['Exp Ret','Holding Return'],
-        ['Exp Ret%','Holding Return%'],['Exp Adj Ret','Holding Adjusted Return'],
-        ['Exp Adj Ret%','Holding Adjusted Return%'],
+        ['Annual Adj Ret%','Annual Adjusted Return%'],['Exp Ret','Holding Period Capital Gain Rate'],
+        ['Exp Ret%','Holding Period Capital Gain%'],['Exp Adj Ret','Holding Period Return'],
+        ['Exp Adj Ret%','Holding Period Return%'],
         
         ['Weekly Price Volatility','Weekly Price Volatility'],
         ['Weekly Adj Price Volatility','Weekly Adjusted Price Volatility'],
@@ -384,31 +384,31 @@ def ectranslate_e(eword):
         ['Annual Ret Volatility%','Annual Return Volatility%'],
         ['Annual Adj Ret Volatility','Annual Adjusted Return Volatility'], 
         ['Annual Adj Ret Volatility%','Annual Adjusted Return Volatility%'], 
-        ['Exp Ret Volatility','Holding Return Volatility'], 
-        ['Exp Ret Volatility%','Holding Return Volatility%'],
-        ['Exp Adj Ret Volatility','Holding Adjusted Return Volatility'],        
-        ['Exp Adj Ret Volatility%','Holding Adjusted Return Volatility%'],
-        
-        ['Weekly Ret LPSD','Weekly Return LPSD'],
-        ['Weekly Ret LPSD%','Weekly Return LPSD%'],
-        ['Weekly Adj Ret LPSD','Weekly Adjusted Return LPSD'],
-        ['Weekly Adj Ret LPSD%','Weekly Adjusted Return LPSD%'],
-        ['Monthly Ret LPSD','Monthly Return LPSD'],
-        ['Monthly Ret LPSD%','Monthly Return LPSD%'],
-        ['Monthly Adj Ret LPSD','Monthly Adjusted Return LPSD'],
-        ['Monthly Adj Ret LPSD%','Monthly Adjusted Return LPSD%'],
-        ['Quarterly Ret LPSD','Quarterly Return LPSD'],
-        ['Quarterly Ret LPSD%','Quarterly Return LPSD%'],
-        ['Quarterly Adj Ret LPSD','Quarterly Adjusted Return LPSD'],
-        ['Quarterly Adj Ret LPSD%','Quarterly Adjusted Return LPSD%'],
-        ['Annual Ret LPSD','Annual Return LPSD'],
-        ['Annual Ret LPSD%','Annual Return LPSD%'],
-        ['Annual Adj Ret LPSD','Annual Adjusted Return LPSD'], 
-        ['Annual Adj Ret LPSD%','Annual Adjusted Return LPSD%'], 
-        ['Exp Ret LPSD','Holding Return LPSD'], 
-        ['Exp Ret LPSD%','Holding Return LPSD%'],
-        ['Exp Adj Ret LPSD','Holding Adjusted Return LPSD'],        
-        ['Exp Adj Ret LPSD%','Holding Adjusted Return LPSD%'],
+        ['Exp Ret Volatility','Holding Period Capital Gain Volatility'], 
+        ['Exp Ret Volatility%','Holding Period Capital Gain Volatility%'],
+        ['Exp Adj Ret Volatility','Holding Period Return Volatility'],        
+        ['Exp Adj Ret Volatility%','Holding Period Return Volatility%'],
+        
+        ['Weekly Ret LPSD','Weekly Loss Risk'],
+        ['Weekly Ret LPSD%','Weekly Loss Risk%'],
+        ['Weekly Adj Ret LPSD','Weekly Adjusted Loss Risk'],
+        ['Weekly Adj Ret LPSD%','Weekly Adjusted Loss Risk%'],
+        ['Monthly Ret LPSD','Monthly Loss Risk'],
+        ['Monthly Ret LPSD%','Monthly Loss Risk%'],
+        ['Monthly Adj Ret LPSD','Monthly Adjusted Loss Risk'],
+        ['Monthly Adj Ret LPSD%','Monthly Adjusted Loss Risk%'],
+        ['Quarterly Ret LPSD','Quarterly Loss Risk'],
+        ['Quarterly Ret LPSD%','Quarterly Loss Risk%'],
+        ['Quarterly Adj Ret LPSD','Quarterly Adjusted Loss Risk'],
+        ['Quarterly Adj Ret LPSD%','Quarterly Adjusted Loss Risk%'],
+        ['Annual Ret LPSD','Annual Loss Risk'],
+        ['Annual Ret LPSD%','Annual Loss Risk%'],
+        ['Annual Adj Ret LPSD','Annual Adjusted Loss Risk'], 
+        ['Annual Adj Ret LPSD%','Annual Adjusted Loss Risk%'], 
+        ['Exp Ret LPSD','Holding Period Capital Loss Risk'], 
+        ['Exp Ret LPSD%','Holding Period Capital Loss Risk%'],
+        ['Exp Adj Ret LPSD','Holding Period Loss Risk'],        
+        ['Exp Adj Ret LPSD%','Holding Period Loss Risk%'],
         
         ['roll_spread','Roll Spread'],['amihud_illiquidity','Amihud Illiquidity'],
         ['ps_liquidity','P-S Liquidity'],    
@@ -607,8 +607,12 @@ def codetranslate(codelist):
 #==============================================================================
 if __name__=='__main__':
     codelist=['601398.SS','01398.HK']
+    codelist='PDD'
+    
     code='601398.SS'
     code='01398.HK'
+    
+    codetranslate_e(codelist)
 
 #在common中定义
 #SUFFIX_LIST_CN=['SS','SZ','BJ','NQ']
@@ -1813,7 +1817,7 @@ def codetranslate1(code):
         ['EBAY','eBay'],['eBay','eBay'],['META','META'],['ZM','ZOOM'],
         ['GOOG','Google'],['TWTR','Twitter'],
         ['VIPS','Vipshop'],['Vipshop','Vipshop'],
-        ['PDD','Pinduoduo'],['Pinduoduo','Pinduoduo'],        
+        ['PDD','PDD(US)'],['Pinduoduo','Pinduoduo'],        
         ['BABA','Alibaba(US)'],['Alibaba','Alibaba'],
         ['JD','JD(US)'],
         ['SINA','Sina'],['BIDU','Baidu'],['NTES','Netease'],
@@ -1967,9 +1971,10 @@ def codetranslate1(code):
         ['000022.SS','SSE Corpbond Index'],['000061.SS','SSE Entbond30 Index'],
         ['000116.SS','SSE Creditbond100 Index'],['000101.SS','SSE 5-year Creditbond Index'],
         
-        ['002594.SZ','BYD Auto (A)'],['01211.HK','BYD Auto (HK)'],['81211.HK','BYD Auto (HK RMB)'],
+        ['002594.SZ','BYD Auto(A)'],['01211.HK','BYD Auto(HK)'],['81211.HK','BYD Auto(HK RMB)'],
         ['600941.SS','China Mobile'],['00941.HK','China Mobile (HK)'],['80941.HK','China Mobile (HK RMB)'],
         ['ULVR.UK','Unilever (UK)'],['605011.SS','Hangzou Power'],['000723.SZ','Meijin Energy'],
+        ['EL','Estee Lauder'],['LOR.DE','L\'Oreal(DE)'],
 
         ['^GSPC','S&P500 Index'],['^DJI','Dow Jones Index'],
         ['WISGP.SI','FTSE Singapore Index'], ['^STI','Straits Times Index'],
@@ -1977,6 +1982,7 @@ def codetranslate1(code):
         ['^N100','Euronext 100 Index'],['^FMIB','FTSE Italy Index'],
         ['^TSX','Toronto Composite Index'],['^MXX','Mexico IPC Index'],
         ['^SNX','India SENSEX 30 Index'],['^FTM','UK FTSE 250 Index'],
+        ['^KLCI','Kuala Lumpur Composite Index'],['^KLSE','Kuala Lumpur Composite Index'],
         
         ['FVTT.FGI','FTSE Viernam Index'],['^RUT','Russell 2000 Index'],
         ['^HSI','Hang Seng Index'],['^N225','Nikkei 225 Index'],
@@ -2218,6 +2224,8 @@ def get_names(symbol):
 if __name__=='__main__':
     symbol='00700.HK'
     symbol='001979.SZ'
+    symbol='PDD'
+    
     get_names0(symbol)
     
 def get_names0(symbol):
@@ -2755,7 +2763,7 @@ def texttranslate(code):
         ['数据来源: 新浪/stooq,','Source: sina/stooq,'],['数据来源: 雅虎财经,','Source: Yahoo Finance,'],
         ["证券快照：","证券快照："],
         ["证券价格走势图：","证券价格走势图："],
-        ["证券收益率波动损失风险走势图：","证券收益率波动损失风险走势图："],
+        ["证券收益率损失风险走势图：","证券收益率损失风险走势图："],
         ["证券指标走势对比图：","证券指标走势对比图："],
         ["证券价格走势蜡烛图演示：","证券价格走势蜡烛图演示："],
         ["股票分红历史","Stock Dividend History"],
@@ -3213,6 +3221,7 @@ if __name__=='__main__':
     ticker='010107.SS' #债券/基金重码
     ticker='sh010303' #国债/基金重码
     ticker='sh018001' #金融债
+    ticker='PDD'
     
     ticker_type='auto'
     ticker_type='bond'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.45
+Version: 3.2.51
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -33,6 +33,7 @@ Requires-Dist: luddite
 Requires-Dist: pendulum
 Requires-Dist: itables
 Requires-Dist: py-trans
+Requires-Dist: bottleneck
 
 # Welcome to the Magic World of siat
 

{siat-3.2.45.dist-info → siat-3.2.51.dist-info}/RECORD

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=_PkuAzT9fNJazC1p3NIQDqLduzfBFcLsV3KPteo377I,149963
+siat/common.py,sha256=-0zmR2N_t2xaTyYedwztT7HcHKG39DwaoLoX1u5Wm7s,150656
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -97,15 +97,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=nP6kfYsnaQWZj8dK-zklwSDW8FDS-obZWp_zL0ec2Ig,118603
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=NKlk5VRA-WeSK8dU960PRfWUOzj4BQ4HbUw3t4j9cv8,25955
-siat/security_prices.py,sha256=ChiVcubRiPzUvYm8a5X5qjxWtawRQdYHFQXLIevGFC4,105328
+siat/security_price2.py,sha256=4xvc9AzRhLKJMu6AxVzIqcn1-NrHoeCF2Ao2p9nwYjU,25978
+siat/security_prices.py,sha256=WXC-UNLnuZ69MtC5oLIXbFKX5UeJ_52wRiqHj4LfJW0,105797
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
 siat/security_trend2.py,sha256=WOygSyWSynNmk5gpOA8n1738-nWqfDzuyMjwriB3eP4,25284
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=lk3Cvbm2ieFk-ISoy2nX0rEoqnnAGuX3lNiT6iskTjg,143914
+siat/stock.py,sha256=cIEVxAZ6vPhpICWk4p4tqpeyidLjxZHO2fF_HClaxHw,152530
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -131,14 +131,14 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=YoC7OzzGUxT-7EEIU-GYWz0A9CBQ4aIQjlparfVJYSQ,216156
+siat/translate.py,sha256=5o7hSMeNOdyenqiyB5oZwFvIpFvt3yGgp25KZNbqy9o,216309
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
-siat-3.2.45.dist-info/METADATA,sha256=a1zRvc3eoGiRhfDYBCgHd6iE9YgNmlj83jV1Alrq7Cc,7283
-siat-3.2.45.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.45.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.45.dist-info/RECORD,,
+siat-3.2.51.dist-info/METADATA,sha256=3PAMtgmDyOlUvGAb41VpjG5L2_ZVWfKGjN7qau9xKTc,7310
+siat-3.2.51.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.51.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.51.dist-info/RECORD,,