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

siat/common.py

@@ -1613,7 +1613,7 @@ if __name__=='__main__':
 
 def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
     """
-    功能：打印进度百分比
+    功能：打印进度百分比，注意需要放在循环体的开始处，不能放在循环体的末尾！
     current：当前完成
     total：需要完成的列表
     steps：分成几个进度点显示
@@ -1643,7 +1643,7 @@ def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
             pct=pct_list[pos]
             
             if pct=="100%":
-                print("100% completing")
+                print("100% completing last job ...")
             else:
                 print(pct,end=' ')
     
@@ -1729,12 +1729,22 @@ def printInLine_md(aList,numberPerLine=5,colalign='left'):
         groupedList=groupedList+[tmpList]
         
     #装入df
-    cols=[' ']*numberPerLine
+    #cols=[' ']*numberPerLine
+    cols=[i+1 for i in range(numberPerLine)]
+    
     import pandas as pd
     df=pd.DataFrame(groupedList,columns=cols)
+    
+    """
     alignlist=[colalign]*numberPerLine
     print(df.to_markdown(index=False,tablefmt='plain',colalign=alignlist))
-
+    """
+    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')
+    
     return
 
 #==============================================================================
@@ -3755,35 +3765,74 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
     return
 
 #==============================================================================
-def upgrade_siat():
+if __name__=='__main__':
+    upgrade_siat()
+
+def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
+                 'yfinance','yahooquery','urllib3','twine','mplfinance'], \
+                 pipcmd="pip install --upgrade"):
     """
     功能：一次性升级siat及其相关插件
     
-    注意：在Spyder中可用，但在Jupyter中不能用，可能是路径问题!
+    注意：pip的路径问题!
     """
-    #系统路径
+    print("  Try upgrading siat and related modules, please wait ... ...")
+    #获取系统目录
     import sys
-    python_dir=sys.path
+    syspath=sys.path
+    
+    #判断目录分隔符号
+    win_sep='\\'; win_flag=False
+    mac_sep='//'; mac_flag=False
     
-    #插件列表
-    pip_list=['siat','akshare','pandas','pandas_datareader','yfinance','yahooquery']
-    pip_cmd='pip install --upgrade '
+    sp_list=syspath[0].split(win_sep)
+    if len(sp_list) > 1:
+        win_flag=True
+        
+    sp_list=syspath[0].split(mac_sep)
+    if len(sp_list) > 1:
+        win_flag=True   
     
+    if win_flag:
+        sep_flag=win_sep
+    else:
+        sep_flag=mac_sep
+    
+    #寻找anaconda3的安装目录
+    for sp in syspath:
+        sp_list=sp.split(sep_flag)
+        if sp_list[-1] == 'anaconda3': break
+    
+    #生成pip命令字符串前半段，仅缺插件名
+    cmdstr=sp+sep_flag+'Scripts'+sep_flag+pipcmd+' '
+    
+    #逐个升级插件
     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)        
+    fail_list=[]
+    for m in module_list:
+        #print("Upgrading",m,"... ...",end='')
+        print_progress_percent2(m,module_list,steps=5,leading_blanks=2)
+        
+        cmdstr1=cmdstr+m
+        #print(cmdstr1)
+        #proc=subprocess.run(cmdstr1.split(' '),stdout=subprocess.PIPE)
+        proc=subprocess.run(cmdstr1.split(' '))
+        rcode=proc.returncode
+        if rcode !=0: fail_list=fail_list+[m]
+        
+        """
+        if rcode==0: result='done✓'
+        else: result='FAILed❌, try again manually'
+        print(result)
+        """
     
+    if len(fail_list) == 0:
+        print("  All specified modules are successfully upgraded!")
+    else:
+        print("  All specified modules are successfully upgraded except",end='')
+        print_list(fail_list,leading_blanks=1)
+        
     return
-
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/financials_china2.py

@@ -1308,11 +1308,12 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
             print("  Solution: check ticker spelling and try at least 10 minutes later")
             return
     
-    title_head=ticker_name(comparator,'stock')+"资产负债分析："
+    #title_head=ticker_name(comparator,'stock')+"资产负债分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     ### 资产负债表的主要项目
     #资产变动趋势2
-    title_txt=title_head+"主要资产项目"
+    title_txt=title_head+"主要资产项目，"+fsdate
     items2=["货币资金","应收账款","存货","长期股权投资","固定资产净额","资产总计"]
     
     notes1="注1：货币资金包括库存现金、银行存款和其他货币资金三个部分"
@@ -1323,12 +1324,12 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp2=fs_item_analysis_1(df,ticker,fsdate,items2,title_txt,notes,facecolor=facecolor)
     
     #负债变动趋势
-    title_txt=title_head+"主要负债项目"
+    title_txt=title_head+"主要负债项目，"+fsdate
     items3=["短期借款","长期借款","应付账款","预收款项","应交税费","应付职工薪酬","负债合计"]
     dfp3=fs_item_analysis_1(df,ticker,fsdate,items3,title_txt,facecolor=facecolor)
     
     #所有者权益变动趋势
-    title_txt=title_head+"主要权益项目"
+    title_txt=title_head+"主要权益项目，"+fsdate
     items4=["实收资本(或股本)","资本公积","盈余公积","未分配利润","所有者权益合计"]
     
     notes1="注1：实收资本(或股本，Paid-in Capital)指企业实际收到的投资人投入的资本"
@@ -1353,7 +1354,7 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     
     ### 货币资金与应收项目    
     #资产变动趋势1："货币资金","应收票据","应收账款"
-    title_txt=title_head+"货币资金与应收项目"
+    title_txt=title_head+"货币资金与应收项目，"+fsdate
     items1=["货币资金","应收票据","应收账款"]
     dfp1=fs_item_analysis_1(df,ticker,fsdate,items1,title_txt,facecolor=facecolor)
     
@@ -1371,7 +1372,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
 
     #应收账款占比同行对比
     items7=['应收账款','资产总计','应收账款占比%']
-    title_txt=title_head+"应收账款占比同行对比"
+    #title_txt=title_head+"应收账款占比同行对比"
+    title_txt="应收账款占比同行对比："+fsdate
     dfp7=fs_item_analysis_7(df,tickers,fsdate,items7,title_txt,facecolor=facecolor)        
 
     ### 存货
@@ -1390,7 +1392,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
 
     #存货占比与行业对比        
     items11=['存货','资产总计','存货占比%']
-    title_txt=title_head+"存货占比情况同行对比"
+    #title_txt=title_head+"存货占比情况同行对比"
+    title_txt="存货占比情况同行对比："+fsdate
     dfp11=fs_item_analysis_7(df,tickers,fsdate,items11,title_txt,facecolor=facecolor)
 
     ### 偿债能力
@@ -1407,7 +1410,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp14=fs_item_analysis_5(df,ticker,fsdates1,title_txt,facecolor=facecolor)    
 
     #资产负债率同行比较
-    title_txt=title_head+"资产负债率同行比较"
+    #title_txt=title_head+"资产负债率同行比较"
+    title_txt="资产负债率同行比较："+fsdate
     items15=['资产总计','资产负债率%','流动比率%','速动比率%']
     dfp15=fs_item_analysis_8(df,tickers,fsdate,items15,title_txt,facecolor=facecolor)
 
@@ -1490,15 +1494,15 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return
     
-    title_head=ticker_name(comparator,'stock')+"收入成本分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     #收入成本总体变动趋势
-    title_txt=title_head+"主要项目及其变动趋势"
+    title_txt=title_head+"主要利润表项目，"+fsdate
     items1=["营业总收入","营业总成本","营业成本","毛利润","营业利润","营业外收支","税前利润","所得税费用","净利润","归母净利润"]
     dfp1=fs_item_analysis_1(df,ticker,fsdate,items1,title_txt,facecolor=facecolor)
     
     #成本变动趋势
-    title_txt=title_head+"主要成本费用及其变动趋势"
+    title_txt=title_head+"主要成本费用项目，"+fsdate
     print('')
     """
     items2=["营业总成本","营业成本","营业税金及附加","销售费用","管理费用","研发费用",
@@ -1551,7 +1555,8 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes="注：管理费用是行政管理部门为组织生产/经营活动发生的各种费用"
     dfp7=fs_item_analysis_2(df,ticker,fsdates1,items7,title_txt,notes,facecolor=facecolor)
     
-    title_txt=title_head+"三项费用率同行对比"
+    #title_txt=title_head+"三项费用率同行对比"
+    title_txt="三项费用率同行对比："+fsdate
     items14=['营业总收入','销售费用率%','管理费用率%','研发费用率%']
     
     notes1="注1：销售费用率 = 销售费用 / 营业总收入"
@@ -1583,7 +1588,8 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp11=fs_item_analysis_6(df,ticker,fsdates2,items13,title_txt,facecolor=facecolor)
 
     #同行比较
-    title_txt=title_head+"利润率同行对比"
+    #title_txt=title_head+"利润率同行对比"
+    title_txt="利润率同行对比："+fsdate
     #items15=['营业利润','营业利润率%','税前利润率%','实际所得税率%','净利润','净利润率%']
     #items15=['毛利润率%','营业利润率%','税前利润率%','净利润率%']
     items15=['净利润率%','税前利润率%','营业利润率%','毛利润率%']
@@ -1667,10 +1673,10 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return    
     
-    title_head=ticker_name(comparator,'stock')+"现金流分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     #总体变动趋势
-    title_txt=title_head+"主要项目及其变动趋势"
+    title_txt=title_head+"主要现金流项目，"+fsdate
     items1=["经营活动现金流净额","经营活动现金流入","经营活动现金流出",
             "投资活动现金流净额","投资活动现金流入","投资活动现金流出",
             "筹资活动现金流净额","筹资活动现金流入","筹资活动现金流出",
@@ -1694,7 +1700,7 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp12=fs_item_analysis_6(df,ticker,fsdates2,items12,title_txt,facecolor=facecolor)
 
     #同行比较
-    title_txt=title_head+"现金收入能力同行比较"
+    title_txt=title_head+"现金收入能力同行比较，"+fsdate
     items16=['销售现金比率%','现金购销比率%','营业现金回笼率%']
     
     notes1="注1：销售现金比率 = 经营活动现金流入 / 营业总收入"
@@ -1703,7 +1709,7 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items16,title_txt,notes,facecolor=facecolor)  
     
-    title_txt=title_head+"现金偿债能力同行比较"
+    title_txt=title_head+"现金偿债能力同行比较，"+fsdate
     items14=['短期现金偿债能力%','长期现金偿债能力%']
     
     notes1="注1：短期现金偿债能力 = 经营活动现金流净额 / 流动负债合计"
@@ -1711,7 +1717,7 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes=notes1+'\n'+notes2
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items14,title_txt,notes,facecolor=facecolor)
     
-    title_txt=title_head+"现金支付能力同行比较"
+    title_txt=title_head+"现金支付能力同行比较，"+fsdate
     items15=['现金支付股利能力(元)','现金综合支付能力%','支付给职工的现金比率%']
     
     notes1="注1：现金支付股利能力 = 经营活动现金流净额 / 流通股股数"
@@ -1720,7 +1726,7 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items15,title_txt,notes,facecolor=facecolor)
 
-    title_txt=title_head+"财务指标含金量同行比较"
+    title_txt=title_head+"财务指标含金量同行比较，"+fsdate
     items17=['盈利现金比率%','现金流入流出比率%','资产现金回收率%']
     
     notes1="注1：盈利现金比率 = 经营活动现金流净额 / 净利润"
@@ -1786,7 +1792,7 @@ 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='whitesmoke'):
+                      facecolor='papayawhip'):
     """
     【功能】财务报表分析，仅适用于中国A股，注意不适用于港股和美股（含中概股）
     

siat/sector_china.py

@@ -760,9 +760,10 @@ if __name__=='__main__':
     
     print_industry_sw(itype='I',numberPerLine=5,colalign='right')
 
-def print_industry_sw(itype='I',numberPerLine=4,colalign='left'):
+def print_industry_sw(itype='I',numberPerLine=5,colalign='left'):
     """
-    按照类别打印申万行业列表，名称(代码)，每行5个
+    功能：按照类别打印申万行业列表，名称(代码)
+    行业分级itype：F="市场表征", I="一级行业", T="二级行业", 3="三级行业", S="风格指数"
     """
     df=industry_sw_list()
     df1=df[df['type']==itype]
@@ -776,8 +777,8 @@ def print_industry_sw(itype='I',numberPerLine=4,colalign='left'):
     ilist=list(df1['name_code'])
     print("\n*** 申万行业分类："+iname+"，共计"+str(len(ilist))+'个行业(板块)')
     
-    if itype=='3':
-        numberPerLine=4
+    if itype=='T': numberPerLine=4
+    if itype=='3': numberPerLine=3
     
     printInLine_md(ilist,numberPerLine=numberPerLine,colalign=colalign)
     
@@ -2075,7 +2076,7 @@ def industry_stock_sw(industry='801270.SW',top=5,printout=False):
             clist1=clist1+[c+'.SZ']
     """
     if printout:
-        title_txt="申万行业指数成分股排名与权重："+industry_sw_name(industry)+'('+industry+'.SW)'
+        title_txt="申万行业成分股："+industry_sw_name(industry)+'('+industry+'.SW)'
         import datetime as dt; today=str(dt.date.today())
         footnote="*** 成分股总数："+str(cdf_total)+"，数据来源：申万宏源，"+str(today)
         df_directprint(cdf1,title_txt,footnote)        

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.20
+Version: 3.0.30
 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.20.dist-info → siat-3.0.30.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=egDH2ihlNYMC8hAMQq2JRrJH8_52VenHTYeMBPnVJdI,139936
+siat/common.py,sha256=_g7uJlrAcyui22MTZ9mcylpKbO7edQlQotR9lpWcUY8,141536
 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
@@ -41,7 +41,7 @@ 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=ffikW5pgL0omDq0C8_7wKih-1nYfcVX1u23UAb1bp4U,188137
-siat/financials_china2.py,sha256=fkt9JCLS3nYWGrWFeQa9co1gv1H0PPe2pEw9jdRuoeU,82492
+siat/financials_china2.py,sha256=-lelBcwtpew4h1-l0-QtThaOOhjudbn089FkVbQ2Hx0,82874
 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
@@ -91,7 +91,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=IMrbgrYgv5y_ZiVK92AbWiup6eFwcC_u_Pib1srk_z0,104462
+siat/sector_china.py,sha256=W8HUsBacNbILRzDLn6JLdBZ4eCAGmnVZl7nO4BcxUUs,104578
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=kuYh0V5cqclkM6MjZUd-N361fv3oxGVVerYINuTzZrE,24622
@@ -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.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.30.dist-info/METADATA,sha256=REvoWcCLwcvUXlqUsNnBTAZmHdyO_B_bUGGdeneQTpM,1448
+siat-3.0.30.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.30.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.30.dist-info/RECORD,,