siat 3.2.20__py3-none-any.whl → 3.2.25__py3-none-any.whl

siat/common.py

@@ -1620,7 +1620,7 @@ def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
             pct=pct_list[pos]
             
             if pct=="100%":
-                print("100% completing last job ...")
+                print("100% wrapping up ...")
             else:
                 print(pct,end=' ')
     
@@ -2182,10 +2182,27 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
         print("  #Error(descriptive_statistics2): zero data found")
         return
     
+    #为避免nan的影响，对nan进行填充
+    df.fillna(method='bfill',inplace=True)
+    df.fillna(method='ffill',inplace=True)
+    
+    #转换字符为数值
+    import pandas as pd
+    for c in list(df):
+        try:
+            df[c] = pd.to_numeric(df[c], errors='coerce')
+        except:
+            continue
+    
+    dfn=df.select_dtypes(include='number')
+    if dfn.empty:
+        print("  #Error(descriptive_statistics2): no numeric columns found to describe")
+        return
+    
     # 计算短期趋势
     df20=df.tail(trailing)
 
-    ds=df.describe(include='all',percentiles=[.5])
+    ds=df.describe(include='number',percentiles=[.5])
     dst=ds.T   
     cols=['min','max','50%','mean','std']
     
@@ -2952,6 +2969,10 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
     """
     功能：对于dfs中的数据进行预处理变换，以便克服数量级压制现象更好地展现多条曲线的趋势
     """
+    #填充空值，防止后续处理出错
+    dfs.fillna(method='ffill') #使用前一个非NaN值填充（向下填充）
+    dfs.fillna(method='bfill') #使用下一个非NaN值填充（向上填充）
+    
     plus_sign=False
     
     preprocess1=preprocess.lower()
@@ -2999,8 +3020,10 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
                     # 从头寻找第一个非空数值
                     import numpy as np
                     for n in range(0,len(dfs2)):
-                        if np.isnan(dfs2[c][n]): 
-                            continue
+                        try:
+                            checknan=np.isnan(dfs2[c][n])
+                        except: continue
+                        if checknan: continue
                         else:
                             cmean=dfs2[c][n] #使用第一个非空值
                             break
@@ -3011,8 +3034,9 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
                         scalingOptionText=text_lang('百分比','percentage') 
                     else:
                         scalingOptionText=text_lang('变化率%','change%')
-                    
-                meanlist=meanlist+[cmean]
+                try:
+                    meanlist=meanlist+[cmean]
+                except: continue
             
             #print(cmean,cstd,dfs2[c])
 
@@ -3765,7 +3789,8 @@ if __name__=='__main__':
     upgrade_siat()
 
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
-                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance','openpyxl'], \
+                 'yfinance','yahooquery','urllib3','tabulate','twine', \
+                 'mplfinance','openpyxl','pip'], \
                  pipcmd="pip install --upgrade",alternative=""):
     """
     功能：一次性升级siat及其相关插件

siat/grafix.py

@@ -1390,20 +1390,35 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     collist=df.columns.values.tolist()  
     collist3=collist[:3] #专用于绘制布林带，取前3个字段
     
+    if lslist==[]:
+        lslist=['-','--','-.',':','-','--','-.',':','-','--','-.',':','-','--','-.',':',]
+    if colorlist==[]:
+        colorlist=['blue','tomato','green','chocolate','darksage','cyan','blueviolet','violet','darkcyan','gold','wheat','silver','darkred','brown','coral','pink',]
+        
     #绘制折线图    
     for c in collist:
         pos=collist.index(c)
         try:
             lcolor=colorlist[pos]
+        except:
+            lcolor=''
+        try:
             lls=lslist[pos]
+        except:
+            lls=''
+        try:
             llw=lwlist[pos]
         except:
-            lwadjust=linewidth_adjust(df)
-            plt.plot(df[c],label=c,linewidth=lwadjust)
-            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
-        else:
+            llw=linewidth_adjust(df)
+        
+        if (lcolor !='') and (lls !=''):
             plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
-            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
+        elif (lcolor !=''):
+            plt.plot(df[c],label=c,linewidth=llw,color=lcolor)
+        else:
+            plt.plot(df[c],label=c,linewidth=llw)
+            
+        lines = plt.gca().lines; last_line_color = lines[-1].get_color()
         
         #为折线加数据标签
         if data_label==True:
@@ -1474,8 +1489,27 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         
     #绘制带状区域
     if band_area != '' and isinstance(band_area,list) and len(band_area)>=2:
-       plt.fill_between(df.index,df[band_area[0]],df[band_area[1]],alpha=0.5,label='') 
-    
+        upper_line=band_area[0]; lower_line=band_area[1]
+        if upper_line not in collist:
+            upper_line=ectranslate(upper_line)
+            lower_line=ectranslate(lower_line)
+            
+            if upper_line not in collist:
+                upper_line=ticker_name(upper_line)
+                lower_line=ticker_name(lower_line)
+                
+                if upper_line not in collist:
+                    upper_line=None
+                    lower_line=None
+                
+        if not (upper_line is None) and not (lower_line is None):
+            """
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='moccasin',alpha=0.5,label='',where=df[upper_line]>=df[lower_line])
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='',where=df[upper_line]<=df[lower_line])
+            """
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='')
+            
+            
     #绘制水平辅助线
     if axhline_label !="":
         if "零线" in axhline_label:

siat/market_china.py

@@ -904,6 +904,177 @@ def market_detail_china2table(df,titletxt,firstColSpecial=True,leftColAlign='l',
     return
     
 #==============================================================================
+#==============================================================================
+if __name__=='__main__':
+    category='price'
+    category='valuation'
+    
+    facecolor='papayawhip'
+    decimals=2
+    font_size='16px'
+    
+    df1=market_detail_china(category='price')
+    df1=market_detail_china(category='price')
+
+def market_detail_china2(category='price',
+                         facecolor='papayawhip',
+                         decimals=2,
+                         font_size='22px'):
+    """
+    功能：给出中国当前最新的三大股票交易所的更多细节，合成
+    输出：构造表格型数据框df，利用CSS格式输出
+    数据来源：em东方财富
+    """
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-2)+'px'    
+
+    # 检查信息类别
+    category1=category.upper()
+    catelist=["PRICE","VOLUME","RETURN","VALUATION"]
+    catenamelist=["当前股价","当前成交量","近期投资回报","市值与估值"]
+    if not (category1 in catelist):
+        print("  #Error(market_detail_china2): invalid category",category)
+        print(" Valid category",catelist)
+        return None
+    
+    # 合并三大交易所
+    import pandas as pd
+    df=pd.DataFrame()
+    exchlist=["SSE","SZSE","BJSE"]
+    for e in exchlist:
+        dft=market_detail_exchange_china(exchange=e,category=category)
+        if dft is None:
+            print("  #Warning(market_detail_china): info inaccessible for",e,"\b, try later")
+            #return None
+            continue
+        if len(dft)==0:
+            print("  #Warning(market_detail_china): zero info found for",e,"\b, try later")
+            continue
+        
+        if len(df)==0:
+            df=dft
+        else:
+            df=pd.merge(df,dft,left_index=True,right_index=True)
+    
+    if len(df)==0:
+        print("  #Warning(market_detail_china2): zero info found for",exchlist,"\b, try later")
+        return None
+    
+    # 处理索引字段
+    newcollist=['项目']+list(df)
+    df['项目']=df.index
+    df=df[newcollist]    
+
+    # 将空缺值替换为空格
+    df.fillna('',inplace=True)    
+    
+    import datetime as dt
+    nowstr0=str(dt.datetime.now())
+    nowstr=nowstr0[:19]
+    
+    # 前置空格个数
+    heading=' '*1
+    
+    if category1=='PRICE':
+        titletxt="中国三大股票交易所横向对比：股价与涨跌"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注释：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆昨日指的是上一个交易日\n"
+        ft4=heading+"☆涨速：平均每分钟股价变化率，表示股价变化速度\n"
+        ft5=heading+"☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n"
+        ft6=heading+"☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n"
+        ft7=heading+"☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n"
+        ft8=heading+"☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6+ft7+ft8+ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='VOLUME':
+        titletxt="中国三大股票交易所横向对比：成交状况"
+
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆成交量：当前成交股数，表示交易活跃度\n"
+        ft4=heading+"☆成交额：当前开市后的累计成交金额\n"
+        ft5=heading+"☆换手率：成交量/流通股数，表示成交量占比\n"
+        ft6=heading+"☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='RETURN':
+        titletxt="中国三大股票交易所横向对比：投资回报"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆MRQ：最近一个季度的滚动数据\n"
+        ft4=heading+"☆YTD：今年以来的累计情况\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+
+        footnote=ft0+ft1+ft2+ft3+ft4 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='VALUATION':
+        titletxt="中国三大股票交易所横向对比：市值与估值"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n"
+        ft4=heading+"☆市净率：这里为静态市净率\n"
+        ft5=heading+"☆标准差/均值=标准差(数值)/均值，提升可比性\n"
+       
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    return df
+
+#==============================================================================
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/risk_adjusted_return2.py

@@ -699,17 +699,22 @@ if __name__=='__main__':
     ticker=["600519.SS","000858.SZ"]
     ticker={'Market':('US','^SPX','中概教培组合'),'EDU':0.7,'TAL':0.3}
     
-    start="2024-1-1"
-    end="2024-3-15"
-    rar='sharpe'
-    ret_type="Monthly Ret%"
-    RF=0.01759
-    regression_period=365
+    ticker=['601628.SS','601319.SS','601318.SS','00966.HK']
     
-    graph=True; axhline_value=0; axhline_label=''
-    printout=False; sortby='tpw_mean'; trailing=5; trend_threshhold=0.01
-    annotate=False
+    start="2023-6-27"
+    end="2024-6-27"
+    rar='sharpe'
+    RF=0.01692
+    printout=True
+    
+    ret_type="Annual Ret%"; regression_period=365
+    graph=True; loc1='best'
+    axhline_value=0; axhline_label=''
+    sortby='tpw_mean'; trailing=7; trend_threshhold=0.01
+    annotate=False; annotate_value=False
+    mark_top=False; mark_bottom=False; mark_end=False
     mktidx='auto'; source='auto'
+    style_print=True; ticker_type='auto';facecolor='whitesmoke'
     
     rars=compare_mticker_1rar(ticker=["600519.SS","000858.SZ"],start="2024-1-1",end="2024-6-16",rar='sharpe',printout=True)
 
@@ -719,7 +724,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                             mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          style_print=True,ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -781,6 +786,10 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
     
     #仅用于绘图和制表
     df1=df.copy()
+    #进行空缺值填充，以便绘图连续
+    df1.fillna(method='bfill',inplace=True)
+    df1.fillna(method='ffill',inplace=True)
+    
     for c in list(df1):
         if df1[c].max() > axhline_value and df1[c].min() < axhline_value:
             axhline_label='零线'   #显示零线，但不标注图例        
@@ -817,7 +826,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                    facecolor=facecolor,loc=loc1)
             
     #制表
-    recommenddf=pd.DataFrame()
+    #recommenddf=pd.DataFrame()
     if printout:
         if sortby=='tpw_mean':
             sortby_txt='按推荐标记+近期优先加权平均值降序排列'
@@ -837,8 +846,8 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         footnote7="近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星"
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
-        #删除含有Nan的行，否则可能引起近期优先加权平均计算结果市场出现Nan
-        df1.dropna(inplace=True,axis=1)    
+        #不能简单删除含有Nan的行，否则导致清空df1，应该进行填充
+        #df1.dropna(inplace=True,axis=1)    
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
                                sortby=sortby,recommend_only=True,trailing=trailing, \
                                trend_threshhold=trend_threshhold, \

siat/security_trend2.py

@@ -100,6 +100,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                    ret_type='Annual 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, \
@@ -220,7 +221,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         if not isinstance(mav,list):
             mav=[mav]
         df=candlestick(stkcd=tickers[0],fromdate=fromdate,todate=todate,mav=mav, \
-                       ticker_type=ticker_type,facecolor=facecolor)
+                       ticker_type=ticker_type,facecolor=facecolor,loc=loc1)
         return df
 
     if kline and kline_demo:
@@ -388,7 +389,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
         df=security_mindicators(ticker=tickers[0],measures=measures, \
                                 adjust=adjust, \
                                 fromdate=fromdate,todate=todate, \
-                                graph=graph,smooth=smooth,loc=loc1, \
+                                graph=graph,smooth=smooth,band_area=band_area,loc=loc1, \
                                 date_range=date_range,date_freq=date_freq, \
                                 annotate=annotate,annotate_value=annotate_value, \
                                 source=source,

siat/stock.py

@@ -814,6 +814,7 @@ if __name__ =="__main__":
 def security_mindicators(ticker,measures,
                          fromdate,todate, \
                          adjust='', \
+                         band_area='', \
                          graph=True,smooth=True,loc='best',facecolor='whitesmoke', \
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
@@ -904,7 +905,8 @@ def security_mindicators(ticker,measures,
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                annotate=annotate,annotate_value=annotate_value, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
+               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
+               band_area=band_area,loc=loc)
 
     return df1
 
@@ -1651,7 +1653,7 @@ def compare_msecurity(tickers,measure,start,end, \
         print("  #Error(compare_msecurity): support only one measure")
         return None
     
-    print("  Searching for multiple security information for",measure,"\b, it may take great time ...") 
+    print("  Searching for multiple security for",measure,"...") 
     #屏蔽函数内print信息输出的类
     import os, sys
     class HiddenPrints:
@@ -1738,10 +1740,15 @@ def compare_msecurity(tickers,measure,start,end, \
             title_txt=title_txt+': '+title_txt2
 
     # 标准化处理
-    dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \
-            axhline_label=axhline_label,x_label=x_label,y_label=y_label, \
-            preprocess=preprocess,scaling_option=scaling_option)
-
+    try:
+        dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \
+                axhline_label=axhline_label,x_label=x_label,y_label=y_label, \
+                preprocess=preprocess,scaling_option=scaling_option)
+    except:
+        print("  #Error(compare_msecurity): preprocess failed, returning dfs for further check")
+        #df_display_CSS(dfs,titletxt='Unexpected Data in dfs')
+        return dfs
+        
     # 填充非交易日的缺失值，使得绘制的曲线连续
     dfs2.fillna(axis=0,method='ffill',inplace=True)
     #dfs2.fillna(axis=0,method='bfill',inplace=True)
@@ -1900,9 +1907,21 @@ def stock_Kline(ticker,start='default',end='default',volume=True, \
     
     return df
 
-
+if __name__ =="__main__":
+    stkcd="BABA"
+    fromdate="2024-5-1"
+    todate="2024-6-20"
+    volume=True
+    style='China'
+    mav=[5,10]
+    ticker_type='auto'
+    facecolor='whitesmoke'
+    loc='best'
+    
+    
+    
 def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
-                ticker_type='auto',facecolor='whitesmoke'):
+                ticker_type='auto',facecolor='whitesmoke',loc='best'):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -1929,7 +1948,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
 
     #延长开始日期，以便绘制长期均线
     #fromdate1=date_adjust(fromdate, adjust=-mav_max*2)
-    fromdate1=date_adjust(fromdate, adjust=-mav_max)
+    fromdate1=fromdate
     
     #检查命令参数
     stylelist=['binance','China','blueskies','brasil','charles','checkers','classic','default', \
@@ -1949,14 +1968,14 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
             wick="inherit"  # 蜡烛图影线的颜色 
             )        
         s = mpf.make_mpf_style(
-            gridaxis='both',
-            gridstyle='-.',
+            #gridaxis='both',
+            #gridstyle='-.',
             y_on_right=True,
             marketcolors=mc,
             edgecolor='black',
             figcolor='white',
             facecolor=facecolor, 
-            gridcolor='cyan',
+            #gridcolor='cyan',
             rc=mpfrc)        
     
     #抓取证券价格
@@ -1993,6 +2012,9 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
     #titletxt=ticker_name(stkcd)
     titletxt=ticker_name(stkcd,ticker_type=ticker_type)
     
+    #空一行
+    print('')
+    
     fig, axlist = mpf.plot(daily,type='candle',
          volume=volume,
          show_nontrading=False,#自动剔除非交易日空白
@@ -2017,6 +2039,17 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
                         #style='italic',
                         #fontfamily='fantasy',
                         loc='center')
+    
+    #设置图例，注意前两个为图中期间开始日期的线和柱子
+    mav_labels=['期间首日线','期间首日柱']
+    for d in mav:
+        mav_labels=mav_labels+[str(d)+"日移动均线"]
+    axlist[0].legend(mav_labels,loc=loc)
+    """
+    #去掉前两个无用的图例
+    handles, labels = axlist[0].get_legend_handles_labels()
+    axlist[0].legend(handles=handles[2:],labels=labels[2:],loc=loc)
+    """
     fig.show()
     reset_plt()
     

siat/stock_technical.py

@@ -90,7 +90,7 @@ if __name__ =="__main__":
     
     BIAS_days=[6,12,24]
     
-    CCI_day=14; CCI_madays=[5,20]
+    CCI_days=[6,12]
     
     WR_days=[10,6]
     
@@ -183,7 +183,7 @@ def calc_technical(df,start,end,technical='MACD', \
             
         TRIX_day=12,TRIX_madays=[20], \
         BIAS_days=[6,12,24], \
-        CCI_day=14,CCI_madays=[5,20], \
+        CCI_days=[6,12], \
         WR_days=[10,6], \
         ROC_day=12,ROC_madays=[6], \
         DMI_DIdays=[14],DMI_ADXdays=[6], \
@@ -640,11 +640,14 @@ def calc_technical(df,start,end,technical='MACD', \
     """
     计算过程：
     CCI(N日) = （TP-MA）÷MD÷0.015
-    说明：TP = （最高价+最低价+收盘价）÷3；MA=最近N日收盘价的累计之和÷N；MD=最近N日（MA-收盘价）的累计之和÷N；0.015为计算系数；N为计算周期，默认为14天
+    说明：TP = （最高价+最低价+收盘价）÷3；
+    MA=最近N日收盘价的累计之和÷N；
+    MD=最近N日（MA-收盘价）的累计之和÷N；
+    0.015为计算系数；N为计算周期，默认为14天
     """ 
     if technical=='CCI':
-    
-        df['cci'] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=CCI_day)
+        """
+        df['cci'] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=CCI_days)
         
         if not isinstance(CCI_madays,list):
             CCI_madays=[CCI_madays]
@@ -655,6 +658,14 @@ def calc_technical(df,start,end,technical='MACD', \
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['cci'],inplace=True) 
+        """
+        if not isinstance(CCI_days,list):
+            CCI_days=[CCI_days]
+            
+        for d in CCI_days:    
+            df['cci'+str(d)] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=d)
+        
+        
     #=========== W%R: 威廉指标   
     """
     N日W%R = [(Hn-Ct)/(Hn-Ln)]*100
@@ -854,7 +865,8 @@ def security_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数：可用于股票、交易所债券、交易所基金、部分期货期权(限美股)
     """
@@ -864,7 +876,8 @@ def security_MACD(ticker,start='default',end='default', \
                  MACD_signalperiod=MACD_signalperiod, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
     
     
@@ -873,7 +886,8 @@ def stock_MACD(ticker,start='default',end='default', \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标MACD
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -998,7 +1012,7 @@ def stock_MACD(ticker,start='default',end='default', \
     if ('EMA' in graph) or ('ALL' in graph):
         EMA_cols=[]
         for mad in EMA_days:
-            col='EMA'+str(mad)+'指数加权均线'
+            col='EMA'+str(mad)+'指数移动平均线'
             EMA_cols=EMA_cols+[col]
             df[col] = talib.EMA(df['Close'],timeperiod=mad)
         
@@ -1029,13 +1043,13 @@ def stock_MACD(ticker,start='default',end='default', \
         
         df3=df1[['Close']+EMA_cols]
         df3.rename(columns={'Close':'收盘价'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，指数加权均线"
+        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，指数移动平均线"
         draw_lines(df3,y_label,x_label,axhline_value,axhline_label,title_txt, \
                    data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2)        
 
         if printout:
             if len(dft3)!=0:            
-                print("\n== 指数加权均线交叉 ==")
+                print("\n== 指数移动平均线交叉 ==")
                 alignlist=['left','center']
                 print(dft3[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
             else:
@@ -1121,8 +1135,8 @@ def stock_MACD(ticker,start='default',end='default', \
         """
         macd_plus=df4[df4['柱线MACD']>=0]
         macd_minus=df4[df4['柱线MACD']<=0]
-        ax.bar(macd_plus.index,macd_plus['柱线MACD'],color='red')
-        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label='柱线MACD')
+        ax.bar(macd_plus.index,macd_plus['柱线MACD'],color='red',alpha=0.5)
+        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label='柱线MACD',alpha=0.5)
         
         # 绘制水平辅助线
         #plt.axhline(y=0,label='指标零线',color='cyan',linestyle=':',linewidth=linewidth*2) 
@@ -1149,7 +1163,7 @@ def stock_MACD(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -1225,7 +1239,8 @@ def security_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数，除了股票，还可用于交易所债券和交易所基金（如ETF和REITS）
     """
@@ -1233,7 +1248,8 @@ def security_RSI(ticker,start='default',end='default', \
                  RSI_days=RSI_days,RSI_lines=RSI_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
 
     
@@ -1241,7 +1257,8 @@ def stock_RSI(ticker,start='default',end='default', \
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标RSI
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1295,6 +1312,10 @@ def stock_RSI(ticker,start='default',end='default', \
         return None   
     
     #============ 计算RSI 
+    if len(RSI_days) < 3:
+        print("  #Warning(stock_RSI): RSI_days parameter needs 3 different days")
+        return None
+        
     #df['rsi'] = talib.RSI(df['Close'], timeperiod=RSI_days)
     RSI_cols=[]
     RSI_seq=1
@@ -1383,7 +1404,7 @@ def stock_RSI(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -1466,7 +1487,8 @@ def security_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     套壳函数
     """
@@ -1474,7 +1496,8 @@ def security_KDJ(ticker,start='default',end='default', \
                  KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
                  resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
                  loc1=loc1,loc2=loc2, \
-                 graph=graph,printout=printout,ticker_type=ticker_type,source=source)
+                 graph=graph,printout=printout,ticker_type=ticker_type,source=source, \
+                 price_line_color=price_line_color)
     return df
 
     
@@ -1482,7 +1505,8 @@ def stock_KDJ(ticker,start='default',end='default', \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              resample_freq='H',smooth=True,linewidth=1.5, \
              loc1='lower left',loc2='lower right', \
-             graph=['ALL'],printout=True,ticker_type='auto',source='auto'):
+             graph=['ALL'],printout=True,ticker_type='auto',source='auto', \
+             price_line_color='red'):
     """
     功能：计算股票的技术分析指标KDJ
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -1674,7 +1698,7 @@ def stock_KDJ(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color='gray',ls='--')
+        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
         ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
@@ -2442,6 +2466,8 @@ if __name__ =="__main__":
 def security_technical(ticker,start='default',end='default', \
              MA_days=[5,20],EMA_days=[5,20], \
              MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+                 
+             #RSI参数个数必须为3个，否则出错
              RSI_days=[6,12,24],RSI_lines=[20,50,80], \
              KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
              boll_days=20,boll_years=7, \
@@ -2450,7 +2476,8 @@ def security_technical(ticker,start='default',end='default', \
              graph=['ALL'],printout=False, \
              date_range=False,date_freq=False,annotate=False, \
              technical=['MACD'],indicator='Close', \
-             ticker_type='auto',source='auto'):
+             ticker_type='auto',source='auto', \
+             price_line_color='red'):
     
     """
     功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
@@ -2509,21 +2536,24 @@ def security_technical(ticker,start='default',end='default', \
              MACD_fastperiod=MACD_fastperiod,MACD_slowperiod=MACD_slowperiod,MACD_signalperiod=MACD_signalperiod, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
        
     if 'RSI' in technical1:
         df=security_RSI(ticker=ticker,start=fromdate,end=todate, \
              RSI_days=RSI_days,RSI_lines=RSI_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
 
     if 'KDJ' in technical1:
         df=security_KDJ(ticker=ticker,start=fromdate,end=todate, \
              KDJ_days=KDJ_days,matypes=matypes,KDJ_lines=KDJ_lines, \
              resample_freq=resample_freq,smooth=smooth,linewidth=linewidth, \
              loc1=loc1,loc2=loc2, \
-             graph=graph1,printout=printout,ticker_type=ticker_type,source=source)
+             graph=graph1,printout=printout,ticker_type=ticker_type,source=source, \
+             price_line_color=price_line_color)
 
     if 'Bollinger' in technical1 and 'Close' in indicator1:
         df=security_Bollinger(ticker=ticker,start=fromdate,end=todate,boll_days=boll_days, \
@@ -2586,7 +2616,7 @@ if __name__ =="__main__":
     TRIX_day=12; TRIX_madays=20
     DMA_fastperiod=10; DMA_slowperiod=50; DMA_madays=10
     BIAS_days=[6,12,24]
-    CCI_day=14; CCI_madays=[5,10]
+    CCI_days=[6,12]
     WR_days=[10,6]
     ROC_day=12; ROC_madays=6
     DMI_DIdays=14; DMI_ADXdays=6
@@ -2600,7 +2630,7 @@ if __name__ =="__main__":
     
     ticker='002594.SZ';ticker_type='auto'
     start='2024-5-1'; end='2024-6-13'; ahead_days=30*8
-    technical='OBV'; indicator='Close'
+    technical='BIAS'; indicator='Close'
     
     attention_values=[0,25,50,75]
     more_details=True
@@ -2665,7 +2695,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
         BIAS_days=[6,12,24], \
             
-        CCI_day=14,CCI_madays=[5,10], \
+        CCI_days=[6,12], \
             
         WR_days=[13,34,89], \
             
@@ -2696,8 +2726,8 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         resample_freq='2H',smooth=True,linewidth=1.5, \
         date_range=False,date_freq=False, \
             
-        #未启用    
-        annotate=False, \
+        #启用
+        annotate=True, \
         
         #除了MACD外，其他指标均应为ALL
         graph=['ALL'], \
@@ -2819,7 +2849,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
                 
             TRIX_day=TRIX_day,TRIX_madays=TRIX_madays, \
             BIAS_days=BIAS_days, \
-            CCI_day=CCI_day,CCI_madays=CCI_madays, \
+            CCI_days=CCI_days, \
             WR_days=WR_days, \
             ROC_day=ROC_day,ROC_madays=ROC_madays, \
             DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
@@ -2976,7 +3006,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     except:
         ax3.set_facecolor('papayawhip')
         
-    color_list=['k','g','b','c','m','y','r']
+    color_list=['k','g','b','c','m','yellowgreen','tomato','lime','orange','deepskyblue']
     attention_draws=[False] * len(attention_values)
 
     for l in tech_line_collist:
@@ -2988,8 +3018,29 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         if labeltxt =='DIF':
             labeltxt='快线(DIF)'            
             
-        ax.plot(df1.index,df1[l],label=labeltxt)
-        
+        axline, = ax.plot(df1.index,df1[l],label=labeltxt)
+        last_line_color = axline.get_color()
+        
+        if annotate:
+            df_end=df1.tail(1)
+            # df_end[c]必须为数值类型，否则可能出错
+            y_end = df_end[l].min()    # 末端的y坐标
+            x_end = df_end[l].idxmin() # 末端值的x坐标 
+            """
+            if annotate_value: #在标记曲线名称的同时标记其末端数值
+                y1=str(int(y_end)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 10 else str(round(y_end,3))
+                plt.annotate(text=c+':'+y1, 
+                             xy=(x_end, y_end),
+                             xytext=(x_end, y_end),color=last_line_color)
+            else:
+                plt.annotate(text=c, 
+                             xy=(x_end, y_end),
+                             xytext=(x_end, y_end),color=last_line_color)        
+            """
+            ax.annotate(text=' '+l.upper(), 
+                         xy=(x_end, y_end),
+                         xytext=(x_end, y_end),color=last_line_color,fontsize=legend_txt_size)        
+            
         #判断是否绘制关注线
         lmax=df1[l].max(); lmin=df1[l].min()
         
@@ -3012,20 +3063,21 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     ax.set_ylabel(ylabeltxt1,fontsize=ylabel_txt_size)
     
     #对图例项目排序
-    # 获取图例句柄和标签
-    handles, labels = ax.get_legend_handles_labels()
-     
-    # 指定显示顺序
-    labels_sorted = sort_list_by_len(labels,reverse=False)
-    handles_sorted = []
-    for l in labels_sorted:
-        pos=labels.index(l)
-        h=handles[pos]
-        handles_sorted =handles_sorted +[h]
-     
-    # 在指定位置添加新的图例，并按照指定顺序显示
-    ax.legend(handles=handles_sorted,labels=labels_sorted,loc=loc1,fontsize=legend_txt_size)
-    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+    if not annotate:
+        # 获取图例句柄和标签
+        handles, labels = ax.get_legend_handles_labels()
+         
+        # 指定显示顺序
+        labels_sorted = sort_list_by_len(labels,reverse=False)
+        handles_sorted = []
+        for l in labels_sorted:
+            pos=labels.index(l)
+            h=handles[pos]
+            handles_sorted =handles_sorted +[h]
+         
+        # 在指定位置添加新的图例，并按照指定顺序显示
+        ax.legend(handles=handles_sorted,labels=labels_sorted,loc=loc1,fontsize=legend_txt_size)
+        #ax.legend(loc=loc1,fontsize=legend_txt_size)
     
     interval=int(len(df1)/10)+1
     ax.xaxis.set_major_locator(mdates.DayLocator(interval=interval))  # 隔interval天一个标记

siat/translate.py

@@ -3297,7 +3297,20 @@ def ticker1_name(ticker,ticker_type='auto'):
                 #注意：绘图时有基于‘基金’字符的判断，决定显示收盘价还是单位净值
                 if '基金' not in tname: tname=tname + '基金'
                 break
+    
+    #加港股标记
+    if ('.HK' in ticker) and not ("港股" in tname):
+        tname=tname+"港股"
+        #加港股人民币柜台标志
+        HKcode=ticker.split('.')[0]
+        if len(HKcode)==5 and HKcode[0]=='8' and not ("人民币" in tname):
+            tname=tname+"(人民币)"
         
+    #加美股标记
+    """
+    if len(ticker.split('.'))==1 and not ("美股" in tname):
+        tname=tname+"美股" 
+    """  
     return tname
 
 #==============================================================================

{siat-3.2.20.dist-info → siat-3.2.25.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=bybxwy6m7KHvObW_tqmNIIFO_hqu-DQ1KJYYh9E1tm0,144843
+siat/common.py,sha256=mw6fvy_RPc1hBCu_IERWmjknjoSwLHQzMqf0g5Gcfac,145721
 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
@@ -59,12 +59,12 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=afR5QAJvPVCxuIx_UQPXj3FJRuW5GZBVjdBnRhQQpWE,85009
+siat/grafix.py,sha256=yPWr1rqb8yJjEs2zSJ5LMGl0TeSg2G_GID_QF6clysI,86432
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/market_china.py,sha256=nabx24qm7N51OafTrwUw542pNeFJ3JaQ1wqyv-nLN5I,37883
+siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
 siat/markowitz2.py,sha256=csHIjqTbIsHMYQ_LEur9K0Jg8pOm8deEVdQfAGCOG5o,111461
@@ -86,7 +86,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=dWVrCDnoxvMmI6cVtrL_FC18QZFrGb6-k9lOoyy5JGE,55085
-siat/risk_adjusted_return2.py,sha256=mI2ynVICzSIHV4_-jZyZ4vbwI1-zen7Byug31lzViS4,65957
+siat/risk_adjusted_return2.py,sha256=nK5tO-FIVnECbJD0on2CClQVgCyrkI1pWve1oQERK3k,66310
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -100,10 +100,10 @@ siat/security_prices.py,sha256=ChiVcubRiPzUvYm8a5X5qjxWtawRQdYHFQXLIevGFC4,10532
 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=kCFi8NW4uOkSnl4MkWZB5_rfvDqUiQlVH8tGsvUluEY,25219
+siat/security_trend2.py,sha256=5U1yZBqwRq0YX5BpmHij-7QFz7inIbWCq5kS9JSVY04,25284
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=tHGEI4yuceM6ZcfQ52y500KU8Bauy70-932nfWhM5Ko,142353
+siat/stock.py,sha256=TLiHaBBpqfE2S-Q4QrzBaj-uWEh5Zu17GAYYIDZlMCI,143322
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -115,7 +115,7 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
-siat/stock_technical.py,sha256=6Tx6-Ab7Ko-4F83FdxYGPz_drAaolHyneCYQgyKFfQA,129187
+siat/stock_technical.py,sha256=DYSewOV9kRTusA3PX37BVbLQuo3qAeJML_qmEljXcAc,131491
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -129,14 +129,14 @@ 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=d-qS-LsOmeeweaJKgc52EpApGxeym9ax9KjvItWslh8,215292
+siat/translate.py,sha256=dO9SZjlRTSc8dInr0VYoBVywGYX70Bk-cfBgZjHLIhc,215736
 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.20.dist-info/METADATA,sha256=nbos2VGpGWtUaE6WZqD8wxPZ44yonDhP7a78SBvesxg,7234
-siat-3.2.20.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.20.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.20.dist-info/RECORD,,
+siat-3.2.25.dist-info/METADATA,sha256=rrntA_Rsj1bjBtLPjAssepn-I-IYK1cxL7eAMMHDgmU,7234
+siat-3.2.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.25.dist-info/RECORD,,