siat 3.9.21__py3-none-any.whl → 3.9.32__py3-none-any.whl

siat/__init__.py

@@ -40,7 +40,7 @@ if os == 'windows':
     srcfile=srcpath1+'/'+tagfile
 else:
     srcpath1=srcpath
-    srcfile=srcpath1+'/'+file
+    srcfile=srcpath1+'/'+tagfile
 
 try:
     with open(srcfile,'rb') as file:
@@ -70,6 +70,6 @@ if not restart:
 else:
     with HiddenPrints():
         fix_package()
-    print("  Please RESTART Python kernel and run this command again")
+    print("  Please RESTART Python kernel and then run this command again")
 
 #==============================================================================

siat/common.py

@@ -3501,7 +3501,7 @@ if __name__=='__main__':
     
     test_website(url)
 
-def test_website(url):
+def test_website(url="https://finance.yahoo.com"):
     """
     功能：测试一个网址是否可访问
     """
@@ -5000,6 +5000,79 @@ def shift_column_position(df,col_name,position=1):
     
     return df
 #==============================================================================
+if __name__ == '__main__':
+    text='accountsReceivable'
+    text='periodType'
+    text='reportDate'
+    text='currencyCode'
+    text='BasicEPS'
+    text='EBITDA'
+    text='CashAndCashEquivalents'
+    text='Debt to Asset'
+    
+    text_separate(text)
+
+def text_separate(text):
+    """
+    功能：将连写在一起的专业术语拆分成为正常的形式
+    参数：
+    text：待拆分短语，例如accountsReceivable
+    输出：拆分后短语，例如Accounts Receivable
+    """
+    DEBUG=False
+    
+    if not text:
+        return ""
+    
+    articles={"and","from","in","on","the","of","to","for","not","non","as","per"}
+    
+    words = []
+    current_word = [text[0].upper()]  # 首字母默认大写
+    for i in range(1, len(text)):
+        prev_char, curr_char = text[i-1], text[i]
+        
+        # 分割条件：当前大写且前一个字符为小写，或当前大写后跟小写（保留连续大写）
+        if (curr_char.isupper() and prev_char.islower()) or \
+           (curr_char.isupper() and prev_char.isupper() and i < len(text)-1 and text[i+1].islower()):
+            words.append(''.join(current_word))
+            current_word = [curr_char]
+        else:
+            current_word.append(curr_char)
+    words.append(''.join(current_word))
+    
+    # 处理虚词：除首单词外，虚词首字母小写
+    formatted_words = [words[0]]
+    for word in words[1:]:
+        lower_word = word.lower()
+        formatted_words.append(lower_word if lower_word in articles else word)
+    
+    words2=' '.join(formatted_words)
+    
+    if DEBUG:
+        print(f"BEFORE: {text}, AFTER: {words2}")
+        
+    return words2
+    
+#==============================================================================
+if __name__ == '__main__':
+    alist=['a','b','c']
+    element='b'
+    element='c'
+    
+    last_in_list(element,alist)
+
+def last_in_list(element,alist):
+    """
+    功能：测试element是否alist的最后一个元素
+    参数：
+    element：alist的元素，用于循环
+    alist：列表，用于循环
+    """
+    result=False
+    if alist.index(element) == len(alist)-1:
+        result=True
+        
+    return result
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/financial_statements.py

@@ -53,7 +53,8 @@ def get_balance_sheet(symbol):
         stmta=stock.balance_sheet()  # Defaults to Annual
     except:
         print("  Searching for annual report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
+        
         try:
             stmta=stock.balance_sheet()
         except:
@@ -76,7 +77,8 @@ def get_balance_sheet(symbol):
         stmtq=stock.balance_sheet(frequency="q")
     except:
         print("  Searching for quarterly report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
+        
         try:
             stmtq=stock.balance_sheet(frequency="q")
         except:
@@ -195,7 +197,7 @@ def get_income_statements(symbol):
         stmta=stock.income_statement()  # Defaults to Annual
     except:
         print("  Searching for annual report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
         try:
             stmta=stock.income_statement()
         except:
@@ -218,7 +220,7 @@ def get_income_statements(symbol):
         stmtq=stock.income_statement(frequency="q")
     except:
         print("  Searching for quarterly report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
         try:
             stmtq=stock.income_statement(frequency="q")
         except:
@@ -310,7 +312,7 @@ def get_cashflow_statements(symbol):
         stmta=stock.cash_flow()  # Defaults to Annual
     except:
         print("  Searching for annual report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
         try:
             stmta=stock.cash_flow()
         except:
@@ -333,7 +335,7 @@ def get_cashflow_statements(symbol):
         stmtq=stock.cash_flow(frequency="q")
     except:
         print("  Searching for quarterly report failed, recovering......")
-        time.sleep(5)
+        sleep_random(max_sleep=60)
         try:
             stmtq=stock.cash_flow(frequency="q")
         except:
@@ -407,11 +409,11 @@ def get_financial_statements(ticker):
         fbs = get_balance_sheet(ticker)
     except:
         print("  Retrieving fin info failed, trying to recover...")
-        import time; time.sleep(3)
+        sleep_random(max_sleep=60)
         try:
             fbs = get_balance_sheet(ticker)
         except:
-            import time; time.sleep(5)
+            sleep_random(max_sleep=60)
             try:
                 fbs = get_balance_sheet(ticker)
             except:
@@ -426,11 +428,11 @@ def get_financial_statements(ticker):
         fis = get_income_statements(ticker)
     except:
         print("      Failed, recovering...")
-        import time; time.sleep(3)
+        sleep_random(max_sleep=60)
         try:
             fis = get_income_statements(ticker)
         except:
-            import time; time.sleep(5)
+            sleep_random(max_sleep=60)
             try:
                 fis = get_income_statements(ticker)
             except:
@@ -445,11 +447,11 @@ def get_financial_statements(ticker):
         fcf = get_cashflow_statements(ticker)
     except:
         print("      Failed, recovering...")
-        import time; time.sleep(3)
+        sleep_random(max_sleep=60)
         try:
             fcf = get_cashflow_statements(ticker)
         except:
-            import time; time.sleep(5)
+            sleep_random(max_sleep=60)
             try:
                 fcf = get_cashflow_statements(ticker)
             except:

siat/financials.py

@@ -1186,7 +1186,7 @@ def get_financial_rates(ticker):
         fsdf=get_financial_statements(ticker)
     except:
         print("  Failed to get financial statements of",ticker,"\b, recovering")
-        import time; time.sleep(5)
+        sleep_random(max_sleep=60)
         try:
             fsdf=get_financial_statements(ticker)
         except:

siat/financials2.py

@@ -103,6 +103,7 @@ if __name__=='__main__':
 
 def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 category='profile',business_period='annual', \
+                    items_included='all', \
                 scale1=10,scale2=10,dupont_sort='PM',
                 printout=True, \
                #entry_sort=False, \
@@ -124,7 +125,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
     可为基本信息'profile'、高管概况('officers')、分红('dividend')、股票分拆('split')、市场表现('market')、
     财务状况('financial')、一般风险('risk')、ESG风险('esg')
     
-    business_period：业务期间类型，可为季报'quarterly'，年报'annual'、最近的6次报告'recent', 所有'all' 
+    business_period：业务期间类型，可为季报'quarterly'，默认年报'annual'、最近的6次报告'recent', 所有'all' 
+    items_included：默认输出所有报表项目，可以列表形式选择其中一部分。
     scale1：仅用于杜邦分析，放大倍数（以便缩小与EM之间的数量级差异），用于Profit Margin，默认10
     scale2：仅用于杜邦分析，放大倍数，用于Total Asset Turnover，默认10
     dupont_sort：仅用于杜邦分析，用于排序指标，默认净利润率'PM'，还可为总资产周转率'TAT'或权益乘数'EM'
@@ -179,7 +181,10 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
     注意4：不同经济体上市公司年报季报日期不同，需要列示报表日期和类型(年报或季报)
        
     """
+    DEBUG=False
+    
     import numpy as np
+    import pandas as pd
 
     #屏蔽函数内print信息输出的类
     import os, sys
@@ -265,8 +270,11 @@ 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)
+            print(f"  #Warning(fs_analysis): failed to access financial info for {tickers}")
+            if test_yahoo_access():
+                print(f"  Solution: if {tickers} are correct, then try again later")
+            else:
+                print("  Problem: no internet connection to Yahoo for retrieveing data")
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -302,8 +310,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4=fsdf3[fsdf3['periodType']=='Quarterly']
             elif business_period == 'annual':
                 fsdf4=fsdf3[fsdf3['periodType']=='Annual']   
-            else:
-                fsdf4=fsdf3[fsdf3['periodType']=='Annual']                
+            else: #'all'
+                #fsdf4=fsdf3[fsdf3['periodType'].isin(['Annual','Quarterly'])]     
+                fsdf4=fsdf3
                 
             # 转置
             fsdf4=fsdf4.T
@@ -349,7 +358,22 @@ 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,'\n',footnote2)  
-            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+            
+            # 将Item科目名称拆分加空格和转大写
+            fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+            
+            # 判断是否仅输出部分科目
+            if 'all' in items_included:
+                fsdf7=fsdf6
+            else:
+                mask=fsdf6['Item'].isin(items_included)
+                fsdf7=fsdf6[mask]
+                # 将Item列转为分类类型，指定顺序
+                fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                # 按分类顺序排序
+                fsdf7=fsdf7.sort_values(by='Item')
+            
+            df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                data_font_size=data_font_size)
             
@@ -370,6 +394,11 @@ 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)
+            if test_yahoo_access():
+                print(f"  Solution: if {tickers} are correct, then try again later")
+            else:
+                print("  Problem: no internet connection to Yahoo for retrieveing data")
+
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -430,7 +459,22 @@ 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,'\n',footnote2)    
-            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+            
+            # 将Item科目名称拆分加空格和转大写
+            fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+            
+            # 判断是否仅输出部分科目
+            if 'all' in items_included:
+                fsdf7=fsdf6
+            else:
+                mask=fsdf6['Item'].isin(items_included)
+                fsdf7=fsdf6[mask]
+                # 将Item列转为分类类型，指定顺序
+                fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                # 按分类顺序排序
+                fsdf7=fsdf7.sort_values(by='Item')
+            
+            df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                data_font_size=data_font_size)
             
@@ -450,6 +494,11 @@ 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)
+            if test_yahoo_access():
+                print(f"  Solution: if {tickers} are correct, then try again later")
+            else:
+                print("  Problem: no internet connection to Yahoo for retrieveing data")
+
             return None
         
         fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -510,7 +559,22 @@ 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,'\n',footnote2)     
-            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+            
+            # 将Item科目名称拆分加空格和转大写
+            fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+            
+            # 判断是否仅输出部分科目
+            if 'all' in items_included:
+                fsdf7=fsdf6
+            else:
+                mask=fsdf6['Item'].isin(items_included)
+                fsdf7=fsdf6[mask]
+                # 将Item列转为分类类型，指定顺序
+                fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                # 按分类顺序排序
+                fsdf7=fsdf7.sort_values(by='Item')
+            
+            df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                data_font_size=data_font_size)
             return fsdf6
@@ -543,11 +607,16 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         
         # 股票可为单只股票(单只股票深度分析)       
         if isinstance(tickers,str):
-            print("  Getting financial rates for financial summary of",tickers,"......")
+            print("  Getting financial rates for financial summary of",tickers,"...")
             with HiddenPrints():
                 fsdf=get_financial_rates(tickers)
             if fsdf is None:
                 print("  #Warning(fs_analysis): financial info unaccessible for",tickers)
+            if test_yahoo_access():
+                print(f"  Solution: if {tickers} are correct, then try again later")
+            else:
+                print("  Problem: no internet connection to Yahoo for retrieveing data")
+
                 return None
         
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -593,8 +662,10 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                     fsdf4=fsdf3[fsdf3['periodType']=='Annual']
                 elif business_period == 'all':
                     fsdf4=fsdf3                    
+                    #fsdf4=fsdf3[fsdf3['periodType'].isin(['Annual','Quarterly'])]
                 else:
-                    fsdf4=fsdf3[fsdf3['periodType']=='Annual']
+                    #fsdf4=fsdf3[fsdf3['periodType']=='Annual']
+                    fsdf4=fsdf3
                     
                 # 转置
                 fsdf4=fsdf4.T
@@ -620,7 +691,22 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 footnote3="Data source: Yahoo Finance, "+todaydt
                 footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
                 #print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+            
+                # 将Item科目名称拆分加空格和转大写
+                fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+                
+                # 判断是否仅输出部分科目
+                if 'all' in items_included:
+                    fsdf7=fsdf6
+                else:
+                    mask=fsdf6['Item'].isin(items_included)
+                    fsdf7=fsdf6[mask]
+                    # 将Item列转为分类类型，指定顺序
+                    fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                    # 按分类顺序排序
+                    fsdf7=fsdf7.sort_values(by='Item')
+                
+                df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                                titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                    data_font_size=data_font_size)                
                 return fsdf6
@@ -633,13 +719,20 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             business_period=business_period.lower()
             fsdf=pd.DataFrame()
             for t in tickers:
-                print("  Getting financial rates for financial summary of",t,"......")
+                print("  Getting financial rates for financial summary of",t,"...")
                 with HiddenPrints():
                     dftmp=get_financial_rates(t)
                 if dftmp is None:
                     print("  #Warning(fs_analysis): financial info unaccessible for",t)
+                    if test_yahoo_access():
+                        print(f"  Solution: if {t} are correct, then try again later")
+                    else:
+                        print("  Problem: no internet connection to Yahoo for retrieveing data")
                     return None
                 
+                if not last_in_list(t,tickers):
+                    sleep_random(max_sleep=60)
+
                 if business_period=='recent':
                     dftmp2=dftmp.tail(1)
                 elif business_period=='annual':
@@ -721,8 +814,23 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
                 footnote3="Data source: Yahoo Finance, "+str(todaydt)
                 footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
-                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)    
+            
+                # 将Item科目名称拆分加空格和转大写
+                fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+                
+                # 判断是否仅输出部分科目
+                if 'all' in items_included:
+                    fsdf7=fsdf6
+                else:
+                    mask=fsdf6['Item'].isin(items_included)
+                    fsdf7=fsdf6[mask]
+                    # 将Item列转为分类类型，指定顺序
+                    fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                    # 按分类顺序排序
+                    fsdf7=fsdf7.sort_values(by='Item')
+                    
+                df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                                titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                    data_font_size=data_font_size)                
                 return fsdf6
@@ -756,11 +864,16 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         
         # 股票可为单只股票(单只股票深度分析)       
         if isinstance(tickers,str):
-            print("  Getting financial rates for financial indicators of",tickers,"......")
+            print("  Getting financial rates for financial indicators of",tickers,"...")
             with HiddenPrints():
                 fsdf=get_financial_rates(tickers)
             if fsdf is None:
                 print("  #Warning(fs_analysis): financial info unaccessible for",tickers)
+                if test_yahoo_access():
+                    print(f"  Solution: if {tickers} are correct, then try again later")
+                else:
+                    print("  Problem: no internet connection to Yahoo for retrieveing data")
+
                 return None
         
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -803,8 +916,10 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                     fsdf4=fsdf3[fsdf3['periodType']=='Annual']
                 elif business_period == 'all':
                     fsdf4=fsdf3                    
+                    #fsdf4=fsdf3[fsdf3['periodType'].isin(['Annual','Quarterly'])]
                 else:
-                    fsdf4=fsdf3[fsdf3['periodType']=='Annual']
+                    #fsdf4=fsdf3[fsdf3['periodType']=='Annual']
+                    fsdf4=fsdf3
                     
                 # 转置
                 fsdf4=fsdf4.T
@@ -829,8 +944,23 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
                 footnote3="Data source: Yahoo Finance, "+str(todaydt)
                 footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
-                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)   
+            
+                # 将Item科目名称拆分加空格和转大写
+                fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+                
+                # 判断是否仅输出部分科目
+                if 'all' in items_included:
+                    fsdf7=fsdf6
+                else:
+                    mask=fsdf6['Item'].isin(items_included)
+                    fsdf7=fsdf6[mask]
+                    # 将Item列转为分类类型，指定顺序
+                    fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                    # 按分类顺序排序
+                    fsdf7=fsdf7.sort_values(by='Item')
+                    
+                df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                                titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                    data_font_size=data_font_size)                
                 return fsdf6
@@ -842,18 +972,28 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             business_period=business_period.lower()
             fsdf=pd.DataFrame()
+            print("  Working on financial rates, it may take long time ...")
+
             for t in tickers:
-                print("  Getting financial rates for financial indicators of",t,"......")
+                print("  Getting financial rates for financial indicators of",t,"...")
                 with HiddenPrints():
                     dftmp=get_financial_rates(t)
                 if dftmp is None:
                     print("  #Warning(fs_analysis): financial info unaccessible for",t)
+                    if test_yahoo_access():
+                        print(f"  Solution: if {t} are correct, then try again later")
+                    else:
+                        print("  Problem: no internet connection to Yahoo for retrieveing data")
+
                     return None
                 
-                if dftmp is None:
-                    print("  #Warning(fs_analysis): none of financial indicators found for stock",t)
+                if len(dftmp) == 0:
+                    print("  #Warning(fs_analysis): zero financial indicators found for stock",t)
                     continue
                 
+                if not last_in_list(t,tickers):
+                    sleep_random(max_sleep=60)
+                
                 if business_period=='recent':
                     dftmp2=dftmp.tail(1)
                 elif business_period=='annual':
@@ -932,8 +1072,26 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
                 footnote3="Data source: Yahoo Finance, "+str(todaydt)
                 footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
-                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3) 
+            
+                # 将Item科目名称拆分加空格和转大写
+                fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+            
+                # 将Item科目名称拆分加空格和转大写
+                fsdf6['Item']=fsdf6['Item'].apply(lambda x: text_separate(x))
+                
+                # 判断是否仅输出部分科目
+                if 'all' in items_included:
+                    fsdf7=fsdf6
+                else:
+                    mask=fsdf6['Item'].isin(items_included)
+                    fsdf7=fsdf6[mask]
+                    # 将Item列转为分类类型，指定顺序
+                    fsdf7['Item'] = pd.Categorical(fsdf7['Item'], categories=items_included, ordered=True)    
+                    # 按分类顺序排序
+                    fsdf7=fsdf7.sort_values(by='Item')
+                
+                df_display_CSS(fsdf7,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                                titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                                    data_font_size=data_font_size)                
                 return fsdf6
@@ -949,14 +1107,23 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
         business_period=business_period.lower()
         fsdf=pd.DataFrame()
+        print("  Working on dupont identity, it may take long time ...")
         for t in tickers:
-            print("  Getting financial rates for dupont identity of",t,"......")
+            print("  Getting financial rates for dupont identity of",t,"...")
             with HiddenPrints():            
                 dftmp=get_financial_rates(t)
             if dftmp is None:
                 print("  #Warning(fs_analysis): financial info unaccessible for",t)
+                if test_yahoo_access():
+                    print(f"  Solution: if {t} are correct, then try again later")
+                else:
+                    print("  Problem: no internet connection to Yahoo for retrieveing data")
+
                 return None
             
+            if not last_in_list(t,tickers):
+                sleep_random(max_sleep=60)
+
             if business_period=='recent':
                 dftmp2=dftmp.tail(1)
             elif business_period=='annual':
@@ -1064,7 +1231,11 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             footnote1="Based on exchange's local accounting standards, EM/TAT are on periodic mean"
             footnote2="Data source: Yahoo Finance, "+str(todaydt)
             footnote='Note:\n'+footnote1+'\n'+footnote2
-            #print('\n',footnote1,'\b.',footnote2)               
+            #print('\n',footnote1,'\b.',footnote2)  
+            
+            # 将Item科目名称拆分加空格和转大写
+            df['Item']=df['Item'].apply(lambda x: text_separate(x))
+             
             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)        

siat/stock.py

@@ -127,7 +127,7 @@ def get_profile(ticker):
         dic=tp.info
     except:
         print(f"  #Error(get_profile): failed to retrieve info for {ticker}")
-        print("  Solution: need access to Yahoo")
+        print("  Solution: try get_stock_profile instead")
         return None    
 
     if dic is None:
@@ -3542,6 +3542,7 @@ def get_stock_profile(ticker,info_type='basic',printout=True):
             return None
     if info is None:
         print("  #Error(get_stock_profile): retrieved none info of",ticker)
+        print(f"  Solution: if {ticker} is correct, try again later!")
         return None
     if len(info) == 0:
         print("  #Error(get_stock_profile): retrieved empty info of",ticker)

{siat-3.9.21.dist-info → siat-3.9.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.9.21
+Version: 3.9.32
 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.9.21.dist-info → siat-3.9.32.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=tpSBf8BYpWOzBDF2iNQ4tlVxjx7bmkVQ3kPUu9X3iog,2227
+siat/__init__.py,sha256=LZKNrzk9Ibuzpox_Fy4zzxvAZLvtgVFeKMEY5go6ns0,2235
 siat/__init__.py.backup_20250214.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
 siat/allin.py,sha256=--32Bt2Mfg7l38w7X9cLJCdWtYRB3tTtVHnS9WnqKDI,3035
 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=XDt269wDd8L_sd4FWqFw2N5bPA6v051c2YnIxIJ_2V0,181169
+siat/common.py,sha256=J0qSvKtPS1gAfb2_GJNKxFkWJJaNbkQzg4fzaBvKwjM,183440
 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
@@ -40,11 +40,11 @@ siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 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.py,sha256=7cv0z3djnfWsbnvW04ScrWSjCLEyUFrbGgQ6NtclyD0,25512
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
-siat/financials.py,sha256=hcXcwozYhfMtW6cTE2bDp5R80-IEKAyUHFO6mJ87GXQ,86267
+siat/financials.py,sha256=jIkK8nhjQa5Z1SLeJ2rSQsSBswMgredvX2lZ6-1-Y7E,86267
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=YF-A-5iSTzLXTFI0sDGju4_6T87wWC9IlFd4fSXbJXw,50805
+siat/financials2.py,sha256=xCxqubwCNdfS7WyIb5IXTFonMZfw8FM9F8TCIkAruhk,58795
 siat/financials_china.py,sha256=iHF3lEESTK9DLWLBHFpyxn3S_dO2sNBE89xqaVYpNCw,192459
 siat/financials_china2.py,sha256=VvkzkjZeH84zwypR7ReldgJeZ7jnNw0qkzebvWMPm10,94956
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
@@ -110,7 +110,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=itQquZpB8B086nmzzGadppGKsTE6Y7aGizhamGIXs0I,159860
+siat/stock.py,sha256=ixl9NWhFS-z9cQUnBOaQ_u2gqsCiG02zZZrLVBSqPwQ,159941
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -145,8 +145,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.9.21.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.9.21.dist-info/METADATA,sha256=BlxRIjZzBPns5W-qJOwLmdZkrEvbSYlMHwXZT5AF51E,8396
-siat-3.9.21.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.9.21.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.9.21.dist-info/RECORD,,
+siat-3.9.32.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.9.32.dist-info/METADATA,sha256=nrawbbVkm08ig_snc7NU6XTo8pCuFWPU2FmgDCBhKxk,8396
+siat-3.9.32.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.9.32.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.9.32.dist-info/RECORD,,