siat 3.9.22__py3-none-any.whl → 3.10.1__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, \
@@ -125,6 +126,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
     财务状况('financial')、一般风险('risk')、ESG风险('esg')
     
     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'))
@@ -350,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)
             
@@ -371,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'))
@@ -431,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)
             
@@ -451,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'))
@@ -511,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
@@ -544,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'))
@@ -623,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
@@ -636,14 +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)
-                    print(f"  Solution: make sure {t} is correct, try again later")
+                    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':
@@ -725,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
@@ -760,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'))
@@ -835,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
@@ -848,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':
@@ -938,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
@@ -955,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':
@@ -1070,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/other_indexes.py

@@ -291,6 +291,7 @@ if __name__=='__main__':
     api_key='VTRR3TA7L9O2DIX6'
     keyword='AAPL'
     keyword='Apple'
+    keyword='^TYX'
     
     search_av("microsoft")
     search_av("Apple")
@@ -308,13 +309,19 @@ def search_av(keyword,api_key='VTRR3TA7L9O2DIX6'):
     
     data = response.json()
     if "bestMatches" in data:
-        firstcode=data["bestMatches"][0]['1. symbol']
-        firstname=data["bestMatches"][0]['2. name']
+        try:
+            firstcode=data["bestMatches"][0]['1. symbol']
+            firstname=data["bestMatches"][0]['2. name']
+        except:
+            print(f"  #Warning(search_av): no contents found for {keyword} in Alpha Vantage")
+            #未找到可匹配的股票代码
+            return None,None,None
+            
     else:
         if "Information" in data:
-            print(f"  Warning(search_av): exceeded the limit of max requests per day")
+            print(f"  #Warning(search_av): exceeded limit of requests per day in Alpha Vantage")
         else:
-            print(f"  Warning(search_av): keyword {keyword} not found in Alpha Vantage")
+            print(f"  #Warning(search_av): keyword {keyword} not found in Alpha Vantage")
         #未找到可匹配的股票代码
         return None,None,None
     

siat/security_price2.py

@@ -171,9 +171,14 @@ def get_price_1ticker(ticker,fromdate,todate, \
     if source in ['auto','yahoo'] and found not in ['Found','Empty']:
         dft=None
         if test_yahoo_finance():
-            #数据源情形3：yahoo, yfinance, 需要访问yahoo，直接为复权价？
-            dft=get_price_yf(ticker1,fromdate,todate)
+            #数据源情形3a：yahoo, yahooquery, 需要访问yahoo
+            dft=get_price_yq(ticker1,fromdate,todate)
             found=df_have_data(dft) 
+            
+            #数据源情形3b：yahoo, yfinance, 需要访问yahoo，直接为复权价
+            if found not in ['Found','Empty']:
+                dft=get_price_yf(ticker1,fromdate,todate)
+                found=df_have_data(dft) 
         
             #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，似乎不工作了！
             if found not in ['Found','Empty']:

siat/security_prices.py

@@ -1449,6 +1449,74 @@ if __name__=='__main__':
     df4=get_prices_yf(['0700.HK','600519.SS'],'2020-12-1','2021-1-31')
     df5=get_prices_yf(['AAPL','MSFT','0700.HK','600519.SS'],'2020-12-1','2021-1-31')
     df6=get_prices_yf(['ABCD','EFGH','0700.HK','600519.SS'],'2020-12-1','2021-1-31')
+
+#==============================================================================
+if __name__=='__main__':
+    ticker='^TYX'
+    start='2024-12-1'
+    end='2025-1-31'
+
+    get_price_yq(ticker,start,end)
+    
+def get_price_yq(ticker,start,end):
+    """
+    功能：从雅虎财经抓取股价，使用yahooquery(注意插件版本问题)
+    输入：股票代码或股票代码列表，开始日期，结束日期
+    ticker: 股票代码或股票代码列表。大陆股票代码加上后缀.SZ或.SS或.BJ，港股代码去掉前导0加后缀.HK
+    start: 样本开始日期，尽量远的日期，以便取得足够多的原始样本，yyyy-mm-dd
+    end: 样本结束日期，既可以是今天日期，也可以是一个历史日期
+    
+    输出：指定收盘价格序列，最新日期的股价排列在前
+    """
+    p=None
+
+    #支持多个证券
+    import yahooquery as yq
+    ticker1,islist=cvt_yftickerlist(ticker)
+    if not islist:
+        #下载单一股票的股价
+        stock=yq.Ticker(ticker1, asynchronous=True)
+        try:
+            p=stock.history(start=start,end=end)
+            #仅针对雅虎情况
+            if p is not None:
+                if len(p)==0: p=None
+        except:
+            p=None
+    else: 
+        #下载股票列表的股价，与但股票情况相同，但需注意MultiInex结构
+        stock=yq.Ticker(ticker1, asynchronous=True)
+        try:
+            p=stock.history(start=start,end=end)
+            #仅针对雅虎情况
+            if p is not None:
+                if len(p)==0: p=None
+        except:
+            p=None
+            
+    found=df_have_data(p)
+    if found in ['Found','Empty']:
+        p.rename(columns={'open':'Open','high':'High','low':'Low','close':'Close', \
+                          'adjclose':'Adj Close','volume':'Volume'},inplace=True)
+        
+        if 'Adj Close' not in list(p):
+            p['Adj Close']=p['Close']  
+        p['ticker']=ticker
+        p['source']=text_lang('雅虎','Yahoo')
+        
+        # 去掉一级Index
+        p=p.droplevel('symbol')
+        p['date']=p.index
+        if len(p) > 0:
+            print("  Successfully retrieved",len(p),"records for",ticker1)  
+            
+            #去掉时区
+            p=df_index_timezone_remove(p)
+    else:
+        pass
+        #print("  #Error(get_prices_yf):",ticker1,"not found or no prices in the period or inaccessible to yahoo")
+
+    return p
     
 #==============================================================================
 if __name__=='__main__':

{siat-3.9.22.dist-info → siat-3.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.9.22
+Version: 3.10.1
 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.22.dist-info → siat-3.10.1.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=Yp2ffv3vc7zFwnJhYljWXbuyOANDpsW5btXjUdMkbB8,51177
+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
@@ -89,7 +89,7 @@ siat/option_china_test.py,sha256=UQ-YUHUjoGBQyanLcM-yzqeEIUQP_gCQIeT0W6rnUnA,163
 siat/option_pricing.py,sha256=vyQNgBsjcJi70Pa-fJTVVIGK_3jWh80tkd1ESnn3sE4,74069
 siat/option_pricing_test.py,sha256=eeorV5Ja5vjlRXnP6fWJHetGU5Vb8SnLopkC6RV3GfA,2203
 siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,5908
-siat/other_indexes.py,sha256=i-yj2wU7mErlSCoNSOSQjY3_HNcI_8gJBs7H0PhiE5U,13353
+siat/other_indexes.py,sha256=zIUOcaytf0e2NnGU9Bkyiu3z_GaR_-T8nVGCZ4s4Bws,13615
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
 siat/risk_adjusted_return.py,sha256=6F8CpKm-HKO4wfnndri0ew-D3lDAH1fs5O9K5cphoLg,55096
@@ -102,8 +102,8 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 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=35AV6zcL-u26uM1MGtyO5bj9uY6CCrdk3MTff5Q-0rc,27465
-siat/security_prices.py,sha256=HoCZ7YPrQYZHgKC-LyXFeeBCTfRc3EMMEiEg52SVv2w,109073
+siat/security_price2.py,sha256=uC-wA6w3IlA9ZOJYINqIB7LexCbrnnqTkHTPuCSCwpo,27697
+siat/security_prices.py,sha256=MD1pANBD4E_dppLHxgoc7QoceGmKO3huOr2IQpU_eiQ,111570
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
@@ -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.22.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.9.22.dist-info/METADATA,sha256=a-vcD3uMrLpIc3q4vg40-_IKlNjvgWgzJCTwzhfNO7Y,8396
-siat-3.9.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.9.22.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.9.22.dist-info/RECORD,,
+siat-3.10.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.10.1.dist-info/METADATA,sha256=45hmgtcQRU3Qq-7X7UlCGRDQrV-_c-VNt8Oec76xNBQ,8396
+siat-3.10.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.10.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.10.1.dist-info/RECORD,,