siat 3.4.14__py3-none-any.whl → 3.4.16__py3-none-any.whl

siat/common.py

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

siat/sector_china.py

@@ -814,8 +814,11 @@ def print_industry_component_sw(iname,numberPerLine=5,colalign='left'):
     """
     打印申万行业的成分股，名称(代码)
     """
-    
-    icode=industry_sw_code(iname)
+    try:
+        icode=industry_sw_code(iname)
+    except:
+        print("  #Warning(print_industry_component_sw): sector or industry name not found for",iname)
+        return
     
     clist,cdf=industry_stock_sw(icode,top=1000)    
 
@@ -826,10 +829,13 @@ def print_industry_component_sw(iname,numberPerLine=5,colalign='left'):
     cdf=cdf.mask(cdf.eq('None')).dropna()
     cdf['name_code']=cdf.apply(lambda x: x['证券名称']+'('+x['icode']+')',axis=1)
     
-    ilist=list(cdf['name_code'])
+    #标题
     import datetime as dt; stoday=dt.date.today()    
-    print("\n*** "+iname+'行业(板块)包括的股票：共计'+str(len(ilist))+'只，'+str(stoday)+"统计")
-    
+    ilist=list(cdf['name_code'])
+
+    titletxt="行业板块"+iname+"("+icode+")成分股：计"+str(len(ilist))+'只，按行业指数权重降序排列，'+str(stoday)
+    print("\n"+titletxt,end='')
+    #表格
     printInLine_md(ilist,numberPerLine=numberPerLine,colalign=colalign)
     
     return
@@ -3524,6 +3530,8 @@ def get_stock_industry_sw(ticker):
         industry = t.find_all("tr")[2].find("td").text
         
         return industry
+    else:
+        return ticker
 
 #==============================================================================
 if __name__ == '__main__':

siat/translate.py

@@ -3252,6 +3252,7 @@ if __name__=='__main__':
     ticker='PDD'
     ticker='IBM'
     ticker='600000.SS'
+    ticker='ULVR.L'
     
     ticker_type='auto'
     ticker_type='bond'
@@ -3259,6 +3260,7 @@ if __name__=='__main__':
     ticker={'Market':('US','^SPX','中概教培组合'),'EDU':0.5,'TAL':0.3,'TEDU':0.2}
     
     ticker1_name(ticker,ticker_type)
+    ticker1_name(ticker)
 
 def ticker1_name(ticker,ticker_type='auto'):
     """
@@ -3321,7 +3323,12 @@ def ticker1_name(ticker,ticker_type='auto'):
                 else:
                     tname=df1[df1['SYMBOL']==symbol]['ENAME'].values[0]
             except: pass
-            if tname != symbol: break
+            if tname != symbol or symbol in ['IBM']: break
+            else:
+                tname=get_stock_name_china_sina(symbol[:6])
+                if tname=='': tname=symbol
+                if tname != symbol and tname != '': break
+                
         
         #查找证券名称文件：次优先交易所债券
         if tt in ['bond']:
@@ -3346,11 +3353,11 @@ def ticker1_name(ticker,ticker_type='auto'):
                 break
     
     #如未查到，尝试stooq和雅虎名称，限英文名称
-    if tname==symbol:
+    if tname==symbol or tname=='':
         #不包括中国大陆和香港证券，这些都应在前面查到?新上市的可能查不到
         #if ('.SS' not in symbol) and ('.SH' not in symbol) and ('.SZ' not in symbol) and ('.BJ' not in symbol) and ('.HK' not in symbol):
         tname=get_stock_name1_en(symbol)
-        if tname==symbol:
+        if tname!=symbol:
             return tname
     
     #加港股标记

siat/yf_name.py

@@ -295,6 +295,52 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
                 t_name=t_name+'('+sid+')'
     
     return t_name
+
+#==============================================================================
+if __name__ == '__main__':
+    stock_code='KSL.AX'
+    stock_code='AAPL'
+    stock_code='600519.SS'
+    stock_code='6758.T'
+    stock_code='6758.JP'
+    stock_code='ULVR.L'
+    stock_code='ULVR.UK'
+    
+    stock_code='1155.KL'
+    stock_code='MSFT'
+    
+    yahoo_name1_direct(stock_code)
+
+ 
+def yahoo_name1_direct(stock_code,add_suffix=True):
+    """
+    功能：网页直接抓取，有的带后缀的股票代码可能失败，原因未知
+    """
+    import requests
+    from bs4 import BeautifulSoup
+    
+    stock_code1=stock_code.upper()
+    
+    #抓取证券名称
+    url = f"https://finance.yahoo.com/quote/{stock_code1}/"
+    response = requests.get(url)
+    if response.status_code == 200:
+        soup = BeautifulSoup(response.text, 'html.parser')
+        soup_title=soup.title
+        soup_text=soup_title.text
+        soup_text_list=soup_text.split('(')
+        
+        t_name = soup_text_list[0].strip()
+    else:
+        #未找到证券代码
+        pass
+        return stock_code
+    
+    #过滤名称中多余的尾部词汇
+    t_name=filter_stock_name(t_name)
+    
+    
+    return t_name   
 #==============================================================================
 if __name__=='__main__':
     original_name='Oponeo.pl SA'
@@ -437,6 +483,10 @@ if __name__=='__main__':
     ticker='MBG.DE'
     ticker='005930.KS'
     ticker='LI'
+    ticker='ULVR.L'
+    ticker='KSL.AX'
+    
+    ticker='IBM'
     
     get_stock_name1_en(ticker)
 
@@ -460,6 +510,39 @@ def get_stock_name1_en(ticker,short_name=False,add_suffix=True,maxlen=80):
     return sname
 
 #==============================================================================
+#==============================================================================
+if __name__ == '__main__':
+    ticker='600519.SS'
+    ticker='600305.SS'
+    ticker='200725.SZ'
+    ticker='000725.SZ'
+    
+    get_stock_name_china_sina(ticker)
+
+def get_stock_name_china_sina(ticker):
+    """
+    功能：抓取股票的申万行业分类名称
+    """
+    
+    import requests
+    from bs4 import BeautifulSoup
+
+    ticker6=ticker[:6]    
+    url=f"https://vip.stock.finance.sina.com.cn/corp/go.php/vCI_CorpOtherInfo/stockid/{ticker6}/menu_num/2.phtml"
+    response = requests.get(url)
+    
+    if response.status_code == 200:
+        soup = BeautifulSoup(response.text, 'html.parser')
+        soup_text=soup.find(id="stockName").text
+
+        soup_text_list=soup_text.split('(')
+        
+        t_name = soup_text_list[0].strip()
+                
+        return t_name
+    else:
+        return ticker
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

{siat-3.4.14.dist-info → siat-3.4.16.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=lUuCPVSxebkA2yye1PXu1V2Jd2UKEwD_kIA25DCIDTs,29750
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=UBmP_PES09tiht6K_DlM08BLlXGC-_CFB4FqoCORu9c,151695
+siat/common.py,sha256=hRRYWfmxAz1gSz2DJBoY8z8li0cbDMw-EiJIvThuhZY,151708
 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
@@ -94,7 +94,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=-3Z13BOwTlNzRLlB2-Pt1xEVu4R7PY6OTuW9BxvXVVw,132299
+siat/sector_china.py,sha256=_-NgVSI2AMRCZw3U85ov6CgU5riii4Y9oY-rfUrfVSk,132551
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=65s64L68aRZdVVK3V8UYxdPd_JHMqgJ2FBJJX5MSW-Q,26174
@@ -131,15 +131,15 @@ 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=Nspy2Ts2QTqWcqH94BXHO7OjnNvYOCqfPCcwTFoWwxc,218285
+siat/translate.py,sha256=Isa2gjmuY6xKo3HwaPOR0CJzPqLalcu0J1Qw2cZbmFs,218567
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
-siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.14.dist-info/METADATA,sha256=Bb5sc9tqZHXC_O1LOe7LRT9-OK8FKscIj8QzMRcUCqg,7683
-siat-3.4.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.4.14.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.14.dist-info/RECORD,,
+siat/yf_name.py,sha256=9U_XfEeMlS3TrCrO3Bww21nuFgghbnO-cqDJMhQWqew,16193
+siat-3.4.16.dist-info/METADATA,sha256=6jn_hf0WErGP2RdyweWl-65rvA-ypaJ2y-UumDF2fyU,7683
+siat-3.4.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.16.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.16.dist-info/RECORD,,