siat 3.10.131__py3-none-any.whl → 3.10.132__py3-none-any.whl

siat/security_prices.py

@@ -604,10 +604,12 @@ if __name__=='__main__':
     
     p=get_price_stooq(ticker,start,end)
 
-def get_price_stooq(ticker,start,end):
+def get_price_stooq(ticker,start,end='today'):
     """
     从stooq抓取单个股价
     """
+    start,end=start_end_preprocess(start,end)
+    
     #转换证券代码
     ticker2=cvt_stooq_ticker(ticker)
     

siat/security_trend2.py

@@ -466,7 +466,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                               facecolor=facecolor)
         return df
     
-    # 情形2：单个证券，两个普通指标，twinx==True =================================
+    # 情形2：单个证券，两个普通指标，twinx==True/UD/LR ===========================
     if ticker_num==1 and indicator_num == 2 and indicator_group1 and twinx:
         if DEBUG:
             print("Scenario 2: ticker_num==1 and indicator_num == 2 and indicator_group1 and twinx")

siat/stock.py

@@ -660,8 +660,8 @@ if __name__ =="__main__":
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 
-def security_indicator(ticker,indicator, \
-                       fromdate,todate,adjust='', \
+def security_indicator(ticker,indicator='Close', \
+                       fromdate='MRM',todate='today',adjust='', \
                        zeroline=False, \
                            attention_value='',attention_value_area='', \
                            attention_point='',attention_point_area='', \
@@ -673,6 +673,8 @@ def security_indicator(ticker,indicator, \
     """
     功能：单只证券的全部指标
     """
+    fromdate,todate=start_end_preprocess(fromdate,todate)
+    
     #判断复权价
     adjust_list=['','qfq','hfq']
     if adjust not in adjust_list:

siat/translate.py

@@ -1968,7 +1968,7 @@ def codetranslate1(code):
         
         #股票：指数==============================================================
         ['000300.SS','CSI300 Index'],['399300.SS','CSI300 Index'],
-        ['000001.SS','SSE Composite Index'],['399001.SZ','SZE Component Index'],
+        ['000001.SS','SSE Composite Index'],['399001.SZ','SZSE Component Index'],
         ['000016.SS','SSE50 Index'],['000132.SS','SSE100 Index'],
         ['000133.SS','SSE150 Index'],['000010.SS','SSE180 Index'],
         ['000688.SS','STAR50 Index'],['000043.SS','SSE Supercap Index'],
@@ -1997,15 +1997,15 @@ def codetranslate1(code):
         ['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'],
-        ['399106.SZ','SZE Composite Index'],['399004.SZ','SZE100 Index'],
+        ['399107.SZ','SZSE A Index'],['399108.SZ','SZSE B Index'],
+        ['399106.SZ','SZSE Composite Index'],['399004.SZ','SZSE100 Index'],
         ['399012.SZ','GEM300 Index'],
         
-        ['399232.SZ','SZE Mining Index'],['399233.SZ','SZE Manufacturing Index'],
-        ['399234.SZ','SZE Utility Index'],['399236.SZ','SZE Commercial Index'],
-        ['399237.SZ','SZE Logistics Index'],['399240.SZ','SZE Financial Index'],
-        ['399241.SZ','SZE Realestate Index'],['399244.SZ','SZE EP Index'],
-        ['399991.SZ','SZE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
+        ['399232.SZ','SZSE Mining Index'],['399233.SZ','SZSE Manufacturing Index'],
+        ['399234.SZ','SZSE Utility Index'],['399236.SZ','SZSE Commercial Index'],
+        ['399237.SZ','SZSE Logistics Index'],['399240.SZ','SZSE Financial Index'],
+        ['399241.SZ','SZSE Realestate Index'],['399244.SZ','SZSE EP Index'],
+        ['399991.SZ','SZSE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
         
         ['000903.SS','CSI100 Index'],['399903.SZ','CSI100 Index'],
         ['000904.SS','CSI200 Index'],['399904.SZ','CSI200 Index'],
@@ -2022,7 +2022,7 @@ def codetranslate1(code):
         ['002594.SZ','BYD Auto(A)'],['01211.HK','BYD Auto(HK)'],['81211.HK','BYD Auto(HK RMB)'],
         ['600941.SS','China Mobile'],['00941.HK','China Mobile (HK)'],['80941.HK','China Mobile (HK RMB)'],
         ['ULVR.UK','Unilever (UK)'],['605011.SS','Hangzou Power'],['000723.SZ','Meijin Energy'],
-        ['EL','Estee Lauder'],['LOR.DE','L\'Oreal(DE)'],
+        ['EL','Estée Lauder'],['LOR.DE','L\'Oreal(DE)'],
 
         ['^GSPC','S&P500 Index'],['^DJI','Dow Jones Index'],
         ['WISGP.SI','FTSE Singapore Index'], ['^STI','Straits Times Index'],
@@ -2074,8 +2074,8 @@ def codetranslate1(code):
         ['050111','博时信债C'],['320019','诺安货币B基金'],
         ['510580','Yifangda CSI500 ETF'],['510210.SS','SSE Composite Index ETF'],
         ["510050.SS",'Huaxia CSI50 ETF'],['510880.SS','SSE Dividend ETF'],
-        ["510180.SS",'SSE180 ETF'],['159901.SZ','SZE100 ETF'],
-        ["159902.SZ",'SZE SMB ETF'],['159901.SZ','SZE100 ETF'],
+        ["510180.SS",'SSE180 ETF'],['159901.SZ','SZSE100 ETF'],
+        ["159902.SZ",'SZSE SMB ETF'],['159901.SZ','SZSE100 ETF'],
         ["159919.SZ",'Jiashi CSI300 ETF'],["510300.SS",'Huaxia Borui CSI300 ETF'],
         
         ["004972",'长城收益宝货币A基金'],["004137",'博时合惠货币B基金'],