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

siat/common.py

@@ -3789,7 +3789,7 @@ if __name__=='__main__':
     upgrade_siat()
 
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
-                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance'], \
+                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance','openpyxl'], \
                  pipcmd="pip install --upgrade"):
     """
     功能：一次性升级siat及其相关插件

siat/sector_china.py

@@ -756,16 +756,16 @@ def display_industry_sw(sw_level='1',numberPerLine=4,colalign='left'):
 
 
 if __name__=='__main__':
-    itype='I'
+    itype='1'
     numberPerLine=5
     colalign='left'
     
-    print_industry_sw(itype='I',numberPerLine=5,colalign='right')
+    print_industry_sw(itype='1',numberPerLine=5,colalign='right')
 
-def print_industry_sw(itype='I',numberPerLine=5,colalign='left'):
+def print_industry_sw(itype='1',numberPerLine=5,colalign='left'):
     """
     功能：按照类别打印申万行业列表，名称(代码)
-    行业分级itype：F="市场表征", I="一级行业", T="二级行业", 3="三级行业", S="风格指数"
+    行业分级itype：F=市场表征, 1=一级行业, 2=二级行业, 3=三级行业, S="风格指数"，B=大类风格，C=金创
     """
     df=industry_sw_list()
     df1=df[df['type']==itype]
@@ -944,12 +944,12 @@ if __name__=='__main__':
     start='2018-1-1'
     end='2022-10-31'
     measure='Exp Ret%'
-    itype='I'
+    itype='1'
     graph=True
     axisamp=0.8
     
 def industry_ranking_sw(start,end,measure='Exp Ret%', \
-                                itype='I',period="day", \
+                                itype='1',period="day", \
                                 graph=True,axisamp=0.8):
     """
     完整版，全流程
@@ -1048,7 +1048,7 @@ if __name__=='__main__':
     start='2018-1-1'
     end='2022-10-31'
     measure='Exp Ret%'
-    itype='I'
+    itype='1'
     graph=True
     axisamp=0.8
     
@@ -1157,10 +1157,10 @@ if __name__=='__main__':
     period="day"
     industry_list='all'    
     
-def get_industry_sw(itype='I',period="day",industry_list='all'):
+def get_industry_sw(itype='1',period="day",industry_list='all'):
     """
     功能：遍历某类申万指数，下载数据
-    itype: F表征指数，I行业指数，S风格指数
+    itype: F表征指数，n=1/2/3行业指数，S风格指数，B大类风格，C金创类
     period="day"; choice of {"day", "week", "month"}
     industry_list: 允许选择部分行业
     """
@@ -1569,12 +1569,12 @@ if __name__=='__main__':
     measure='Exp Ret%'
     start='2020-11-1'
     end='2022-10-31'
-    itype='I'
+    itype='1'
     period="day"
     graph=True
 
 def compare_mindustry_sw(industry_list,measure,start,end, \
-                         itype='I',period="day",graph=True,printout=False,sortby='tpw_mean'):
+                         itype='1',period="day",graph=True,printout=False,sortby='tpw_mean'):
     """
     功能：比较多个行业industry_list某个指标measure在时间段start/end的时间序列趋势
     industry_list: 至少有两项，若太多了则生成的曲线过于密集
@@ -1685,8 +1685,8 @@ def compare_mindustry_sw(industry_list,measure,start,end, \
         else:
             pass
         
-        title_txt='*** '+title_txt+'：'+y_label+'，'+sortby_txt
-        additional_note="*** 注：列表仅显示有星号标记或特定数量的证券。"
+        title_txt=title_txt+'：'+y_label+'，'+sortby_txt
+        additional_note="注：列表仅显示有星号标记或特定数量的证券。"
         footnote='比较期间：'+start+'至'+end
         ds=descriptive_statistics(df2,title_txt,additional_note+footnote,decimals=4, \
                                sortby=sortby,recommend_only=False)
@@ -1839,7 +1839,7 @@ if __name__=='__main__':
     measure='Exp Ret%'
     start='2020-11-1'
     end='2022-10-31'
-    itype='I'
+    itype='1'
     period="day"
     graph=True
 
@@ -2160,9 +2160,9 @@ if __name__ =="__main__":
     start='2023-1-1'; end='2023-4-10'
     itype='F'
     
-    idf,idfall=get_industry_info_sw(start,end,itype='I')
+    idf,idfall=get_industry_info_sw(start,end,itype='1')
 
-def get_industry_info_sw(start,end,itype='I'):
+def get_industry_info_sw(start,end,itype='1'):
     """
     功能：获得申万行业历史数据
     start: 开始日期
@@ -2347,7 +2347,7 @@ if __name__=='__main__':
     end='2023-3-22'
     info_type='Close'
     
-    df=get_industry_sw('I')
+    df=get_industry_sw('1')
     df=industry_correlation_sw(df,tickers,start,end,info_type='Close')
 
 def cm2inch(x,y):

siat/stock.py

@@ -1574,7 +1574,7 @@ def compare_msecurity(tickers,measure,start,end, \
         print("  #Error(compare_msecurity): support only one measure")
         return None
     
-    print("  Searching for multiple security information for",measure,"\b, it takes great time, please wait ...") 
+    print("  Searching for multiple security information for",measure,"\b, it may take great time ...") 
     #屏蔽函数内print信息输出的类
     import os, sys
     class HiddenPrints:

siat/stock_technical.py

@@ -2003,12 +2003,15 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
     
     try:
         #pricedf=get_price(ticker,fromdate1,todate)
-        pricedf=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
+        pricedf,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
                                         todate=todate,ticker_type=ticker_type)
     except:
         print("  #Error(security_bollinger): price info not found for",ticker)
         return None
-    
+    if found not in ['Found']:
+        print("  #Error(): ticker info either inaccessible or not found for",ticker)
+        return None
+        
     # 滚动均值与标准差
     pricedf['bmiddle']=pricedf["Close"].rolling(window=boll_days).mean()
     pricedf['bsd']=pricedf["Close"].rolling(window=boll_days).std()
@@ -2351,7 +2354,9 @@ def security_technical(ticker,start='default',end='default', \
     
     if 'Bollinger' in technical1:
         vallist=['MV','PE','PB','ROE']
-        if val in vallist and val in indicator1: #只能处理股票估值，无需ticker_type
+        #if val in vallist and val in indicator1: #只能处理股票估值，无需ticker_type
+        if any(val in indicator1 for val in vallist):
+            val=list(set(indicator1).intersection(set(vallist)))[0] #找出2个列表中第1个共同元素
             df=security_Bubble(ticker=ticker,start=fromdate,end=todate,boll_years=boll_years, \
                                 indicator=val, \
                                 graph=True,smooth=smooth,loc=loc1, \

siat/translate.py

@@ -819,7 +819,8 @@ def codetranslate0(code):
         
         ['00700.HK','腾讯港股'],['TENCENT','腾讯控股'],
         ['09988.HK','阿里巴巴港股'],['BABA-SW','阿里巴巴港股'],
-        ['09618.HK','京东港股'],['JD-SW','京东港股'], 
+        ['09618.HK','京东港股'],['JD-SW','京东港股'],
+        ['02517.HK','锅圈食品'], 
         
         #股票：石油、矿业
         ['SLB','斯伦贝谢'],['BKR','贝克休斯'],['HAL','哈里伯顿'],
@@ -1615,6 +1616,8 @@ def codetranslate0(code):
         ['BRLUSD=X','巴西雷亚尔/美元汇率'],['BRLUSD','巴西雷亚尔/美元汇率'],
         
         ['INRTUS.M','美联储基准利率'],['USDCNY','美元/人民币汇率'],
+        ['AUDCNY','澳大利亚元/人民币汇率'],['JPYCNY','日元/人民币汇率'],
+        ['USDJPY','美元/日元汇率'],['AUDJPY','澳大利亚元/日元汇率'],
         
         ['EUR_I','STOOQ欧元指数'],
         ['EURUSD=X','欧元/美元汇率'],['EURUSD','欧元/美元汇率'],
@@ -2994,12 +2997,19 @@ if __name__=='__main__':
 #==============================================================================
 #==============================================================================
 #==============================================================================
+if __name__=='__main__':
+    #更新所有证券名称
+    update_all_names2files()
+
 def update_all_names2files():
     """
     功能：更新股票(中港美)、基金(沪深)和债券(沪深)名称至文件中(S:/siat)
     """
+    print("  Updating stock names in China, China HK and US markets ... ...")
     df1=update_stock_names()
+    print("  Updating exchange fund names in China markets ... ...")
     df2=update_fund_names_china()
+    print("  Updating exchange bond names in China markets ... ...")
     df3=update_exchange_bond_name_china()
     
     return

{siat-3.0.40.dist-info → siat-3.0.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.40
+Version: 3.0.41
 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.40.dist-info → siat-3.0.41.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=ABOA9aMdRRrnlSNzKEgBminm8p1cwq0idRXZtPKTUVM,142632
+siat/common.py,sha256=PVVP59khcYr0B0Kd-lcOPlekAU8ZzmKP_nuwIgJcjro,142643
 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
@@ -31,7 +31,7 @@ siat/economy.py,sha256=J0-xBtp6gg6CNP9N-UvpKLJ-0Tw5O_DKaDvEq1R35Fw,73853
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=PRgZo6rwlldAG9qNRnFWX0fnLdPHXIPVQOIFOJ2azmQ,19016
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
-siat/exchange_bond_china.pickle,sha256=mGy55toxgUrNL2rdf8lIVeSDz9wyHk6x7hierKxTklI,1255244
+siat/exchange_bond_china.pickle,sha256=2Zp4Zfl7YBFQ7i4mG8x-7b562MPc3Jg_b2DjN9UMuTk,1247727
 siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 siat/financial_base.py,sha256=5u298_1OSlgLnDmhXxqvo4WgMM0JKSa_4jBYF-Ilx38,41097
@@ -51,7 +51,7 @@ siat/financials_china_test2_fin_indicator.py,sha256=WkNlVW_0hGegdw1rzg4BP_dKR-sm
 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=sl-SquUMSKHM_lQ0Ojty2982BWTxhcH_zd6VUCtGtKg,2351460
+siat/fund_china.pickle,sha256=QI3IjV46EeJ5ryO3xocmByc-6b_6_nDxgcXDhBHzop0,2380915
 siat/fund_china.py,sha256=vdri-FucJ39SDdnM0AWULN9biSaQVh-dnfM03AhOuZY,80880
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
@@ -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=axG2B-6PJSzapiHAvA7lyOXpg7FqHCQAjxVqATpmydk,111573
+siat/sector_china.py,sha256=QSNJclhzT6V9NidziMwwAs-Kk6f7nzdK6PiPGkKrBCk,111617
 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,18 +101,18 @@ siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2.py,sha256=AhIheVc0EvXShwDvMX3UbR3cX5cKYxSgUVqA_bHeCEI,24579
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=1KC33O7AxQa-poXrMORn3Uvqpleo8LUh1-15OFcwBsQ,138974
+siat/stock.py,sha256=PkNSJPwMlvwnRcbsyIrkslk_jvFfveQ7FDQg5XbEPoc,138964
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=UsC8vy1wnyBMGGsm5r1XMjIeGoHQyIcbxS6VKGiIlRs,91425
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
-siat/stock_info.pickle,sha256=EUUfZwFS3SMO2f25tOLWcjiJheGRCL3PDt7jII-i_4M,1315662
+siat/stock_info.pickle,sha256=IGUkPbvwtXbngKBMWAzgYhplE96FucuTfnc26wvBiLQ,1319270
 siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
 siat/stock_list_china_test.py,sha256=gv14UwMMvkZqtb6G7DCTSuehIwVHuVwu7w60p6gyHoo,1014
 siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum6s,36738
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
-siat/stock_technical.py,sha256=bu8vu937shf7Ck0nYfnHiIUEDtil88hoQ5Wv9cyYNKM,112519
+siat/stock_technical.py,sha256=c9kv_ih1BxxBGk2bcfkFUfKxy3I4_1jNFfoYMk-j0gY,112833
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -126,13 +126,13 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=GdylBFXrgYY2tWE0YvGPi0D3HoGrtcO-CkLh7HfdSK0,209277
+siat/translate.py,sha256=fmI2K6o2klJEQCxYqdh1njLg7aTYPjU_P_tCRqki2W8,209799
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 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.40.dist-info/METADATA,sha256=fR0SNdX-xQVExJ87D_dvJeZIbIdZqF9wyz0Eq0tzOis,1448
-siat-3.0.40.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.0.40.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.40.dist-info/RECORD,,
+siat-3.0.41.dist-info/METADATA,sha256=seEw_evcNzXWMM5VhRD1XWxlxbsKT9XkDX5eUOi_jSw,1448
+siat-3.0.41.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+siat-3.0.41.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.41.dist-info/RECORD,,

{siat-3.0.40.dist-info → siat-3.0.41.dist-info}/WHEEL

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