siat 3.7.7__py3-none-any.whl → 3.7.9__py3-none-any.whl

siat/financials2.py

@@ -104,17 +104,38 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 category='profile',business_period='annual', \
                 scale1=10,scale2=10,dupont_sort='PM',
                 printout=True, \
-                entry_sort=False, \
+               #entry_sort=False, \
                 facecolor='papayawhip',font_size='16px'
                 ):
     """
-    功能：tickers为股票列表，fsdates为财报日期，可为单个日期或日期列表
+    
+    功能：分析境外上市公司财报信息
+    
+    参数：
+    tickers：股票列表，对比分析时需要多个股票，单列财报时仅取第一个股票
+    fsdates：财报日期，可为单个日期或日期列表，注意境外上市公司财报日期与中国大陆的不同
+    
+    analysis_type：分析类型，可为企业概况('profile')、资产负债表简表('balance sheet')、
+    利润表简表('income statement')、现金流量表简表('cash flow')、财报概况('financial summary')、
+    财务比率('financial indicator')、杜邦分析('dupont identity')
+    
+    category：企业概况分类，，仅当analysis_type='profile'时有效，
+    可为基本信息'profile'、高管概况('officers')、分红('dividend')、股票分拆('split')、市场表现('market')、
+    财务状况('financial')、一般风险('risk')、ESG风险('esg')
+    
+    business_period：业务期间类型，可为季报'quarterly'，年报'annual'、最近的6次报告'recent', 所有'all' 
+    scale1：仅用于杜邦分析，放大倍数（以便缩小与EM之间的数量级差异），用于Profit Margin，默认10
+    scale2：仅用于杜邦分析，放大倍数，用于Total Asset Turnover，默认10
+    dupont_sort：仅用于杜邦分析，用于排序指标，默认净利润率'PM'，还可为总资产周转率'TAT'或权益乘数'EM'
+    printout：是否显示数据表，默认是True
+    facecolor：背景颜色，默认小麦黄'papayawhip'
+    font_size：标题字体大小，默认'16px'
+    
     注意1：仅从雅虎财经获取数据
     注意2：不同经济体上市公司报表币种可能不同，金额项目仅进行同公司对比，不进行公司间对比
-    注意3：公司间仅对比财务比率
+    注意3：公司间仅对比财务比率和杜邦分析
     注意4：不同经济体上市公司年报季报日期不同，需要列示报表日期和类型(年报或季报)
-    
-    business_period：取季报'quarterly'，年报'annual'，最近的6次报告'recent', 所有'all'    
+       
     """
     import numpy as np
 
@@ -177,9 +198,11 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             info=get_stock_profile(tickers,info_type=category)
             
         elif contains_any(category,['risk']):
+            #这里的是风险指标，数值越大风险越高，数值越小越好
             category='risk_general'
             info=get_stock_profile(tickers,info_type=category)
         elif contains_any(category,['esg']):
+            #这里的ESG为风险指标，数值越大风险越高，数值越小越好
             category='risk_esg'
             info=get_stock_profile(tickers,info_type=category)
         else:
@@ -200,7 +223,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         # 分析资产负债表       
         fsdf=get_balance_sheet(symbol=tickers)
         if fsdf is None:
-            print("  #Warning(fs_analysis): financial info unaccessible for",tickers,"\b, which needs connection to Yahoo Finance")
+            print("  #Warning(fs_analysis): financial info unaccessible for",tickers,"\b, which needs connection to Yahoo")
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -245,7 +268,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
             
             #titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
-            titletxt=ticker_name(tickers,'stock')+": BALANCE SHEET"
+            titletxt=ticker_name(tickers,'stock')+text_lang("：资产负债简表",": BALANCE SHEET")
             #print(titletxt)
             """
             tablefmt_list=["plain","simple","github","grid","simple_grid","rounded_grid", \
@@ -347,7 +370,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
             
             #titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
-            titletxt=ticker_name(tickers,'stock')+": INCOME STATEMENTS"
+            titletxt=ticker_name(tickers,'stock')+text_lang("：利润简表",": INCOME STATEMENTS")
             #print(titletxt)
             
             collist=list(fsdf4)
@@ -427,7 +450,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
             
             #titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
-            titletxt=ticker_name(tickers,'stock')+": CASHFLOW STATEMENTS"
+            titletxt=ticker_name(tickers,'stock')+text_lang("：现金流量简表",": CASHFLOW STATEMENTS")
             #print(titletxt)
             
             collist=list(fsdf4)
@@ -536,7 +559,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
                 
                 #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
-                titletxt=ticker_name(tickers,'stock')+": FINANCIAL STATEMENT SUMMARY"
+                titletxt=ticker_name(tickers,'stock')+text_lang("：财报摘要",": FINANCIAL STATEMENT SUMMARY")
                 #print(titletxt)
                 
                 collist=list(fsdf4)
@@ -638,7 +661,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
                 
                 #titletxt="\n***** PEER COMPARISON OF FINANCIAL STATEMENT SUMMARY *****\n"
-                titletxt="FINANCIAL STATEMENT SUMMARY: PEER COMPARISON"
+                titletxt=text_lang("财报摘要对比","FINANCIAL STATEMENT SUMMARY: COMPARISON")
                 #print(titletxt)
                 
                 collist=list(fsdf4)
@@ -746,7 +769,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
                 
                 #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
-                titletxt=ticker_name(tickers,'stock')+": FINANCIAL INDICATORS"
+                titletxt=ticker_name(tickers,'stock')+text_lang("：财务比率",": FINANCIAL INDICATORS")
                 #print(titletxt)
                 
                 collist=list(fsdf4)
@@ -849,7 +872,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
                 
                 #titletxt="\n***** PEER COMPARISON OF FINANCIAL INDICATORS *****\n"
-                titletxt="FINANCIAL INDICATORS: PEER COMPARISON"
+                titletxt=text_lang("财务比率对比","FINANCIAL INDICATORS: COMPARISON")
                 #print(titletxt)
                 
                 collist=list(fsdf4)
@@ -963,21 +986,21 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         plt.ylabel("Items (Amplified)")
             
         footnote1="[Bar amplifier] "+name1+'：x'+str(scale1)+'，'+name2+'：x'+str(scale2)
-        footnote2='Financial statement period: '+fin_period+'. Bar height does not indicate ROE value.'
+        footnote2='Statement period: '+fin_period+'. Bar height does not indicate ROE value.'
         footnote3="Data source: Yahoo Finance，"+todaydt
         footnote ='\n'+footnote1+'\n'+footnote2+'\n'+footnote3
         plt.xlabel(footnote,fontsize=10)
         
         plt.legend(loc='best',fontsize=10)
-        plt.title("Dupont Identity Analysis")
+        plt.title(text_lang("杜邦分析对比","Dupont Identity Analysis"))
         plt.xlim([min(tick_pos)-w,max(tick_pos)+w])
         
-        plt.gca().set_facecolor('whitesmoke')
+        plt.gca().set_facecolor(facecolor)
         plt.show()    
         
         if printout:
             #title_txt="\n***** Dupont Identity Fact Sheet *****\n"
-            titletxt="Dupont Identity Fact Sheet"
+            titletxt=text_lang("杜邦分析数据表","Dupont Identity Fact Sheet")
             #print(titletxt)
             
             # 保留四位小数
@@ -998,7 +1021,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             footnote2="Data source: Yahoo Finance, "+str(todaydt)
             footnote='Note:\n'+footnote1+'\n'+footnote2
             #print('\n',footnote1,'\b.',footnote2)               
-            df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+            df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor,decimals=4, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                data_font_size=data_font_size)        
         return  df2      

siat/grafix.py

@@ -1448,6 +1448,25 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     return
 
 #==============================================================================
+if __name__ =="__main__":
+    df0=security_trend(['PDD','JD'],annotate=True,graph=False)
+    
+    y_label=''; x_label='Footnote'
+    axhline_value=0; axhline_label=''
+    title_txt='Title'
+    data_label=False
+    resample_freq='H'; smooth=True
+    linewidth=1.5
+    loc='best'
+    annotate=True; annotate_value=True
+    plus_sign=False
+    attention_value=''; attention_value_area=''
+    attention_point=''; attention_point_area=''
+    mark_top=False; mark_bottom=False; mark_end=False
+    ticker_type='auto'
+    facecolor='whitesmoke'
+
+
 def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=True,resample_freq='H',smooth=True,linewidth=1.5, \
                loc='best',annotate=False,annotate_value=False,plus_sign=False, \
@@ -1758,8 +1777,24 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         
     # 若不绘制annotate，则绘制图例
     #if not annotate:
-    plt.legend(loc=loc,fontsize=legend_txt_size)
+    #检查是否存在可绘制的标签，若有则绘制
+    if DEBUG:
+        have_label=False
+        for line in plt.gca().lines:
+            print(f"  DEBUG: plt.gca().lines, line={line.get_label()}")
+            if line.get_label() != '':
+                have_label=True
     
+    #plt.legend没有图例标签时会提示信息No artists...
+    if not annotate or attention_value !='' or attention_point !='':
+        plt.legend(loc=loc,fontsize=legend_txt_size)
+        
+    """
+    if any([line.get_label() != '' for line in plt.gca().lines]):
+        tuli=plt.legend(loc=loc,fontsize=legend_txt_size)
+        if DEBUG:
+            print(f"  DEBUG: result of plt.legend is {tuli}")
+    """
     if plus_sign:
         # 尝试改变纵轴刻度格式：给正数添加正号+，以便突出显示增减幅度
         import matplotlib.ticker as ticker
@@ -2072,7 +2107,9 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         plt.gca().set_facecolor("whitesmoke") 
         
     #if not annotate:
-    plt.legend(loc=loc,fontsize=legend_txt_size)
+    #plt.legend没有图例标签时会提示信息No artists...
+    if not annotate or attention_value !='' or attention_point !='':
+        plt.legend(loc=loc,fontsize=legend_txt_size)
         
     #设置绘图风格：关闭网格虚线
     plt.rcParams['axes.grid']=False

siat/stock.py

@@ -2654,10 +2654,10 @@ def stock_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcol
     try:
         div=stock.dividends
     except:
-        print("  #Error(stock_dividend): no div info found for",ticker)
+        print("  #Error(stock_dividend): no dividend information found for",ticker)
         return None    
     if len(div)==0:
-        print("  #Warning(stock_dividend): no div info found for",ticker)
+        print("  #Warning(stock_dividend): no dividend information found for",ticker)
         return None      
 
     # 去掉时区信息，避免合并中的日期时区冲突问题
@@ -2795,10 +2795,10 @@ def stock_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor
     try:
         div=stock.splits
     except:
-        print("  #Error(stock_split): no split info found for",ticker)
+        print("  #Error(stock_split): no split information found for",ticker)
         return None    
     if len(div)==0:
-        print("  #Warning(stock_split): no split info found for",ticker)
+        print("  #Warning(stock_split): no split information found for",ticker)
         return None      
 
     # 去掉时区信息，避免合并中的日期时区冲突问题
@@ -2810,7 +2810,7 @@ def stock_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor
     div1=div[div.index >= startdt]
     div2=div1[div1.index <= enddt]
     if len(div2)==0:
-        print("  #Warning(stock_split): no split info in period",fromdate,todate)
+        print("  #Warning(stock_split): no split information in period",fromdate,todate)
         return None          
     
     #对齐打印

siat/translate.py

@@ -4554,6 +4554,306 @@ if __name__=='__main__':
     industry_sw_name(icode)
 
 #==============================================================================
-         
+#实现简单中英文短语互译
+#==============================================================================
+if __name__ == '__main__':
+    chntext='市盈率'
+    engtext="PE ratio"
+    engtext="P/E ratio"
+    
+    zh2en(chntext)
+    
+    en2zh(engtext)
+    
+
+def zh2en(text):
+    '''英文转换成中文'''
+    
+    from translate import Translator
+    translator = Translator(from_lang="zh", to_lang="en")
+    translation = translator.translate(text)
+
+    return translation
+
+def en2zh(text):
+    '''中文转换成英文'''
+    
+    from translate import Translator
+    translator = Translator(from_lang="en", to_lang="zh")
+    translation = translator.translate(text)
+    
+    return translation
+
+if __name__ == '__main__':
+    chntext='市盈率'
+    engtext1="PE ratio"
+    engtext2="P/E ratio"
+
+    lang_auto(chntext)
+    lang_auto(engtext1)
+    lang_auto(engtext2)
+    
+    lang_auto(text)
+
+
+def lang_auto(text):
+    '''转换字符串text至当前语言环境，基于translate'''
+    
+    #注意：这个翻译模块只能每天提供有限单词翻译服务
+    from translate import Translator
+    
+    lang_env=check_language()
+    lang_text=detect_language(text)
+    
+    #字符串语言与当前环境语言相同，无需翻译，节省运行时间
+    if lang_env==lang_text:
+        return text
+    
+    provider_list=['mymemory']
+    
+    if lang_env=='Chinese':
+        #translator = Translator(from_lang="en", to_lang="zh")
+        #translator = Translator(to_lang="zh")
+        translator = Translator(to_lang="zh",provider="mymemory")
+    elif lang_env=='English':
+        translator = Translator(to_lang="en")
+    else:
+        return text
+    
+    translation = translator.translate(text)
+    
+    return translation
+
+if __name__ == '__main__':
+    text='市盈率'
+    text='贵州茅台'
+    text='五粮液'
+    text='Dividend Payout Ratio'
+    text='asOfDate'
+    text='Cash And Cash Equivalents'
+    text='AccountsReceivableNetSalesAllowance'
+    text='Accounts Receivable Net of Sales Allowance'
+    text='Accounts Payable'
+    
+    language_detect=True
+    language_engine=['google','baidu','bing']
+    
+    chntext='市盈率'
+    engtext1="PE ratio"
+    engtext2="P/E ratio"
+
+    lang_auto2(text)
+    lang_auto2(text,language_detect=True)
+    
+    lang_auto2(chntext)
+    lang_auto2(engtext1)
+    lang_auto2(engtext2)
+
+
+def lang_auto2(text,language_detect=True,language_engine=['alibaba','google','bing','sogou']):
+    '''转换字符串text至当前语言环境，基于translators，可指定翻译服务器，准确度更高'''
+    
+    import translators as ts
+    
+    lang_env=check_language()
+    
+    if language_detect:
+        lang_text=detect_language(text)
+        
+        #字符串语言与当前环境语言相同，无需翻译，节省运行时间
+        if lang_env==lang_text:
+            return text
+    
+    success=False
+    if lang_env=='Chinese':
+        #translator支持baidu/bing/google
+        if isinstance(language_engine,str):
+            language_engine=[language_engine]
+            
+        for le in language_engine:
+            try:
+                translation = ts.translate_text(text,from_language='en',to_language='zh', translator=le)
+                success=True
+                break
+            except:
+                continue
+    elif lang_env=='English':
+        for le in language_engine:
+            try:
+                translation = ts.translate_text(text,from_language='zh',to_language='en', translator=le)
+                success=True
+                break
+            except:
+                continue
+    else:
+        return text
+    
+    if not success:
+        translation = text
+        
+    return translation
+
+
+if __name__ == '__main__':
+    chntext='市盈率'
+    engtext1="PE ratio"
+
+    detect_language(chntext)
+    detect_language(engtext)
+ 
+def detect_language(text):
+    '''判断字符串text是中文还是英文'''
+    
+    import re
+    chinese_pattern = re.compile(r'[\u4e00-\u9fa5]')
+    english_pattern = re.compile(r'[a-zA-Z]')
+    
+    chinese_count = len(chinese_pattern.findall(text))
+    english_count = len(english_pattern.findall(text))
+    total_count = chinese_count + english_count
+    
+    if total_count == 0:
+        result='Unknown'
+        
+    if chinese_count > english_count:
+        result='Chinese'
+    elif english_count > chinese_count:
+        result='English'
+    else:
+        result='Both'    
+    
+    return result
+
+
+if __name__ == '__main__':
+    text='DividendPayoutRatio'
+    text='CashAndCashEquivalents'
+    text='asOfDate'
+    
+    text='GrossPPE'
+    
+    text='Cash And Cash Equivalents'
+
+    words_split_yahoo(text)
+ 
+def words_split_yahoo(text,split_improve=True):
+    '''将雅虎英文财报术语拆分为带空格的词组'''
+
+    
+    #替换基于大写字母无法分词的短语
+    text=text.replace("periodType","PeriodType")
+    text=text.replace("Tradeand","TradeAnd")
+    
+    words_list=[]
+    start=0
+    
+    for i in range(len(text)):
+        c=text[i]
+        
+        if (c>='A' and c<='Z') or c==' ':
+            words_list=words_list+[text[start:i].strip(' ')]
+            start=i
+    
+    #添加最后一个单词
+    words_list=words_list+[text[start:i+1]]
+    
+    special_words=['and','of','in','at','as','for','non','from']
+    words_list2=[]
+    for w in words_list:
+        if text.index(w) == 0:
+            words_list2=words_list2+[w.title()]
+        elif w.lower() in special_words:
+            words_list2=words_list2+[w.lower()]
+        else:
+            words_list2=words_list2+[w]
+    
+    text_new=''
+    for w in words_list2:
+        text_new=text_new+' '+w
+    
+    #若出现多个空格则替换为单个空格
+    import re
+    text_new=re.sub(r' +', ' ', text_new)
+    
+    #去掉首尾的空格
+    text_new=text_new.strip(' ')
+    
+        
+    #判断大写字母缩写合并
+    prev_c1=''; prev_c2=''
+    text_new2=''
+    for c in text_new:
+        if c>='A' and c<='Z':
+            if prev_c1==' ' and (prev_c2>='A' and prev_c2<='Z'):
+                text_new2=text_new2.strip(' ')+c
+            else:
+                text_new2=text_new2+c
+        else:
+            text_new2=text_new2+c
+            
+        prev_c2=prev_c1; prev_c1=c
+    
+    #弥补大写字母合并后继词的逻辑缺陷
+    for upl in ['PPE']:
+        text_new2=text_new2.replace(upl,upl+' ')
+        text_new2=re.sub(r' +', ' ', text_new2)
+        text_new2=text_new2.strip(' ')
+    
+    
+    #替换缩写/简写/容易翻译出错的词，强行规避翻译错误。
+    #注意：不影响未拆分科目名称，仅为翻译用途
+    if split_improve:
+        text_new3=text_new2.replace("PPE","Plant Property and Equipment")
+        
+        text_new3=text_new3.replace("Treasury Shares Number","Treasury Shares")
+        text_new3=text_new3.replace("Ordinary Shares Number","Ordinary Shares")
+        text_new3=text_new3.replace(" Gross "," and ")
+        text_new3=text_new3.replace("non Current","Non-current")
+        text_new3=text_new3.replace("Non Current","Non-current")
+        text_new3=text_new3.replace("Short Term","Short-term")
+        text_new3=text_new3.replace("Long Term","Long-term")
+        text_new3=text_new3.replace("Available for Sale","Available-for-sale")
+    
+        text_new3=text_new3.replace(" Com "," Common ")
+        text_new3=text_new3.replace(" Net "," Net of ")
+        text_new3=text_new3.replace("Net Income","Net Profit")
+        
+        text_new3=text_new3.replace("EBITDA","XXX")
+        text_new3=text_new3.replace("EBIT","Earnings before Interest and Tax")
+        text_new3=text_new3.replace("XXX","EBITDA")
+        
+        text_new3=text_new3.replace("Tax Provision","Tax Accrued")
+        text_new3=text_new3.replace("non Operating","Non-operating")
+        
+        text_new3=text_new3.replace("Operating Income","Operating Profit")
+        text_new3=text_new3.replace("Pretax Income","Pretax Profit")
+        
+        text_new3=text_new3.replace("Current Provisions","Current Reserve")
+        
+        text_new3=text_new3.replace("Duefrom ","Due from ")
+        text_new3=text_new3.replace("Dueto ","Due to ")
+        
+        text_new3=text_new3.replace("Investmentin ","Investment in ")
+        text_new3=text_new3.replace("Diluted NIAvailto ","Diluted Net Profit Avail to ")
+        text_new3=text_new3.replace(" Noncontrolling "," Non-controlling ")
+        text_new3=text_new3.replace("Other Gand A","Other General and Administrative Expense")
+        text_new3=text_new3.replace("Otherunder ","Other under ")
+        text_new3=text_new3.replace("Mergern Acquisition","Merger and Acquisition")
+        text_new3=text_new3.replace("Write Off","Write-off")
+        
+        text_new3=text_new3.replace("Cash Flow From ","Cash Flow from ")
+        text_new3=text_new3.replace("Cash From ","Cash Flow from ")
+        text_new3=text_new3.replace(" From "," from ")
+        text_new3=text_new3.replace("Provisionand","Provision and")
+        text_new3=text_new3.replace("Write-offof","Write-off of")
+        text_new3=text_new3.replace("non Cash","non-Cash")
+        text_new3=text_new3.replace("Changein","Change in")
+        
+    else:
+        text_new3=text_new2
+        
+    return text_new3
+
+#==============================================================================
 #==============================================================================
 #==============================================================================

siat/valuation.py

@@ -1177,9 +1177,10 @@ def security_valuation(tickers,indicators,start,end, \
         
 #==============================================================================
 if __name__=='__main__':
-    df=security_trend(baijiu_stocks,indicator='PE',start='MRY',graph=False) 
+    bank_big=find_peers_china('国有大型银行Ⅱ',top=25)
+    df=security_trend(bank_big,indicator='PE',start='MRY',graph=False) 
     indicator='PE'
-    base=''
+    base='601398.SS'
     
     
 def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
@@ -1189,14 +1190,15 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     try:
         df1=df[indicator]
     except:
-        print("  #Warning: current dataframe does not support indicator",indicator)
+        print(f"  #Warning(print_valuation): unsupported indicator {indicator} in current dataframe")
         return
     
     collist=list(df1)
     base=base.upper()
+    base=ticker_name(base)
     if not (base in collist):
         """
-        print("  #Warning: invalid item",base,"for current dataframe")
+        print("  #Warning(print_valuation): invalid item",base,"for current dataframe")
         print("  Valid items in current dataframe:\n",collist)
         return
         """
@@ -1256,7 +1258,8 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     #df4=df3[['序号','证券名称',col_mean,col_mean_rel,'均值对比',col_latest_date,col_latest_rel,'对比@'+col_latest_date]]
     df4=df3[['证券名称',col_mean,'均值排名',col_latest_date,'排名@'+col_latest_date,col_mean_rel,col_latest_rel,'均值对比','对比@'+col_latest_date]]
     
-    titletxt="*** 估值对比："+indicator+"，降序排列"
+    #titletxt="估值对比："+ectranslate(indicator)+"，降序排列"
+    titletxt="证券估值对比：{0}({1})，降序排列".format(ectranslate(indicator),indicator)
     """
     print("\n",titletxt,'\n')
     alignlist=['left','right','center','right','center']+['right']*(len(list(df4))-5)
@@ -1273,16 +1276,17 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     #设置列数值对齐
     dispf=dispt.set_properties(**{'text-align':'center'})
     #设置前景背景颜色
-    dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+    #dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+    dispf2=dispf.set_properties(**{'background-color':facecolor})
 
     from IPython.display import display
     display(dispf2)
     
-    print(" ")
+    #print(" ")
     if diff > 0:
         print("【注】未列出"+str(diff)+"只估值为非正数的证券："+str(diff_list))
     import datetime; todaydt = datetime.date.today()
-    footnote="*** 期间："+col_start_date+"至"+col_latest_date+"。数据来源: baidu/stooq/funddb/swhysc，"+str(todaydt)
+    footnote="估值期间："+col_start_date+"至"+col_latest_date+"，数据来源: baidu/stooq/funddb/swhysc，"+str(todaydt)
     print(footnote)   
 
     return

{siat-3.7.7.dist-info → siat-3.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.7
+Version: 3.7.9
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -35,6 +35,8 @@ Requires-Dist: pendulum
 Requires-Dist: itables
 Requires-Dist: py-trans
 Requires-Dist: bottleneck
+Requires-Dist: translate
+Requires-Dist: translators
 
 
 # What is siat?