siat 3.4.15__py3-none-any.whl → 3.4.17__py3-none-any.whl

siat/security_price2.py

@@ -37,8 +37,11 @@ if __name__=='__main__':
     ticker='sz159998' #基金
     
     ticker='801010.SW' #申万
+    ticker='851242.SW' #申万
     
     ticker='AAPL'
+    
+    
     fromdate='2024-5-1'; todate='2024-5-20'
     
     ticker_type='auto'
@@ -49,7 +52,7 @@ if __name__=='__main__':
     ticker_type='fund'
     
     source='auto'
-    source='yahoo'
+    #source='yahoo'
     
     adjust='qfq'
     fill=True
@@ -84,6 +87,7 @@ def get_price_1ticker(ticker,fromdate,todate, \
     #检查日期期间合理性
     valid_period,fromdatepd,todatepd=check_period(fromdate,todate)
     if not valid_period:
+        pass
         #print("  #Warning(get_price_1ticker): invalid date period from",fromdate,"to",todate)
         return df,found
         
@@ -612,6 +616,9 @@ if __name__=='__main__':
     ticker='180202.SZ'
     ticker_type='fund'
     
+    ticker='851242.SW'
+    ticker_type='auto'    
+    
     fromdate='2021-1-1'
     todate='2024-5-30'
     adjust=''

siat/security_prices.py

@@ -2805,10 +2805,10 @@ def china_security_identify(ticker6):
     
 #==============================================================================
 if __name__=='__main__':
-    ticker='850831'
+    ticker='850831.SW'
     
-    start='2023-1-1'
-    end='2023-4-4'
+    start='2024-1-1'
+    end='2024-4-4'
     info_types=['Close','Volume']
     
     df3=fetch_price_swindex(ticker,start,end)
@@ -2834,12 +2834,17 @@ def fetch_price_swindex(ticker,start,end,info_types=['Close','Volume'],adjust=-2
     _,start1pd,_=check_period(start1,end)
     
     import akshare as ak
+    if len(ticker)==6:
+        ticker=ticker+'.SW'
+    ticker6=ticker[:6]
     try:
-        prices= ak.index_hist_sw(symbol=ticker,period="day")
+        prices= ak.index_hist_sw(symbol=ticker6,period="day")
     except: pass
 
     found=df_have_data(prices)
-    if found not in ['Found','Empty']: return df
+    if found not in ['Found','Empty']: 
+        pass
+        return df
 
     prices.columns=['Code','Date','Close','Open','High','Low','Volume','Amount']
     million=1000000

siat/security_trend2.py

@@ -76,6 +76,7 @@ if __name__=='__main__':
     indicator='Close'
     start="2020-1-1"
     end="2020-6-30"
+    ticker_type='auto'
     
     
     #测试组5
@@ -85,6 +86,29 @@ if __name__=='__main__':
     end="2024-5-30"   
     ticker_type='fund'
     
+    #测试组6
+    ticker="851242.SW"
+    indicator='Close'
+    start="2024-1-1"
+    end="2024-6-30"
+    ticker_type='auto'  
+    
+    attention_value=''; average_value=False
+    kline=False; kline_demo=False; mav=[5,10,20]
+    dividend=False; split=False
+    ret_type='Annual Adj Ret%'; RF=0; regression_period=365; market_index="auto"
+    sortby='tpw_mean'; trailing=7; trend_threshhold=0.05
+    band_area=''
+    graph=True; twinx=False; loc1='best'; loc2='best'
+    datatag=False; power=0
+    smooth=True; date_range=False; date_freq=False
+    preprocess='none'; scaling_option='change%'
+    annotate=False; annotate_value=False
+    mark_top=False; mark_bottom=False; mark_end=False
+    printout=False; source='auto'
+    ticker_type='auto'
+    facecolor='papayawhip'    
+    
     df=security_trend(ticker,indicator,start,end,ticker_type=ticker_type)
     
     

siat/stock.py

@@ -613,6 +613,16 @@ if __name__ =="__main__":
     ticker_type='auto'
     facecolor='whitesmoke'
     
+    # 测试组5
+    ticker='851242.SW'
+    indicator='Close'
+    fromdate='2024-5-1'; todate='2024-5-20'
+    adjust=''
+    zeroline=False; average_value=False; datatag=False; power=0; graph=True
+    source='auto'
+    mark_top=True; mark_bottom=True; mark_end=True
+    ticker_type='auto'
+    facecolor='whitesmoke'    
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 

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'):
     """
@@ -3283,7 +3285,6 @@ def ticker1_name(ticker,ticker_type='auto'):
     if tname != ticker: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
         return tname
     
-    
     symbol=ticker1_cvt2yahoo(ticker)
     
     #申万行业指数
@@ -3325,7 +3326,8 @@ def ticker1_name(ticker,ticker_type='auto'):
             if tname != symbol or symbol in ['IBM']: break
             else:
                 tname=get_stock_name_china_sina(symbol[:6])
-                if tname != symbol: break
+                if tname=='': tname=symbol
+                if tname != symbol and tname != '': break
                 
         
         #查找证券名称文件：次优先交易所债券
@@ -3351,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)
 

{siat-3.4.15.dist-info → siat-3.4.17.dist-info}/METADATA

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

@@ -97,15 +97,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 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
-siat/security_prices.py,sha256=ZEnuKgLnkw1O41BpR44Mpq53N69mW3UdSzEnI_4LuPc,106387
+siat/security_price2.py,sha256=Y4suVC-4koUSI_n8kY0l0y4lo_CTcoeM_kwTHiIFzyM,26291
+siat/security_prices.py,sha256=lh4G7Q20HoC3Iph8hOuACFcIc33xKyWBgMqhTykh8Qo,106492
 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
-siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
+siat/security_trend2.py,sha256=za9vUgWUsfG_xCjwjtCdo3kpQKWjzw8pDNAJZuDwXl0,26115
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=IY4-RC8jztjFEN4FFdc6YP299IRyIOwIcPRObswg588,152527
+siat/stock.py,sha256=o8Mowq8qKYnRUczYdjV4Q_HSSMfbShylLUowDyYkXQ8,152856
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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=6Bp0DPoR2mpoja0ElAWlPdXuImZ2uz4_YLJchxbd9Fo,218453
+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=0c2jsMu8MwEShCE6IROSWnFman1H1V7wXIOFv12652Q,14881
-siat-3.4.15.dist-info/METADATA,sha256=zlhaTgEyLTvXD5W2MQpc9YwmNUN1Mguh79vLxjxGn1w,7683
-siat-3.4.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.4.15.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.15.dist-info/RECORD,,
+siat/yf_name.py,sha256=9U_XfEeMlS3TrCrO3Bww21nuFgghbnO-cqDJMhQWqew,16193
+siat-3.4.17.dist-info/METADATA,sha256=M2n9lbqaF_FGunS14PxHCmi43xlZqE_vb2_xiWomdvk,7683
+siat-3.4.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.17.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.17.dist-info/RECORD,,