siat 3.0.0__py3-none-any.whl → 3.0.2__py3-none-any.whl

siat/risk_adjusted_return2.py

@@ -20,6 +20,7 @@ import warnings; warnings.filterwarnings('ignore')
 from siat.common import *
 from siat.translate import *
 from siat.security_prices import *
+from siat.security_price2 import *
 from siat.capm_beta2 import *
 #from siat.fama_french import *
 from siat.risk_adjusted_return import *

siat/security_prices.py

@@ -344,7 +344,7 @@ if __name__=='__main__':
 
 #在common中定义SUFFIX_LIST_CN
 
-def get_price_ak_em(ticker,fromdate,todate,adjust=''):
+def get_price_ak_em(ticker,fromdate,todate,adjust='',ticker_type='auto'):
     """
     功能：基于东方财富从akshare获得中国国内的股票和指数历史行情，只能处理单个股票，处理指数有时出错
     ticker：雅虎格式，沪市股票为.SS，深市为.SZ，北交所为.BJ，其他的不处理，直接返回None
@@ -415,10 +415,13 @@ def get_price_ak_em(ticker,fromdate,todate,adjust=''):
     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,ticker_name(ticker,ticker_type))
+        print("  Successfully retrieved",num,"records for",ticker,ptname)
     else:
-        print("  Sorry, no records retrieved for",ticker,ticker_name(ticker,ticker_type))
+        print("  Sorry, no records retrieved for",ticker,ptname)
 
     return df1
     
@@ -603,11 +606,14 @@ 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,ticker_name(ticker,ticker_type))
+            print("  Successfully retrieved",num,"records for",ticker,ptname)
             return prices2
         else:
-            print("  Sorry, no records found from stooq for",ticker,ticker_name(ticker,ticker_type),"from",start,'to',end)
+            print("  Sorry, no records found from stooq for",ticker,ptname,"from",start,'to',end)
             return None   
     else:
         return None
@@ -890,9 +896,12 @@ def get_price_ak_cn(ticker,fromdate,todate,adjust='',ticker_type='auto'):
         if 'Adj Close' not in list(df2):
             df2['Adj Close']=df2['Close']
         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,ticker_name(ticker,ticker_type))
+            print("  Successfully retrieved",len(df2),"records for",ticker,ptname)
     
     return df2
 
@@ -955,8 +964,12 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     df2['ticker']=symbol
     df2['Adj Close']=df2['Close']
     df2['source']='新浪'
-    df2['footnote']=adjust    
-    print("  Successfully retrieved",num,"records for",symbol,ticker_name(symbol,ticker_type))    
+    df2['footnote']=adjust   
+    
+    ptname=ticker_name(symbol,'stock')
+    if ptname == symbol: ptname=''
+
+    print("  Successfully retrieved",num,"records for",symbol,ptname)    
     
     return df2
 
@@ -1025,7 +1038,11 @@ def get_price_ak_hk(symbol, fromdate, todate, adjust=""):
     df2['ticker']=symbol
     df2['Adj Close']=df2['Close']
     df2['source']='新浪'
-    print("  Successfully retrieved",num,"records for",symbol,ticker_name(symbol,ticker_type))
+    
+    ptname=ticker_name(symbol,'stock')
+    if ptname == symbol: ptname=''
+    
+    print("  Successfully retrieved",num,"records for",symbol,ptname)
     
     return df2
 
@@ -1217,7 +1234,10 @@ def get_prices_yahoo(ticker,start,end,retry_count=3,pause=1):
         #p['Adj Close']=p['Close']
         p['source']='雅虎'
     
-        print("  Successfully retrieved",len(p),"records for",ticker,ticker_name(ticker,ticker_type))
+        ptname=ticker_name(ticker,'stock')
+        if ptname == ticker: ptname=''
+
+        print("  Successfully retrieved",len(p),"records for",ticker,ptname)
         
     return p
 
@@ -1299,7 +1319,10 @@ def get_prices_yf(ticker,start,end,threads=False):
         p['source']='雅虎'
         
         if len(p) > 0:
-            print("  Successfully retrieved",len(p),"records for",ticker1,ticker_name(ticker1,ticker_type))  
+            ptname=ticker_name(ticker1,'stock')
+            if ptname == ticker: ptname=''
+
+            print("  Successfully retrieved",len(p),"records for",ticker1,ptname)  
     else:
         pass
         #print("  #Error(get_prices_yf):",ticker1,"not found or no prices in the period or inaccessible to yahoo")
@@ -1362,7 +1385,10 @@ def get_index_fred(ticker,start,end):
     
     num=len(df)
     if num > 0:
-        print("  Successfully retrieved",num,"records for",ticker,ticker_name(ticker,ticker_type))    
+        ptname=ticker_name(ticker,'stock')
+        if ptname == ticker: ptname=''
+
+        print("  Successfully retrieved",num,"records for",ticker,ptname)    
     else:
         print("  Sorry, no records retrieved for",ticker)
     

siat/security_trend2.py

@@ -97,7 +97,7 @@ def security_trend(ticker,indicator='Close', \
                    preprocess='none',scaling_option='start', \
                    annotate=False,annotate_value=False, \
                    printout=False,source='auto', \
-                   mark_top=True,mark_bottom=True,mark_end=False, \
+                   mark_top=False,mark_bottom=False,mark_end=False, \
                    ticker_type='auto'):
 
     """

{siat-3.0.0.dist-info → siat-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.0
+Version: 3.0.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.0.0.dist-info → siat-3.0.2.dist-info}/RECORD

@@ -84,7 +84,7 @@ siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
 siat/risk_adjusted_return.py,sha256=dtuetKL5Vu38SdH_hqV93eN851uZ-1hOvf1drKel92w,54740
-siat/risk_adjusted_return2.py,sha256=byHgnRTPw781-CuUqCKw9O9U8qTLdTrDsHrFv0Q0BNA,56955
+siat/risk_adjusted_return2.py,sha256=MdNrqDaw2IbjitkZrjrqbOQJJkfI2sLvce6gmAAKmrc,56991
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=tNobb3FoP7rdqC_KHwgU0VhZvSwfeg2Rp3NkaSndqIY,75969
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -94,10 +94,10 @@ siat/sector_china.py,sha256=r4w7o9PEiZjMRB4pkKVbA9afk7A7Wh8toudocN8mN5I,104413
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=kuYh0V5cqclkM6MjZUd-N361fv3oxGVVerYINuTzZrE,24622
-siat/security_prices.py,sha256=Xl1VSOmciWmRSTKS-YQ2UHxCyzor_Q8y4b1OaCnZm0g,101137
+siat/security_prices.py,sha256=gSmnXt3EtTxUvETwUVzIC95j8U4Tivr1AU5RwzmKQzo,101601
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=BNZm0Yujs3V6tlOirtcKqsKAegy36shWXGen_c4KwBo,17204
-siat/security_trend2.py,sha256=EDeUC9g9F4aeezsGUsOcW6o_JuuCMx6VbUr_sRKD-JY,23617
+siat/security_trend2.py,sha256=hQ-cIOL-XXjBaEEEuo4m-3GPKp5of_G4zDI9tR0H2uU,23619
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
 siat/stock.py,sha256=aMpmvcMyAfl2hbH3AjCLO5mGAUsEFlbYUbXYWDGrC3w,134797
@@ -131,7 +131,7 @@ siat/valuation.py,sha256=3SopU5yomIXg6zH6oVFiBJyZosndFxOo1AINnbwW0lo,47334
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=3LY2JLvVpPNZLomHMUZvD2-nbL64ACtD7LKrNTk6JmU,14862
-siat-3.0.0.dist-info/METADATA,sha256=-oeCF7kqrHhYBKA94FSaYE4d3LaTc7f-cMQMtZvPdF4,1447
-siat-3.0.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.0.0.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.0.dist-info/RECORD,,
+siat-3.0.2.dist-info/METADATA,sha256=4-3GqcuZz9CTk0KYbzJcicp_8JaTwMZ6eIZNv1fTO3E,1447
+siat-3.0.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.2.dist-info/RECORD,,