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

siat/common.py

@@ -3671,6 +3671,119 @@ def ticker_type_preprocess_mticker_mixed(ticker,ticker_type='auto'):
 
 
 #==============================================================================
+if __name__=='__main__':
+    df=get_price('600519.SS','2024-4-1','2024-4-20')
+    titletxt='This is the Tilte'
+    titletxt=''
+    footnote='This is the footnote'
+    facecolor='papayawhip'
+    decimals=2
+    
+    #在Spyder中无法测试效果
+    df_display_CSS(df,titletxt,footnote,facecolor,decimals)
+
+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'):
+    """
+    功能：采样CSS式样显示df，适用于Jupyter环境，整齐紧凑，不挑浏览器
+    注意：若facecolor不被支持，则自动改为papayawhip
+    """
+    #检查df是否为空
+    if len(df)==0: return
+    
+    #替换nan和inf
+    import pandas as pd
+    import numpy as np
+    df.replace([np.inf, -np.inf],'-', inplace=True)
+    df.replace([np.nan],'-', inplace=True)
+
+    #默认的facecolor，一旦不支持则改为这个颜色
+    facecolor_default='papayawhip' 
+    
+    #不显示索引列，注意style1已经不是DaraFrame了
+    style1=df.style.hide() 
+    
+    #设置数值字段的千分位符号，同时设置数值字段的小数点精度
+    style2=style1.format(precision=decimals,thousands=',',na_rep='-') 
+    
+    #设置标题/列名：对齐，颜色，背景
+    try:
+        style3=style2.set_caption(titletxt).set_table_styles(
+            [{'selector':'caption', #设置标题对齐
+              'props':[('color','black'),('font-size',titile_font_size),('font-weight','bold')]}, \
+             
+             {'selector':'th.col_heading', #设置列名对齐
+              'props':[('color','black'),('background-color',facecolor), \
+                       ('font-size',heading_font_size),('text-align','center'),('margin','auto')]}])        
+    except:
+        style3=style2.set_caption(titletxt).set_table_styles(
+            [{'selector':'caption', #设置标题对齐
+              'props':[('color','black'),('font-size',titile_font_size),('font-weight','bold')]}, \
+             
+             {'selector':'th.col_heading', #设置列名对齐
+              'props':[('color','black'),('background-color',facecolor_default), \
+                       ('font-size',heading_font_size),('text-align','center'),('margin','auto')]}])        
+            
+    #设置数据：字体大小
+    style4=style3.set_properties(**{'font-size':data_font_size})
+    
+    #设置数据：对齐，第一列，最后列，中间列
+    col_list=list(df)
+    style5=style4.set_properties(**{'text-align':other_col_align}).\
+                  set_properties(**{'text-align':first_col_align},subset=[col_list[0]]).\
+                  set_properties(**{'text-align':second_col_align},subset=[col_list[1]]).\
+                  set_properties(**{'text-align':last_col_align},subset=[col_list[-1]])
+    
+    #设置数据：背景颜色
+    try:
+        style6=style5.set_properties(**{'background-color':facecolor,'color':'black'})
+    except:
+        print("  #Warning(df_display_CSS): unsupported color",facecolor,"\b, changed to default")
+        style6=style5.set_properties(**{'background-color':facecolor_default,'color':'black'})
+
+    #打印数据框本身
+    print('') #空一行
+    from IPython.display import display
+    display(style6)    
+
+    print(footnote)
+    print('') #空一行
+
+    return
+
 #==============================================================================
-#==============================================================================
+def upgrade_siat():
+    """
+    功能：一次性升级siat及其相关插件
+    
+    注意：在Spyder中可用，但在Jupyter中不能用，可能是路径问题!
+    """
+    #系统路径
+    import sys
+    python_dir=sys.path
+    
+    #插件列表
+    pip_list=['siat','akshare','pandas','pandas_datareader','yfinance','yahooquery']
+    pip_cmd='pip install --upgrade '
+    
+    import subprocess
+    for p in pip_list:
+        print("  Upgrading",p,"\b, please wait ... ...")
+        command = pip_cmd + p
+        #result = subprocess.run(command, shell=True, text=True, capture_output=True)
+        result = subprocess.run(command.split(' '), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+         
+        if result.returncode == 0:
+            print('    Successfully upgraded', p)
+        else:
+            print('      Upgrade failed:', result.returncode)
+            print('      Error message:', result.stderr)        
+    
+    return
 
+#==============================================================================
+#==============================================================================
+#==============================================================================

siat/financials_china.py

@@ -799,8 +799,11 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
         footnote1="2、表中数值基于期末数字直接计算，而非期初期末均值，可能与公告数字存在差异。"
         footnote2="*** 数据来源：sina/EM，"+str(today)
         footnote=footnote0+'\n'+footnote1+'\n'+footnote2
-        df_directprint(df,title_txt,footnote)
+        
         #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)
         
         
     #合并所有历史记录
@@ -3621,14 +3624,14 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
 
     # 注释
     notesdict={'常用指标': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 毛利率=毛利润 / 营业(总)收入 ×100% \n'+ \
                '2. 毛利润=营业(总)收入-营业(总)成本 \n'+ \
                '3. 销售净利率=净利润 / 营业(总)收入 ×100% \n'+ \
                '4. 期间费用率=期间费用 / 营业(总)收入 ×100%，期间费用包括管理费用，销售费用和财务费用。 \n', \
               
               '每股指标': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 稀释每股指标:假设企业所有发行在外的稀释性潜在普通股期间内均转换为普通股，导致普通股股数增加 \n'+ \
                '2. 潜在普通股：指赋予其持有者在报告期或以后期间享有取得普通股权利的金融工具或者其他合同，例如公司可转债、认股权证、股份期权等 \n'+ \
                '3. 摊薄每股指标：使用期末数值计算，而非期初期末均值，其结果更能反应期末情况，可能大于、小于或等于每股指标 \n'+ \
@@ -3646,13 +3649,13 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
                '15.(企业)自由现金流可以理解为归属于股东与债权人的最大现金流，而股东(股权)自由现金流则是归属于股东的最大现金流。 \n', \
 
               '营运能力': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 指标周转率/周转次数：营业(总)收入 / 指标的起初期末均值。一般来说数值越大越好 \n'+ \
                '2. 指标周转天数：360/周转率(或周转次数)。一般来说数值越小越好 \n'+ \
                '3. 注意：本表指标主要针对非金融行业，部分指标不适用于金融行业。 \n', \
               
               '盈利能力': 
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 毛利润=营业(总)收入-营业(总)成本 \n'+ \
                '2. 营业利润=毛利润-营业税金及附加-期间费用-资产减值损失+公允价值变动损益+投资损益 \n'+ \
                '3. 营业利润率=营业利润 / 营业(总)收入 x100% \n'+ \
@@ -3676,18 +3679,18 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
                '21.投入资本回报率的意义：更多地从投资而非财务角度看，每单位投资的资本所能赚取息税前利润的多少。 \n', \
               
               '收益质量':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 销售成本率=营业(总)成本 / 营业(总)收入 x100%，=1-毛利润 \n'+ \
                '2. 成本费用率=(营业(总)成本+期间费用) / 营业(总)收入 x100%，=销售成本率+期间费用率，可评价企业对成本费用的控制能力 \n'+ \
                '3. 期间费用率=期间费用 / 营业(总)收入 x100% \n',
               
               '成长能力':
-                '\n注：\n'+ \
+                '注：\n'+ \
               '1. 扣费(后)净利润=净利润-非经常性损益，即扣除了偶然的不可持续或不常发生的收益，可持续性更强，可能大于或小于净利润 \n'+ \
                '2. 归属母公司净利润：简称归母净利润，指企业合并报表中归属控股公司(母公司)的利润，不包括归属子公司中非控股股东的利润。 \n',
               
               '财务风险':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 保守速动比率：又称超速动比率，=(现金+短期证券投资+应收账款净额) / 流动负债，比速动比能够更好地评价企业短期偿债能力 \n'+ \
                '2. 应收账款净额:指应收账款和其他应收款减去备抵坏账的净额，实质即为信誉高客户的应收款净额 \n'+ \
                '3. 产权比率(equity ratio)=负债总额 / 所有者权益总额(净资产) x100%，从一个方面说明企业长期偿债能力，越高越弱 \n'+ \
@@ -3698,8 +3701,11 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
         ticker1=tickers[0]
+        """
         titletxt="\n===== 上市公司财务报表摘要："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
+        """
+        titletxt=ticker_name(ticker1)+'：'+"财报摘要"
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
         for ty in typelist:
@@ -3714,11 +3720,15 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
             dft.index=dft.index + 1
             dft2=dft.drop(labels=['选项','ticker'],axis=1)
             
+            """
             print("\n***",ty+'：')
             colalign=['center','left']+['right']*(len(list(dft2)) - 1)
             print(dft2.to_markdown(tablefmt='Simple',index=True,colalign=colalign))
             print(notesdict[ty])
-            
+            """
+            titletxt1=titletxt+'，'+ty
+            df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
+                           facecolor=facecolor,decimals=2)
     
     # 多只股票情形：单日期
     import pandas as pd
@@ -3730,9 +3740,12 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
     fsdates3=sorted(fsdates2,reverse=True)                
     
     if len(tickers_found) > 1:
+        """
         titletxt="\n===== 上市公司财务报表摘要对比：报表日期"+fsdates3[0]+" ====="
         print('\n'+titletxt)    
-    
+        """
+        titletxt="财报摘要：报表日"+fsdates3[0]
+        
         mdf=pd.DataFrame()
         for t in tickers_found:
             dft=fsdf[fsdf['ticker']==t]
@@ -3759,12 +3772,16 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke'):
             dft.reset_index(drop=True,inplace=True)
             dft.index=dft.index + 1
             dft2=dft.drop(labels=['选项'],axis=1)
-            
+            """
             print("\n***",ty+'：')
             colalign=['center','left']+['right']*(len(list(dft2)) - 1)
             print(dft2.to_markdown(tablefmt='Simple',index=True,colalign=colalign))
             print(notesdict[ty])
-    
+            """
+            titletxt1=titletxt+'，'+ty
+            df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
+                           facecolor=facecolor,decimals=2)
+            
     return dft2
 
 #==============================================================================
@@ -4084,12 +4101,12 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
     
     # 注释
     notesdict={'规模指标': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 短期=一年以内，长期=一年以上 \n'+ \
                '2. 非经常性损益=非经常性或偶然活动带来的损益，一般不可持续。 \n', \
               
               '利润回报': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 销售毛利率=毛利率=毛利润/营业(总)收入*100%，毛利润=营业(总)收入-营业(总)成本 \n'+ \
                '2. 主营业务利润率=主营业务利润/主营业务收入*100%，主营业务利润=主营业务收入-主营业务成本-主营业务税金及附加 \n'+ \
                '3. 营业利润率=营业利润/营业(总)收入*100%，营业利润=主营业务利润+其他业务利润-期间费用+其他损益 \n'+ \
@@ -4113,7 +4130,7 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
                '21.股息发放率=股利支付率=股利/净利润*100%，反映公司的股利分配政策，比例高表明公司不需更多的资金进行再投入。 \n', \
 
               '每股指标': \
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 每股收益=净利润/流通股数量，其中流通股数量按期初期末均值计算 \n'+ \
                '2. 扣除非经常性损益后的每股收益=扣除非经常性损益后的净利润/流通股数量 \n'+ \
                '3. 加权每股收益=净利润/加权流通股数量，加权流通股数量含期间内流通股数量的变化(增发新股、送股、转增股本或配股等) \n'+ \
@@ -4125,20 +4142,20 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
                '9. 每股资本公积金=资本公积金/流通股数量，资本公积金含发行股份的溢价、资产重估增值、接受捐赠等，仅可用于转增股本。 \n', \
               
               '营运能力': 
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 指标周转率/周转次数：营业(总)收入 / 指标的起初期末均值，从企业自身角度来说越大越好，但若涉及供应商则可能相反 \n'+ \
                '2. 指标周转天数：360/周转率(或周转次数)，从企业自身角度来说越小越好，但若涉及供应商则可能相反 \n'+ \
                '3. 注意：本表指标主要针对非金融行业，部分指标不适用于金融行业。 \n', \
               
               '现金指标':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 现金流量比率=经营活动产生的现金净流量/期末流动负债*100%，反映企业短期偿债能力 \n'+ \
                '2. 经营现金净流量对销售收入比率=销售现金比率，与赊销政策有关，若企业有虚假收入，也会使该指标过低 \n'+ \
                '3. 资产的经营现金流量回报率=经营现金流量净额/总资产*100%,体现企业经营活动的收现能力 \n'+ \
                '4. 经营现金净流量与净利润的比率=净现比=经营现金流量净额/净利润*100%。比率越大,企业盈利质量越高。 \n',
                
               '偿债能力':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 流动比率=流动资产/流动负债，反映企业的短期偿债能力，属于宽松指标 \n'+ \
                '2. 速动比率=(流动资产-存货)/流动负债，反映企业的短期偿债能力，属于较严的指标 \n'+ \
                '3. 现金比率=(货币资金+短期有价证券)/流动负债*100%，反映企业的短期偿债能力，属于严厉的指标 \n'+ \
@@ -4153,17 +4170,17 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
                '12. 经营现金净流量对负债比率=现金流量负债比=经营活动现金流量净额/负债总额*100%，比率越高，财务弹性越好。 \n',
               
               '应收账款':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 使用账龄法对应收账款/其他应收款分类 \n'+ \
                '2. 一般而言，应收款项的账龄越长，成为呆坏账的可能性就越大。 \n',
               
               '预付账款':
-               '\n注：\n'+ \
+               '注：\n'+ \
                '1. 一般而言，预付款项数额越大，企业在供应链中的地位越低 \n'+ \
                '2. 一般而言，预付款项的账龄越长，企业在供应链中的地位越低。 \n',
               
               '其他指标':
-                '\n注：\n'+ \
+                '注：\n'+ \
                '1. 长期资产与长期资金比率=非流动资产/(长期负债+股东权益)*100%，长期资金少，流动负债较多，财务风险较大 \n'+ \
                '2. 资本化比率=长期负债/(长期负债+股东权益)*100%，指标值越小，负债的资本化程度就越低，长期偿债压力就越小 \n'+ \
                '3. 固定资产净值率=(固定资产原值-累计折旧)/固定资产原值*100%，反映企业全部固定资产平均新旧程度 \n'+ \
@@ -4180,8 +4197,11 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
         ticker1=tickers[0]
+        """
         titletxt="\n===== 上市公司主要财务比率和重要指标："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
+        """
+        titletxt="主要财务比率和指标："+ticker_name(ticker1)
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
         for ty in typelist:
@@ -4206,16 +4226,19 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
             dft2.reset_index(drop=True,inplace=True)
             dft2.index=dft2.index + 1
             dft3=dft2.drop(labels=['选项','ticker'],axis=1)
-            
+            """
             print("\n***",ty+'：')
             colalign=['center','left']+['right']*(len(list(dft3)) - 1)
             print(dft3.to_markdown(tablefmt='Simple',index=True,colalign=colalign))
+            print(notesdict[ty])
+            """
             """
             注意：若dft3为空，则会出现错误：list assignment index out of range
             无论如何修改colalign都没用
             """
-            
-            print(notesdict[ty])
+            titletxt1=titletxt+'，'+ty
+            df_display_CSS(df=dft3,titletxt=titletxt1,footnote=notesdict[ty], \
+                           facecolor=facecolor,decimals=2)
         
         return dft3
             
@@ -4245,9 +4268,11 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
                 mdf=dft2
             else:
                 mdf=mdf.merge(dft2,how='outer',left_on=['选项','指标'], right_on=['选项','指标'])
-        
+        """
         titletxt="\n===== 上市公司财务报表主要比率和重要项目对比：报表日期"+fsdates3[0]+" ====="
         print('\n'+titletxt)    
+        """
+        titletxt="主要财务比率和指标：报表日"+fsdates3[0]
         
         for ty in typelist:
             dft=mdf[mdf['选项']==ty]
@@ -4263,11 +4288,15 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip'):
             dft2.reset_index(drop=True,inplace=True)
             dft2.index=dft2.index + 1
             dft3=dft2.drop(labels=['选项'],axis=1)
-            
+            """
             print("\n***",ty+'：')
             colalign=['center','left']+['right']*(len(list(dft3))-2)
             print(dft3.to_markdown(tablefmt='Simple',index=True,colalign=colalign))
             print(notesdict[ty])
+            """
+            titletxt1=titletxt+'，'+ty
+            df_display_CSS(df=dft3,titletxt=titletxt1,footnote=notesdict[ty], \
+                           facecolor=facecolor,decimals=2)
     
         return dft3
 

siat/financials_china2.py

@@ -608,8 +608,11 @@ def fs_item_analysis_1(df,ticker,fsdate,items,title_txt='',notes='',facecolor='p
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)    
+        
     return dfp
 
 
@@ -668,8 +671,11 @@ def fs_item_analysis_2(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)    
+        
     return dfp
 
 #==============================================================================
@@ -723,7 +729,10 @@ def fs_item_analysis_3(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     
     return dfp
 
@@ -798,8 +807,10 @@ def fs_item_analysis_4(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)   
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor)   
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     return dfp
 
 #==============================================================================
@@ -853,8 +864,10 @@ def fs_item_analysis_5(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor)    
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     return dfp
 
 #==============================================================================
@@ -976,8 +989,10 @@ def fs_item_analysis_6(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     return dfp
 
 #==============================================================================
@@ -1117,8 +1132,10 @@ def fs_item_analysis_7(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor)         
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor)         
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     return dfp
 
 #==============================================================================
@@ -1197,8 +1214,10 @@ def fs_item_analysis_8(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
     else:
         foottext=notes+'\n'+footnote
         
-    df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
-    
+    #df_directprint(dfp,title_txt,foottext,facecolor=facecolor) 
+    df_display_CSS(df=dfp,titletxt=title_txt,footnote=foottext, \
+                   first_col_align='left', \
+                   facecolor=facecolor,decimals=2)       
     return dfp
 
 #==============================================================================
@@ -1301,12 +1320,12 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes3="注3：长期股权投资是指企业对其子公司、合营企业及联营企业的权益性投资"
     notes4="注4：固定资产净额 = 固定资产原值 - 累计折旧 - 资产减值准备"
     notes=notes1+'\n'+notes2+'\n'+notes3+'\n'+notes4
-    dfp2=fs_item_analysis_1(df,ticker,fsdate,items2,title_txt,notes)
+    dfp2=fs_item_analysis_1(df,ticker,fsdate,items2,title_txt,notes,facecolor=facecolor)
     
     #负债变动趋势
     title_txt=title_head+"主要负债项目"
     items3=["短期借款","长期借款","应付账款","预收款项","应交税费","应付职工薪酬","负债合计"]
-    dfp3=fs_item_analysis_1(df,ticker,fsdate,items3,title_txt)
+    dfp3=fs_item_analysis_1(df,ticker,fsdate,items3,title_txt,facecolor=facecolor)
     
     #所有者权益变动趋势
     title_txt=title_head+"主要权益项目"
@@ -1330,7 +1349,7 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notesB=notes8+'\n'+notes9+'\n'+notes10+'\n'+notes11+'\n'+notes12+'\n'+notes13+'\n'+notes14
     
     notes=notesA+'\n'+notesB
-    dfp4=fs_item_analysis_1(df,ticker,fsdate,items4,title_txt,notes)
+    dfp4=fs_item_analysis_1(df,ticker,fsdate,items4,title_txt,notes,facecolor=facecolor)
     
     ### 货币资金与应收项目    
     #资产变动趋势1："货币资金","应收票据","应收账款"
@@ -1767,8 +1786,49 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
                       category='profile',business_period='recent', \
                       printout=False,gview=False, \
                       loc1='upper left',loc2='upper right', \
-                      facecolor='papayawhip'):
+                      facecolor='whitesmoke'):
     """
+    【功能】财务报表分析，仅适用于中国A股，注意不适用于港股和美股（含中概股）
+    
+    选项tickers：必选
+        单只股票：用于单只股票历史财报对比
+        股票列表：用于股票之间同期财报横向对比
+        
+    选项fsdates：必选   
+        单个财报日期：适用于选项tickers为股票列表时
+        财报日期列表：适用于选项tickers为单只股票时，至少四个财报日期，便于对比
+    
+    选项analysis_type: 
+        资产负债表分析(默认)：balance sheet, asset liability
+        利润表分析：income statement, cost, expense, earning
+        现金流量表分析：cash flow, cashflow statement
+        财报概述：financial summary
+        财务指标：financial indicator
+        股票画像：stock profile, 下面还可分别选择不同的category项目
+        杜邦分析：dupont identify, dupont analysis
+        杜邦分解：dupont decompose，需要安装graphviz插件
+    
+    选项category: 
+        基本信息(默认)：profile
+        股东信息：shareholder
+        历史分红：dividend
+        主营业务：business
+        市场估值：valuation
+        财务概况：financial    
+    
+    选项business_period：
+        最新(默认)：recent，可能为最新可获得的季报或中报或年报
+        最新的季报：quarterly
+        最新的中报：semiannual
+        最新的年报：annual
+    
+    选项loc1/loc2：适用于需要绘图时指定图例的位置，仅在双图例重叠时手动调整
+    
+    选项facecolor：指定表格/绘图的背景颜色
+        烟白色(默认)：whitesmoke
+        其他颜色：参见matplotlib颜色列表，例如淡雅小麦色papayawhip
+    
+    【备注】封装说明
     套壳函数1：tickers为股票列表，fsdates为财报日期，可为单个日期或日期列表
     asset_liab_china, income_cost_china, cash_flow_china
     
@@ -1779,9 +1839,9 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
     compare_fin_indicator_china
     
     套壳函数4：tickers为股票代码，fsdates不需要，
-    category可为: profile(默认), shareholder, dividend, business, valuation, 
-    financial    
-    stock_profile_china    
+    stock_profile_china
+    
+    套壳函数5/6：杜邦分析compare_dupont_china / 杜邦分解dupont_decompose
     """
         
     # 统一转小写，便于判断

siat/grafix.py

@@ -352,6 +352,9 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                color1='red',color2='blue',facecolor='whitesmoke'):
     """
+    注意：可能有问题，左纵坐标轴和横坐标轴标记可能发生重叠！
+    facecolor不起作用
+    
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
     输入：
@@ -370,9 +373,9 @@ def plot2_line2(df1,ticker1,colname1,label1, \
     """
     #空值判断
     if len(df1) ==0:
-        print ("  #Warning(plot_line2): no data to plot df1.")
+        print ("  #Warning(plot2_line2): no data to plot df1.")
     if len(df2) ==0:
-        print ("  #Warning(plot_line2): no data to plot df2.")
+        print ("  #Warning(plot2_line2): no data to plot df2.")
     if (len(df1) ==0) and (len(df2) ==0):
         return
     
@@ -944,7 +947,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     except:
         print("  #Warning(plot_line2_twinx2): color",facecolor,"is unsupported, changed to default setting")
         fig.gca().set_facecolor("whitesmoke") 
-
+    
     ax = fig.add_subplot(111)
 
     if ticker1 == '':
@@ -957,6 +960,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         
     date_start=df1.index[0]
     date_end=df1.index[-1]
+    
     if date_range and not date_freq:
         ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(date_start,date_end))
@@ -995,6 +999,18 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         else:
             label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
         ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
+        
+    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
+    
+    if ticker1 == '':
+        label1txt=label1
+    else:
+        if label1 == "":
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
+        else:
+            label1txt=label1+'('+ticker_name(ticker1,ticker_type_list[0])+')'
+    ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
+    ax.legend(loc=loc1,fontsize=legend_txt_size)
 
     #绘证券2：建立第二y轴
     ax2 = ax.twinx()
@@ -1010,13 +1026,13 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     date_start=df2.index[0]
     date_end=df2.index[-1]
     if date_range and not date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+        ax2.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(date_start,date_end))
     if not date_range and date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+        ax2.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(freq=date_freq))
     if date_range and date_freq:
-        ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
+        ax2.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))        
     
     lwadjust=linewidth_adjust(df2)        
@@ -1048,18 +1064,6 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
             label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
         
         ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
-        
-    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
-    
-    if ticker1 == '':
-        label1txt=label1
-    else:
-        if label1 == "":
-            label1txt=ticker_name(ticker1,ticker_type_list[0])
-        else:
-            label1txt=label1+'('+ticker_name(ticker1,ticker_type_list[0])+')'
-    ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
-    ax.legend(loc=loc1,fontsize=legend_txt_size)
     
     if ticker2 == '':
         label2txt=label2

siat/stock_china.py

@@ -1100,8 +1100,11 @@ 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'):
     """
@@ -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-3.0.15.dist-info → siat-3.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.15
+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

{siat-3.0.15.dist-info → siat-3.0.20.dist-info}/RECORD

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=hta-X1iWPjNbG1YYIVlQF-YvKA8An3KuEyLmUEZ3hH8,25562
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=pppwY6Uf2Zs_HdqMYhCN9ApEDRLDC-OhilBFT8Ygu44,135212
+siat/common.py,sha256=egDH2ihlNYMC8hAMQq2JRrJH8_52VenHTYeMBPnVJdI,139936
 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,8 +40,8 @@ siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHY
 siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
 siat/financials2.py,sha256=c5-QHu4VJn6f67mzX_t4cJc99rE3PmlChHC9VCNdYwY,42332
-siat/financials_china.py,sha256=ciHQIgx4Tmggalzn1RUqFV-ktn5rMQeGDTyGA5S5lyI,186871
-siat/financials_china2.py,sha256=Ipxqi2-aXcs0IAn2gTLYrFAW23-oW4r8TdPb3FMpzFU,79242
+siat/financials_china.py,sha256=ffikW5pgL0omDq0C8_7wKih-1nYfcVX1u23UAb1bp4U,188137
+siat/financials_china2.py,sha256=fkt9JCLS3nYWGrWFeQa9co1gv1H0PPe2pEw9jdRuoeU,82492
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
 siat/financials_china2_test3.py,sha256=UXYSA80DNSPRhHpovc2MA9JkpILWMAQaRatbWCHBNPs,3118
@@ -59,7 +59,7 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=300cXcqfPWG3dXiFoK2vIcgib9TkFZ_CRmVHYRmD7uw,84745
+siat/grafix.py,sha256=yP0wgXtydtNjyesaNjLbJN2FY1Es6d6mntLw_n0vsuA,84883
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=X3vL_2rU0zpjiiRtStWxWOXZrAJ323huSsZK3jGgABc,30633
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -104,7 +104,7 @@ siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuY
 siat/stock.py,sha256=1KC33O7AxQa-poXrMORn3Uvqpleo8LUh1-15OFcwBsQ,138974
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
-siat/stock_china.py,sha256=DYPU-x6gIpHFgpRsOuAUtqfmkRF0m870abLtHwbsrhw,83987
+siat/stock_china.py,sha256=6dFY4MGh9xDZ3G0RnkUiC13kmtI2Ro32k-ajCIeJo4k,89837
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
 siat/stock_info.pickle,sha256=EUUfZwFS3SMO2f25tOLWcjiJheGRCL3PDt7jII-i_4M,1315662
 siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
@@ -132,7 +132,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.0.15.dist-info/METADATA,sha256=LG4uUuHDO4yIMJWGYFjPDnpt6qPhF4qvsDy3J9K3qW4,1448
-siat-3.0.15.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siat-3.0.15.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.15.dist-info/RECORD,,
+siat-3.0.20.dist-info/METADATA,sha256=ovHOM235JnIy97atHOdoHLFImQgA_5mlE0OP_8dEGZk,1448
+siat-3.0.20.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.20.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.20.dist-info/RECORD,,

{siat-3.0.15.dist-info → siat-3.0.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py3-none-any