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

siat/common.py

@@ -2461,7 +2461,7 @@ if __name__=='__main__':
     alist=['NIO','LI','XPEV','TSLA']
     print_list(alist)
 
-def print_list(alist,leading_blanks=1):
+def print_list(alist,leading_blanks=1,end='\n'):
     """
     功能：打印一个字符串列表，不带引号，节省空间
     """
@@ -2469,7 +2469,7 @@ def print_list(alist,leading_blanks=1):
     
     for i in alist:
         print(i,end=' ')
-    print('\n')
+    print(end,end='')
     
     return
 

siat/economy.py

@@ -197,7 +197,8 @@ if __name__=='__main__':
     
     
 
-def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0,zeroline=False):
+def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0, \
+                  zeroline=False,yline=999,facecolor='papayawhip'):
     """
     功能：绘制宏观经济指标，单线，有趋势线    
     """
@@ -222,7 +223,26 @@ def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0,zer
     footnote='单位: '+list(ds['units'])[0]+', '+list(ds['freq'])[0]+ \
         '\n数据来源: OECD|IMF|WB|FRED, '+str(today)
     ds.dropna(inplace=True)
-    plot_line(ds,'VALUE',ectranslate(factor),ylabeltxt,titletxt,footnote,datatag,power=power,zeroline=zeroline)
+
+    if factor in ['GNP Ratio','GNI Ratio']:
+        ylabeltxt='GNP(GNI)/GDP'
+        if yline==999:
+            yline=1 #绘制y=1的水平线
+    if factor in ['Currency Value','Constant CPI']:
+        ylabeltxt=ectranslate(factor)
+        if yline==999:
+            yline=100 #绘制y=100的水平线
+    
+    if yline !=999:
+        zeroline=yline
+    if power==0:
+        power=3
+        
+    plot_line(ds,'VALUE',ectranslate(factor), \
+              ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote,datatag=datatag, \
+              power=power,zeroline=zeroline, \
+              mark_top=False,mark_bottom=False,mark_end=False, \
+              facecolor=facecolor)
     
     return ds
 
@@ -236,16 +256,26 @@ if __name__=='__main__':
 
 #==============================================================================
 if __name__=='__main__':
+    #测试1
     tickers=['China','USA']
     measures='M2 GoB'
     measures='GNI'
+    
+    #测试2
+    tickers=['China','USA']
+    measures='Constant CPI'
+    measures='Currency Value'
+    
+    
+    
     fromdate='1999-12-1'
     todate='2022-4-1'
     power=0; twinx=False; loc1='upper left'; loc2='lower right'
 
 
 def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
-                    loc1='upper left',loc2='lower right'):
+                    yline=999, \
+                    loc1='upper left',loc2='lower right',facecolor='papayawhip'):
     """
     功能：对比绘制折线图：一个国家的两种测度，或两个国家的同一个测度。
     输入：
@@ -260,6 +290,10 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
     输出：绘制经济指标折线图，手动指定是否使用单轴或双轴坐标。
     返回：无
     """
+    DEBUG=False
+    if DEBUG:
+        print("DEBUG: tickers =",tickers,"\b, measures =",measures)
+    
     #检查日期期间的合理性
     valid,_,_=check_period(fromdate,todate)
     if not valid:
@@ -354,15 +388,21 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
             source_txt+str(today)
 
         if lang == 'Chinese':
+            """
             plot_line2(df1,ectranslate(ticker1),'VALUE',ectranslate(measure1), \
                    df2,ectranslate(ticker1),'VALUE',ectranslate(measure2), \
                    ylabeltxt,titletxt,footnote, \
                    power=power,twinx=twinx,loc1=loc1,loc2=loc2)    
+            """
+            plot_line2(df1,ticker1,'VALUE',ectranslate(measure1), \
+                   df2,ticker1,'VALUE',ectranslate(measure2), \
+                   ylabeltxt,titletxt,footnote, \
+                   power=power,twinx=twinx,loc1=loc1,loc2=loc2,facecolor=facecolor)   
         else:
             plot_line2(df1,ticker1,'VALUE',measure1, \
                        df2,ticker1,'VALUE',measure2, \
                    ylabeltxt,titletxt,footnote, \
-                   power=power,twinx=twinx,loc1=loc1,loc2=loc2)    
+                   power=power,twinx=twinx,loc1=loc1,loc2=loc2,facecolor=facecolor)    
         
     elif (security_num >= 2) and (measure_num >= 1):
         #双国家+单个测度指标        
@@ -402,13 +442,15 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
         #绘制双国家单指标对比图
         ylabeltxt=ectranslate(measure1)
         #这里的GNP指标实际上是GNP vs GDP的百分比
-        yline=999   #默认不绘制水平线
+        #yline=999   #默认不绘制水平线
         if measure1 in ['GNP Ratio','GNI Ratio']:
             ylabeltxt='GNP(GNI)/GDP'
-            yline=1 #绘制y=1的水平线
+            if yline==999:
+                yline=1 #绘制y=1的水平线
         if measure1 in ['Currency Value','Constant CPI']:
             ylabeltxt=ectranslate(measure1)
-            yline=100 #绘制y=100的水平线
+            if yline==999:
+                yline=100 #绘制y=100的水平线
         
         if lang == 'Chinese':
             titletxt=ectranslate(list(df1['name'])[0])+'趋势对比：'+ \
@@ -425,15 +467,21 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
             source_txt+str(today)
         
         if lang == 'Chinese':
+            """
             plot_line2(df1,ectranslate(ticker1),'VALUE',ectranslate(measure1), \
                    df2,ectranslate(ticker2),'VALUE',ectranslate(measure1), \
                    ylabeltxt,titletxt,footnote, \
                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2)  
+            """
+            plot_line2(df1,ticker1,'VALUE',measure1, \
+                   df2,ticker2,'VALUE',measure1, \
+                   ylabeltxt,titletxt,footnote, \
+                   power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2,facecolor=facecolor)                  
         else:
             plot_line2(df1,ticker1,'VALUE',measure1, \
                        df2,ticker2,'VALUE',measure1, \
                     ylabeltxt,titletxt,footnote, \
-                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2)  
+                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2,facecolor=facecolor)  
             
     else:
         print("  #Error(compare_economy): no idea on what to compare")
@@ -711,7 +759,7 @@ def fred_factor_codes():
         ['Italy','Current GDP','Annual','Gross Domestic Product','MKTGDPITA646NWDB','Current USD, Not Seasonally Adjusted'],
         ['Cambodia','Current GDP','Annual','Gross Domestic Product','MKTGDPKHA646NWDB','Current USD, Not Seasonally Adjusted'],
         
-        # Real GDP at Constant National Prices：不变价格GDP，年度指标，百万美元，2017年基准，未经季节性调整。扣除通胀因素，扣除汇率变化因素
+        # Real GDP at Constant National Prices：不变价格GDP，年度指标，百万元，2017年基准，未经季节性调整。扣除通胀因素，扣除汇率变化因素
         ['India','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNAINA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
         ['China','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNACNA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
         ['Japan','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNAJPA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
@@ -1027,11 +1075,12 @@ def fred_factor_codes():
 #==============================================================================
 #==============================================================================
 if __name__ =="__main__":
-    fromdate='2022-1-1'
-    todate='2023-3-18'
+    fromdate='2024-1-1'
+    todate='2024-8-31'
     df=pmi_china(fromdate,todate)
+    loc='best'; facecolor='papayawhip'
 
-def pmi_china(fromdate,todate,loc='lower center'):
+def pmi_china(fromdate,todate,date_range=True,loc='best',facecolor='papayawhip'):
     """
     功能：绘制中国的PMI指数制造业/非制造业单线图
     """
@@ -1072,6 +1121,7 @@ def pmi_china(fromdate,todate,loc='lower center'):
     df2['制造业PMI']=df2['制造业-指数'].astype('float')
     df2['非制造业PMI']=df2['非制造业-指数'].astype('float')
     
+    """
     #绘图：制造业
     ticker1=ticker2='PMI'
     colname2="benchmark"
@@ -1087,7 +1137,7 @@ def pmi_china(fromdate,todate,loc='lower center'):
     titletxt="中国采购经理人指数PMI：制造业"
     plot_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc)
+               ylabeltxt,titletxt,footnote,loc1=loc,facecolor=facecolor)
     
     #绘图：非制造业
     colname1="非制造业PMI"
@@ -1095,13 +1145,24 @@ def pmi_china(fromdate,todate,loc='lower center'):
     titletxt="中国采购经理人指数PMI：非制造业"
     plot_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc)    
+               ylabeltxt,titletxt,footnote,loc1=loc,facecolor=facecolor)    
     """
+    titletxt="中国采购经理人指数PMI"
+    ticker1=ticker2='PMI'
+    colname1="制造业PMI"; label1="制造业"
+    colname2="非制造业PMI"; label2="非制造业"
+    ylabeltxt=''
+        
+    import datetime
+    today=datetime.date.today()
+    footnote="数据来源：东方财富，"+str(today)
+    
     plot2_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc, \
-               date_range=True,date_freq='1M',date_fmt='%Y-%m')    
-    """
+               yline=50, \
+               ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote,loc1=loc, \
+               date_range=date_range,date_fmt='%Y-%m',facecolor=facecolor)    
+    
     #返回数据
     return df2
 
@@ -1168,13 +1229,13 @@ def internal_growth_rate_df(df0,fieldlist=['VALUE','scope','factor','freq','name
     if lang == 'Chinese':
         print('从'+date0+'至'+date1+'：')
         if freq != 'Annual':
-            print('    '+ectranslate(scope)+ectranslate(factor)+'的'+ectranslate(freq)+'均环比增长率：',round(item_gr*100.0,4),'\b%')
-        print('    '+ectranslate(scope)+ectranslate(factor)+'的年均增长率：',round(annual_gr*100.0,4),'\b%')
+            print('    '+ectranslate(scope)+ectranslate(factor)+'的'+ectranslate(freq)+'均环比复合增长率：',round(item_gr*100.0,4),'\b%')
+        print('    '+ectranslate(scope)+ectranslate(factor)+'的年均复合增长率：',round(annual_gr*100.0,4),'\b%')
     else:
         print('From '+date0+' to '+date1+':')
         if freq != 'Annual':
-            print('    '+scope+', '+factor+' mom growth rate:',round(item_gr*100.0,4),'\b%')
-        print('    '+scope+', '+factor+' yoy growth rate:',round(annual_gr*100.0,4),'\b%')
+            print('    '+scope+', '+factor+' mom compound growth rate:',round(item_gr*100.0,4),'\b%')
+        print('    '+scope+', '+factor+' yoy compound growth rate:',round(annual_gr*100.0,4),'\b%')
         
     return 
 
@@ -1204,6 +1265,81 @@ def internal_growth_rate(rvar,fieldlist=['VALUE','scope','factor','freq','name',
 if __name__ =="__main__":
     internal_growth_rate(df)
 #==============================================================================
+if __name__ =="__main__":
+    ticker='China'
+    indicator='GDP'
+
+
+def macro_trend(ticker,indicator,start='L10Y',end='today', \
+                power=0,twinx=False,attention_value=999,zeroline=False, \
+                datatag=False,date_range=False, \
+                loc1='best',loc2='best',facecolor='papayawhip'):
+    """
+    功能：套壳函数，compare_economy, economy_trend
+    """
+    
+    # 处理日期
+    fromdate,todate=start_end_preprocess(start,end)
+    
+    # 判断ticker个数
+    if isinstance(ticker,str):
+        ticker_num=1
+    if isinstance(ticker,list):
+        ticker_num=len(ticker)
+        if ticker_num==1:
+            ticker=ticker[0]
+    
+    # 判断indicator个数
+    if isinstance(indicator,str):
+        indicator_num=1
+    if isinstance(indicator,list):
+        indicator_num=len(indicator) 
+        if indicator_num==1:
+            indicator=indicator[0]        
+
+    # 是否PMI
+    if ticker_num==1 and indicator_num==1:
+        if indicator.upper()=='PMI' and ticker.title()=='China':
+            df=pmi_china(fromdate=fromdate,todate=todate, \
+                         date_range=date_range,loc=loc1,facecolor=facecolor)
+        
+            return df
+        
+    # 双ticker或者双indicator
+    if ticker_num>=2 or indicator_num>=2:
+        if 'YoY PPI' in indicator:
+            attention_value=0
+
+        df=compare_economy(tickers=ticker,measures=indicator, \
+                           fromdate=fromdate,todate=todate, \
+                           power=power,twinx=twinx, \
+                           yline=attention_value, \
+                           loc1=loc1,loc2=loc2,facecolor=facecolor)
+        # 计算增长率
+        # 有inf/nan错误，未找出原因，先避开
+        if not 'YoY PPI' in indicator:
+            internal_growth_rate(df)
+        return df
+        
+    # 单ticker且单indicator
+    if ticker_num==1 and indicator_num==1:
+        if 'YoY PPI' in indicator:
+            attention_value=0
+        
+        df=economy_trend(start=fromdate,end=todate,scope=ticker,factor=indicator, \
+                         datatag=datatag,power=power, \
+                         zeroline=zeroline,yline=attention_value,facecolor=facecolor)    
+        # 计算增长率
+        # 有inf/nan错误，未找出原因，先避开
+        if not 'YoY PPI' in indicator:
+            internal_growth_rate(df)
+            
+        return df
+    
+    print("  #Warning(macro_trend): puzzled on what to for",ticker,"with",indicator)
+    return None
+
+
 #==============================================================================
 #==============================================================================
 

siat/grafix.py

@@ -119,7 +119,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
               mark_top=True,mark_bottom=True,mark_end=True, \
-                  facecolor='whitesmoke'):
+              facecolor='whitesmoke'):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -128,7 +128,8 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     mark_top,mark_bottom：是否标记最高最低点
     输出：折线图
     返回值：无
-    注意：需要日期类型作为df索引
+    注意1：需要日期类型作为df索引
+    注意2：date_freq不为False时，必须设置date_range=True，否则无法完成日期设置！
     """
     
     #空值判断
@@ -296,7 +297,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         ylabeltxt=ylabeltxt.replace('收盘价','单位净值')
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     plt.show()
@@ -560,7 +561,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
         plt.gca().set_facecolor("whitesmoke")
     
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     plt.close()
@@ -749,7 +750,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
         plt.gca().set_facecolor("whitesmoke")  
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     plt.close()
@@ -877,7 +878,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
             label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
         ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
         
-    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
+    ax.set_xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     
     if ticker1 == '':
         label1txt=label1
@@ -1019,7 +1020,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
             label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
         ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
         
-    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
+    ax.set_xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     
     if ticker1 == '':
         label1txt=label1
@@ -1307,7 +1308,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     
     x_label_t=ectranslate(x_label)
     if x_label != "":
-        plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size)
+        plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
     
@@ -1541,7 +1542,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     #坐标轴标记
     plt.ylabel(y_label,fontweight='bold',fontsize=ylabel_txt_size)
     if x_label != "":
-        plt.xlabel(x_label,fontweight='bold',fontsize=xlabel_txt_size)
+        plt.xlabel(x_label,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -1579,7 +1580,7 @@ def plot_barh(df,colname,titletxt,footnote,datatag=True, \
 
     plt.barh(df.index,df[colname],align='center',color=colors,alpha=0.8)
     coltxt=ectranslate(colname)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     #xmin=int(min(df[colname]))
@@ -1784,7 +1785,7 @@ def plot_2lines(df01,colname1,label1, \
         plt.axvline(x=vline,ls=":",c="black")
     
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.legend(loc='best',fontsize=legend_txt_size)
     
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -2007,7 +2008,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         wid1=5*sd+mu
         wid2=1*sd+mu
         plt.xticks(np.arange(-wid,wid1,wid2))
-        plt.xlabel('分位点',fontsize=xlabel_txt_size) #x轴文本
+        plt.xlabel('分位点',fontsize=xlabel_txt_size,ha='center') #x轴文本
         plt.yticks(np.arange(0,0.45,0.05))
         plt.ylabel('概率密度',fontsize=ylabel_txt_size) #y轴文本
 
@@ -2015,7 +2016,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         wid1=3.5*sd+mu
         wid2=0.5*sd+mu        
         plt.xticks(np.arange(-wid,wid1,wid2))
-        plt.xlabel('分位点',fontsize=xlabel_txt_size) #x轴文本
+        plt.xlabel('分位点',fontsize=xlabel_txt_size,ha='center') #x轴文本
         plt.yticks(np.arange(0,1.1,0.1))
         plt.ylabel('累积概率密度',fontsize=ylabel_txt_size) #y轴文本
 
@@ -2026,7 +2027,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         plt.yticks(np.arange(-wid,wid1,wid2))
         plt.ylabel('分位点',fontsize=ylabel_txt_size) #y轴文本
         plt.xticks(np.arange(0,1.1,0.1))
-        plt.xlabel('累积概率密度',fontsize=xlabel_txt_size) #x轴文本        
+        plt.xlabel('累积概率密度',fontsize=xlabel_txt_size,ha='center') #x轴文本        
         
     plt.title('正态分布示意图: $\mu$=%.1f, $\sigma$=%.1f'%(mu,sd),fontweight='bold',fontsize=title_txt_size) #标题
     plt.tight_layout()

siat/sector_china.py

@@ -151,13 +151,24 @@ def sector_list_china(indicator="新浪行业"):
 #==============================================================================
 if __name__=='__main__':
     sector_name="房地产"
+    sector_name="房"
+    sector_name="煤炭"
+    sector_name="华为"
+    
+    indicator='新浪行业'
     indicator="启明星行业"
     indicator="地域"
     indicator="行业"
     
-    sector_name="煤炭"
     sector_code_china(sector_name)
 
+def sector_code_sina(sector_name):
+    """
+    功能：套壳sector_code_china
+    """
+    sector_code_china(sector_name)
+    return
+
 def sector_code_china(sector_name):
     """
     功能：查找行业、板块名称对应的板块代码
@@ -175,26 +186,45 @@ def sector_code_china(sector_name):
         dfi['label']=dfi['label'].apply(lambda x: x.strip())
         
         try:
-            sector_code=list(dfi[dfi['板块']==sector_name]['label'])[0]
+            #sector_code=list(dfi[dfi['板块']==sector_name]['label'])[0]
+            dfi['match']=dfi['板块'].apply(lambda x: 1 if sector_name in x else 0)
+            found=found+dfi['match'].sum()
+            
+            sector_code=list(dfi[dfi['match']==1]['label'])
+            sector_name1=list(dfi[dfi['match']==1]['板块'])
+            
             #记录找到的板块分类
             indicator=i
-            #记录找到的板块概述
-            dff=dfi[dfi['板块']==sector_name]
             
-            if found > 0: print(" ")
+            #if found > 0: print(" ")
             if indicator == "行业": indicator = "证监会行业"
-            print("行业/板块名称："+sector_name)
-            print("行业/板块代码："+sector_code,end='')
-            print(", "+indicator+"分类")
-            found=found+1
+            
+            if len(sector_code)>0:
+                """
+                print("行业/板块名称:",sector_name1)
+                #print_list(sector_name1,leading_blanks=1)
+                
+                print("行业/板块代码:",sector_code,end='')
+                #print_list(sector_code,leading_blanks=1)
+                
+                print("（"+indicator+"分类）\n")
+                """
+                print("行业/板块名称:",end='')
+                print_list(sector_name1,leading_blanks=1)
+                
+                print("行业/板块代码:",end='')
+                print_list(sector_code,leading_blanks=1,end='')
+                print("（"+indicator+"分类）\n")
+                
+                
         except:
             # 无意义，仅为调试
-            x=1
+            pass
             continue
     
     #未找到板块代码
     if found==0:
-        print("  #Error(sector_code_china): unsupported sector name",sector_name)
+        print("*** Sorry, no sector name found for",sector_name)
         return 
     
     return 
@@ -220,6 +250,13 @@ if __name__=='__main__':
     indicator="行业"
     num=10
 
+def sector_rank_sina(indicator="涨跌幅",category="新浪行业",rank=5):
+    """
+    功能：套壳sector_rank_china
+    """
+    df=sector_rank_china(comp=indicator,indicator=category,num=rank)
+    return df
+
 def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
     """
     功能：按照比较指标降序排列
@@ -233,14 +270,14 @@ def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
     #complist=["涨跌幅","成交量","平均价格","公司家数"]
     complist=["涨跌幅","平均价格","公司家数"]
     if comp not in complist:
-        print("#Error(sector_rank_china): unsupported measurement",comp)
-        print("Supported measurements:",complist)
+        print("  #Warning(sector_rank_china): unsupported measurement",comp)
+        print("  Supported measurements:",complist)
         return None
     
     indicatorlist=["新浪行业","概念","地域","启明星行业","行业"]
     if indicator not in indicatorlist:
-        print("#Error(sector_list_china): unsupported sectoring method",indicator)
-        print("Supported sectoring method:",indicatorlist)
+        print("  #Warning(sector_list_china): unsupported sectoring method",indicator)
+        print("  Supported sectoring method:",indicatorlist)
         return None
     
     import akshare as ak
@@ -252,9 +289,9 @@ def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
         df['label']=df['label'].apply(lambda x: x.strip())
         
     except:
-        print("#Error(sector_rank_china): data source tentatively unavailable for",indicator)
-        print("Possible reason: data source is self-updating.")
-        print("Solution: have a breath of fresh air and try later.")
+        print("  #Warning(sector_rank_china): data source tentatively unavailable for",indicator)
+        print("  Possible reason: data source is self-updating.")
+        print("  Solution: have a breath of fresh air and try later.")
         return None
     
     df.dropna(inplace=True)
@@ -322,12 +359,18 @@ def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
     
     #处理空记录
     if len(df3) == 0:
-        print("#Error(sector_rank_china):data source tentatively unavailable for",comp,indicator)
-        print("Possible reason: data source is self-updating.")
-        print("Solution: have a breath of fresh air and try later.")
+        print("  #Warning(sector_rank_china):data source tentatively unavailable for",comp,indicator)
+        print("  Possible reason: data source is self-updating.")
+        print("  Solution: have a breath of fresh air and try later.")
         return
     
     df3.index=df3.index + 1
+    
+    df3_collist=list(df3)
+    df3['序号']=df3.index
+    df3=df3[['序号']+df3_collist]
+    
+    """
     print("\n===== 中国股票市场：板块"+comp+"排行榜（按照"+indtag+"分类） =====")
     if num > 0:
         print(df3.head(num))
@@ -339,6 +382,23 @@ def sector_rank_china(comp="涨跌幅",indicator="新浪行业",num=10):
     footnote1="*注：代表个股是指板块中涨幅最高或跌幅最低的股票"
     print(footnote1)
     print(" 板块数:",len(df),"\b, 数据来源：新浪财经,",today,"\b（信息为上个交易日）") 
+    """
+    if num > 0:
+        df4=df3.head(num)
+    else:
+        df4=df3.tail(-num)
+    
+    titletxt="中国股票市场：板块"+comp+"排行榜（按照"+indtag+"分类）"
+    import datetime; stoday = datetime.date.today()
+    footnote1="注：代表个股是指板块中涨幅最高或跌幅最低的股票\n"
+    footnote2="板块总数"+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    footnote=footnote1+footnote2
+    
+    df_display_CSS(df4,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                   first_col_align='center',second_col_align='left', \
+                       last_col_align='left',other_col_align='right', \
+                       titile_font_size='16px',heading_font_size='15px', \
+                       data_font_size='15px')
 
     return df3
 
@@ -349,6 +409,14 @@ if __name__=='__main__':
         
     num=10
 
+def sector_detail_sina(sector="new_dlhy",indicator="涨跌幅",rank=5):
+    """
+    功能：套壳sector_detail_china
+    """
+    df=sector_detail_china(sector=sector,comp=indicator,num=rank)
+    return df
+    
+
 def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
     """
     功能：按照板块内部股票的比较指标降序排列
@@ -458,6 +526,11 @@ def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
     pd.set_option('display.unicode.east_asian_width', True)
     
     df3.index=df3.index + 1
+
+    df3_collist=list(df3)
+    df3['序号']=df3.index
+    df3=df3[['序号']+df3_collist]    
+    """
     print("\n=== 中国股票市场："+sector_name+"板块，成份股排行榜（按照"+comp+"） ===\n")
     if num > 0:
         print(df3.head(num))
@@ -469,7 +542,29 @@ def sector_detail_china(sector="new_dlhy",comp="涨跌幅",num=10):
     footnote1="\n 注：市值的单位是亿元人民币, "
     print(footnote1+"板块内成份股个数:",len(df))
     print(" 数据来源：新浪财经,",today,"\b（信息为上个交易日）") 
-
+    """
+    if num > 0:
+        df4=df3.head(num)
+    else:
+        df4=df3.tail(-num)
+    
+    titletxt="中国股票市场："+sector_name+"板块，成份股排行榜（基于"+comp+"）"
+    
+    import datetime; stoday = datetime.date.today()
+    if "流通市值" in df3_collist:
+        footnote1="市值单位：亿元，板块成份股："+str(len(df))+'\n'
+        footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    else:
+        footnote1="板块成份股："+str(len(df))+'，'
+        footnote2="数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    footnote=footnote1+footnote2
+    
+    df_display_CSS(df4,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                   first_col_align='center',second_col_align='left', \
+                       last_col_align='right',other_col_align='right', \
+                       titile_font_size='16px',heading_font_size='15px', \
+                       data_font_size='15px')    
+    
     return df2
 
 #==============================================================================
@@ -481,6 +576,13 @@ if __name__=='__main__':
     sector="yysw"
     sector="xyz"
 
+def sector_position_sina(ticker,sector="new_dlhy"):
+    """
+    功能：套壳sector_position_china
+    """
+    df=sector_position_china(ticker=ticker,sector=sector)
+    return df
+
 def sector_position_china(ticker,sector="new_dlhy"):
     """
     功能：查找一只股票在板块内的百分数位置
@@ -547,7 +649,10 @@ def sector_position_china(ticker,sector="new_dlhy"):
     #确定比较范围
     complist=['changepercent','turnoverratio','settlement','per','pb','nmc','mktcap']
     compnames=['涨跌幅%','换手率%','收盘价(元)','市盈率','市净率','流通市值(亿元)','总市值(亿元)']
-    compdf=pd.DataFrame(columns=['指标名称','指标数值','板块百分位数%','板块中位数','板块最小值','板块最大值'])
+    compdf=pd.DataFrame(columns=['指标名称','指标数值','板块分位数%','板块中位数','板块最小值','板块最大值'])
+    
+    from scipy.stats import percentileofscore
+    
     for c in complist:
         v=list(sdf[c])[0]
         vlist=list(set(list(df[c])))
@@ -557,10 +662,11 @@ def sector_position_china(ticker,sector="new_dlhy"):
         vmedian=round(np.median(vlist),2)
         
         pos=vlist.index(v)
-        pct=round((pos+1)/len(vlist)*100,2)
+        #pct=round((pos+1)/len(vlist)*100,2)
+        pct=percentileofscore(vlist,v)
         
         s=pd.Series({'指标名称':compnames[complist.index(c)], \
-                     '指标数值':v,'板块百分位数%':pct,'板块中位数':vmedian, \
+                     '指标数值':v,'板块分位数%':pct,'板块中位数':vmedian, \
                     '板块最小值':vmin,'板块最大值':vmax})
         try:
             compdf=compdf.append(s,ignore_index=True)
@@ -568,7 +674,7 @@ def sector_position_china(ticker,sector="new_dlhy"):
             compdf=compdf._append(s,ignore_index=True)
         
     compdf.reset_index(drop=True,inplace=True)     
-
+    """
     print("\n======= 股票在所属行业/板块的位置分析 =======")
     print("股票: "+sname+" ("+ticker+")")
     print("所属行业/板块："+sector_name+" ("+sector+", "+indicator+"分类)")
@@ -586,7 +692,23 @@ def sector_position_china(ticker,sector="new_dlhy"):
     today = datetime.date.today()
     print('') #空一行
     print("注：板块内成份股个数:",len(df),"\b, 数据来源：新浪财经,",today,"\b(信息为上个交易日)")
-
+    """
+    if indicator=="行业": indicator="证监会行业"
+    
+    titletxt="上市公司地位分析："+sname+"，"+sector_name+"行业/板块（"+indicator+"分类）"
+    import datetime; stoday = datetime.date.today()
+    footnote1=""
+    footnote2="成分股总数："+str(len(df))+"，数据来源：新浪财经，"+str(stoday)+"(截至昨日)"
+    footnote=footnote1+footnote2
+    
+    print("") #空一行
+    df_display_CSS(compdf,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                   first_col_align='left',second_col_align='right', \
+                       last_col_align='right',other_col_align='right', \
+                       titile_font_size='16px',heading_font_size='15px', \
+                       data_font_size='15px')    
+    
+    
     return df,compdf    
     
 
@@ -3564,7 +3686,11 @@ def stock_peers_sw(ticker):
             try:
                 print_industry_component_sw(iname=hangye)
             except:
-                print("  #Warning(stock_peers_sw): failed to search peers for",ticker)
+                print("\n #Warning(stock_peers_sw): failed to search peers for",ticker)
+                print("  Possible solutions:")
+                print("  1. If siat is outdated, uninstall and then reinstall")
+                print("  2. Try upgrade pandas and akshare if outdated")
+                print("  3. If anaconda is outdated, uninstall and install a newer one")
 
     return
         

siat/translate.py

@@ -3266,6 +3266,10 @@ def ticker1_name(ticker,ticker_type='auto'):
     """
     功能：翻译单个证券名称：股票，基金，债券，投资组合
     """
+    DEBUG=False
+    if DEBUG:
+        print("DEBUG: ticker=",ticker)
+    
     #投资组合
     if isinstance(ticker,dict):
         return portfolio_name(ticker)
@@ -3282,7 +3286,11 @@ def ticker1_name(ticker,ticker_type='auto'):
             return tname
     """
     tname=codetranslate(ticker)
-    if tname != ticker: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
+    if tname != ticker or ticker in ["IBM"]: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
+        return tname
+
+    tname=ectranslate(ticker)
+    if tname != ticker: 
         return tname
     
     symbol=ticker1_cvt2yahoo(ticker)

siat-3.4.32.dist-info/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2024 WANG Dehong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software (siat) and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.4.17
+Version: 3.4.32
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
 Author-email: wdehong2000@163.com
 License: Copyright (C) WANG Dehong, 2024. For educational purpose only!
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: pandas-datareader
 Requires-Dist: yfinance
 Requires-Dist: tqdm
@@ -35,18 +36,18 @@ Requires-Dist: itables
 Requires-Dist: py-trans
 Requires-Dist: bottleneck
 
-<center><font size=6>Welcome to SIAT
 
 # What is siat?
-siat is a Python plug-in for security investment analysis, specially designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
+siat is a Python 3 plug-in for security investment analysis, primarily designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
 
-Most of the results by siat are in the form of figures and/or tables.
-# Version history
+siat is recommended to run in Jupyter Notebook or Jupyter Lab, and most of its results are in the forms of figures and/or tables.
+# Version naming
 Version structure: X.Y.Z
 
 X is the major version for architecture upgrade only.
-Y is the functional version for functional enhancement.
+Y is the functional version for functional enhancements.
 Z is the minor version just for bug fixing.
+
 # Quick examples of using siat
 
 
@@ -68,7 +69,7 @@ set_language("English")
 # Simple way: show Apple's stock price in recent month
 apple=security_trend("AAPL")
 ```
-You may expect to more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
+You may expect more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
 
 ```python
 apple=security_trend("AAPL", start="MRY",
@@ -85,7 +86,7 @@ Since there is a major stock split for NVidia in 2024 by 1:10, it is necessary t
 comp=security_trend(['AAPL','MSFT','NVDA'], 
                     start='MRQ', 
                     indicator='Adj Close', 
-                    preprocess='scaling', 
+                    preprocess='scaling', #use scaling drawing method to avoid loss of details
                     mark_top=True, mark_bottom=True, 
                     annotate=True, annotate_value=True)
 ```
@@ -94,8 +95,7 @@ comp=security_trend(['AAPL','MSFT','NVDA'],
 
 
 ```python
-# Script security_technical only supports 4 popular technical indicators: MACD, Bollinger band, KDJ and RSI. 
-
+# security_technical only supports 4 popular technical indicators: MACD, Bollinger, KDJ and RSI. 
 apple=security_technical("AAPL",
                          technical="Bollinger",
                          start="MRQ",
@@ -107,15 +107,15 @@ apple=security_technical("AAPL",
 
 
 ```python
-# Script security_technical2 supports about 20 popular technical methods.
-
+# security_technical2 supports up to 14 popular technical indicators.
+# security_technical2 uses a simplied drawing method (Dehong graph) to avoid trypophobia [藢tr瑟p蓹u'f蓹蕣bj蓹]
 apple=security_technical2("AAPL",
                          technical="CCI",
                          start="MRM",
                          loc1="upper left", loc2="lower right")
 ```
 
-# What security product does siat support?
+# What security products does siat support?
 1. Public company profile:  world-wide
 2. Stock & stock market index: world-wide
 3. Stock valuation: primarily in China (mainland and HK) and the U.S.
@@ -131,13 +131,13 @@ apple=security_technical2("AAPL",
 13. Cash flow statement: in China mainland (full function) and world-wide (basic function)
 14. DuPont Identity: world-wide
 15. Sector trend and valuation: primarily in China
-# What analytical methodology does siat support?
+# What analytical methods does siat support?
 1. Trend analysis
 2. Panel comparation
 3. Return analysis: rolling returns, holding period returns
 4. Risk analysis: rolling volatility, holding period volatility, LPSD
 5. Technical analysis: more than 15 indicators
-6. Risk-adjusted return: sharpe, sortino, treynor, Jensen alpha
+6. Risk-adjusted return: Sharpe ratio, Sortino ratio, Treynor ratio, Jensen alpha
 7. Portfolio optimization: four risk-adjusted returns
 8. CAPM beta trend
 9. Beta adjustments: simple adjustment, Scholes-Williams, Dimson
@@ -163,11 +163,15 @@ The main data sources siat uses:
 7. IMF
 8. Shanghai Stock Exchange
 9. Shenzhen Stock Exchange
-10. Tokyo Stock Exchange
-11. HKEX
-12. Sustainalytics
-
-Thanks the above websites for their valuable data supply!
+10. Hong Kong Stock Exchange
+11. Beijing Stock Exchange
+12. Tokyo Stock Exchange
+13. London Stock Exchange
+14. New York Stock Exchange
+15. NASDAQ
+16. Sustainalytics
+
+Thanks the above websites for their valuable data!
 # How to install siat?
 The author strongly recommends using siat together with Jupyter Notebook or Jupyter Lab in Anaconda.
 In order to install siat for the very first time, open a Jupyter Notebook, and type in the following command:
@@ -202,7 +206,7 @@ pip install --upgrade siat https://mirrors.aliyun.com/pypi/simple/
 *** Warning
 1. The pip command itself may need upgrade as well.
 2. The pip command sometimes may have conflicts with some vpn programs.
-If in this case, try quit vpn program, and try again. 
+If in this case, try quit vpn program first, and try again. 
 # Are there more detailed case studies on using siat?
 YES!
 

{siat-3.4.17.dist-info → siat-3.4.32.dist-info}/RECORD

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=lUuCPVSxebkA2yye1PXu1V2Jd2UKEwD_kIA25DCIDTs,29750
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=hRRYWfmxAz1gSz2DJBoY8z8li0cbDMw-EiJIvThuhZY,151708
+siat/common.py,sha256=O9-IYeP7z1KHO2YFr-auc_HzBf78nPb-1LY3byb5Avo,151723
 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
@@ -28,7 +28,7 @@ siat/cryptocurrency.py,sha256=IjQTzqTkdp19aS0PrD15nU3-tfCJHyzt0oBd5nWvwk8,27449
 siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2669
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
-siat/economy.py,sha256=J0-xBtp6gg6CNP9N-UvpKLJ-0Tw5O_DKaDvEq1R35Fw,73853
+siat/economy.py,sha256=ijMAVA5ydghbQDgNDDdz8fz9NPd2eq90RzpJSRGWz5c,78638
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -60,7 +60,7 @@ 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=dFec-2Ds76JEfvsMj2HS-gHcufv3vpsWe4LwpNX_XoM,87219
+siat/grafix.py,sha256=HwtDRINvpfiWcrXsR5h6Ghvspitww5xRvP2eS4UfDFw,87465
 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
@@ -94,7 +94,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=_-NgVSI2AMRCZw3U85ov6CgU5riii4Y9oY-rfUrfVSk,132551
+siat/sector_china.py,sha256=A2252BymgpV1LEdZ4DU6SJue7ZMrW4GU8fBfhuqp09w,137485
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=Y4suVC-4koUSI_n8kY0l0y4lo_CTcoeM_kwTHiIFzyM,26291
@@ -131,7 +131,7 @@ 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=Isa2gjmuY6xKo3HwaPOR0CJzPqLalcu0J1Qw2cZbmFs,218567
+siat/translate.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
@@ -139,7 +139,8 @@ 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=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,,
+siat-3.4.32.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.4.32.dist-info/METADATA,sha256=-WEvTLN8wDtXLa77mhBGt9tMIXvoxwAfku48zsdom0s,8010
+siat-3.4.32.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.32.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.32.dist-info/RECORD,,