siat 3.0.35__py3-none-any.whl → 3.0.40__py3-none-any.whl

siat/common.py

@@ -1594,7 +1594,8 @@ def print_progress_percent(current,total,steps=5,leading_blanks=2):
             pct=pct_list[pos]
             
             if pct=="100%":
-                print("100% completing")
+                #print("100% completing")
+                print("100%, wrapping up ...")
             else:
                 print(pct,end=' ')
     
@@ -1704,7 +1705,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 +1740,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
 
@@ -1900,7 +1906,8 @@ if __name__=='__main__':
     footnote="This is the footnote"
 
 def descriptive_statistics(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
-                           recommend_only=False,trailing=7,trend_threshhold=0.01):
+                           recommend_only=False,trailing=7,trend_threshhold=0.01, \
+                           facecolor='papayawhip',font_size='16px'):
     """
     功能：进行描述性统计，并打印结果
     df的要求：
@@ -2135,6 +2142,7 @@ def descriptive_statistics(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
     dst6.reset_index(drop=True,inplace=True)
     dst6.index=dst6.index+1
     
+    """
     print("\n"+titletxt+"\n")
     #alignlist=['right','left']+['center']*(len(list(dst4))-1)
     alignlist=['right','left']+['center']*(len(list(dst6))-3)+['center','left']
@@ -2145,8 +2153,16 @@ def descriptive_statistics(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
         dst7=dst6.to_markdown(index=True,tablefmt='plain',colalign=alignlist)
         dst8=dst7.encode("utf-8",errors="strict")
         print(dst8)
-    
     print("\n"+footnote)
+    """
+    
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    
+    df_display_CSS(dst6,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 dst5
 
@@ -2170,8 +2186,8 @@ if __name__=='__main__':
 
 def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
                            recommend_only=False,trailing=7,trend_threshhold=0.01, \
-                           printout=True,style_print=False, \
-                           facecolor='whitesmoke',fontcolor='black'):
+                           printout=True,style_print=True, \
+                           facecolor='whitesmoke',font_size='16px'):
     """
     功能：进行描述性统计，并打印结果
     df的要求：
@@ -2381,7 +2397,7 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
                 pass
             #确保display显示时不再自动在数值尾部添加零至6位小数
             dst6[c]=dst6[c].apply(lambda x: str(x))
-        
+        """
         if not style_print: #markdown打印
             print("\n"+titletxt+"\n")
             #如果index=True则显示index，这样alignlist的长度就需要dst6列数+1
@@ -2396,14 +2412,11 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
             print("\n"+footnote)
             
         else: #style打印
-            """
             print("\n"+titletxt)
             dst6sd= dst6.style.set_properties(**{'text-align': 'center'})
             from IPython.display import display
             display(dst6sd)
             print(footnote+"\n")
-            """
-            
             disph=dst6.style.hide() #不显示索引列
             dispp=disph.format(precision=3) #设置带有小数点的列精度调整为小数点后3位
             #设置标题/列名
@@ -2417,15 +2430,22 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
             dispf=dispt1.set_properties(**{'text-align':'center'})
             #设置前景背景颜色
             try:
-                dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+                dispf2=dispf.set_properties(**{'background-color':facecolor,'color':'black'})
             except:
                 print("  #Warning(descriptive_statistics2): color",facecolor,"is unsupported, changed to default setting")
                 dispf2=dispf.set_properties(**{'background-color':'whitesmoke','color':'black'})
                 
             from IPython.display import display
             display(dispf2)
-            
             print(footnote+"\n")
+        """
+        #确定表格字体大小
+        titile_font_size=font_size
+        heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+        
+        df_display_CSS(dst6,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 dst5
 
@@ -3695,8 +3715,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

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):
         # 股票需为单只股票，若为列表则仅取第一个        
@@ -249,8 +253,9 @@ 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, \
-                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
+            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
         
@@ -330,8 +335,9 @@ 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, \
-                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
+            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
         
@@ -409,8 +415,9 @@ 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, \
-                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
+            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
@@ -519,8 +526,9 @@ 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, \
-                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')                
+                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
@@ -620,8 +628,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 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, \
-                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')                
+                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     
@@ -728,8 +737,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 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, \
-                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')                
+                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
@@ -830,8 +840,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 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, \
-                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')                
+                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     
@@ -960,8 +971,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             footnote2="Data source: Yahoo Finance, "+str(todaydt)
             footnote='Note:\n'+footnote1+'\n'+footnote2
             #print('\n',footnote1,'\b.',footnote2)               
-            df_display_CSS(df,titletxt=titletxt,footnote=footnote, \
-                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')        
+            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

siat/financials_china.py

@@ -655,7 +655,7 @@ if __name__=='__main__':
 
 def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
                          hatchlist=['.', 'o', '\\'],printout=True,sort='PM', \
-                         facecolor='papayawhip'):
+                         facecolor='papayawhip',font_size='16px'):
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
     tickerlist：股票代码列表，建议在10只以内
@@ -799,11 +799,17 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
         footnote1="2、表中数值基于期末数字直接计算，而非期初期末均值，可能与公告数字存在差异。"
         footnote2="*** 数据来源：sina/EM，"+str(today)
         footnote=footnote0+'\n'+footnote1+'\n'+footnote2
-        
+
+        #确定表格字体大小
+        titile_font_size=font_size
+        heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'   
+     
         #print(df.to_string(index=False))
         #df_directprint(df,title_txt,footnote)
         df_display_CSS(df=df,titletxt=title_txt,footnote=footnote, \
-                       facecolor=facecolor,decimals=4)
+                       facecolor=facecolor,decimals=4, \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
         
         
     #合并所有历史记录
@@ -3539,7 +3545,7 @@ if __name__=='__main__':
     tickers=['000002.SZ','600048.SS','001979.SZ','600325.SS','000069.SZ','600383.SS','600895.SS','601155.SS']
     fsdates='2022-12-31'
     
-def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
+def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='16px'):
     """
     功能：分类别显示财报摘要中的指标
     """        
@@ -3697,6 +3703,10 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
                '说明：本表指标主要针对非金融普通企业，部分指标不完全适用于金融行业。 \n\n'+ \
                '注意：财报比率统计口径可能存在差异(例如采用期末/期初期末均值/期间加权等)，但不影响同一指标的可比性。',
               }        
+    
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'     
         
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
@@ -3727,8 +3737,11 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
             print(notesdict[ty])
             """
             titletxt1=titletxt+'，'+ty
+            
             df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
-                           facecolor=facecolor,decimals=2)
+                           facecolor=facecolor,decimals=2, \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
     
     # 多只股票情形：单日期
     import pandas as pd
@@ -3780,8 +3793,11 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
             print(notesdict[ty])
             """
             titletxt1=titletxt+'，'+ty
+            
             df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
-                           facecolor=facecolor,decimals=2)
+                           facecolor=facecolor,decimals=2, \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
             
     return dft2
 
@@ -3977,7 +3993,7 @@ if __name__=='__main__':
          '2018-12-31',
         ]
     
-def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
+def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size='16px'):
     """
     功能：分类别显示财报摘要中的指标
     """        
@@ -4187,6 +4203,10 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
                '固定资产净值率=(固定资产原值-累计折旧)/固定资产原值*100%，反映企业全部固定资产平均新旧程度 \n'+ \
                '资本固定化比率=非流动资产/净资产*100%，若超过100%说明固定资产资金投入超过自身能力，易造成财务状况恶化。\n',
               }        
+
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
     
     # 标记选项类型
     typedict_keys=list(typedict.keys())
@@ -4239,7 +4259,9 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
             """
             titletxt1=titletxt+'，'+ty
             df_display_CSS(df=dft3,titletxt=titletxt1,footnote=notesdict[ty], \
-                           facecolor=facecolor,decimals=2)
+                           facecolor=facecolor,decimals=2, \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
         
         return dft3
             
@@ -4298,7 +4320,9 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
             """
             titletxt1=titletxt+'，'+ty
             df_display_CSS(df=dft3,titletxt=titletxt1,footnote=notesdict[ty], \
-                           facecolor=facecolor,decimals=2)
+                           facecolor=facecolor,decimals=2, \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
     
         return dft3