siat 3.0.10__py3-none-any.whl → 3.0.20__py3-none-any.whl

siat/stock_china.py

@@ -1100,10 +1100,13 @@ def stock_profile_china(ticker,category='profile', \
                         business_period='recent', \
                         financial_quarters=8, \
                         valuation_start='2020-1-1', \
+                            
+                        #参数prettytab和tabborder弃用，保留只为了兼容性
                         prettytab=False, \
                         tabborder=False, \
+                        
                         loc1='upper left',loc2='upper right', \
-                        ):
+                        facecolor='papayawhip'):
     """
     功能：介绍中国A股的主要信息，包括公司基本信息、主营信息、股东信息、财务信息、分红历史和市场估值等。
     ticker：A股股票代码
@@ -1122,6 +1125,8 @@ def stock_profile_china(ticker,category='profile', \
     返回值：无。
     建议运行环境：Anaconda Jupyter Notebook，其他环境未测试。
     """
+    DEBUG=False
+    
     #检查是否A股
     _,_,suffix=split_prefix_suffix(ticker)
     if not (suffix.upper() in ['SS','SZ','BJ']):
@@ -1148,15 +1153,15 @@ def stock_profile_china(ticker,category='profile', \
     baiwan=1000000.0
     wan=10000.0
 
-
+    import akshare as ak
     # 个股基本信息======================================================================================
-    if category == 'profile':
+    if any(s in category for s in ['profile','basic']): #判断category中是否包含任意子串
         
         # 个股基本信息查询1=============================================================================        
         try:
             df6=ak.stock_profile_cninfo(symbol=ticker1)  
         except:
-            print("  #Warning(stock_profile_china): profile info not found for",ticker)
+            print("  #Warning(stock_profile_china): profile info not found or inaccessible for",ticker1)
             return
     
         # 整理信息
@@ -1228,7 +1233,8 @@ def stock_profile_china(ticker,category='profile', \
         dftmp15=dftmp14.T
         dftmp15.reset_index(inplace=True)
               
-        titletxt=ticker_name(ticker)+"：基本信息"
+        titletxt=ticker_name(ticker)
+        """
         if prettytab:
             pandas2prettytable(dftmp15,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='l',tabborder=tabborder)
             print(' ','数据来源：巨潮资讯,',str(today))
@@ -1236,16 +1242,21 @@ def stock_profile_china(ticker,category='profile', \
             print('\n*** '+titletxt+'\n')
             print(dftmp15.to_markdown(tablefmt='Simple',index=False,colalign=['left']))
             print('\n数据来源：巨潮资讯,',str(today))
-            
-        print("\n*** 主营业务：")
+        """
+        titletxt1=titletxt+"：基本信息"
+        footnote='数据来源：巨潮资讯，'+str(today)
+        df_display_CSS(df=dftmp15,titletxt=titletxt1,footnote=footnote, \
+                       facecolor=facecolor,decimals=2,last_col_align='left')        
+        
+        print("*****",titletxt+"：业务范围")
         longtext=df6.iloc[0]["主营业务"]
         print_sentence(longtext,mid_symbol=['；','。'])
             
-        print("\n*** 经营范围：")
+        print("\n*****",titletxt+"：经营范围")
         longtext=df6.iloc[0]["经营范围"]
         print_sentence(longtext,mid_symbol=['；','。'])
             
-        print("\n*** 机构简介：")
+        print("\n*****",titletxt+"：机构简介")
         longtext=df6.iloc[0]["机构简介"]
         print_sentence(longtext,mid_symbol=['；','。'])
 
@@ -1296,7 +1307,8 @@ def stock_profile_china(ticker,category='profile', \
         cols2=['分类方向','分类','营业收入-同比增长','营业成本-同比增长','毛利率','毛利率-同比增长']
         
         dftmp1=dftmp[cols1]        
-        titletxt1=ticker_name(ticker)+'：主营业务构成，'+period+'财报'
+        titletxt1=ticker_name(ticker)+'：主营业务构成，'+period
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt1,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
             print(' ','数据来源：益盟-F10,',str(today))
@@ -1304,9 +1316,15 @@ def stock_profile_china(ticker,category='profile', \
             print('\n*** '+titletxt1+'\n')
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=['left','left','right','right','right','right','right']))
             print('\n数据来源：益盟-F10,',str(today))
+        """
+        footnote='数据来源：益盟-F10，'+str(today)
+        df_display_CSS(df=dftmp1,titletxt=titletxt1,footnote=footnote, \
+                       first_col_align='left',second_col_align='left', \
+                           facecolor=facecolor,decimals=2)
         
         dftmp2=dftmp[cols2]        
-        titletxt2=ticker_name(ticker)+'：主营业务增长，'+period+'财报'
+        titletxt2=ticker_name(ticker)+'：主营业务增长，'+period
+        """
         if prettytab:
             pandas2prettytable(dftmp2,titletxt2,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
             print(' ','数据来源：益盟-F10,',str(today))
@@ -1314,7 +1332,11 @@ def stock_profile_china(ticker,category='profile', \
             print('\n*** '+titletxt2+'\n')
             print(dftmp2.to_markdown(tablefmt='Simple',index=False,colalign=['left','left','right','right','right','right']))
             print('\n数据来源：益盟-F10,',str(today))
-
+        """
+        df_display_CSS(df=dftmp2,titletxt=titletxt2,footnote=footnote, \
+                       first_col_align='left',second_col_align='left', \
+                           facecolor=facecolor,decimals=2)
+        
     # 历史分红信息查询=============================================================================
     """
     if category == 'dividend':
@@ -1357,7 +1379,8 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=['left','center','center','right','center','center','center','left']))
             print('\n数据来源：巨潮资讯,',str(today))
     """
-    if category == 'dividend':
+    #if category in ['dividend','split']:
+    if any(s in category for s in ['dividend','split']):
         # 分红
         titletxt=ticker_name(ticker)+'：分红历史'
         try:
@@ -1384,6 +1407,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp3=dftmp[newcols]
         
         titletxt=ticker_name(ticker)+'：分红历史'
+        """
         if prettytab:
             pandas2prettytable(dftmp3,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
             print('【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经,',str(today))
@@ -1392,6 +1416,10 @@ def stock_profile_china(ticker,category='profile', \
             alignlist=['center']+['right']*(len(list(dftmp3))-1)
             print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=alignlist))
             print('【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经,',str(today))
+        """
+        footnote='【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经，'+str(today)
+        df_display_CSS(df=dftmp3,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2)
             
         # 配股
         titletxt=ticker_name(ticker)+'：配股历史'
@@ -1400,13 +1428,13 @@ def stock_profile_china(ticker,category='profile', \
         except:
             print('')
             print(titletxt)
-            print("  #Warning(stock_profile_china): rights issue info not found for stock",ticker)
+            print("  #Warning(stock_profile_china): allotment info not found for stock",ticker)
             return
         
         if len(df3p)==0:
             print('')
             print(titletxt)
-            print("  No rights issue record found for stock",ticker)
+            print("  #Warning(stock_profile_china): no allotment info found for stock",ticker)
             return
     
         # 整理信息
@@ -1415,7 +1443,7 @@ def stock_profile_china(ticker,category='profile', \
         
         newcols=['公告日期','配股方案','配股价格','股权登记日','除权日','缴款起始日','缴款终止日','配股上市日']
         dftmp3=dftmp[newcols]
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp3,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
             print('【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经,',str(today))
@@ -1424,10 +1452,15 @@ def stock_profile_china(ticker,category='profile', \
             alignlist=['center']+['right']*(len(list(dftmp3))-1)
             print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=alignlist))
             print('【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经,',str(today))
-    
+        """
+        footnote='【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经，'+str(today)
+        df_display_CSS(df=dftmp3,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2)
+        
 
     # 主要股东信息查询=============================================================================
-    if category == 'shareholder':
+    #if category in ['shareholder','investor']:
+    if any(s in category for s in ['shareholder','investor']):
         try:
             df4=ak.stock_main_stock_holder(stock=ticker1)  
         except:
@@ -1470,7 +1503,9 @@ def stock_profile_china(ticker,category='profile', \
                 return
         
         #df4b=df4a[df4a['持股比例'] != 0]
-        df4a['持股比例'].replace(0,'unknown',inplace=True)
+        #df4a['持股比例'].replace(0,'unknown',inplace=True)
+        #df4a['持股比例'].replace(0,'?',inplace=True)
+        df4a['持股比例'].replace(0,'--',inplace=True)
         dftmp=df4a.head(10).copy(deep=True)
         
         enddate=str(dftmp.head(1)['截至日期'][0])
@@ -1498,7 +1533,7 @@ def stock_profile_china(ticker,category='profile', \
         #newcols=['编号','股东名称','股本性质','持股比例(%)','持股数量(百万股)']
         newcols=['编号','股东名称','股本性质','持股比例(%)']
         dftmp1=dftmp[newcols]        
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='c',otherColAlign='c',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1507,10 +1542,16 @@ def stock_profile_china(ticker,category='profile', \
             #print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=['center','left','left','right','right']))
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=['center','left','left','right']))
             print('\n数据来源：新浪财经,',str(today))
-
+        """
+        footnote='数据来源：新浪财经，'+str(today)
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       first_col_align='center',second_col_align='left', \
+                       facecolor=facecolor,decimals=2)
+        
 
     # 主要市场指标查询=============================================================================
-    if category == 'valuation':
+    #if category == 'valuation':
+    if any(s in category for s in ['valuation','market']):
         try:
             #df5=ak.stock_a_lg_indicator(symbol=ticker1)  
             df5=ak.stock_a_indicator_lg(symbol=ticker1)  
@@ -1544,7 +1585,8 @@ def stock_profile_china(ticker,category='profile', \
         footnote3="数据来源：乐咕乐股，"+str(today)
         
         # 计算市盈率的均值，中位数、最大最小值
-        va='pe'; va_name="市盈率"
+        #va='pe'; va_name="市盈率"
+        va='pe_ttm'; va_name="市盈率TTM"
         va_mean=round(dftmp2[va].mean(),1)
         va_median=round(dftmp2[va].median(),1)
         va_max=round(dftmp2[va].max(),1)
@@ -1554,12 +1596,23 @@ def stock_profile_china(ticker,category='profile', \
         footnote=va_txt+"；"+mv_txt+"\n"+footnote3
         
         # 市盈率与总市值
-        plot2_line2(dftmp2,'',va,va_name, \
-                       dftmp2,'','total_mv(yi)','总市值(亿元)', \
-                       '',titletxt,footnote, \
-                       date_range=True,date_freq='Q',date_fmt='%Y-%m',twinx=True, \
-                       resample_freq='D',loc1=loc1,loc2=loc2, \
-                       color1='red',color2='blue')
+        if DEBUG:
+            display(dftmp2)
+        """
+        plot2_line2(df1=dftmp2,ticker1='',colname1=va,label1=va_name, \
+                    df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
+                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
+                    date_range=True,date_freq='Q',date_fmt='%Y-%m',twinx=True, \
+                    resample_freq='D', \
+                    loc1=loc1,loc2=loc2, \
+                    color1='red',color2='blue',facecolor=facecolor)
+        """
+        plot_line2(df1=dftmp2,ticker1='',colname1=va,label1=va_name, \
+                   df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
+                   ylabeltxt='',titletxt=titletxt,footnote=footnote, \
+                   twinx=True, \
+                   resample_freq='D',loc1='best',loc2='best', \
+                   color1='red',color2='blue',facecolor='whitesmoke')   
         
         # 计算市净率的均值，中位数、最大最小值
         va='pb'; va_name="市净率"
@@ -1571,16 +1624,24 @@ def stock_profile_china(ticker,category='profile', \
         
         footnote=va_txt+"；"+mv_txt+"\n"+footnote3
         
-        # 市盈率与总市值
+        # 市净率与总市值
+        """
         plot2_line2(dftmp2,'',va,va_name, \
                        dftmp2,'','total_mv(yi)','总市值(亿元)', \
                        '',titletxt,footnote, \
                        date_range=True,date_freq='Q',date_fmt='%Y-%m',twinx=True, \
                        resample_freq='D',loc1=loc1,loc2=loc2, \
-                       color1='red',color2='blue')
-        
+                       color1='red',color2='blue',facecolor=facecolor)
+        """
+        plot_line2(df1=dftmp2,ticker1='',colname1=va,label1=va_name, \
+                   df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
+                   ylabeltxt='',titletxt=titletxt,footnote=footnote, \
+                   twinx=True, \
+                   resample_freq='D',loc1='best',loc2='best', \
+                   color1='red',color2='blue',facecolor='whitesmoke')   
+            
         # 计算市销率的均值，中位数、最大最小值
-        va='ps'; va_name="市销率"
+        va='ps_ttm'; va_name="市销率TTM"
         va_mean=round(dftmp2[va].mean(),1)
         va_median=round(dftmp2[va].median(),1)
         va_max=round(dftmp2[va].max(),1)
@@ -1589,16 +1650,25 @@ def stock_profile_china(ticker,category='profile', \
         
         footnote=va_txt+"；"+mv_txt+"\n"+footnote3
         
-        # 市盈率与总市值
+        # 市销率与总市值
+        """
         plot2_line2(dftmp2,'',va,va_name, \
                        dftmp2,'','total_mv(yi)','总市值(亿元)', \
                        '',titletxt,footnote, \
                        date_range=True,date_freq='Q',date_fmt='%Y-%m',twinx=True, \
                        resample_freq='D',loc1=loc1,loc2=loc2, \
-                       color1='red',color2='blue')
+                       color1='red',color2='blue',facecolor=facecolor)
+        """
+        plot_line2(df1=dftmp2,ticker1='',colname1=va,label1=va_name, \
+                   df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
+                   ylabeltxt='',titletxt=titletxt,footnote=footnote, \
+                   twinx=True, \
+                   resample_freq='D',loc1='best',loc2='best', \
+                   color1='red',color2='blue',facecolor='whitesmoke')           
         
         # 计算股息率的均值，中位数、最大最小值
-        va='dv_ratio'; va_name="股息率"
+        #va='dv_ratio'; va_name="股息率"
+        va='dv_ttm'; va_name="股息率TTM"
         va_mean=round(dftmp2[va].mean(),1)
         va_median=round(dftmp2[va].median(),1)
         va_max=round(dftmp2[va].max(),1)
@@ -1607,16 +1677,26 @@ def stock_profile_china(ticker,category='profile', \
         
         footnote=va_txt+"；"+mv_txt+"\n"+footnote3
         
-        # 市盈率与总市值
+        # 股息率与总市值
+        """
         plot2_line2(dftmp2,'',va,va_name+'%', \
                        dftmp2,'','total_mv(yi)','总市值(亿元)', \
                        '',titletxt,footnote, \
                        date_range=True,date_freq='Q',date_fmt='%Y-%m',twinx=True, \
-                       resample_freq='D',loc1=loc1,loc2=loc2, \
-                       color1='red',color2='blue')
-
+                       loc1=loc1,loc2=loc2, \
+                       color1='red',color2='blue',facecolor=facecolor)
+        """
+        plot_line2(df1=dftmp2,ticker1='',colname1=va,label1=va_name+'%', \
+                   df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
+                   ylabeltxt='',titletxt=titletxt,footnote=footnote, \
+                   twinx=True, \
+                   resample_freq='D',loc1='best',loc2='best', \
+                   color1='red',color2='blue',facecolor='whitesmoke')           
+        
+        
     # 财务基本面指标查询=============================================================================
-    if category == 'financial':
+    #if category == 'financial':
+    if any(s in category for s in ['financial','healthy']):
         
         try:
             df7=ak.stock_financial_analysis_indicator(symbol=ticker1)  
@@ -1654,7 +1734,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp1=dftmp.T
         dftmp1.reset_index(inplace=True)
         dftmp1.rename(columns={'index':'项目'},inplace=True)
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1663,7 +1743,12 @@ def stock_profile_china(ticker,category='profile', \
             colalignList=['left','right','right','right','right','right','right','right','right']
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
-            
+        """
+        footnote='数据来源：新浪财经，'+str(today)
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='16px',data_font_size='16px')        
+        
         """
         加权平均每股收益：
         指计算时股份数用按月对总股数加权计算的数据，理由是由于公司投入的资本和资产不同，收益产生的基础也不同。
@@ -1704,7 +1789,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp1=dftmp.T
         dftmp1.reset_index(inplace=True)
         dftmp1.rename(columns={'index':'项目'},inplace=True)
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1713,7 +1798,12 @@ def stock_profile_china(ticker,category='profile', \
             colalignList=['left','right','right','right','right','right','right','right','right']
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
-            
+        """
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='16px',data_font_size='16px')        
+
+        
         """
         总资产利润率=利润总额/平均总资产
         总资产净利润率=净利润/平均总资产
@@ -1744,7 +1834,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp2=dftmp1.T
         dftmp2.reset_index(inplace=True)
         dftmp2.rename(columns={'index':'项目'},inplace=True)
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp2,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1753,7 +1843,12 @@ def stock_profile_china(ticker,category='profile', \
             colalignList=['left','right','right','right','right','right','right','right','right']
             print(dftmp2.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
-            
+        """
+        df_display_CSS(df=dftmp2,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='16px',data_font_size='16px')        
+
+        
         """
         净资产收益率=净利润/净资产。净资产=所有者权益+少数股东权益
         
@@ -1778,7 +1873,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp1=dftmp.T
         dftmp1.reset_index(inplace=True)
         dftmp1.rename(columns={'index':'项目'},inplace=True)
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1789,7 +1884,10 @@ def stock_profile_china(ticker,category='profile', \
             print('\n数据来源：新浪财经,',str(today))
             
         """
-        """
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='16px',data_font_size='16px')        
+
         
         titletxt=ticker_name(ticker)+"：主要财务信息，资产负债分析"
         colList=['日期','财报类别','流动比率','速动比率','现金比率(%)','利息支付倍数','长期债务与营运资金比率(%)', \
@@ -1818,7 +1916,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp1=dftmp.T
         dftmp1.reset_index(inplace=True)
         dftmp1.rename(columns={'index':'项目'},inplace=True)
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1827,7 +1925,12 @@ def stock_profile_china(ticker,category='profile', \
             colalignList=['left','right','right','right','right','right','right','right','right']
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
-            
+        """
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='16px',data_font_size='16px')        
+
+        
         """
         股东权益比率（又称自有资本比率或净资产比率）是股东权益与资产总额的比率。
         固定资产净值率是指固定资产原价扣除其累计磨损额后的余额即固定资产折余价值对固定资产原价的比率。
@@ -1859,7 +1962,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp1.reset_index(inplace=True)
         dftmp1.rename(columns={'index':'项目'},inplace=True)
 
-        
+        """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='r',tabborder=tabborder)
             print(' ','数据来源：新浪财经,',str(today))
@@ -1868,7 +1971,11 @@ def stock_profile_china(ticker,category='profile', \
             colalignList=['left','right','right','right','right','right','right','right','right']
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
-            
+        """
+        df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
+                       facecolor=facecolor,decimals=2, \
+                       heading_font_size='15px',data_font_size='15px')        
+
         """
         资产的经营现金流量回报率是经营活动产生的现金流量净额/总资产,是体现企业收现能力的指标之一。
         

siat/stock_technical.py

@@ -2615,7 +2615,7 @@ def security_technical2(ticker,start='default',end='default', \
     fig = plt.figure()
     ax = fig.add_subplot(111)
     #plt.gca().set_facecolor('whitesmoke')
-    plt.gca().set_facecolor(facecolor) #放在这里生效，放尾部不生效
+    fig.gca().set_facecolor(facecolor) #放在这里生效，放尾部不生效
     
     line0=False; line30=False; line50=False; line80=False
     for l in tech_line_collist:

siat/valuation.py

@@ -927,7 +927,9 @@ if __name__=='__main__':
 def security_valuation(tickers,indicators,start,end, \
                        preprocess='none',scaling_option='start', \
                        twinx=False,loc1='best',loc2='best', \
-                       graph=True,annotate=False):
+                       graph=True,facecolor='whitesmoke', \
+                       annotate=False,annotate_value=False, \
+                       mark_top=False,mark_bottom=False,mark_end=False):
     """
     功能：绘制估值走势
     """
@@ -985,7 +987,8 @@ def security_valuation(tickers,indicators,start,end, \
         draw_lines(df2,y_label=ylabeltxt,x_label=footnote, \
                    axhline_value=0,axhline_label='', \
                    title_txt=titletxt,data_label=False, \
-                   resample_freq='D',loc=loc1)        
+                   resample_freq='D',loc=loc1,facecolor=facecolor,
+                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df
         
@@ -1020,7 +1023,7 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue')
+                   color1='red',color2='blue',facecolor=facecolor)
         return df
    
     # 绘制双线: 两只证券，一个指标。twinx双轴绘图
@@ -1057,7 +1060,7 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue')
+                   color1='red',color2='blue',facecolor=facecolor)
 
         return df                
    
@@ -1089,7 +1092,11 @@ def security_valuation(tickers,indicators,start,end, \
         draw_lines(dfs2,y_label=y_label,x_label=x_label, \
                    axhline_value=0,axhline_label=axhline_label, \
                    title_txt=titletxt,data_label=False, \
-                   resample_freq='D',loc=loc1,annotate=annotate,plus_sign=plus_sign)        
+                   resample_freq='D',loc=loc1, \
+                   annotate=annotate,annotate_value=annotate_value, \
+                   plus_sign=plus_sign, \
+                   facecolor=facecolor, \
+                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df        
    
@@ -1130,7 +1137,10 @@ def security_valuation(tickers,indicators,start,end, \
         draw_lines(dfs2,y_label=y_label,x_label=x_label, \
                    axhline_value=0,axhline_label=axhline_label, \
                    title_txt=titletxt,data_label=False, \
-                   resample_freq='D',loc=loc1,annotate=annotate,plus_sign=plus_sign)        
+                   resample_freq='D',loc=loc1,plus_sign=plus_sign, \
+                   annotate=annotate,annotate_value=annotate_value, \
+                   facecolor=facecolor, \
+                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df 
                 
@@ -1142,7 +1152,7 @@ if __name__=='__main__':
     base=''
     
     
-def print_valuation(df,indicator='PE',base=''):
+def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     """
     功能：显示同行估值数字，并进行对比
     """
@@ -1217,9 +1227,26 @@ def print_valuation(df,indicator='PE',base=''):
     df4=df3[['证券名称',col_mean,'均值排名',col_latest_date,'排名@'+col_latest_date,col_mean_rel,col_latest_rel,'均值对比','对比@'+col_latest_date]]
     
     titletxt="*** 估值对比："+indicator+"，降序排列"
+    """
     print("\n",titletxt,'\n')
     alignlist=['left','right','center','right','center']+['right']*(len(list(df4))-5)
     print(df4.to_markdown(index=False,tablefmt='simple',colalign=alignlist))
+    """
+    disph=df4.style.hide() #不显示索引列
+    dispp=disph.format(precision=2) #设置带有小数点的列精度调整为小数点后2位
+    #设置标题/列名
+    dispt=dispp.set_caption(titletxt).set_table_styles(
+        [{'selector':'caption', #设置标题
+          'props':[('color','black'),('font-size','16px'),('font-weight','bold')]}, \
+         {'selector':'th.col_heading', #设置列名
+           'props':[('color','black'),('text-align','center'),('margin','auto')]}])        
+    #设置列数值对齐
+    dispf=dispt.set_properties(**{'text-align':'center'})
+    #设置前景背景颜色
+    dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+
+    from IPython.display import display
+    display(dispf2)
     
     print(" ")
     if diff > 0:

{siat-3.0.10.dist-info → siat-3.0.20.dist-info}/METADATA

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