siat 3.1.4__py3-none-any.whl → 3.1.6__py3-none-any.whl

siat/common.py

@@ -399,7 +399,13 @@ def date_adjust2(basedate,adjust_year=0,adjust_month=0,adjust_day=0, \
         new_year=new_year + 1
         
     #合成中间日期：新年份，新月份，原日期
-    ndym=datetime(new_year,new_month,bd_day)
+    while True:
+        try:
+            ndym=datetime(new_year,new_month,bd_day)
+            break
+        except:
+            bd_day=bd_day - 1
+            continue
         
     #调整日期
     nd=ndym + timedelta(days=adjust_day)

siat/financials_china.py

@@ -54,6 +54,8 @@ if __name__=='__main__':
     
     ticker='000002.SZ'
     ticker='601398.SS'
+    ticker='600791.SS'
+    
     akfs=get_fin_stmt_ak(ticker)
     
 def get_fin_stmt_ak(ticker):
@@ -72,6 +74,7 @@ def get_fin_stmt_ak(ticker):
         return None        
     
     #抓取三大报表
+    import akshare as ak
     import time
     try:
         fbs = ak.stock_financial_report_sina(stock=prefix, symbol="资产负债表")
@@ -263,7 +266,7 @@ def get_fin_stmt_ak(ticker):
     #现金分析比率
     if not ('销售现金比率%' in fslist):
         #fs4['销售现金比率%']=round((fs4['经营活动现金流入'] / fs4['营业总收入'])*100,2)           
-        fs4['销售现金比率%']=fs4.apply(lambda x: round((x['经营活动现金流入'] / x['营业总收入'])*100,2),axis=1)
+        fs4['销售现金比率%']=fs4.apply(lambda x: round((x['经营活动现金流入'] / x['营业总收入'])*100,2) if x['营业总收入'] !=0 else np.nan,axis=1)
         
     if not ('现金购销比率%' in fslist):
         #fs4['现金购销比率%']=round((fs4['经营活动现金流出'] / fs4['经营活动现金流入'])*100,2)
@@ -271,19 +274,19 @@ def get_fin_stmt_ak(ticker):
         
     if not ('营业现金回笼率%' in fslist):
         #fs4['营业现金回笼率%']=round((fs4['经营活动现金流入'] / fs4['营业总收入'])*100,2)          
-        fs4['营业现金回笼率%']=fs4.apply(lambda x: round((x['经营活动现金流入'] / x['营业总收入'])*100,2),axis=1)
+        fs4['营业现金回笼率%']=fs4.apply(lambda x: round((x['经营活动现金流入'] / x['营业总收入'])*100,2) if x['营业总收入'] !=0 else np.nan,axis=1)
         
     if not ('短期现金偿债能力%' in fslist):
         #fs4['短期现金偿债能力%']=round((fs4['经营活动现金流净额'] / fs4['流动负债合计'])*100,2)
         try:
-            fs4['短期现金偿债能力%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['流动负债合计'])*100,2),axis=1)        
+            fs4['短期现金偿债能力%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['流动负债合计'])*100,2) if x['流动负债合计'] !=0 else np.nan,axis=1)        
         except:
             fs4['短期现金偿债能力%']=np.nan
         
     if not ('长期现金偿债能力%' in fslist):
         #fs4['长期现金偿债能力%']=round((fs4['经营活动现金流净额'] / fs4['负债合计'])*100,2)     
         try:
-            fs4['长期现金偿债能力%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['负债合计'])*100,2),axis=1)
+            fs4['长期现金偿债能力%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['负债合计'])*100,2) if x['负债合计'] !=0 else np.nan,axis=1)
         except:
             fs4['长期现金偿债能力%']==np.nan
 
@@ -320,7 +323,7 @@ def get_fin_stmt_ak(ticker):
         
     if not ('盈利现金比率%' in fslist):
         #fs4['盈利现金比率%']=round((fs4['经营活动现金流净额'] / fs4['净利润'])*100,2)
-        fs4['盈利现金比率%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['净利润'])*100,2),axis=1)
+        fs4['盈利现金比率%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['净利润'])*100,2) if x['净利润'] !=0 else np.nan,axis=1)
         
     if not ('现金流入流出比率%' in fslist):
         #fs4['现金流入流出比率%']=round((fs4['经营活动现金流入'] / fs4['经营活动现金流出'])*100,2)
@@ -328,7 +331,7 @@ def get_fin_stmt_ak(ticker):
         
     if not ('资产现金回收率%' in fslist):
         #fs4['资产现金回收率%']=round((fs4['经营活动现金流净额'] / fs4['资产总计'])*100,2)
-        fs4['资产现金回收率%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['资产总计'])*100,2),axis=1)
+        fs4['资产现金回收率%']=fs4.apply(lambda x: round((x['经营活动现金流净额'] / x['资产总计'])*100,2) if x['资产总计'] !=0 else np.nan,axis=1)
  
  
     return fs4

siat/financials_china2.py

@@ -2158,6 +2158,7 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
     
     else:
         print("  #Warning(fs_analysis_china): sorry, no idea on what to do for",analysis_type)
+        
     return
 
 

siat/fund_china.py

@@ -202,7 +202,7 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     print("\n*** 注：持股数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%，包括A股与非A股")
     print("    数据来源：天天基金/东方财富, 期间持仓股票总计"+str(len(df_merge))+"只,",today)      
     """
-    titletxt="基金持仓分析："+name+'，'+s1+"对比"+s2+"（按后者持仓比例降序排列，"+order+str(rank)+"名成份证券）"
+    titletxt="基金持仓转移矩阵："+name+'，'+s1+"对比"+s2+"（按后者持仓比例降序排列，"+order+str(rank)+"名成份证券）"
     
     footnote1="【注】持仓数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%；"
     footnote2="期间内（曾经）持仓证券数合计"+str(len(df_merge))+"只"+'\n'
@@ -373,7 +373,7 @@ def fund_stock_holding_rank_china(fund,rank=10,year_num=2):
     name=get_fund_name_china2(fund)
     
     #print("=== 基金持仓股票排行分析："+name+"，按照占净值比例高低排列 ===\n")
-    titletxt="基金持仓分析："+name+"，按照占净值比例降序排列，前"+str(rank)+"名成份证券"
+    titletxt="基金持仓转移详情："+name+"，按照占净值比例降序排列，前"+str(rank)+"名成份证券"
     import datetime; todaydt = datetime.date.today()
     #print("\n*** 注：包括A股与非A股。持股结构：股票简称(占净值比例%，持股数万股),",str(todaydt)) 
     footnote="【注】持仓结构：证券简称(占净值比例%，持仓数万股)，"+str(todaydt)+"统计"

siat/sector_china.py

@@ -851,7 +851,11 @@ def print_industry_component_sw2(icode,numberPerLine=5,colalign='left'):
     
     iname=industry_sw_name(icode)
     
-    clist,cdf=industry_stock_sw(icode,top=1000)    
+    clist,cdf=industry_stock_sw(icode,top=1000)   
+    if cdf is None:
+        print("  Error(print_industry_component_sw2): Shenwan industry component info tentatively inaccessible")
+        print("  Try later, or change to another computer and try again")
+        return
 
     #cdf['icode']=cdf['证券代码'].apply(lambda x: x+'.SS' if x[:1] in ['6'] else (x+'.SZ' if x[:1] in ['0','3'] else x+'.BJ' ))
     cdf['icode']=cdf['证券代码']
@@ -2070,7 +2074,10 @@ def rank_industry_sw_sharpe(idfall,base_return='Exp Ret%',graph=True,axisamp=0.8
 if __name__=='__main__':
     industry='850831.SW'
     industry='801193.SW'
+    industry='851811.SW'
+    industry='801181.SW'
     top=5
+    df=industry_stock_sw(industry)
 
 def industry_stock_sw(industry='801270.SW',top=5,printout=False):
     """
@@ -2092,7 +2099,7 @@ def industry_stock_sw(industry='801270.SW',top=5,printout=False):
         cdf = ak.index_component_sw(industry)
     except:
         print("  #Warning(industry_stock_sw): internal failure on component stocks for Shenwan industry",industry)
-        print("  Possible solution: upgrade akshare and then try again (expecting good luck but no guarantee)")
+        print("  Possible solution: upgrade akshare and then try again (good luck but no guarantee)")
         return None,None
 
     # 删除'证券名称'为None的行
@@ -2122,10 +2129,18 @@ 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)'
-        import datetime as dt; today=str(dt.date.today())
-        footnote="成分股总数："+str(cdf_total)+"，数据来源：申万宏源，"+str(today)
-        df_directprint(cdf1,title_txt,footnote)        
+        if '.SW' not in industry:
+            industry=industry+'.SW'
+        titletxt="申万行业指数成分股："+industry_sw_name(industry)+'('+industry+')'
+        import datetime as dt; todaydt=str(dt.date.today())
+        footnote="成分股总数："+str(cdf_total)+"，数据来源：申万宏源，"+str(todaydt)
+        
+        #df_directprint(cdf1,title_txt,footnote)
+        df_display_CSS(cdf1,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
+                           first_col_align='center',second_col_align='left', \
+                           last_col_align='left',other_col_align='right', \
+                           titile_font_size='16px',heading_font_size='15px', \
+                           data_font_size='15px')     
     
     #return clist1,cdf1
     return clist,cdf1
@@ -3018,7 +3033,38 @@ def industry_scan_china(sw_level='F', \
     
     return df2   
     
+#==============================================================================
+if __name__=='__main__':
+    ticker='600791.SS'
+    find_industry_sw(ticker)
+    
+def find_industry_sw(ticker):
+    """
+    功能：寻找一只股票所属的申万行业，细分行业
+    """
+    ticker6=ticker[:6]
     
+    import akshare as ak
+    #df3 = ak.sw_index_third_info()
+    df2 = ak.sw_index_second_info()
+    df2['industry_code']=df2['行业代码'].apply(lambda x: x[:6])
+    industry_list=list(df2['industry_code'])
+    
+    for i in industry_list:
+        cdf = ak.index_component_sw(i)
+        component_list=list(cdf)
+        
+        if ticker6 in component_list:
+            stock_name=cdf[cdf["证券代码"]==ticker6]['证券名称'].values[0]
+            print("股票：",ticker,"，",stock_name)
+            
+            isi=i+'.SI'
+            industry_name=df3[df3[行业代码]==isi]['行业名称'].values[0]
+            print("申万三级行业代码：",i+".SW","，",industry_name)
+            
+            break
+        
+    return    
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/stock.py

@@ -1645,7 +1645,7 @@ def compare_msecurity(tickers,measure,start,end, \
     if (len(tickersplit) > 1) and (measure == 'Close'):
         if tickersplit[1].upper() in ['M','B']:
             #y_label='指标'
-            y_label=''
+            y_label='指标对比'
     
     x_label1cn="数据来源: 综合新浪/东方财富/stooq/yahoo等，"
     x_label1en="Source: integrating sina/stooq/yahoo, "
@@ -1653,12 +1653,18 @@ def compare_msecurity(tickers,measure,start,end, \
     import datetime; todaydt = datetime.date.today()
     x_label=x_label1+str(todaydt)  
 
-    title_txt1=text_lang("证券趋势分析：","Trend Analysis: ") 
-    title_txt=title_txt1+y_label
+    title_txt1=text_lang("证券趋势对比分析","Trend Comparative Analysis") 
+    if y_label != '':
+        title_txt=title_txt1+": "+y_label
+    else:
+        title_txt=title_txt1
+        
     if preprocess == 'scaling' and scaling_option == 'change%':
-        title_txt2=text_lang("，涨跌幅度",", Changes")
-        title_txt=title_txt+title_txt2          
-    
+        title_txt2=text_lang("涨跌幅度","Changes")
+        if ':' in title_txt:
+            title_txt=title_txt+', '+title_txt2  
+        else:
+            title_txt=title_txt+': '+title_txt2
 
     # 标准化处理
     dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \

{siat-3.1.4.dist-info → siat-3.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.1.4
+Version: 3.1.6
 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.1.4.dist-info → siat-3.1.6.dist-info}/RECORD

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=UOI4sCz3ld7yezlARqPHvgHzfduDiGeRqNa82dDTCZ8,25849
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=kGsyiuYJX-Y8VNb2mmspSp7rNc5r8eexxEt9JiKmwHM,143250
+siat/common.py,sha256=Jjr8Fozk8JpHRMxOuK_a_BXMetV5O8QrmBNFQuGAJZA,143378
 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=7mnsTncKsgwFu8PP4refh5C5iMIO9P0KOMSF87ZyncY,45736
-siat/financials_china.py,sha256=HdX6YKI4tUC7VnPCTAjtdC3JxGgGepu07wdrpyykxbE,190119
-siat/financials_china2.py,sha256=mFwWtzwPbantjmXkGsr4CTEj9VRdZe5yITG3VwlJC9E,92655
+siat/financials_china.py,sha256=CJHMZAWwE0dTYqCL_ffgpbt_UkuJ26InAM0j7CpLGUg,190406
+siat/financials_china2.py,sha256=8qOHl617G_54GlqVJIUfXCitJy0pkEDRil30tpkuHJ0,92665
 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
@@ -52,7 +52,7 @@ siat/financials_test.py,sha256=HJ3CPo_Xckz2wXi3AEP6ZNWCF1Duc1pLi0Y10USiImc,23829
 siat/fred_test.py,sha256=KF50ssSbsfpa_kT6iuomD0vG4eXztAcOasZxg1OGX5w,1201
 siat/fund.py,sha256=wMDORsCBV8ZXfgwbtq-0bu3qqWY66dHnbqgllW0gWCo,24637
 siat/fund_china.pickle,sha256=QI3IjV46EeJ5ryO3xocmByc-6b_6_nDxgcXDhBHzop0,2380915
-siat/fund_china.py,sha256=uO2RexvO0ldclJwKAtbmdmaP9UvfkHq_uQDKOEVG5Sc,97516
+siat/fund_china.py,sha256=Sa9_s1A_dTT_sBu_pYYw2WaNZF0MIrNy-5X2FO4Lm00,97528
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
 siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
@@ -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=QSNJclhzT6V9NidziMwwAs-Kk6f7nzdK6PiPGkKrBCk,111617
+siat/sector_china.py,sha256=zbN8MdQJi84femJFB9vxu1XgfPPCWGH7SPV44EjZCNI,113475
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=kuYh0V5cqclkM6MjZUd-N361fv3oxGVVerYINuTzZrE,24622
@@ -101,7 +101,7 @@ siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2.py,sha256=4yBY3ve0Kddu95JemS02gfLbrHVN2_gl_irr5pA4F6w,24626
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=9w7LzOZzt-gAzfdVfYB8nd73DrG73wLmFpIolJKUCBc,139188
+siat/stock.py,sha256=GkGRY06uIKFuXg0Rw2rhUPFw2LY0VHIV-FMQYcpEP9Q,139380
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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.1.4.dist-info/METADATA,sha256=GjZl5T5oguZg8fcFxvDskZKFVJizNcgQEU-IxlH0RSI,1447
-siat-3.1.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.4.dist-info/RECORD,,
+siat-3.1.6.dist-info/METADATA,sha256=7I1oTuPz1RUF3cmw1c0t_zAdexvckE9P8x9U5sCp16c,1447
+siat-3.1.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.6.dist-info/RECORD,,