siat 3.8.36__py3-none-any.whl → 3.8.42__py3-none-any.whl

siat/__init__.py

@@ -66,10 +66,10 @@ class HiddenPrints:
         sys.stdout = self._original_stdout
 
 if not restart:
-    print("Successfully enabled siat v{}".format(current_version))
+    print("  Successfully enabled siat v{}".format(current_version))
 else:
     with HiddenPrints():
         fix_package()
-    print("Please RESTART Python kernel and run this command again")
+    print("  Please RESTART Python kernel and run this command again")
 
 #==============================================================================

siat/common.py

@@ -4697,7 +4697,7 @@ def df_save(df,file="df"):
         df.to_pickle(file_name)
         
         import os; path=os.getcwd()
-        print("  Data is saved to file",path+"\\"+file_name)
+        print("  Saved to",path+"\\"+file_name)
     except:
         print("  #Error(df_save): failed to save data to file",file_name)
         

siat/financials.py

@@ -90,7 +90,7 @@ def compare_history(tickers,items, \
             ticker2=tickers[1]
             ticker_num=2
         if len(tickers) == 0: 
-            print("  #Error(): no stock code found",tickers)
+            print("  #Error(compare_history): no stock code found",tickers)
             return None,None
     else:
         ticker1=tickers
@@ -103,7 +103,7 @@ def compare_history(tickers,items, \
             item2=items[1]
             item_num=2
         if len(items) == 0: 
-            print("  #Error(): no analytical item found",items)
+            print("  #Error(compare_history): no analytical item found",items)
             return None,None
     else:
         item1=items
@@ -181,7 +181,7 @@ def compare_history(tickers,items, \
         collabel=ectranslate(item1)
         ylabeltxt=''
         #titletxt=ticker_name(ticker1)+texttranslate(": 基于年(季)报的业绩历史")
-        titletxt=ticker_name(ticker1)+": 基于财务报表的业绩历史"
+        titletxt=ticker_name(ticker1)+": 财报业绩历史"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -205,7 +205,7 @@ def compare_history(tickers,items, \
         label2=ectranslate(item2)
         ylabeltxt=''
         #titletxt=ticker_name(ticker1)+texttranslate(": 基于年(季)报的业绩历史对比")
-        titletxt=ticker_name(ticker1)+": 基于财务报表的业绩历史对比"
+        titletxt=ticker_name(ticker1)+": 财报业绩历史对比"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -243,7 +243,7 @@ def compare_history(tickers,items, \
         label2=ectranslate(item2)
         ylabeltxt=''
         #titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+texttranslate(": 基于年(季)报的业绩历史对比")
-        titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+": 基于财务报表的业绩历史对比"
+        titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+": 财报业绩历史对比"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -260,25 +260,26 @@ if __name__ == '__main__':
     
 #==============================================================================
 if __name__ == '__main__':
-    tickers=['AAPL','MSFT','WMT']
+    ticker=['AAPL','MSFT','WMT']
     itemk='Current Ratio'
     itemk='Employees'
+    indicator=itemk='PEG'
     
     multicolor=False
     
     tickers=['AMZN','EBAY']
     itemk='IGR'
+    
     datatag=True
     tag_offset=0.01
     graph=True
     axisamp=1.3
     
-    
-    itemk='IGR'
 
-def compare_snapshot(tickers,itemk, \
+def compare_snapshot(ticker,indicator, \
+                     facecolor='lightblue',
                      datatag=True,tag_offset=0.01, \
-                     graph=True,axisamp=1.2,px=False, \
+                     graph=True,axisamp=1.2,px=True, \
                      printout=True,numberPerLine=10):
     """
     功能：比较多个股票的快照数据，绘制水平柱状图
@@ -287,10 +288,13 @@ def compare_snapshot(tickers,itemk, \
     tag_offset=0.01：标记的数值距离图形的距离，若不理想可以手动调节，可为最大值1%-5%
     graph：是否将结果绘图，默认True
     axisamp：绘图时横轴放大系数，默认1.2。若标记数值超出右边界则增加数值，也可能需要负数数值
-    px：是否使用plotly-express工具绘图，默认False。其优点是无需调整axisamp，缺点是无法保存绘图结果在Jupyter Notebook中
+    px：是否使用plotly-express工具绘图，默认True。
+        其优点是无需调整axisamp，缺点是无法保存绘图结果在Jupyter Notebook中。
     printout：是否显示哪些股票找到或未找到相关数据，默认True
     numberPerLine：在显示相关数据时，每行显示的股票代码或名称个数，默认10
     """
+    tickers=ticker; itemk=indicator
+    
     #检查股票代码列表
     if not isinstance(tickers,list): 
         print("  #Error(compare_snapshot): need more stock codes in",tickers)
@@ -336,13 +340,18 @@ def compare_snapshot(tickers,itemk, \
         'TTM Price to Sales':'priceToSalesTrailing12Months', \
         'beta':'beta','52-Week Change':'52WeekChange', \
         'Trailing PE':'trailingPE','Forward PE':'forwardPE', \
-        'PEG':'pegRatio',
-        #'IGR':'IGR','SGR':'SGR',
+        #'PEG':'pegRatio',#经常取不到数据
+        #'IGR':'IGR','SGR':'SGR',#另起其他命令处理
         }
+        
     itemlist=list(itemdict.keys())
     if itemk not in itemlist:
-        print("  #Error(compare_snapshot): unsupported rate for",itemk)
-        print("  Supported rates are as follows:\n",itemlist)
+        print("  #Error(compare_snapshot): unsupported indicator",itemk)
+        #print("  Supported indicators:\n",itemlist)
+        print("  Supported indicators:")
+        #printInLine(itemlist,numberPerLine=5,leadingBlanks=2)
+        printInLine_md(itemlist,numberPerLine=5,colalign='left',font_size='16px')
+        
         return None
 
     item=itemdict[itemk]
@@ -353,7 +362,7 @@ def compare_snapshot(tickers,itemk, \
     
     notfoundlist=[]
     total0=len(tickers)
-    print("Searching info of",itemk,"for specified stocks ...")
+    print("  Searching",itemk,"for specified stocks ...")
     for t in tickers:
         
         current=tickers.index(t)
@@ -389,10 +398,86 @@ def compare_snapshot(tickers,itemk, \
             df=df.append(row,ignore_index=True)
         except:
             df=df._append(row,ignore_index=True)
-    
+
+    # 尝试恢复失败的股票信息 1           
+    if len(notfoundlist) > 0:
+        print("\n  Recovering info of",itemk,"for",notfoundlist,"...")
+        total0=len(notfoundlist)
+        tickers2=notfoundlist.copy(); notfoundlist=[]
+        for t in tickers2:
+            
+            current=tickers2.index(t)
+            total=total0 - len(notfoundlist)
+            print_progress_percent(current,total,steps=10,leading_blanks=2)
+            
+            try:
+                info=stock_info(t)
+            except:
+                notfoundlist=notfoundlist+[t]
+                continue
+            if (info is None) or (len(info)==0):
+                notfoundlist=notfoundlist+[t]
+                continue
+            try:
+                value=info[info.index == item]['Value'][0]
+            except:
+                try:
+                    itemp=proxydict[item]
+                    value=info[info.index == itemp]['Value'][0]
+                    notfoundlist=notfoundlist+[t]
+                except:
+                    notfoundlist=notfoundlist+[t]
+                    continue
+                
+            name=ticker_name(t)
+            row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
+            try:
+                df=df.append(row,ignore_index=True)
+            except:
+                df=df._append(row,ignore_index=True)
+
+
+    # 尝试恢复失败的股票信息 2           
+    if len(notfoundlist) > 0:
+        print("\n  Recovering info of",itemk,"for",notfoundlist,"...")
+        total0=len(notfoundlist)
+        tickers3=notfoundlist.copy(); notfoundlist=[]
+        for t in tickers3:
+            
+            current=tickers3.index(t)
+            total=total0 - len(notfoundlist)
+            print_progress_percent(current,total,steps=10,leading_blanks=2)
+            
+            try:
+                info=stock_info(t)
+            except:
+                notfoundlist=notfoundlist+[t]
+                continue
+            if (info is None) or (len(info)==0):
+                notfoundlist=notfoundlist+[t]
+                continue
+            try:
+                value=info[info.index == item]['Value'][0]
+            except:
+                try:
+                    itemp=proxydict[item]
+                    value=info[info.index == itemp]['Value'][0]
+                    notfoundlist=notfoundlist+[t]
+                except:
+                    notfoundlist=notfoundlist+[t]
+                    continue
+                
+            name=ticker_name(t)
+            row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
+            try:
+                df=df.append(row,ignore_index=True)
+            except:
+                df=df._append(row,ignore_index=True)
+            
+    # 未找到任何股票信息
     if len(df) == 0:
-        print("\n  #Warning(compare_snapshot): no stock info not found for specified stocks")
-        print("  Possible reasons: no internet access to data source - Yahoo Finance")
+        print("\n  #Warning(compare_snapshot): no stock info found for specified stocks")
+        print("  Possible reasons: failed to access to or fetch info from Yahoo Finance")
         return None
     
     #处理小数点
@@ -406,12 +491,12 @@ def compare_snapshot(tickers,itemk, \
     
     #绘图
     if graph:
-        print("Calculating and drawing graph, please wait ...")
+        print("  Calculating and rendering graph, please wait ...")
         colname='value'
         
         lang=check_language()
         if lang == 'Chinese':
-            titletxt="企业横向对比: 业绩快照"
+            titletxt="企业对比: 指标快照"
             notestxt="注：财务指标为TTM数值"
         else:
             titletxt="Company Snapshot Comparison"
@@ -433,9 +518,9 @@ def compare_snapshot(tickers,itemk, \
             plot_barh(df,colname,titletxt,footnote,datatag=datatag,tag_offset=tag_offset,axisamp=axisamp)
         else:
             #在Spyder中可能无法显示
-            titletxt="企业业绩快照："+ectranslate(itemk)
+            titletxt="企业快照："+ectranslate(itemk)
             footnote=notestxt+'，'+footnote1+str(today)
-            plot_barh2(df,colname,titletxt,footnote)
+            plot_barh2(df,colname,titletxt,footnote,facecolor=facecolor)
     
     if (len(notfoundlist) > 0):
         foundlist=[]
@@ -453,9 +538,10 @@ def compare_snapshot(tickers,itemk, \
         printInLine(foundlist,numberPerLine=numberPerLine,leadingBlanks=2)
     """
     if (len(notfoundlist) > 0):
-        print("Warning:",itemk,"info not found for the stocks below")
+        print("  [Warning]",itemk,"info not found for the stocks below:")
         notfoundlist_names=ticker_name(notfoundlist)
         printInLine(notfoundlist_names,numberPerLine=numberPerLine,leadingBlanks=2)
+        print("  [Solution] re-run the command with more stable internet connection")
     
     return df
 
@@ -463,11 +549,15 @@ if __name__ == '__main__':
     df=compare_snapshot(tickers,itemk)
     
 #==============================================================================
-def compare_snapshot2(tickers,itemk,graph=True):
+def compare_snapshot2(ticker,indicator,graph=True):
     """
     功能：比较多个股票的快照数据，绘制水平柱状图
     itemk需要通过对照表转换为内部的item
+    
+    特点：与compare_snapshot相比如何？
     """
+    tickers=ticker; itemk=indicator
+    
     #检查股票代码列表
     if not isinstance(tickers,list): 
         print("  #Error(compare_snapshot2): need more stock codes in",tickers)
@@ -510,10 +600,11 @@ def compare_snapshot2(tickers,itemk,graph=True):
         'EV to Revenue':'enterpriseToRevenue','EV to EBITDA':'enterpriseToEbitda', \
         #市场看法
         'Current Price':'currentPrice','Price to Book':'priceToBook', \
-        'TTM Price to Sales':'priceToSalesTrailing12Months', \
+        #'TTM Price to Sales':'priceToSalesTrailing12Months', \
+            'Price to Sales':'priceToSalesTrailing12Months', \
         'beta':'beta','52-Week Change':'52WeekChange', \
         'Trailing PE':'trailingPE','Forward PE':'forwardPE', \
-        'PEG':'pegRatio',
+        #'PEG':'pegRatio',
         #'IGR':'IGR','SGR':'SGR'
         }
     itemlist=list(itemdict.keys())
@@ -526,7 +617,10 @@ def compare_snapshot2(tickers,itemk,graph=True):
     import pandas as pd
     #import siat.stock_base as sb
     df=pd.DataFrame(columns=('ticker','item','value','name'))
+    print(f"  Working on {indicator} for specified stocks ...")
     for t in tickers:
+        print_progress_percent2(t,tickers,steps=5,leading_blanks=4)   
+        
         try:
             info=stock_info(t)
         except:
@@ -568,14 +662,14 @@ def compare_snapshot2(tickers,itemk,graph=True):
     
     #绘图
     if graph:
-        print("...Calculating and drawing graph, please wait ...")
+        print("  Calculating and rendering graph, please wait ...")
         
         df.rename(columns={'value':itemk},inplace=True)
         colname=itemk
         #titletxt="企业横向对比: "+ectranslate(itemk)+"（TTM）"
-        titletxt="企业横向对比: "+ectranslate(itemk)
+        titletxt=text_lang("企业对比: ","Comparing Company: ")+ectranslate(itemk)
         import datetime; today=datetime.date.today()
-        footnote="注：财务比率为TTM，数据来源: 雅虎财经, "+str(today)
+        footnote=text_lang("注：财务比率为TTM，数据来源: 雅虎财经, ","Note: TTM data, source: Yahoo Finance, ")+str(today)
         plot_barh2(df,colname,titletxt,footnote)
     
     return df
@@ -589,10 +683,12 @@ if __name__ == '__main__':
     tickers=["0883.HK","0857.HK","0386.HK",'XOM','2222.SR','OXY','BP','RDSA.AS']
     graph=True
     
-def compare_tax(tickers,graph=True,axisamp=1.3,px=False):
+def compare_tax(ticker,graph=True,axisamp=1.3,px=True):
     """
     功能：比较公司最新的实际所得税率
     """
+    tickers=ticker
+    
     #检查股票代码列表
     if not isinstance(tickers,list): 
         print("  #Error(compare_tax): need more stock codes in",tickers)
@@ -604,7 +700,10 @@ def compare_tax(tickers,graph=True,axisamp=1.3,px=False):
     import siat.beta_adjustment as badj
     import pandas as pd
     df=pd.DataFrame(columns=('ticker','name','date','tax rate'))
+    print("  Working on tax info for specified stocks ...")
     for t in tickers:
+        print_progress_percent2(t,tickers,steps=5,leading_blanks=4)   
+
         try:
             df0=badj.prepare_hamada_yahoo(t)
         except:
@@ -625,15 +724,15 @@ def compare_tax(tickers,graph=True,axisamp=1.3,px=False):
     df.set_index('key',inplace=True)      
     #绘图
     if graph:
-        print("...Calculating and drawing graph, please wait ...")
+        print("  Calculating and rendering graph, please wait ...")
         lang=check_language()
         colname='tax rate'
         if lang == 'Chinese':
-            titletxt="企业横向对比: 实际所得税率"
+            titletxt="企业对比: 实际所得税率"
             itemk="实际所得税率"
             source_txt="数据来源: 雅虎财经,"
         else:
-            titletxt=texttranslate("企业横向对比: 实际税率")
+            titletxt=texttranslate("企业对比: 实际税率")
             itemk=texttranslate("实际所得税率")
             source_txt=texttranslate("数据来源: 雅虎财经,")
 
@@ -654,7 +753,7 @@ def calc_igr_sgr(ticker):
 
     
     import siat.stock as stk
-    sub_info=stk.get_stock_profile(ticker,info_type='fin_rates',graph=False)
+    sub_info=stk.get_stock_profile(ticker,info_type='fin_rates',printout=False)
     """
     #应对各种出错情形：执行出错，返回NoneType，返回空值
     try:
@@ -690,10 +789,12 @@ def calc_igr_sgr(ticker):
     
     return igr,sgr
 
-def compare_igr_sgr(tickers,graph=True,axisamp=1.0,px=False):
+def compare_igr_sgr(ticker,graph=True,axisamp=1.0,px=True):
     """
     功能：比较公司TTM的IGR和SGR
     """
+    tickers=ticker
+    
     #检查股票代码列表
     if not isinstance(tickers,list): 
         print("  #Error(compare_igr_sgr): need more stock codes in",tickers)
@@ -704,7 +805,10 @@ def compare_igr_sgr(tickers,graph=True,axisamp=1.0,px=False):
     
     import pandas as pd
     df=pd.DataFrame(columns=('ticker','name','date','IGR','SGR'))
+    print("  Working on IGR & SGR for specified stocks ...")
     for t in tickers:
+        print_progress_percent2(t,tickers,steps=5,leading_blanks=4)
+        
         try:
             igr,sgr=calc_igr_sgr(t)
         except:
@@ -727,11 +831,11 @@ def compare_igr_sgr(tickers,graph=True,axisamp=1.0,px=False):
     #绘图
     lang=check_language()
     if graph:
-        print("\n...Calculating and drawing graph, please wait ...")
+        print("\n  Calculating and rendering graph, please wait ...")
         
         colname='IGR'
         if lang == "Chinese":
-            titletxt="企业横向对比: 内部增长率"
+            titletxt="企业对比: 内部增长率IGR"
             itemk="内部增长率(IGR)"
             source_txt="数据来源: 雅虎财经,"
         else:
@@ -755,7 +859,7 @@ def compare_igr_sgr(tickers,graph=True,axisamp=1.0,px=False):
     if graph:
         colname='SGR'
         if lang == 'Chinese':
-            titletxt="企业横向对比: 可持续增长率"
+            titletxt="企业对比: 可持续增长率SGR"
             itemk="可持续增长率(SGR)"
         else:
             titletxt="Company Sustainable Growth Rate (SGR TTM)"
@@ -794,11 +898,11 @@ def get_PE(fsdf):
     import siat.security_prices as ssp
     prices=ssp.get_price(ticker, fromdate, todate)
     if prices is None:
-        print("#Error(get_PE): retrieving stock price failed for",ticker,fromdate,todate,"\b, recovering...")
+        print("  #Error(get_PE): retrieving stock price failed for",ticker,fromdate,todate,"\b, recovering...")
         import time; time.sleep(5)
         prices=ssp.get_price(ticker, fromdate, todate)
         if prices is None: 
-            print("#Error(get_PE): failed retrieving stock price, retrying stopped")
+            print("  #Error(get_PE): failed retrieving stock price, retrying stopped")
             import numpy as np
             fsdf['BasicPE']=np.nan
             fsdf['DilutedPE']=np.nan
@@ -873,13 +977,13 @@ def calc_DebtToAsset(fsdf):
     try:
         fsdf1['Debt to Asset']=round(fsdf1['TotalLiabilities']/fsdf1['TotalAssets'],4)
     except:
-        print("#Error(get_DebtToAsset): failed in calculating DebtToAsset")
+        print("  #Error(get_DebtToAsset): failed in calculating DebtToAsset")
     
     #计算Debt to Equity
     try:
         fsdf1['Debt to Equity']=round(fsdf1['TotalLiabilities']/fsdf1['TotalEquities'],4)    
     except:
-        print("#Error(get_DebtToAsset): failed in calculating DebtToEquity")    
+        print("  #Error(get_DebtToAsset): failed in calculating DebtToEquity")    
     
     return fsdf1
 
@@ -1068,7 +1172,7 @@ def get_financial_rates(ticker):
     财务比率：短期还债能力，长期还债能力，营运能力，盈利能力，发展能力
     返回：报表+比率    
     """
-    print("\n  Analyzing financial rates of",ticker,"\b, it may take time......")
+    print("\n  Analyzing financial rates of",ticker,"......")
     
     # 变换港股代码5位-->4位
     result,prefix,suffix=split_prefix_suffix(ticker)
@@ -1080,13 +1184,13 @@ def get_financial_rates(ticker):
     try:
         fsdf=get_financial_statements(ticker)
     except:
-        print("  ......Failed to get financial statements of",ticker,"\b, recovering")
+        print("  Failed to get financial statements of",ticker,"\b, recovering")
         import time; time.sleep(5)
         try:
             fsdf=get_financial_statements(ticker)
         except:
-            print("  ......Failed to get financial statements of",ticker,"\b!")
-            print("  ......If the stock code",ticker,"\b is correct, please try a few minutes later.")
+            print("  Failed to get financial statements of",ticker,"\b!")
+            print("  If the stock code",ticker,"\b is correct, please try a few minutes later.")
         return None
         
     #抓取股票的稀释后EPS，计算财务比率
@@ -1859,7 +1963,9 @@ if __name__=='__main__':
     scale2 = 10
     hatchlist=['.', 'o', '\\']
 
-def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=['.', 'o', '\\']):
+def compare_dupont(tickerlist,fsdate='latest', \
+                   sort='PM',facecolor='whitesmoke',font_size='16px', \
+                   scale1 = 10,scale2 = 10,hatchlist=['.', 'o', '\\']):
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
     tickerlist：股票代码列表，建议在10只以内
@@ -1888,13 +1994,25 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     name4 = '净资产收益率'
     name5 = '财报日期'
     name6 = '财报类型'    
+
+    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
     
     dpidflist,dpilist,fsdatelist,fstypelist=[],[],[],[]
     name1list,name2list,name3list,name4list,name5list,name6list=[],[],[],[],[],[]
     newtickerlist=[]
+    print("Working on DuPont factsheet for specified stocks ...")
     for t in tickerlist:
         try:
-            dpidf=calc_dupont(t)
+            with HiddenPrints():
+                dpidf=calc_dupont(t)
         except:
             print("  #Warning(compare_dupont): lack of some accounting items for",t)
             continue
@@ -1921,6 +2039,9 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
         name4list=name4list+[dpi['ROE'][0]]
         name5list=name5list+[dpi['endDate'][0]]
         name6list=name6list+[dpi['periodType'][0]]
+        
+        #显示进度
+        print_progress_percent2(t,tickerlist,steps=5,leading_blanks=4)
     
     tickerlist=newtickerlist
     raw_data = {ticker:tickerlist,
@@ -1936,7 +2057,22 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     for i in range(num):
         code=df.loc[i,'公司']
         df.loc[i,'公司']=ticker_name(code)
-    
+
+    # 排序
+    if sort=='PM':
+        df.sort_values(name1,ascending=False,inplace=True)
+        sorttxt=text_lang("：按照"+name1+"降序排列",": By Descending"+name1)
+    elif sort=='TAT':
+        df.sort_values(name2,ascending=False,inplace=True)
+        sorttxt=text_lang("：按照"+name2+"降序排列",": By Descending"+name2)
+    elif sort=='EM':
+        df.sort_values(name3,ascending=False,inplace=True)
+        sorttxt=text_lang("：按照"+name3+"降序排列",": By Descending"+name3)
+    else:
+        df.sort_values(name1,ascending=False,inplace=True)
+        sorttxt=text_lang("：按照"+name1+"降序排列",": By Descending"+name1)
+
+    # 绘图    
     #f,ax1 = plt.subplots(1,figsize=(10,5))
     f,ax1 = plt.subplots(1,figsize=(12.8,6.4))
     w = 0.75
@@ -1997,9 +2133,9 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     
     plt.legend(loc='best',fontsize=legend_txt_size)
     if lang == 'Chinese':
-        plt.title("杜邦分析对比图",fontsize=title_txt_size,fontweight='bold')
+        plt.title("杜邦分析对比图"+sorttxt,fontsize=title_txt_size,fontweight='bold')
     else:
-        plt.title(texttranslate("杜邦分析对比图"),fontsize=title_txt_size,fontweight='bold')
+        plt.title(texttranslate("杜邦分析对比图")+sorttxt,fontsize=title_txt_size,fontweight='bold')
     plt.xlim([min(tick_pos)-w,max(tick_pos)+w])
     
     plt.gca().set_facecolor('whitesmoke')
@@ -2011,10 +2147,7 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     pd.set_option('display.max_colwidth', 1000)
     pd.set_option('display.unicode.ambiguous_as_wide', True)
     pd.set_option('display.unicode.east_asian_width', True)    
-    if lang == 'Chinese':
-        print("===== "+"杜邦分析分项数据表"+" =====")
-    else:
-        print("===== "+texttranslate("杜邦分析分项数据表")+" =====")
+    
     df[name1]=df[name1]/scale1
     df[name2]=df[name2]/scale2
 
@@ -2032,12 +2165,17 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     df[ectranslate('财报类型')]=df['财报类型'].apply(lambda x:'Quarterly' if x=='季报' else 'Annual')
     dfe=df[dfecols]
     
-    if lang == 'Chinese':
-        print(df.to_string(index=False))
-        print("*** "+"数据来源: 雅虎财经,"+' '+str(today))
-    else:
-        print(dfe.to_string(index=False))
-        print("*** "+texttranslate("数据来源: 雅虎财经,")+' '+str(today))
+    titletxt=text_lang("杜邦分析分项数据表","Du Pont Identity Fact Sheet")
+    footnote=text_lang("数据来源: 雅虎财经","Data source: Yahoo Finance")+', '+str(today)    
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'   
+    
+    df_display_CSS(df=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)
+
     
     #合并所有历史记录
     alldf=pd.concat(dpidflist)

siat/financials2.py

@@ -265,7 +265,8 @@ 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")
+            #print("  #Warning(fs_analysis): financial info unaccessible for",tickers,"\b, which needs connection to Yahoo")
+            print("  #Warning(fs_analysis): financial info unaccessible for",tickers)
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -368,7 +369,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         # 分析利润表
         fsdf=get_income_statements(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)
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -448,7 +449,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         # 分析现金流量表
         fsdf=get_cashflow_statements(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)
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -546,7 +547,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             with HiddenPrints():
                 fsdf=get_financial_rates(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)
                 return None
         
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -636,7 +637,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 with HiddenPrints():
                     dftmp=get_financial_rates(t)
                 if dftmp is None:
-                    print("  #Warning(fs_analysis): financial info unaccessible for",t,"\b, which needs connection to Yahoo Finance")
+                    print("  #Warning(fs_analysis): financial info unaccessible for",t)
                     return None
                 
                 if business_period=='recent':
@@ -759,7 +760,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             with HiddenPrints():
                 fsdf=get_financial_rates(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)
                 return None
         
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -846,7 +847,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 with HiddenPrints():
                     dftmp=get_financial_rates(t)
                 if dftmp is None:
-                    print("  #Warning(fs_analysis): financial info unaccessible for",t,"\b, which needs connection to Yahoo Finance")
+                    print("  #Warning(fs_analysis): financial info unaccessible for",t)
                     return None
                 
                 if dftmp is None:
@@ -953,7 +954,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             with HiddenPrints():            
                 dftmp=get_financial_rates(t)
             if dftmp is None:
-                print("  #Warning(fs_analysis): financial info unaccessible for",t,"\b, which needs connection to Yahoo Finance")
+                print("  #Warning(fs_analysis): financial info unaccessible for",t)
                 return None
             
             if business_period=='recent':

siat/grafix.py

@@ -476,6 +476,17 @@ def plot_line2(df1,ticker1,colname1,label1, \
                          loc1=loc1,loc2=loc2, \
                          color1=color1,color2=color2,facecolor=facecolor, \
                              maxticks=maxticks)
+    elif twinx == False: # twinx == False # 正常绘图           
+        plot_line2_coaxial(df1,ticker1,colname1,label1, \
+                df2,ticker2,colname2,label2, \
+                ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
+                    yline=yline,attention_value_area=attention_value_area, \
+                    xline=xline,attention_point_area=attention_point_area, \
+                resample_freq=resample_freq, \
+                loc1=loc1,loc2=loc2, \
+                color1=color1,color2=color2,facecolor=facecolor, \
+                    maxticks=maxticks)
+            
     elif 'LR' in twinx.upper(): # 左右双图
         plot_line2_LR(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
@@ -2895,7 +2906,7 @@ if __name__=='__main__':
     titletxt="This is a title"
     footnote="This is a footnote"
 
-def plot_barh2(df,colname,titletxt,footnote,facecolor='whitesmoke'):
+def plot_barh2(df,colname,titletxt,footnote,facecolor='lightblue'):
     """
     功能：绘制水平单值柱状图，并在外侧标注数据标签。
     输入：数据集df；列名colname；标题titletxt；脚注footnote；
@@ -2913,7 +2924,8 @@ def plot_barh2(df,colname,titletxt,footnote,facecolor='whitesmoke'):
     xlabel=colname+'颜色棒'
     df[xlabel]=df[colname]
 
-    import plotly_express as px
+    #import plotly_express as px
+    import plotly.express as px
     
     fig=px.bar(data_frame = df, 
                y='ycolname', #纵轴绘制的字段
@@ -2924,7 +2936,10 @@ def plot_barh2(df,colname,titletxt,footnote,facecolor='whitesmoke'):
                labels={'ycolname':'',colname:footnote,xlabel:''} #将字段改名作为纵轴、横轴或颜色棒的标注
         )
     
-    fig.update_traces(textposition='outside') #直方图顶端的数值标在外侧
+    fig.update_coloraxes(showscale=False)  # 隐藏颜色条
+    
+    fig.update_traces(textposition='outside',#直方图顶端的数值标在外侧
+                      ) 
     
     fig.update_layout(
         title={
@@ -2933,14 +2948,10 @@ def plot_barh2(df,colname,titletxt,footnote,facecolor='whitesmoke'):
             'x':0.5,
             'xanchor': 'center',   # 相对位置
             'yanchor': 'top'},
+        plot_bgcolor=facecolor, #设置画布背景颜色
+        coloraxis_showscale=False, #彻底移除颜色条，需要升级plotly！
         )
-
-    try:
-        fig.gca().set_facecolor(facecolor)
-    except:
-        print("  #Warning(plot_barh2): color",facecolor,"is unsupported, changed to default setting")
-        fig.gca().set_facecolor("whitesmoke")
-
+    
     fig.show()
     
     return

siat/sector_china.py

@@ -394,7 +394,8 @@ def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
     titletxt="中国股票市场：板块"+comp+"排行榜（按照"+indtag+"分类）"
     import datetime; stoday = datetime.date.today()
     footnote1="注：代表个股是指板块中涨幅最高或跌幅最低的股票\n"
-    footnote2="板块总数"+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    #footnote2="板块总数"+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    footnote2="板块总数"+str(len(df))+"，数据来源：新浪财经，"+str(stoday)
     footnote=footnote1+footnote2
     
     df_display_CSS(df4,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
@@ -556,10 +557,12 @@ def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
     import datetime; stoday = datetime.date.today()
     if "流通市值" in df3_collist:
         footnote1="市值单位：亿元，板块成份股："+str(len(df))+'\n'
-        footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+        #footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+        footnote2="数据来源：新浪财经，"+str(stoday)
     else:
         footnote1="板块成份股："+str(len(df))+'，'
-        footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+        #footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+        footnote2="数据来源：新浪财经，"+str(stoday)
     footnote=footnote1+footnote2
     
     df_display_CSS(df4,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
@@ -568,7 +571,8 @@ def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
                        titile_font_size='16px',heading_font_size='15px', \
                        data_font_size='15px')    
     
-    return df2
+    #return df2
+    return df4
 
 #==============================================================================
 if __name__=='__main__':
@@ -717,7 +721,8 @@ def sector_position_china(ticker,sector="new_dlhy"):
     titletxt="\n上市公司地位分析："+sname+"，"+sector_name+"行业/板块（"+indicator+"分类）"
     import datetime; stoday = datetime.date.today()
     footnote1=""
-    footnote2="成分股总数："+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    #footnote2="成分股总数："+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    footnote2="成分股总数："+str(len(df))+"，数据来源：新浪财经，"+str(stoday)
     footnote=footnote1+footnote2
     
     #print("") #空一行

siat/stock.py

@@ -125,8 +125,8 @@ def get_profile(ticker):
     tp=yf.Ticker(ticker1)
     try:
         dic=tp.info
-    except:
-        print("  #Error(get_profile): failed to access Yahoo Finance for",ticker)
+    except ValueError as e:
+        print("  #Error(get_profile): {e} when processing",ticker)
         return None    
     
     #将字典转换为数据框
@@ -346,7 +346,7 @@ def stock_profile(ticker,option='basic',verbose=False):
     返回：证券快照信息数据表。
     注意：放弃
     """
-    print("..Searching for security snapshot information, please wait ...")
+    print("  Searching for security snapshot information, please wait ...")
     #抓取证券静态信息
     try:
         df=get_profile(ticker)
@@ -2009,7 +2009,7 @@ def compare_msecurity(tickers,measure,start,end, \
     if isinstance(measure,list):
         measure=measure[0]
     
-    print("  Searching for multiple securities for",measure,"...") 
+    print("  Searching securities for",measure,"...") 
     #屏蔽函数内print信息输出的类
     import os, sys
     class HiddenPrints:
@@ -2973,7 +2973,9 @@ def stock_info(symbol):
     if result & (suffix=='HK'):
         symbol=prefix[-4:]+'.'+suffix
     
-    from yahooquery import Ticker #如果出现类似于{'AAPL': 'Invalid Cookie'}错误，则需要升级
+    from yahooquery import Ticker 
+    #如果出现类似于{'AAPL': 'Invalid Cookie'}错误，则需要升级yahooquery
+    #如果出现crump相关的错误，则需要更换lxml的版本以便与当前的yahooquery版本匹配
     stock = Ticker(symbol)
 
     """
@@ -2991,12 +2993,12 @@ def stock_info(symbol):
         #如果出现类似于{'AAPL': 'Invalid Cookie'}错误，则需要升级yahooquery
         adict=stock.asset_profile
     except:
-        print("  #Error(stock_info): failed to get the profile of",symbol)
-        print("  Possible reasons: Wrong stock code, or unstable internet connection")
+        print("  #Error(stock_info): failed to get info of",symbol)
+        print("  Reasons: Wrong stock code, or poor internet connection, or need to upgrade yahooquery")
         return None
     
     if adict[symbol] == 'Invalid Cookie':
-        print("  #Error(stock_info): failed in retrieving info of",symbol,"\b. Try upgrade yahooquery and do again")
+        print("  #Error(stock_info): failed in retrieving info of",symbol,"\b. Try upgrade yahooquery and run again")
         return None
     
     keylist=list(adict[symbol].keys())
@@ -3524,7 +3526,7 @@ def get_stock_profile(ticker,info_type='basic',printout=True):
     try:
         info=stock_info(ticker)
     except:
-        print("  #Warning(get_stock_profile): failed to access Yahoo for",ticker,"\b, recovering...")
+        print("  #Warning(get_stock_profile): recovering info for",ticker,"...")
         import time; time.sleep(5)
         try:
             info=stock_info(ticker)

siat/translate.py

@@ -156,7 +156,7 @@ def ectranslate_c(eword):
         ['exchangeTimezoneShortName','交易所时区简称'],['quoteType','证券类别'],
         ['symbol','证券代码'],['messageBoardId','证券留言板编号'],
         ['market','证券市场'],['annualHoldingsTurnover','一年內转手率'],
-        ['enterpriseToRevenue','市售率(EV/Revenue)'],['EV to Revenue','市售率(EV/Revenue)'],        
+        ['enterpriseToRevenue','市售率(EV/Revenue)'],['EV to Revenue','企业价值收入比'],        
         ['Price to Book','市净率'],['beta3Year','3年贝塔系数'],
         ['profitMargins','净利润率'],['enterpriseToEbitda','企业价值/EBITDA'],
         ['EV to EBITDA','企业价值倍数（EV/EBITDA)'],
@@ -212,7 +212,8 @@ def ectranslate_c(eword):
         ['BasicEPS','基本每股收益'],['Cashflow per Share','每股现金流量'],
         ['Profit Margin','净利润率'],['Gross Margin','毛利润率'],
         ['EBITDA Margin','EBITDA利润率'],['Operating Margin','营业利润率'],
-        ['Trailing EPS','每股收益TTM'],['Trailing PE','市盈率TTM'],['Forward PE','预期市盈率'],
+        ['Trailing EPS','每股收益TTM'],['Forward EPS','预期每股收益'],
+        ['Trailing PE','市盈率TTM'],['Forward PE','预期市盈率'],
         ['Revenue Growth','销售收入增长率'],['Earnings Growth','年度盈余增长率'],
         ['Earnings Quarterly Growth','季度盈余增长率'],
         ['IGR','内部增长率(IGR)'],['SGR','可持续增长率(SGR)'],
@@ -507,7 +508,8 @@ def ectranslate_e(eword):
         ['BasicEPS','Basic EPS'],['Cashflow per Share','Cashflow per share'],
         ['Profit Margin','Profit margins'],['Gross Margin','Gross margins'],
         ['EBITDA Margin','EBITDA margins'],['Operating Margin','Operating margins'],
-        ['Trailing EPS','EPS TTM'],['Trailing PE','PE TTM'],['Forward PE','Forward PE'],
+        ['Trailing EPS','EPS TTM'],['Forward EPS','Forward EPS'],
+        ['Trailing PE','PE TTM'],['Forward PE','Forward PE'],
         ['Revenue Growth','Revenue growth'],['Earnings Growth','Earnings growth(annual)'],
         ['Earnings Quarterly Growth','Earnings growth(quarterly)'],
         ['IGR','Internal growth rate'],['SGR','Sustainable growth rate'],

{siat-3.8.36.dist-info → siat-3.8.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.8.36
+Version: 3.8.42
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.8.36.dist-info → siat-3.8.42.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=N2D1ydfh_lejim0z6eQR17utNF7-5lk04c1esGO71_E,2223
+siat/__init__.py,sha256=tpSBf8BYpWOzBDF2iNQ4tlVxjx7bmkVQ3kPUu9X3iog,2227
 siat/__init__.py.backup_20250214.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
 siat/allin.py,sha256=9xwa97S6KPHXGuqDtyN9b6Y4lCSM1VdBqpFBrlRvV8I,3001
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
@@ -19,7 +19,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=wGF_HmK_AiGWjpSAx79XHIxDghtI_ueYozvh06-2JEQ,33707
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=z_oMRdzzA05OJnN0kJ9ZFwYCdEfiyeR59a1OCZiblYE,181182
+siat/common.py,sha256=XDt269wDd8L_sd4FWqFw2N5bPA6v051c2YnIxIJ_2V0,181169
 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
@@ -42,9 +42,9 @@ siat/fin_stmt2_yahoo.py,sha256=LGmspk0nKyz4X87MtcovZXUfMQkAvrWINuxR4HQ8PI8,41178
 siat/financial_base.py,sha256=A1rV7XQOVFpCXCV-T6Ge0QeF897hINiu0olN1XWeaFk,41287
 siat/financial_statements.py,sha256=xx0SMpFqAMKm6cj8uYeG2RpJE6G-RoJ3NWa33UyaVMk,25414
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
-siat/financials.py,sha256=6mmcOI03rJuz3xmrX_H46wTudgXLGtNqrwfuFZCiwaE,80739
+siat/financials.py,sha256=fYnMF66xkO0DKSzDoXRb3acYQUYkepXaM5SG6e8gEeY,86168
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=N2qOfVQ2SE7T5kmMkAcccCOHIEwGylFDvB5_GxxOin0,51039
+siat/financials2.py,sha256=YF-A-5iSTzLXTFI0sDGju4_6T87wWC9IlFd4fSXbJXw,50805
 siat/financials_china.py,sha256=Hu85JOKnCmcTHgblIvHhsV-6c-Y15HFGNR_ZaaJt8nM,191974
 siat/financials_china2.py,sha256=VvkzkjZeH84zwypR7ReldgJeZ7jnNw0qkzebvWMPm10,94956
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
@@ -64,7 +64,7 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=Noy_gIwVGjktPgfUIx-KZQJ-pjtwR3o7iBI030m4wzs,139126
+siat/grafix.py,sha256=X9eWpD6ndQSAkOEcbfC9b8KrY-rlYEhz63kE8JALs8E,139802
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=uWRtMMJqKr-puQn26g6Fq5N3mFB70c0B99zLQug8hAo,30774
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -98,7 +98,7 @@ siat/risk_evaluation.py,sha256=HK6U2G85-AxjSoeARbmTuiCNwTVdPdB9Znfgvslo0Os,76455
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=HbU3SokSWuwNKYFrbamS6qlXE8J8ZAyM3fWo4RskhEU,157074
+siat/sector_china.py,sha256=9zjdORWx5ia_gUezidhOKWmCnVDwWcnnjjugHudelaQ,157411
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=dYwvz9H-uWp-Gyc1g_MId9k8cITS6ZHmjW-Fc2ypp-0,26587
@@ -109,7 +109,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=8-Z-PWaX8fjnyAyfxEp3qXdVllgDpRISOASKEn7Zeoc,30706
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=W3JhjfRwqb9luNydrKyGd97uRmTsZD5FvRdqJ3DynVo,159509
+siat/stock.py,sha256=bXG1FIwNTNvzHGNDH3ZNWFmXCMyD5dy-CTsHI2OKGWM,159614
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -135,7 +135,7 @@ 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=t4SM4QWE7mCfY5GWPJ8SSquNRFrPAKHxJbpKsCWnneU,262247
+siat/translate.py,sha256=6kIzzzdh04J2BkR2XSnKkl4rTZWSHarW-4AdarTZJvI,262334
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
@@ -144,8 +144,8 @@ siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.8.36.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.36.dist-info/METADATA,sha256=e4VCORGHR9rk7kDQKISHBuK7_TeZzGpi7M7ZaImKCu0,8321
-siat-3.8.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.36.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.36.dist-info/RECORD,,
+siat-3.8.42.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.42.dist-info/METADATA,sha256=fXxjQCNXJFoLw_cm0qw_P46eOWOqLHrXZsvxJ-F5-6g,8321
+siat-3.8.42.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.8.42.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.42.dist-info/RECORD,,