siat 3.0.30__py3-none-any.whl → 3.0.38__py3-none-any.whl

siat/common.py

@@ -1704,7 +1704,7 @@ if __name__ == '__main__':
            '26', '27', '28']
     printInLine_md(aList,numberPerLine=8,colalign='center')
 
-def printInLine_md(aList,numberPerLine=5,colalign='left'):
+def printInLine_md(aList,numberPerLine=5,colalign='left',font_size='16px'):
     """
     功能：将一个长列表等行分组打印，使用df.to_markdown方式打印，实现自动对齐
     aList：用于打印的数据列表
@@ -1739,11 +1739,16 @@ def printInLine_md(aList,numberPerLine=5,colalign='left'):
     alignlist=[colalign]*numberPerLine
     print(df.to_markdown(index=False,tablefmt='plain',colalign=alignlist))
     """
+    
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    
     df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2, \
                        first_col_align='left',second_col_align='left', \
                        last_col_align='left',other_col_align='left', \
-                       titile_font_size='18px',heading_font_size='17px', \
-                       data_font_size='17px')
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                       data_font_size=data_font_size)
     
     return
 
@@ -3695,8 +3700,8 @@ if __name__=='__main__':
 def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2, \
                    first_col_align='left',second_col_align='right', \
                    last_col_align='right',other_col_align='right', \
-                   titile_font_size='18px',heading_font_size='17px', \
-                   data_font_size='17px'):
+                   titile_font_size='16px',heading_font_size='15px', \
+                   data_font_size='15px'):
     """
     功能：采样CSS式样显示df，适用于Jupyter环境，整齐紧凑，不挑浏览器
     注意：若facecolor不被支持，则自动改为papayawhip
@@ -3769,7 +3774,7 @@ if __name__=='__main__':
     upgrade_siat()
 
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
-                 'yfinance','yahooquery','urllib3','twine','mplfinance'], \
+                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance'], \
                  pipcmd="pip install --upgrade"):
     """
     功能：一次性升级siat及其相关插件

siat/financials2.py

@@ -93,7 +93,7 @@ if __name__=='__main__':
 def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 category='profile',business_period='annual', \
                 scale1=10,scale2=10,sort='PM',
-                printout=True,
+                printout=True,facecolor='papayawhip',font_size='16px'
                 ):
     """
     功能：tickers为股票列表，fsdates为财报日期，可为单个日期或日期列表
@@ -128,6 +128,10 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
     million=1000000
     billion=million * 1000
     
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    
     # 基于analysis_type1的类型分别处理
     if ('profile' in analysis_type1):
         # 股票需为单只股票，若为列表则仅取第一个        
@@ -210,8 +214,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": BALANCE SHEET"
+            #print(titletxt)
             """
             tablefmt_list=["plain","simple","github","grid","simple_grid","rounded_grid", \
                            "heavy_grid","mixed_grid","double_grid","fancy_grid","outline", \
@@ -239,13 +244,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
-            
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+            """
             
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)   
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            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, \
+                           titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                               data_font_size=data_font_size)
             
             return fsdf6
         
@@ -307,8 +317,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": INCOME STATEMENTS"
+            #print(titletxt)
             
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
@@ -316,13 +327,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
-            
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)    
+            """    
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            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, \
+                           titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                               data_font_size=data_font_size)
             
             return fsdf6
         
@@ -382,8 +397,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": CASHFLOW STATEMENTS"
+            #print(titletxt)
             
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
@@ -391,14 +407,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
-            
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)     
-            
+            """  
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            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, \
+                           titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                               data_font_size=data_font_size)
             return fsdf6
             
         return fsdf2
@@ -488,8 +507,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
-                print(titletxt)
+                #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
+                titletxt=ticker_name(tickers,'stock')+": FINANCIAL STATEMENT SUMMARY"
+                #print(titletxt)
                 
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -497,15 +517,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
-                
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                    
-                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                
+                """
+                footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+                footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
+                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, \
+                               titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                                   data_font_size=data_font_size)                
                 return fsdf6
 
             return fsdf2
@@ -586,8 +609,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** PEER COMPARISON OF FINANCIAL STATEMENT SUMMARY *****\n"
-                print(titletxt)
+                #titletxt="\n***** PEER COMPARISON OF FINANCIAL STATEMENT SUMMARY *****\n"
+                titletxt="FINANCIAL STATEMENT SUMMARY: PEER COMPARISON"
+                #print(titletxt)
                 
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -595,15 +619,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType','reportDate','currencyCode'],ascending=True)
-                
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                    
-                footnote1="*** Amount unit: billion, based on exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                
+                """  
+                footnote1="Amount unit: billion, based on exchange's local accounting standards"
+                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, \
+                               titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                                   data_font_size=data_font_size)                
                 return fsdf6
 
         return fsdf2     
@@ -691,8 +718,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
-                print(titletxt)
+                #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
+                titletxt=ticker_name(tickers,'stock')+": FINANCIAL INDICATORS"
+                #print(titletxt)
                 
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -700,15 +728,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
-                
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                    
-                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                
+                """  
+                footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+                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, \
+                               titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                                   data_font_size=data_font_size)                
                 return fsdf6
 
             return fsdf2
@@ -790,8 +821,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** PEER COMPARISON OF FINANCIAL INDICATORS *****\n"
-                print(titletxt)
+                #titletxt="\n***** PEER COMPARISON OF FINANCIAL INDICATORS *****\n"
+                titletxt="FINANCIAL INDICATORS: PEER COMPARISON"
+                #print(titletxt)
                 
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -799,15 +831,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType','reportDate','currencyCode'],ascending=True)
-                
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                    
-                footnote1="*** Amount unit: billion, based on exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)     
-                
+                """  
+                footnote1="Amount unit: billion, based on exchange's local accounting standards"
+                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, \
+                               titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                                   data_font_size=data_font_size)                
                 return fsdf6
 
         return fsdf2     
@@ -914,8 +949,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         plt.show()    
         
         if printout:
-            title_txt="\n***** Dupont Identity Fact Sheet *****\n"
-            print(title_txt)
+            #title_txt="\n***** Dupont Identity Fact Sheet *****\n"
+            titletxt="Dupont Identity Fact Sheet"
+            #print(titletxt)
             
             # 保留四位小数
             collist=list(df)
@@ -927,14 +963,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             for d in list(df):
                 df[d]=df[d].apply(lambda x: round(x,5) if isinstance(x,float) else x)
-            
+            """
             alignlist=['left']+['right']*(len(list(df))-1)
             print(df.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
-                
-            footnote1="*** Based on exchange's local accounting standards, EM/TAT are on periodic mean"
-            footnote2="Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\b.',footnote2)               
-        
+            """    
+            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)               
+            df_display_CSS(df,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  df2      
     
     else:   # analysis_type1