siat 3.2.58__py3-none-any.whl → 3.3.1__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/common.py

@@ -3985,8 +3985,6 @@ def show_df(data,search_mode=False):
     """
     
     import pandas as pd
-    # 设置列对齐方式为靠左
-    pd.set_option('display.align', 'left')
     
     if not isinstance(data,pd.DataFrame):
         print("#Warning: the first parameter must be a dataframe")

siat/markowitz2.py

@@ -737,7 +737,7 @@ def portfolio_expectation_universal(pname,member_returns,portfolio_weights,membe
         print("  ***投资组合持仓策略***")
         print_tickerlist_sharelist(tickerlist,portfolio_weights,leading_blanks=4,ticker_type=ticker_type)
        
-        print("  *来源：Sina/EM/stooq，"+str(stoday)+"统计")
+        print("  *数据来源：Sina/EM/Stooq/Yahoo，"+str(stoday)+"统计")
     else:
         print("\n  ======= Investment Portfolio: Return and Risk =======")
         print("  Investment portfolio:",pname)
@@ -749,7 +749,7 @@ def portfolio_expectation_universal(pname,member_returns,portfolio_weights,membe
         print("  ***Portfolio Constructing Strategy***")
         print_tickerlist_sharelist(tickerlist,portfolio_weights,4)
        
-        print("  *Source: sina/eastmoney/stooq，"+str(stoday))
+        print("  *Data source: Sina/EM/Stooq/Yahoo, "+str(stoday))
 
     return 
 
@@ -1233,7 +1233,7 @@ def portfolio_eset(pf_info,simulation=1000,convex_hull=False):
         footnote1="年化收益率标准差-->"
         footnote2="\n\n基于给定的成份证券构造"+str(simulation)+"个投资组合"
         footnote3="\n观察期间："+hstart+"至"+hend
-        footnote4="\n来源: Sina/EM/Stooq/Yahoo, "+str(stoday)
+        footnote4="\n数据来源: Sina/EM/Stooq/Yahoo, "+str(stoday)
     else:
         if pname == '': pname='Investment Portfolio'
         
@@ -1244,7 +1244,7 @@ def portfolio_eset(pf_info,simulation=1000,convex_hull=False):
         footnote1="Annualized Std -->\n\n"
         footnote2="Based on given securities, constructed "+str(simulation)+" portfolios\n"
         footnote3="Period of observation: "+hstart+" to "+hend
-        footnote4="\nSource: Sina/EM/Stooq/Yahoo, "+str(stoday)
+        footnote4="\nData source: Sina/EM/Stooq/Yahoo, "+str(stoday)
     
     plt.xlabel(footnote1+footnote2+footnote3+footnote4,fontsize=xlabel_txt_size)
     
@@ -2625,7 +2625,7 @@ def security_correlation(tickers,start,end,info_type='Close'):
 
     footnote3="\n观察期间: "+start+'至'+end
     import datetime as dt; stoday=dt.date.today()    
-    footnote4="；来源：Sina/EM/stooq/Yahoo，"+str(stoday)
+    footnote4="；数据来源：Sina/EM/stooq/Yahoo，"+str(stoday)
     
     fontxlabel={'size':6}
     plt.xlabel(footnote1+footnote2+footnote3+footnote4,fontxlabel)

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

@@ -17,6 +17,7 @@ SIAT：Security Investment Analysis Tool
 #关闭所有警告
 import warnings; warnings.filterwarnings('ignore')
 from siat.common import *
+from siat.yf_name import *
 #==============================================================================
 def ectranslate(eword):
     """
@@ -1951,13 +1952,16 @@ def codetranslate1(code):
         ['^NDQ','NASDAQ Composite Index'],['^NDX','NASDAQ 100 Index'],
         ['IBM','IBM Corp'],
         
-        ['1155.KL','Maybank'],['5347.KL','Tenaga Nasional Berhad'],
-        ['1295.KL','Public Bank Berhad'],['1066.KL','RHB Bank'],
-        ['5819.KL','Hong Leong Bank'],['5183.KL','Petronas Chemical'],
-        ['7113.KL','Top Glove Bhd'],['3182.KL','Genting Berhad'],
-        ['6888.KL','Axiata Berhad'],['1015.KL','AmBank'],
+        ['1155.KL','Maybank(KL)'],['5347.KL','Tenaga Nasional(KL)'],
+        ['1295.KL','Public Bank(KL)'],['1066.KL','RHB Bank(KL)'],
+        ['5819.KL','Hong Leong Bank(KL)'],['5183.KL','Petronas Chemical(KL)'],
+        ['7113.KL','Top Glove(KL)'],['3182.KL','Genting(KL)'],
+        ['6888.KL','Axiata(KL)'],['1015.KL','AmBank(KL)'],
         
-        ['D05.SI','DBS Bank(SG)'],['U11.SI','UOB Bank(SG)'],['O39.SI','OCBC Bank(SG)'],
+        ['D05.SI','DBS Bank(SG)'],['DBSDY','DBS Bank(US)'],
+        ['U11.SI','UOB Bank(SG)'],['UOVEY','UOB Bank(US)'],
+        ['O39.SI','OCBC Bank(SG)'],['OVCHY','OCBC Bank(US)'],
+        ['S41.SI','Hong Leong Finance(SG)'],
         
         ['000002.SS','SSE A Index'],['000003.SS','SSE B Index'],
         ['399107.SZ','SZE A Index'],['399108.SZ','SZE B Index'],
@@ -3263,10 +3267,9 @@ def ticker1_name(ticker,ticker_type='auto'):
             return tname
     """
     tname=codetranslate(ticker)
-    if tname != ticker: #翻译成功
+    if tname != ticker: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
         return tname
     
-    
     symbol=ticker1_cvt2yahoo(ticker)
     
     #申万行业指数
@@ -3325,19 +3328,28 @@ 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=get_stock_name1_en(symbol)
+        if tname==symbol:
+            return tname
+    
     #加港股标记
-    if ('.HK' in ticker) and not ("港股" in tname):
-        tname=tname+"港股"
+    if ('.HK' in ticker) and not (text_lang("港股","(HK)") in tname):
+        tname=tname+text_lang("港股","(HK)")
         #加港股人民币柜台标志
         HKcode=ticker.split('.')[0]
-        if len(HKcode)==5 and HKcode[0]=='8' and not ("人民币" in tname):
-            tname=tname+"(人民币)"
+        if len(HKcode)==5 and HKcode[0]=='8' and not (text_lang("人民币","(RMB)") in tname):
+            tname=tname+text_lang("人民币","(RMB)")
         
-    #加美股标记
+    #加美股标记：绝大多数中概股在前面已经查完，真正美股没必要标注美股
     """
-    if len(ticker.split('.'))==1 and not ("美股" in tname):
-        tname=tname+"美股" 
-    """  
+    if len(ticker.split('.'))==1 and not (text_lang("美股","(US)") in tname):
+        tname=tname+text_lang("美股","(US)")
+    """
+    
     return tname
 
 #==============================================================================

siat/yf_name.py

@@ -0,0 +1,469 @@
+# -*- coding: utf-8 -*-
+"""
+本模块功能：SIAT公共转换函数，获取雅虎证券代码英文名称
+所属工具包：证券投资分析工具SIAT 
+SIAT：Security Investment Analysis Tool
+创建日期：2024年7月12日
+最新修订日期：
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+作者邮件：wdehong2000@163.com
+版权所有：王德宏
+用途限制：仅限研究与教学使用，不可商用！商用需要额外授权。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+#==============================================================================
+#关闭所有警告
+import warnings; warnings.filterwarnings('ignore')
+
+#==============================================================================
+if __name__=='__main__':
+    test_yahoo_access()
+    
+def test_yahoo_access():
+    """
+    功能：测试雅虎财经是否可达
+    """
+    url="https://finance.yahoo.com"
+    result=test_website(url)
+    
+    return result    
+
+if __name__=='__main__':
+    url="https://finance.yahoo.com"
+    test_website(url)
+    
+def test_website(url):
+    import requests
+    try:
+        response = requests.get(url)
+        if response.status_code == 200:
+            #print(f"Website {url} is accessible")
+            return True
+        else:
+            #print(f"Website {url} access failed，Code：{response.status_code}")
+            return False
+    except requests.exceptions.RequestException:
+        print(f"Website {url} is inaccessible")
+        return False
+ 
+if __name__=='__main__':
+    s = "Hello, world. Python is fun!"
+    split_string(s)
+ 
+def split_string(s):
+    import re
+    # 使用正则表达式匹配空格、逗号或句点
+    return re.split(r'[ ,.]', s)
+
+if __name__=='__main__':
+    s = "Hello, world. Python is fun!"
+    filter_string(s)
+    
+def filter_string(s):
+    #排除证券名称中的多余空格、逗号和句号
+    slist=split_string(s)
+    s1=''
+    for sl in slist:
+        if sl != '':
+            if s1=='':
+                s1=sl
+            else:
+                s1=s1+' '+sl
+            
+    return s1
+#==============================================================================
+if __name__=='__main__':
+    ticker='1155.KL'
+    ticker='MSFT'
+    ticker='G13.SI'
+    ticker='S63.SI'
+    ticker='SUS.ST'
+    ticker='600519.SS'
+    ticker='U11.SI'
+    ticker='1295.KL'
+    ticker='BMW.DE'
+    ticker='MBG.DE'
+    ticker='005930.KS'
+    ticker='LI'
+    ticker='600599.SS'
+    ticker='600123.SS'
+    ticker='600123.ss'
+    ticker='600999.ss'
+    ticker='600111.ss'
+    ticker='600333.ss'
+    ticker='600444.ss'
+    ticker='600777.ss'
+    
+    yahoo_name1(ticker)
+    
+    #极端测试
+    inamelist=[]
+    for i in range(100,150+1):
+        icode=str(600000+i)+'.SS'
+        iname=yahoo_name1(icode)
+        print(icode+':',iname)
+        inamelist=inamelist+[iname]
+    
+    #发现问题后单独测试
+    ticker='600087.SS'
+    yahoo_name1(ticker)
+    
+    yahoo_name1(ticker,short_name=True)
+    
+    ticker_name(ticker)
+    
+def yahoo_name1x(ticker,short_name=False,add_suffix=True,maxlen=80):
+    """
+    功能：从雅虎财经取得全球证券名称，仅限英文。需要去掉常用词，如Corporation
+    优点：对未定义的证券代码也可给出英文名称，即使在中文语言环境中
+    现存问题：需要访问雅虎，且耗时稍长
+    废弃！！！
+    """
+    #测试雅虎
+    if not test_yahoo_access():
+        return ticker
+    
+    #需要去掉的单词，注意顺序不要轻易颠倒！子串包含的，要长文在前！
+    remove_list=['Corporation','Berhad','Bhd','PLC','plc','Plc', \
+                 ', Inc.','Inc.', \
+                 'AG ST','AG','NA O.N.', \
+                 'Aktiengesellschaft','(publ)', \
+                 ', LLC','LLC', \
+                 'Co., Ltd.','Co., Ltd','Co.,Ltd.','Co.,Ltd','Co,.Ltd','co.,ltd', \
+                 'Co. LTD','CO.,LTD','Co., Limited', \
+                 'Ltd.','Ltd', \
+                 'Company', \
+                 'Incorporated', \
+                 'Corp., Ltd.','Corp.','Corp','AB', \
+                'Limited', \
+                
+                #强行缩短名称长度，去掉不影响名称的花哨词语
+                '(Group)','Group', \
+                'Science & Technology','High-Tech','High Technology', \
+                
+                #扫尾漏网之逗号句点
+                 '.',',']
+        
+    """
+    remove_list=['Corporation','Berhad','Bhd','PLC','plc','Limited', \
+                 'Inc', \
+                 'AG ST','AG','NA O.N.', \
+                 'Aktiengesellschaft','(publ)', \
+                 'LLC', \
+                 'Co., Ltd.','Ltd.','Ltd', \
+                 'Company', \
+                 'Incorporated','Corp.','AB']
+    """
+    #去掉ticker中的.US后缀
+    ticker=ticker.upper()
+    ticker1=ticker.replace('.US', "")
+    
+    import yfinance as yf
+    ticker_info = yf.Ticker(ticker1)
+    
+    try:
+        t_info=ticker_info.info
+    except:
+        pass
+        return ticker
+    
+    try:
+        if short_name:
+            t_name0=t_info['shortName']
+        else:
+            t_name0=t_info['longName']
+            if len(t_name0) > maxlen:
+                t_name0=t_info['shortName']
+    except:
+        pass
+        return ticker #未找到ticker
+    
+    #过滤逗号句点?过滤也可能带来更多复杂性！
+    #t_name1=filter_string(t_name0)
+    t_name1=t_name0
+    
+    for r in remove_list:
+        t_name1=t_name1.replace(r, "")
+
+    #排除前后空格        
+    t_name=t_name1.strip()
+    
+    #增加交易所后缀
+    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
+
+#==============================================================================
+def replace_multiple_spaces(s):
+    import re
+    return re.sub(r'\s+', ' ', s)
+
+#==============================================================================
+if __name__=='__main__':
+    ticker='1155.KL'
+    ticker='MSFT'
+    ticker='G13.SI'
+    ticker='S63.SI'
+    ticker='SUS.ST'
+    ticker='600519.SS'
+    ticker='U11.SI'
+    ticker='1295.KL'
+    ticker='BMW.DE'
+    ticker='MBG.DE'
+    ticker='005930.KS'
+    ticker='LI'
+    ticker='600599.SS'
+    ticker='600123.SS'
+    ticker='600123.ss'
+    ticker='600999.ss'
+    ticker='600111.ss'
+    ticker='600333.ss'
+    ticker='600444.ss'
+    ticker='600777.ss'
+    ticker='CPL.WA'
+    
+    yahoo_name2(ticker)
+    
+    #极端测试
+    inamelist=[]
+    for i in range(0,50+1):
+        icode=str(600000+i)+'.SS'
+        iname=yahoo_name2(icode)
+        print(icode+':',iname)
+        inamelist=inamelist+[iname]
+    
+    #发现问题后单独测试
+    ticker='600088.SS'
+    yahoo_name1(ticker)
+    yahoo_name2(ticker)
+    
+    yahoo_name2(ticker,short_name=True)
+    
+    ticker_name(ticker)
+    
+def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
+    """
+    功能：从雅虎财经取得全球证券名称，仅限英文。需要去掉常用词，如Corporation
+    优点：对未定义的证券代码也可给出英文名称，即使在中文语言环境中
+    现存问题：需要访问雅虎，且耗时稍长
+    """
+    
+    
+    #测试雅虎
+    if not test_yahoo_access():
+        return ticker
+        
+    #去掉ticker中的.US后缀
+    ticker=ticker.upper()
+    ticker1=ticker.replace('.US', "")
+    
+    import yfinance as yf
+    ticker_info = yf.Ticker(ticker1)
+    
+    try:
+        t_info=ticker_info.info
+    except:
+        pass
+        return ticker
+    
+    try:
+        if short_name:
+            t_name0=t_info['shortName']
+        else:
+            t_name0=t_info['longName']
+            if len(t_name0) > maxlen:
+                t_name0=t_info['shortName']
+    except:
+        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=original_name.replace(',',' ')
+    name2=name1.replace('.',' ')
+    
+    #将字符串中的多个空格变为单个空格
+    name3=replace_multiple_spaces(name2)
+    
+    #将字符串字母全部大写
+    name4=name3.upper()
+    
+    name5=name4
+    for ss in remove_list:
+        name5=name5.replace(ss,'')
+
+    name6=name5.strip()
+    
+    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)
+    
+    #增加交易所后缀
+    if add_suffix:
+        tlist=stock_code1.split('.')
+        if len(tlist)==1: sid='PL'
+        if len(tlist)==2:
+            sid=tlist[1].upper()
+            
+        if sid not in ['CN','US']:
+            t_name=t_name+'('+sid+')'
+    
+    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.58.dist-info → siat-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.58
+Version: 3.3.1
 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.58.dist-info → siat-3.3.1.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
@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=d7lZ-VXVVmBkMVGDPlozL-9gAU3cYpHG23X1WSRCOgY,26907
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=voALy4D-hTj7VOmibBH-1P0QUJf6PU-aS7hjjbFP7Zo,151717
+siat/common.py,sha256=VU4AhQZGQmTCcw-lbiuG7jSz7Dsy1psOi9ayaAbBDdY,151635
 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
@@ -69,7 +69,7 @@ siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
 siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
-siat/markowitz2.py,sha256=rrnUbHG2ErJRWBeaq297Mr5qjF_-gRjCZqwKSl6pr2E,113902
+siat/markowitz2.py,sha256=oStv4V74OiqBk-rnBPo6QJTUSNe1FCyT1Yl6-Fx_mHc,113934
 siat/markowitz_ccb_test.py,sha256=xBkkoaNHdq9KSUrNuHGgKTdNYUvgi84kNYcf719eoyE,1593
 siat/markowitz_ef_test.py,sha256=wjNlICkgRIqnonPeSIHo4Mu2GRtb9dr21wDt2kMNEcI,4032
 siat/markowitz_old.py,sha256=Lf7O_4QWT8RsdkHiUyc_7kKY3eZjKDtFR89Fz3pwYnY,33046
@@ -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
@@ -131,14 +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=6C3oWihKQPd0Lfv-lIMiGdMIYKJ7n6N88jiWnp6cWb8,217029
+siat/translate.py,sha256=GjuJTXsZKpmAEtljUxs1T-TT-aGZ726zWCAqQM03ElU,217888
 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-3.2.58.dist-info/METADATA,sha256=n-vzBXNpfzQFJw505Um6b29cG9J_IDzpjycmx4Nl01A,7310
-siat-3.2.58.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.58.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.58.dist-info/RECORD,,
+siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
+siat-3.3.1.dist-info/METADATA,sha256=vdhsH9jtHlGhPaJ_YFcUYY7skJN7j4b663c9NWnTQRg,7309
+siat-3.3.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.3.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.3.1.dist-info/RECORD,,