siat 3.2.4__py3-none-any.whl → 3.2.10__py3-none-any.whl

siat/common.py

@@ -3824,6 +3824,31 @@ def is_weekend(adate):
 
 
 #==============================================================================
+if __name__=='__main__':
+    alist=['EMA40','EMA5','EMA','EMA20']
+    alist=['EMA20','EMA5']
+    sort_list_by_len(alist)
+    
+def sort_list_by_len(alist,reverse=False):
+    """
+    功能：基于字符串列表中元素的长度和大小排序
+    """
+    import pandas as pd
+    adf=pd.DataFrame(columns=('item','len'))
+    for a in alist:
+        row=pd.Series({'item':a,'len':len(a)})
+        try:
+            adf=v.append(row,ignore_index=True)
+        except:
+            adf=adf._append(row,ignore_index=True)
+    if not reverse:    
+        adf.sort_values(by=['len','item'],ascending=True,inplace=True)
+    else:
+        adf.sort_values(by=['len','item'],ascending=False,inplace=True)
+    
+    alist_sorted=list(adf['item'])
+    
+    return alist_sorted
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/security_price2.py

@@ -86,8 +86,8 @@ def get_price_1ticker(ticker,fromdate,todate, \
         #print("  #Warning(get_price_1ticker): invalid date period from",fromdate,"to",todate)
         return df,found
         
-    #检查复权选项合理性
-    ak_fq_list=['','qfq','hfq','qfq-factor','hfq-factor']
+    #检查复权选项合理性：adj_only特别指最高最低价开盘收盘价全为复权价
+    ak_fq_list=['','qfq','hfq','qfq-factor','hfq-factor','adj_only']
     if adjust not in ak_fq_list:
         adjust='qfq'
     
@@ -149,11 +149,11 @@ def get_price_1ticker(ticker,fromdate,todate, \
     if source in ['auto','yahoo'] and found not in ['Found','Empty']:
         dft=None
         if test_yahoo_finance():
-            #数据源情形3：yahoo, yfinance, 需要访问yahoo
+            #数据源情形3：yahoo, yfinance, 需要访问yahoo，直接为复权价？
             dft=get_price_yf(ticker1,fromdate,todate)
             found=df_have_data(dft) 
         
-            #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，近期似乎不工作！
+            #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，似乎不工作！
             if found not in ['Found','Empty']:
                 dft=get_prices_yahoo(ticker1,fromdate,todate)
                 found=df_have_data(dft) 

siat/security_prices.py

@@ -755,14 +755,14 @@ def get_price_ak_cn(ticker,fromdate,todate,adjust='',ticker_type='auto'):
     end1=end.strftime('%Y%m%d')
     
     #adjustlist=['none','hfq','qfq']
-    adjustlist=['','qfq','hfq','qfq-factor','hfq-factor']
+    adjustlist=['','qfq','hfq','qfq-factor','hfq-factor','adj_only']
     if adjust not in adjustlist:
         print("  #Warning(get_price_ak_cn): adjust only supports",adjustlist)
         return None          
 
     _,prefix,suffix=split_prefix_suffix(ticker2)
-    #考虑股票复权情形：指数/基金/债券无复权
-    if adjust != '':
+    #考虑股票复权情形：仅收盘价为复权价，指数/基金/债券无复权
+    if adjust not in ['','adj_only']:
         if ticker_type in ['auto','stock'] and suffix not in ['SW']:
             try:
                 #仅用于股票的历史行情数据（考虑复权）
@@ -775,6 +775,18 @@ def get_price_ak_cn(ticker,fromdate,todate,adjust='',ticker_type='auto'):
             except:
                 df=None
             found=df_have_data(df)
+
+    #考虑股票复权情形：所有价格均为复权价，指数/基金/债券无复权
+    if adjust == 'adj_only':
+        if ticker_type in ['auto','stock'] and suffix not in ['SW']:
+            try:
+                #仅用于股票的历史行情数据（考虑复权）
+                df=ak.stock_zh_a_daily(ticker2,start1,end1,adjust='qfq')
+                df['Adj Close']=df['close']
+                df['Date']=df['date']
+            except:
+                df=None
+            found=df_have_data(df)
     
     #股票(无复权)指数/基金/债券
     if found != 'Found': 
@@ -961,6 +973,10 @@ def get_price_ak_us(symbol, fromdate, todate, adjust=""):
     try:
         if adjust=='':
             df=ak.stock_us_daily(symbol=symbol,adjust=adjust)
+        elif adjust=='Adj_only':
+            df=ak.stock_us_daily(symbol=symbol,adjust='qfq')
+            df['Adj Close']=df['close']
+
         else:
             dffqno=ak.stock_us_daily(symbol=symbol,adjust='')
             dffq=ak.stock_us_daily(symbol=symbol,adjust='qfq')
@@ -1048,6 +1064,9 @@ def get_price_ak_hk(symbol,fromdate,todate,adjust=""):
     try:
         if adjust == '':
             df=ak.stock_hk_daily(symbol=symbol3, adjust=adjust)
+        elif adjust == 'Adj_only':
+            df=ak.stock_hk_daily(symbol=symbol3, adjust='qfq')
+            df['Adj Close']=df['close']
         else:
             dffqno=ak.stock_hk_daily(symbol=symbol3, adjust='')
             dffq  =ak.stock_hk_daily(symbol=symbol3,adjust='qfq')