siat 3.2.59__py3-none-any.whl → 3.3.2__py3-none-any.whl

siat/allin.py

@@ -123,3 +123,6 @@ from siat.google_authenticator import *
 # 提问记录
 from siat.luchy_draw import *
 
+# 搜索全球上市公司的英文名称，需要访问雅虎
+from siat.yf_name import *
+

siat/security_prices.py

@@ -417,13 +417,16 @@ def get_price_ak_em(ticker,fromdate,todate,adjust='',ticker_type='auto'):
     df1['footnote']=adjust   
     
     num=len(df1)
+    """
     ptname=ticker_name(ticker,ticker_type)
     if ptname == ticker: ptname=''
-
+    """
     if num > 0:
-        print("  Successfully retrieved",num,"records for",ticker,ptname)
+        #print("  Successfully retrieved",num,"records for",ticker,ptname)
+        print("  Successfully retrieved",num,"records for",ticker)
     else:
-        print("  Sorry, no records retrieved for",ticker,ptname)
+        #print("  Sorry, no records retrieved for",ticker,ptname)
+        print("  Sorry, no records retrieved for",ticker)
 
     return df1
     
@@ -610,15 +613,17 @@ def get_price_stooq(ticker,start,end):
         
         _,start1,end1=check_period(start,end)
         prices2=prices[(prices.index >= start1) & (prices.index <= end1)]
+        
         num=len(prices2)
+        """
         ptname=ticker_name(ticker,'stock')
         if ptname == ticker: ptname=''
-
+        """
         if num > 0:
-            print("  Successfully retrieved",num,"records for",ticker,ptname)
+            print("  Successfully retrieved",num,"records for",ticker)
             return prices2
         else:
-            print("  Sorry, no records found from stooq for",ticker,ptname,"from",start,'to',end)
+            print("  Sorry, no records found from stooq for",ticker,"from",start,'to',end)
             return None   
     else:
         return None
@@ -930,13 +935,15 @@ def get_price_ak_cn(ticker,fromdate,todate,adjust='',ticker_type='auto'):
         df2['ticker']=str(ticker)
         if 'Adj Close' not in list(df2):
             df2['Adj Close']=df2['Close']
-        df2['footnote']=adjust   
-
+        df2['footnote']=adjust  
+        
+        """
         ptname=ticker_name(ticker,ticker_type)
         if ptname == ticker: ptname=''
+        """
         
         if len(df2) > 0:
-            print("  Successfully retrieved",len(df2),"records for",ticker,ptname)
+            print("  Successfully retrieved",len(df2),"records for",ticker)
     
     return df2
 
@@ -1019,10 +1026,12 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     df2['source']=text_lang('新浪','Sina')
     df2['footnote']=adjust   
     
+    """
     ptname=ticker_name(symbol,'stock')
     if ptname == symbol: ptname=''
-
-    print("  Successfully retrieved",num,"records for",symbol,ptname)    
+    """
+    
+    print("  Successfully retrieved",num,"records for",symbol)    
     
     return df2
 
@@ -1106,10 +1115,12 @@ def get_price_ak_hk(symbol,fromdate,todate,adjust=""):
         df2['Adj Close']=df2['Close']
     df2['source']=text_lang('新浪','Sina')
     
+    """
     ptname=ticker_name(symbol,'stock')
     if ptname == symbol: ptname=''
+    """
     
-    print("  Successfully retrieved",num,"records for",symbol,ptname)
+    print("  Successfully retrieved",num,"records for",symbol)
     
     return df2
 
@@ -1301,10 +1312,12 @@ def get_prices_yahoo(ticker,start,end,retry_count=3,pause=1):
         #p['Adj Close']=p['Close']
         p['source']=text_lang('雅虎','Yahoo')
     
+        """
         ptname=ticker_name(ticker,'stock')
         if ptname == ticker: ptname=''
-
-        print("  Successfully retrieved",len(p),"records for",ticker,ptname)
+        """
+        
+        print("  Successfully retrieved",len(p),"records for",ticker)
 
         #去掉时区
         p=df_index_timezone_remove(p)
@@ -1389,10 +1402,12 @@ def get_prices_yf(ticker,start,end,threads=False):
         p['source']=text_lang('雅虎','Yahoo')
         
         if len(p) > 0:
+            """
             ptname=ticker_name(ticker1,'stock')
             if ptname == ticker: ptname=''
-
-            print("  Successfully retrieved",len(p),"records for",ticker1,ptname)  
+            """
+            
+            print("  Successfully retrieved",len(p),"records for",ticker1)  
             
             #去掉时区
             p=df_index_timezone_remove(p)
@@ -1458,10 +1473,12 @@ def get_index_fred(ticker,start,end):
     
     num=len(df)
     if num > 0:
+        """
         ptname=ticker_name(ticker,'stock')
         if ptname == ticker: ptname=''
-
-        print("  Successfully retrieved",num,"records for",ticker,ptname)    
+        """
+        
+        print("  Successfully retrieved",num,"records for",ticker)    
     else:
         print("  Sorry, no records retrieved for",ticker)
 

siat/translate.py

@@ -3108,11 +3108,22 @@ 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()
+    try:
+        df1=update_stock_names()
+    except:
+        pass
+    
+    print("\n  Updating exchange fund names in China markets ... ...")
+    try:
+        df2=update_fund_names_china()
+    except:
+        pass
+    
+    print("\n  Updating exchange bond names in China markets ... ...")
+    try:
+        df3=update_exchange_bond_name_china()
+    except:
+        pass
     
     return
 
@@ -3292,6 +3303,7 @@ def ticker1_name(ticker,ticker_type='auto'):
         ttlist=['bond','stock','fund']
     
     #循环查询，查到则跳出
+    lang=check_language()
     tname=symbol
     for tt in ttlist:
         #查找证券名称文件：优先股票
@@ -3302,7 +3314,10 @@ def ticker1_name(ticker,ticker_type='auto'):
             if '.HK' in symbol and len(symbol)==8: symbol=symbol[1:]
             
             try:
-                tname=df1[df1['SYMBOL']==symbol]['CNAME'].values[0]
+                if lang == "Chinese":
+                    tname=df1[df1['SYMBOL']==symbol]['CNAME'].values[0]
+                else:
+                    tname=df1[df1['SYMBOL']==symbol]['ENAME'].values[0]
             except: pass
             if tname != symbol: break
         
@@ -3328,11 +3343,11 @@ def ticker1_name(ticker,ticker_type='auto'):
                 if '基金' not in tname: tname=tname + '基金'
                 break
     
-    #如未查到，尝试雅虎名称
+    #如未查到，尝试stooq和雅虎名称，限英文名称
     if tname==symbol:
         #不包括中国大陆和香港证券，这些都应在前面查到?新上市的可能查不到
         #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=yahoo_name2(symbol)
+        tname=get_stock_name1_en(symbol)
         if tname==symbol:
             return tname
     

siat/yf_name.py

@@ -113,11 +113,12 @@ if __name__=='__main__':
     
     ticker_name(ticker)
     
-def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
+def yahoo_name1x(ticker,short_name=False,add_suffix=True,maxlen=80):
     """
     功能：从雅虎财经取得全球证券名称，仅限英文。需要去掉常用词，如Corporation
     优点：对未定义的证券代码也可给出英文名称，即使在中文语言环境中
     现存问题：需要访问雅虎，且耗时稍长
+    废弃！！！
     """
     #测试雅虎
     if not test_yahoo_access():
@@ -198,6 +199,11 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     
     return t_name
 
+#==============================================================================
+def replace_multiple_spaces(s):
+    import re
+    return re.sub(r'\s+', ' ', s)
+
 #==============================================================================
 if __name__=='__main__':
     ticker='1155.KL'
@@ -220,6 +226,7 @@ if __name__=='__main__':
     ticker='600333.ss'
     ticker='600444.ss'
     ticker='600777.ss'
+    ticker='CPL.WA'
     
     yahoo_name2(ticker)
     
@@ -240,20 +247,12 @@ if __name__=='__main__':
     
     ticker_name(ticker)
     
-def yahoo_name2(ticker,short_name=False,add_suffix=True,maxlen=80):
+def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     """
     功能：从雅虎财经取得全球证券名称，仅限英文。需要去掉常用词，如Corporation
     优点：对未定义的证券代码也可给出英文名称，即使在中文语言环境中
     现存问题：需要访问雅虎，且耗时稍长
     """
-    #定义需要去掉的单词，注意顺序不要轻易颠倒！子串包含的，要长文在前！前置留空格的为避免误删
-    remove_list=[' CORPORATION',' BERHAD',' BHD',' PLC',' INC',' AG ST',' NA O N', \
-                 ' AKTIENGESELLSCHAFT','(PUBL)',' LLC', \
-                 ' CO LTD',' CO LIMITED',' LTD',' LIMITED',' COMPANY',' INCORPORATED', \
-                 ' CORP LTD',' CORP',' AB', \
-                 '(GROUP)',' GROUP', \
-                     
-                 ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY']
     
     
     #测试雅虎
@@ -284,8 +283,40 @@ def yahoo_name2(ticker,short_name=False,add_suffix=True,maxlen=80):
         pass
         return ticker #未找到ticker
     
+    #过滤名称中多余的尾部词汇
+    t_name=filter_stock_name(t_name0)
+    
+    #增加交易所后缀
+    if add_suffix:
+        tlist=ticker.split('.')
+        if len(tlist)==2:
+            sid=tlist[1]
+            if sid not in ['SS','SZ','BJ']:
+                t_name=t_name+'('+sid+')'
+    
+    return t_name
+#==============================================================================
+if __name__=='__main__':
+    original_name='Oponeo.pl SA'
+    original_name='Apple Inc'
+    
+    filter_stock_name(original_name)
+    
+def filter_stock_name(original_name):
+    """
+    功能：过滤从网站上抓取到的证券名称，去掉尾部的公司类别词汇，缩短长度，便于显示
+    """
+    #定义需要去掉的单词，注意顺序不要轻易颠倒！子串包含的，要长文在前！前置留空格的为避免误删
+    remove_list=[' CORPORATION',' BERHAD',' BHD',' PLC',' INC',' AG ST',' NA O N', \
+                 ' AKTIENGESELLSCHAFT','(PUBL)',' LLC', \
+                 ' CO LTD',' CO LIMITED',' LTD',' LIMITED',' COMPANY',' INCORPORATED', \
+                 ' CORP LTD',' CORP',' AB', \
+                 ' GROUP CO','(GROUP)',' GROUP', \
+                 ' PL S A',' PL SA',' AG', \
+                 ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY']
+
     #去掉逗号和句点
-    name1=t_name0.replace(',',' ')
+    name1=original_name.replace(',',' ')
     name2=name1.replace('.',' ')
     
     #将字符串中的多个空格变为单个空格
@@ -300,21 +331,134 @@ def yahoo_name2(ticker,short_name=False,add_suffix=True,maxlen=80):
 
     name6=name5.strip()
     
-    name7=t_name0[:len(name6)]
+    name7=original_name[:len(name6)]
+    
+    shorter_name=name7
+    return shorter_name
+        
 
+#==============================================================================
+if __name__ == '__main__':
+    stock_code='OPN.PL'
+    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'
+    
+    stooq_name1(stock_code)
+
+ 
+def stooq_name1(stock_code,add_suffix=True):
+    
+    import requests
+    from bs4 import BeautifulSoup
+    
+    stock_code1=stock_code.lower()
+    
+    #美股：尾部增加.us
+    stock_code_list=stock_code1.split('.')
+    if len(stock_code_list)==1:
+        stock_code1=stock_code1+'.us'
+    
+    #其他国家股票
+    if len(stock_code_list)==2:
+        code=stock_code_list[0]
+        sid=stock_code_list[1]
+        
+        #中国股票：尾部变为.cn
+        if sid in ['ss','sz','bj']:
+            stock_code1=code+'.cn'
+        
+        #日本股票：尾部变为.jp
+        if sid in ['t']:
+            stock_code1=code+'.jp'        
+        
+        #英国股票：尾部变为.uk
+        if sid in ['l']:
+            stock_code1=code+'.uk'          
+        
+        #XX国股票
+        
+        #波兰股票：去掉尾部.PL
+        stock_code1=stock_code1.replace('.pl','')
+    
+    #抓取证券名称
+    url = f"https://stooq.com/q/?s={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[1].strip()
+    else:
+        pass
+        return stock_code
+    
+    #未找到证券代码
+    if t_name == 'Stooq':
+        return stock_code
+    
+    #过滤名称中多余的尾部词汇
+    t_name=filter_stock_name(t_name)
+    
     #增加交易所后缀
-    t_name=name7
     if add_suffix:
-        tlist=ticker.split('.')
+        tlist=stock_code1.split('.')
+        if len(tlist)==1: sid='PL'
         if len(tlist)==2:
-            sid=tlist[1]
-            if sid not in ['SS','SZ','BJ']:
-                t_name=t_name+'('+sid+')'
+            sid=tlist[1].upper()
+            
+        if sid not in ['CN','US']:
+            t_name=t_name+'('+sid+')'
     
-    return t_name
-#==============================================================================
-#==============================================================================
+    return t_name   
+ 
 #==============================================================================
+if __name__=='__main__':
+    ticker='1155.KL'
+    ticker='MSFT'
+    ticker='G13.SI'
+    ticker='S63.SI'
+    ticker='SUS.ST'
+    ticker='SUN.UK'
+    ticker='IUI1.DE'
+    
+    ticker='600519.SS'
+    ticker='U11.SI'
+    ticker='1295.KL'
+    ticker='BMW.DE'
+    ticker='MBG.DE'
+    ticker='005930.KS'
+    ticker='LI'
+    
+    get_stock_name1_en(ticker)
+
+def get_stock_name1_en(ticker,short_name=False,add_suffix=True,maxlen=80):
+    """
+    功能：分别从stooq和yahoo网站获取证券名称，优先stooq(因为不需要vpn)
+    """
+    sname=ticker
+    
+    try:
+        sname=stooq_name1(ticker,add_suffix=add_suffix)
+    except:
+        pass
+    
+    if sname==ticker:
+        try:
+            sname=yahoo_name1(ticker,short_name=short_name,add_suffix=add_suffix,maxlen=maxlen)
+        except:
+            pass
+        
+    return sname
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

{siat-3.2.59.dist-info → siat-3.3.2.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
 siat/__init__.py,sha256=NJn2HSa0cdet21YFoJs5nafHgrM3H3J3wdtFYi1KzfM,2065
-siat/allin.py,sha256=f8mlMSQJUgx4mRVOJNlHH2SZP0jUyWaeDPT2V6AGfY8,2757
+siat/allin.py,sha256=mGm28SxvGGiNAsg6RleiqgyFQvrpgQZERYqpPkdDzPw,2851
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
@@ -52,7 +52,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=wJIIvEjWuZylcaQ3c5kvIdKedpFF5T53cJlG-1LVoms,2410657
+siat/fund_china.pickle,sha256=x_nPPdwy7wzIhtZQOplgDyTSyyUdXy9lbNxWysq7N6k,2437771
 siat/fund_china.py,sha256=rPGnYSPkbZUqtBoJnxLZLIQ8MjD8vD3TovCMfletBP4,111839
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
@@ -98,7 +98,7 @@ siat/sector_china.py,sha256=nP6kfYsnaQWZj8dK-zklwSDW8FDS-obZWp_zL0ec2Ig,118603
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=4xvc9AzRhLKJMu6AxVzIqcn1-NrHoeCF2Ao2p9nwYjU,25978
-siat/security_prices.py,sha256=LqTrS20mTmM_ACENOXU5qrLmxczGtxnuziAdAynSG_Q,105871
+siat/security_prices.py,sha256=9T4RVZNDlxAGursIb4hZqGeekjYgjBgo3uALhzhWWLw,106181
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
@@ -110,7 +110,7 @@ siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,3
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
-siat/stock_info.pickle,sha256=YZJmavrPmKC6DrHlE-aCTBQwnV-G2ozYiLB_p0j8gao,1310060
+siat/stock_info.pickle,sha256=XqcFwQrXoBXAzZnE6rnfpI7zETXZS2usqzsx2ff7MEg,1319005
 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
@@ -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=v4__NZBhC7cVevl_lKxwhcKQa_UFuyVK1pdB6_KEflI,217855
+siat/translate.py,sha256=_3fOZozd4RsJGJaITSn7Kil4PvmQFGpKVKHbcLRiBZI,218193
 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=CI3xZJSMGbDCKhmpL8_6DdebH6EDnVUaSfdTSf-FnA8,10199
-siat-3.2.59.dist-info/METADATA,sha256=suq3jI9DoMGKMeRXn-DbMpSlZhVwWtopNKsfiBjgOjw,7310
-siat-3.2.59.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.59.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.59.dist-info/RECORD,,
+siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
+siat-3.3.2.dist-info/METADATA,sha256=hCA4-ijGDtrWLphZmALyrRCRNi2L6dNLfstlUOODTpc,7309
+siat-3.3.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.3.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.3.2.dist-info/RECORD,,