siat 3.8.27__py3-none-any.whl → 3.8.30__py3-none-any.whl

siat/economy2.py

@@ -360,6 +360,8 @@ if __name__ =="__main__":
     indicator="NY.GDP.MKTP.KN"
     indicator="GC.XPN.TOTL.GD.ZS"
     
+    indicator='GC.GDP.COMP.ZS' # 自制指标
+    
     start='2010'; end='2025'; power=3
     
     zeroline=False
@@ -380,7 +382,7 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                            attention_point='',attention_point_area='', \
                       average_value=False, \
                       datatag=False,power=0,graph=True, \
-                      mark_top=True,mark_bottom=True,mark_end=True, \
+                      mark_start=False,mark_top=False,mark_bottom=False,mark_end=True, \
                       facecolor='whitesmoke',loc='best',maxticks=30):
     """
     ===========================================================================
@@ -406,6 +408,15 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
     输出：图形
     返回值：数据表
     """
+    import pandas as pd
+    
+    # 自制指标
+    sm_ind_list=['GC.GDP.COMP.ZS']
+    if indicator in sm_ind_list:
+        sm_ind_flag=True
+    else:
+        sm_ind_flag=False
+    
     # 检测指标是否存在，并取得指标名称
     indicator_name=indicator_name_wb(indicator)
     if indicator_name == indicator:
@@ -416,11 +427,36 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
     start,end=start_end_preprocess(start,end)
     
     # 下载数据
-    try:
-        pricedf=wb.download(indicator=indicator,country=ticker,start=start,end=end)
-    except:
-        print(f"  #Error(economy_indicator_wb): {indicator} not available for {ticker}")
-        return None
+    if not sm_ind_flag:
+        try:
+            pricedf=wb.download(indicator=indicator,country=ticker,start=start,end=end)
+        except:
+            print(f"  #Error(economy_indicator_wb): {indicator} not available for {ticker}")
+            return None
+    elif indicator == 'GC.GDP.COMP.ZS': # 针对自制指标
+        indtmp1='NY.GDP.FCST.CN'    # Compensation of employees (current LCU)，CN无数据！
+        indtmp2='NY.GDP.MKTP.CN'    # GDP (current LCU)
+        try:
+            pricetmp1=wb.download(indicator=indtmp1,country=ticker,start=start,end=end)
+        except:
+            print(f"  #Error(economy_indicator_wb): element {indtmp1} not available for {ticker}")
+            return None
+        try:
+            pricetmp2=wb.download(indicator=indtmp2,country=ticker,start=start,end=end)
+        except:
+            print(f"  #Error(economy_indicator_wb): element {indtmp2} not available for {ticker}")
+            return None
+        
+        # 算法=indtmp1 / indtmp2 * 100
+        pricetmp=pd.merge(pricetmp1,pricetmp2,how='inner',left_on=['country','year'],
+                          right_on=['country','year'])
+        pricetmp[indicator]=pricetmp.apply(lambda x: round(x[indtmp1]/x[indtmp2]*100,2),axis=1)
+        pricetmp['country']=pricetmp.index[0][0]
+        pricetmp['year']=pricetmp.index
+        pricetmp['year']=pricetmp['year'].apply(lambda x: x[1])
+        
+        pricedf=pricetmp[['country','year',indicator]]
+        pricedf.reset_index(drop=True,inplace=True)
 
     # 是否返回None
     if pricedf is None:
@@ -432,10 +468,14 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
         return None
     # 是否返回数据表但内容均为NaN
     if pricedf[indicator].isnull().all():
-        print(f"  #Error(economy_indicator_wb): empty data found on {indicator} in {ticker}")
+        print(f"  #Error(economy_indicator_wb): all empty data found on {indicator} in {ticker}")
         return None
-
-    pricedf.reset_index(inplace=True)  
+    # 判断非空值的个数
+    if pricedf[indicator].count() == 1:
+        print(f"  #Warning(economy_indicator_wb): only 1 non-empty data found on {indicator} in {ticker}")
+        #return None
+    
+    pricedf.reset_index(drop=True,inplace=True)  
     pricedf.set_index('year',inplace=True)    
     pricedf.rename(columns={indicator:indicator_name},inplace=True)
     country=pricedf['country'].values[0]
@@ -475,10 +515,6 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
         erdf3[indicator_name]=erdf3[indicator_name].apply(lambda x: round(x/unit_amount,2))
 
     # 绘图
-    """
-    if not graph:
-        return erdf3
-    """
     # 判断是否绘制零线    
     if ind_max * ind_min <0:
         zeroline=True
@@ -510,7 +546,8 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                   average_value=average_value, \
                       attention_value=attention_value,attention_value_area=attention_value_area, \
                       attention_point=attention_point,attention_point_area=attention_point_area, \
-                  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                  mark_top=mark_top,mark_bottom=mark_bottom, \
+                  mark_start=mark_start,mark_end=mark_end, \
                   facecolor=facecolor,loc=loc,maxticks=30,translate=translate)
     except Exception as e:
         # 捕获所有异常
@@ -553,7 +590,7 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
                            graph=True,smooth=False,loc='best',facecolor='whitesmoke', \
                            date_range=False,date_freq=False, \
                            annotate=False,annotate_value=False, \
-                           mark_top=False,mark_bottom=False,mark_end=False, \
+                           mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                            maxticks=30,translate=False):
     """
     ===========================================================================
@@ -573,7 +610,7 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
     facecolor：画布背景颜色，默认'whitesmoke'
     annotate：是否在曲线末端标注，默认否False
     annotate_value：是否标注曲线末端值，默认否False
-    mark_top, mark_bottom, mark_end：是否标注最大、最小、末端值，默认否
+    mark_start, mark_top, mark_bottom, mark_end：是否标注起始值、最大、最小、末端值，默认否
     maxticks=30：限制横轴刻度最大数量
     
     date_range=False：指定开始结束日期绘图
@@ -720,7 +757,8 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
                     attention_value=attention_value,attention_value_area=attention_value_area, \
                     attention_point=attention_point,attention_point_area=attention_point_area, \
                annotate=annotate,annotate_value=annotate_value, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
+               mark_start=mark_start,mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   facecolor=facecolor, \
                band_area=band_area,loc=loc,maxticks=maxticks,translate=translate)
 
     return pricedf
@@ -758,7 +796,7 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
                       band_area='',loc='best', \
                       annotate=False,annotate_value=False, \
                       smooth=False, \
-                      mark_top=True,mark_bottom=True,mark_end=False, \
+                      mark_start=False,mark_top=True,mark_bottom=True,mark_end=False, \
                       maxticks=30,translate=False):
     """
     ===========================================================================
@@ -969,7 +1007,8 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
                     attention_value=attention_value,attention_value_area=attention_value_area, \
                     attention_point=attention_point,attention_point_area=attention_point_area, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
+               mark_start=mark_start,mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   facecolor=facecolor, \
                maxticks_enable=False,maxticks=10, \
                translate=translate)
 
@@ -982,7 +1021,7 @@ def economy_trend2(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                    start='L10Y',end='today',translate=False, \
                    attention_value='',attention_value_area='', \
                    attention_point='',attention_point_area='', \
-                   mark_top=False,mark_bottom=False,mark_end=False, \
+                   mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                    graph=True,facecolor='whitesmoke',loc='best',maxticks=30, \
                    
                    zeroline=False,average_value=False, \
@@ -1009,7 +1048,7 @@ def economy_trend2(ticker='CN',indicator='NY.GDP.MKTP.KN', \
     attention_point：横轴关注值或其列表，默认无''
     attention_point_area：横轴关注值区间强调，默认无''        
     graph：是否绘图，默认是True
-    mark_top, mark_bottom, mark_end：是否标记最高、最低和末端点：默认是True
+    mark_start, mark_top, mark_bottom, mark_end：是否标记开始点、最高、最低和末端点：默认否False
     facecolor：背景颜色，默认'whitesmoke'
     loc：图例位置，默认自动'best'
 
@@ -1082,7 +1121,8 @@ def economy_trend2(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                                 attention_value_area=attention_value_area, \
                                 attention_point=attention_point, \
                                 attention_point_area=attention_point_area, \
-                                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                mark_top=mark_top,mark_bottom=mark_bottom, \
+                                mark_start=mark_start,mark_end=mark_end, \
                                 graph=graph,facecolor=facecolor,loc=loc,maxticks=maxticks, \
                                 
                                 power=power,average_value=average_value, \
@@ -1097,7 +1137,8 @@ def economy_trend2(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                                attention_value_area=attention_value_area, \
                                attention_point=attention_point, \
                                attention_point_area=attention_point_area, \
-                               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                               mark_top=mark_top,mark_bottom=mark_bottom, \
+                               mark_start=mark_start,mark_end=mark_end, \
                                graph=graph,loc=loc,facecolor=facecolor,maxticks=maxticks, \
                                band_area=band_area, \
                                annotate=annotate,annotate_value=annotate_value,smooth=smooth, \
@@ -1115,7 +1156,8 @@ def economy_trend2(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                                   attention_value_area=attention_value_area, \
                                   attention_point=attention_point, \
                                   attention_point_area=attention_point_area, \
-                                  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                                  mark_top=mark_top,mark_bottom=mark_bottom, \
+                                      mark_start=mark_start,mark_end=mark_end, \
                                   graph=graph,facecolor=facecolor,loc=loc,maxticks=maxticks, \
                                       
                                   annotate=annotate,annotate_value=annotate_value,smooth=smooth, \
@@ -1505,13 +1547,23 @@ def economic_translate(indicator):
          'Exports of goods and services (% of GDP)',
          'Exports of goods and services (% of GDP)'],
 
+        ['NE.IMP.GNFS.CD','进口商品和服务总金额(美元现价)',
+         'Imports of goods and services (current US$)',
+         'Imports of goods and services (current US$)'],
+
+        ['NE.EXP.GNFS.CD','出口商品和服务总金额(美元现价)',
+         'Exports of goods and services (current US$)',
+         'Exports of goods and services (current US$)'],
+
         ['NE.IMP.GNFS.ZS','进口商品和服务占GDP%',
          'Imports of goods and services (% of GDP)',
          'Imports of goods and services (% of GDP)'],
 
-
-
-
+        ['NE.TRD.GNFS.ZS','国际贸易占GDP%',
+         'Trade % of GDP',
+         'Trade % of GDP'],
+        # 用来分析一个国家对国际贸易的依赖程度。
+        # 高贸易占比通常表明一个国家的经济结构以出口和进口为主，而低贸易占比可能表明经济更依赖国内消费或投资。
         
         # 贫困和贫富分化========================================================
         ['SI.POV.GINI','基尼指数',
@@ -1520,8 +1572,60 @@ def economic_translate(indicator):
         # 基尼指数：0-100，用于衡量收入或财富分配的不平等程度。
         # 0表示完全平等，100表示完全不平等。基尼系数高通常意味着贫富差距较大。
         # 注意不是基尼系数（0-1）。
+        
+        # 薪酬=================================================================
+        ['GC.GDP.COMP.ZS','劳动者薪酬占GDP%',
+         'Compensation of employees (% of GDP)',
+         'Compensation of employees (% of GDP)'],
+        # 自制指标：= GC.XPN.COMP.ZS: Compensation of employees (% of expense)
+        # x GC.XPN.TOTL.GD.ZS: Expense (% of GDP) / 100。
+        # 或 = GC.XPN.COMP.CN: Compensation of employees (current LCU)
+        # / NY.GDP.MKTP.CN: GDP (current LCU) * 100.
+        
+        # 储蓄=================================================================
+        ['NY.GNS.ICTR.ZS','国民储蓄总额占GDP%',
+         'Gross savings (% of GDP)',
+         'Gross savings (% of GDP)'],
+        # 国民储蓄：一国居民和政府的总储蓄，包含国内储蓄和来自国外的净收入
+        # 包含国际要素：计入来自国外的净要素收入（如投资收益、侨汇）。
 
+        ['NY.GDS.TOTL.ZS','国内储蓄总额占GDP%',
+         'Gross Domestic Savings (% of GDP)',
+         'Gross Domestic Savings (% of GDP)'],
+        # 国内储蓄：仅统计国内经济主体（家庭、企业、政府）的储蓄，不包含国外净收入。
+        # 仅限国内：不涉及国际收入或支出。
+        
+        # 投资=================================================================
+        ['NE.GDI.TOTL.ZS','总资本形成占GDP%',
+         'Gross capital formation (% of GDP)',
+         'Gross capital formation (% of GDP)'],
+        # 又名Gross domestic investment国内总投资，包括政府、企业和家庭的投资
+        
+        ['NE.GDI.FTOT.ZS','总固定资本形成占GDP%',
+         'Gross fixed capital formation (% of GDP)',
+         'Gross fixed capital formation (% of GDP)'],
+        # 又名Gross domestic fixed investment国内固定资产总投资，包括政府、企业和家庭的投资
+        
+        ['BX.KLT.DINV.WD.GD.ZS','外国直接投资净额占GDP%',
+         'Foreign direct investment, net inflows (% of GDP)',
+         'Foreign direct investment, net inflows (% of GDP)'],
+        # 等于FDI流入 - FDI流出
+        
+        # 政府财政==============================================================
+        ['GC.REV.XGRT.GD.ZS','政府总收入(不含国际赠款)占GDP%',
+         'Revenue, excluding grant (% of GDP)',
+         'Revenue, excluding grant (% of GDP)'],
+        # 包括税收和非税收入
+        
+        ['SH.XPD.GHED.GD.ZS','政府卫生支出占GDP%',
+         'Government health expenditure (% of GDP)',
+         'Domestic general government health expenditure (% of GDP)'],
+        # 包括税收和非税收入
         
+        ['SH.XPD.GHED.CH.ZS','政府卫生支出占当前卫生支出%',
+         'Government health expenditure (% of health expenditure)',
+         'Domestic general government health expenditure (% of current health expenditure)'],
+        # 包括税收和非税收入
         
         
         
@@ -1540,7 +1644,7 @@ def economic_translate(indicator):
 
     found=False; result=indicator
     try:
-        dict_word=trans_dict[trans_dict['indicator']==indicator]
+        dict_word=trans_dict[trans_dict['indicator']==indicator.upper()]
         found=True
     except:
         #未查到翻译词汇，返回原词

siat/grafix.py

@@ -106,7 +106,7 @@ if __name__ =="__main__":
     power=0
     zeroline=False
     average_value=False
-    resample_freq='H'
+    resample_freq='D'
     loc='best'
     date_range=False
     date_freq=False
@@ -122,9 +122,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               attention_point='',attention_point_area='', \
               average_value=False, \
                   
-              resample_freq='H',loc='best', \
+              resample_freq='D',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-              mark_top=True,mark_bottom=True,mark_end=True, \
+              mark_start=False,mark_top=True,mark_bottom=True,mark_end=True, \
               facecolor='whitesmoke',maxticks=15,translate=False):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
@@ -203,7 +203,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     
     #绘制数据标签
     if datatag:
-        mark_top=False; mark_bottom=False; mark_end=False
+        mark_start=False; mark_top=False; mark_bottom=False; mark_end=False
         for x, y in zip(df.index, df[colname]):
             plt.text(x,y*1.001,'%.2f' % y,ha='center',va='bottom',color='black')        
 
@@ -243,6 +243,19 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='seagreen')
                 plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
+    #标记曲线开始数值
+    if mark_start:
+        df_start=df.head(1)
+        y_start = df_start[colname].min()    # 开始的y坐标
+        x_start = df_start[colname].idxmin() # 开始值的x坐标 
+        
+        #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+        y1=str(round(y_start,1)) if abs(y_start) >= 100 else str(round(y_start,2)) if abs(y_start) >= 1 else str(round(y_start,3)) 
+        plt.annotate(text=y1, 
+                     xy=(x_start, y_start),
+                     xytext=(x_start, y_start*0.998),fontsize=annotate_size,ha='right',va='center')
+        # 特别注意：这里的left/right与实际图示的方向正好相反！！！
+
     #标记曲线末端数值
     if mark_end:
         df_end=df.tail(1)
@@ -253,7 +266,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3)) 
         plt.annotate(text=' '+y1, 
                      xy=(x_end, y_end),
-                     xytext=(x_end, y_end),fontsize=annotate_size)
+                     xytext=(x_end, y_end*0.998),fontsize=annotate_size,ha='left',va='center')
     
     #是否绘制水平线
     if isinstance(zeroline,bool):#若zeroline为True
@@ -340,13 +353,15 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
 
     if average_value:
-        av=df[colname].mean()
-        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("均值","Mean"))
         haveLegend=True
+        
+        av=df[colname].mean()
         #av=str(round(av,2)) if av < 100 else str(int(av))
-        av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        #av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        avstr=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
+        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("本期间均值","Periodic mean")+avstr)
         #footnote=footnote + "，均值"+av
-        footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
+        #footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)
@@ -412,7 +427,7 @@ if __name__ =="__main__":
     twinx=False
     yline=999
     xline=999
-    resample_freq='H'
+    resample_freq='D'
 
 def plot_line2(df1,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
@@ -421,7 +436,7 @@ def plot_line2(df1,ticker1,colname1,label1, \
                zeroline=False,twinx=False, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
-               resample_freq='H',loc1='best',loc2='best', \
+               resample_freq='D',loc1='best',loc2='best', \
                color1='red',color2='blue',facecolor='whitesmoke', \
                    maxticks=20):
     """
@@ -480,7 +495,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                zeroline=False,twinx=False, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
-               resample_freq='H',loc1='best',loc2='best', \
+               resample_freq='D',loc1='best',loc2='best', \
                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                color1='red',color2='blue',facecolor='whitesmoke', \
                    maxticks=20):
@@ -547,7 +562,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                        power=0,datatag1=False,datatag2=False,zeroline=False, \
                            yline=999,attention_value_area='', \
                            xline=999,attention_point_area='', \
-                       resample_freq='H', \
+                       resample_freq='D', \
                        loc1='best',loc2='best', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
                        ticker_type='auto',maxticks=15):
@@ -760,7 +775,10 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     
     # 使用 AutoDateLocator 自动选择最佳间隔，目的是显示最后一个日期，亲测有效！！！
     import matplotlib.dates as mdates
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+    try:
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator(maxticks=maxticks))    
+    except:
+        pass
     
     plt.gcf().autofmt_xdate(ha="center") # 优化标注（自动倾斜）
     try:
@@ -802,7 +820,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                        power=0,datatag1=False,datatag2=False,zeroline=False, \
                            yline=999,attention_value_area='', \
                            xline=999,attention_point_area='', \
-                       resample_freq='H', \
+                       resample_freq='D', \
                        loc1='best',loc2='best', \
                        date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                        color1='red',color2='blue',facecolor='whitesmoke', \
@@ -1060,7 +1078,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
 def plot_line2_twinx(df01,ticker1,colname1,label1, \
                      df02,ticker2,colname2,label2, \
                      titletxt,footnote,power=0,datatag1=False,datatag2=False, \
-                     resample_freq='H', \
+                     resample_freq='D', \
                          xline=999,attention_point_area='', \
                      loc1='upper left',loc2='lower left', \
                      color1='red',color2='blue',facecolor='whitesmoke', \
@@ -1289,7 +1307,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                       df02,ticker2,colname2,label2, \
                       titletxt,footnote,power=0,datatag1=False,datatag2=False, \
                           xline=999,attention_point_area='', \
-                      resample_freq='H',loc1='upper left',loc2='lower left', \
+                      resample_freq='D',loc1='upper left',loc2='lower left', \
                       date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                       color1='red',color2='blue',facecolor='whitesmoke', \
                       ticker_type='auto', \
@@ -1532,7 +1550,7 @@ if __name__ =="__main__":
     axhline_value=0; axhline_label=''
     title_txt='Title'
     data_label=False
-    resample_freq='H'; smooth=True
+    resample_freq='D'; smooth=True
     linewidth=1.5
     loc='best'
     annotate=True; annotate_value=True
@@ -1545,12 +1563,12 @@ if __name__ =="__main__":
 
 
 def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
-               data_label=True,resample_freq='H',smooth=True,linewidth=1.5, \
+               data_label=False,resample_freq='D',smooth=False,linewidth=1.5, \
                band_area='',loc='best', \
                    annotate=False,annotate_value=False,plus_sign=False, \
                 attention_value='',attention_value_area='', \
                 attention_point='',attention_point_area='', \
-               mark_top=False,mark_bottom=False,mark_end=False, \
+               mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                ticker_type='auto',facecolor='whitesmoke', \
                    maxticks_enable=True,maxticks=15, \
                translate=False):
@@ -1738,6 +1756,19 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
 
+        #标记曲线开始数值
+        if mark_start and (c not in ["平均值","中位数"]):
+            df_end=dfg.head(1)
+            y_end = df_end[c].min()    # 开始的y坐标
+            x_end = df_end[c].idxmin() # 开始值的x坐标 
+            
+            #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+            y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
+            plt.annotate(text=' '+y1, 
+                         xy=(x_end, y_end),
+                         xytext=(x_end, y_end*0.998),fontsize=annotate_size,
+                         color=last_line_color,ha='right',va='center')
+
         #标记曲线末端数值
         if mark_end and (c not in ["平均值","中位数"]):
             df_end=dfg.tail(1)
@@ -1748,8 +1779,8 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             y1=str(round(y_end,1)) if abs(y_end) >= 100 else str(round(y_end,2)) if abs(y_end) >= 1 else str(round(y_end,3))
             plt.annotate(text=' '+y1, 
                          xy=(x_end, y_end),
-                         xytext=(x_end, y_end),fontsize=annotate_size,
-                         color=last_line_color)
+                         xytext=(x_end, y_end*0.998),fontsize=annotate_size,
+                         color=last_line_color,ha='left',va='center')
 
     #用于关注值的颜色列表
     atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage","hotpink","mediumslateblue"]
@@ -1950,7 +1981,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #指定两个横轴之间的区域
                     attention_point_area='', \
                 annotate=False,annotate_value=False, \
-                mark_top=False,mark_bottom=False,mark_end=False, \
+                mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                 facecolor='whitesmoke',maxticks=20,translate=False):
     """
     函数功能：根据df的内容绘制折线图
@@ -1973,6 +2004,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     band_area=''：默认为空，否则为列表，第1个值为带状区域上边沿字段，第2个值为带状区域下边沿字段
     """
     import pandas as pd
+    
     DEBUG=False
     if DEBUG:
         print(f"band_area={band_area}")
@@ -2115,6 +2147,19 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),fontsize=annotate_size,
                              color=last_line_color)
+
+        #标记曲线开始数值
+        if mark_start:
+            df_start=df.head(1)
+            y_start = df_start[c].min()    # 开始的y坐标
+            x_start = df_start[c].idxmin() # 开始值的x坐标 
+            
+            #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
+            y1=str(round(y_start,1)) if abs(y_start) >= 100 else str(round(y_start,2)) if abs(y_start) >= 1 else str(round(y_start,3)) 
+            plt.annotate(text=y1, 
+                         xy=(x_start, y_start),
+                         xytext=(x_start, y_start*0.998),fontsize=annotate_size,ha='right',va='center')
+            # 特别注意：这里的left/right与实际图示的方向正好相反！！！
     
         #处理布林带的mark_end，仅标记上中下线
         if mark_end & (c in collist3):
@@ -2395,7 +2440,7 @@ if __name__=='__main__':
 #==============================================================================
 def plot_2lines(df01,colname1,label1, \
                 df02,colname2,label2, \
-                ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='H', \
+                ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='D', \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 facecolor='whitesmoke', \
                     maxticks=15):
@@ -2584,7 +2629,7 @@ def df_smooth(df):
     
         
 #==============================================================================
-def df_smooth_manual(df,method='linear',resample_freq='H',order=3):
+def df_smooth_manual(df,method='linear',resample_freq='D',order=3):
     """
     功能：对df中的第一个数值列样本进行插值，以便绘制的折线图相对平滑。
     要求：df的索引为pandas的datetime日期型

siat/valuation_china.py

@@ -123,7 +123,13 @@ def get_valuation_market_china(start,end,measure='pe',method='lyr',value='value'
         mp['Date']=mp['date']
         mp.sort_values(by=['Date'],ascending=True,inplace=True)
         mp.set_index(['Date'],inplace=True) 
-        mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        
+        try:
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        except:
+            startpd=startpd.date()
+            endpd=endpd.date()
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]            
         
         mp9=mp1[['date',field,'close']]
         mp9['field']=mp9[field]
@@ -149,7 +155,13 @@ def get_valuation_market_china(start,end,measure='pe',method='lyr',value='value'
         mp['Date']=mp['date']
         mp.sort_values(by=['Date'],ascending=True,inplace=True)
         mp.set_index(['Date'],inplace=True) 
-        mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        
+        try:
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        except:
+            startpd=startpd.date()
+            endpd=endpd.date()
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]            
         
         mp9=mp1[['date',field,'close']]
         mp9['field']=mp9[field]
@@ -170,6 +182,293 @@ if __name__ =="__main__":
     df=get_valuation_market_china(start,end,measure='pe',method='lyr',value='value',statistic='median')
 
 #==============================================================================
+if __name__ =="__main__":
+    start='2024-1-1'; end='2025-3-31'
+    indicator='pe'
+    method='ttm'
+    value='value'
+    statistic='median'
+    
+    indicator=['pb','pe']
+    method=['lyr','ttm']
+    value=['value','quantile']
+    statistic=['median','equal-weighted']
+    
+    twinx=False; loc1='best'; loc2='best'
+    power=0; twinx=False; average_value=True
+    annotate=False; annotate_value=False; plus_sign=True
+    mark_top=False; mark_bottom=False; mark_end=False
+        
+    loc1='upper left'; loc2='lower right'
+    facecolor='whitesmoke'; maxticks=20
+    
+
+
+def valuation_china(start='MRY',end='today',indicator='pe', \
+                           method='lyr',value='value',statistic='median', \
+                           average_value=False,show_index=False, \
+                           power=0,twinx=False, \
+                               
+                               band_area='', \
+                               attention_value='',attention_value_area='', \
+                               attention_point='',attention_point_area='', \
+                               
+                           annotate=False,annotate_value=False,plus_sign=True, \
+                           mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
+                               
+                           loc1='upper left',loc2='lower right', \
+                           facecolor='whitesmoke', \
+                           maxticks=20):
+    """
+    ===========================================================================
+    功能：比较中国全A股市场的估值指标变化趋势
+    start: 开始日期，格式YYYY-MM-DD。
+    或者简写版，例如'MRY'近1年、'L3Y'表示近3年等。
+    end: 结束日期，默认今天。
+    
+    indicator: 估值指标市盈率'pe'或市净率'pb'，或其组合。不支持股息率
+    method: 滚动'ttm或静态取样'lyr'，或其组合
+    value: 直接采用估值指标数值'value'或分位数'quantile'，或其组合
+    statistic: 采用中位数'median'或等权均值'equal-weighted'，或其组合
+    twinx：是否使用双轴绘图法，默认否False。
+        如果同时选择了市盈率'pe'或市净率'pb'，建议打开该选项True。
+    loc1/loc2：图例1/2的位置，默认自动决定'best'。
+        如果自动位置不理想，可以手动设置位置。
+    """
+    print("  Working on valuating China stock market ... ...")
+    
+    import pandas as pd
+    #处理日期
+    start,end=start_end_preprocess(start,end)
+    
+    # 情形1：双indicator：双指标，PE+PB
+    if isinstance(indicator,list) and len(indicator) >= 2:
+        indicator=indicator[:2]
+        if isinstance(method,list): method=method[0]
+            
+        if isinstance(value,list): value=value[0]
+        if isinstance(statistic,list): statistic=statistic[0]
+        
+        df=None
+        for i in indicator:
+            if 'pb' != i.lower():
+                dftmp=get_valuation_market_china(start,end,measure=i.lower(), \
+                                                 method=method, \
+                                                 value=value,statistic=statistic)
+            else:
+                # pb不支持ttm
+                dftmp=get_valuation_market_china(start,end,measure=i.lower(), \
+                                                 method='lyr', \
+                                                 value=value,statistic=statistic)
+                
+            val_desc=dftmp['desc'].values[0]
+            method_desc=dftmp['method'].values[0]
+            """
+            if method_desc == 'lyr': val_desc=val_desc+'静态'
+            elif method_desc == 'ttm': 
+                #val_desc=val_desc+'动态'
+                val_desc=val_desc
+            if value == 'value': val_desc=val_desc+'数值'
+            elif value == 'quantile': val_desc=val_desc+'分位数'
+            """
+            dftmp[val_desc]=dftmp['field']
+            dftmp2=dftmp[[val_desc]]
+            
+            if df is None:
+                df=dftmp2
+            else:
+                df=pd.merge(df,dftmp2,left_index=True,right_index=True)
+                
+    # 情形2：单indicator+双method：ttm+lyr（仅适用于pe；pb仅适用lyr）；
+    elif isinstance(method,list) and len(method) >= 2:
+        method=method[:2]
+        if isinstance(indicator,list): indicator=indicator[0]
+            
+        if isinstance(value,list): value=value[0]
+        if isinstance(statistic,list): statistic=statistic[0]
+        
+        df=None
+        for i in method:
+            if (indicator.lower() == 'pe') or \
+                (indicator.lower() == 'pb' and i.lower() == 'lyr'):
+                dftmp=get_valuation_market_china(start,end,measure=indicator.lower(), \
+                                                 method=i.lower(), \
+                                                 value=value,statistic=statistic)
+                
+            val_desc=dftmp['desc'].values[0]
+            method_desc=dftmp['method'].values[0]
+            """
+            if method_desc == 'lyr': val_desc=val_desc+'静态'
+            elif method_desc == 'ttm': 
+                #val_desc=val_desc+'动态'
+                val_desc=val_desc
+            if value == 'value': val_desc=val_desc+'数值'
+            elif value == 'quantile': val_desc=val_desc+'分位数'
+            """
+            dftmp[val_desc]=dftmp['field']
+            dftmp2=dftmp[[val_desc]]
+            
+            if df is None:
+                df=dftmp2
+            else:
+                df=pd.merge(df,dftmp2,left_index=True,right_index=True)
+                
+    # 情形3：单indicator+单method+双value；
+    elif isinstance(value,list) and len(value) >= 2:
+        value=value[:2]
+        if isinstance(indicator,list): indicator=indicator[0]
+        if isinstance(method,list): method=method[0]
+        if indicator == 'pb': method='lyr'
+            
+        if isinstance(statistic,list): statistic=statistic[0]
+        
+        df=None
+        for i in value:
+            dftmp=get_valuation_market_china(start,end,measure=indicator.lower(), \
+                                             method=method.lower(), \
+                                             value=i.lower(),statistic=statistic)
+                
+            val_desc=dftmp['desc'].values[0]
+            method_desc=dftmp['method'].values[0]
+            """
+            if method_desc == 'lyr': val_desc=val_desc+'静态'
+            elif method_desc == 'ttm': 
+                #val_desc=val_desc+'动态'
+                val_desc=val_desc
+            if value == 'value': val_desc=val_desc+'数值'
+            elif value == 'quantile': val_desc=val_desc+'分位数'
+            """
+            dftmp[val_desc]=dftmp['field']
+            dftmp2=dftmp[[val_desc]]
+            
+            if df is None:
+                df=dftmp2
+            else:
+                df=pd.merge(df,dftmp2,left_index=True,right_index=True)
+                
+        # 数值与分位数差距较大，使用twinx=True
+        twinx=True
+                
+    # 情形4：单indicator+单method+单value+双statistic；
+    elif isinstance(statistic,list) and len(statistic) >= 2:
+        statistic=statistic[:2]
+        if isinstance(indicator,list): indicator=indicator[0]
+        if isinstance(method,list): method=method[0]
+        if indicator == 'pb': method='lyr'
+        
+        df=None
+        for i in statistic:
+            dftmp=get_valuation_market_china(start,end,measure=indicator.lower(), \
+                            method=method.lower(), \
+                            value=value.lower(),statistic=i.lower())
+                
+            val_desc=dftmp['desc'].values[0]
+            method_desc=dftmp['method'].values[0]
+            """
+            if method_desc == 'lyr': val_desc=val_desc+'静态'
+            elif method_desc == 'ttm': 
+                #val_desc=val_desc+'动态'
+                val_desc=val_desc
+            if value == 'value': val_desc=val_desc+'数值'
+            elif value == 'quantile': val_desc=val_desc+'分位数'
+            """
+            dftmp[val_desc]=dftmp['field']
+            dftmp2=dftmp[[val_desc]]
+            
+            if df is None:
+                df=dftmp2
+            else:
+                df=pd.merge(df,dftmp2,left_index=True,right_index=True)
+                
+    # 情形5：单indicator+单method+单value+单statistic；
+    else:
+        if isinstance(indicator,list): indicator=indicator[0]
+        if isinstance(method,list): method=method[0]
+        if indicator == 'pb': method='lyr'
+        
+        if isinstance(value,list): value=value[0]
+        if isinstance(statistic,list): statistic=statistic[0]
+        
+        dftmp=get_valuation_market_china(start,end,measure=indicator.lower(), \
+                                         method=method.lower(), \
+                            value=value.lower(),statistic=statistic.lower())
+            
+        val_desc=dftmp['desc'].values[0]
+        method_desc=dftmp['method'].values[0]
+        """
+        if method_desc == 'lyr': val_desc=val_desc+'静态'
+        elif method_desc == 'ttm': 
+            #val_desc=val_desc+'动态'
+            val_desc=val_desc
+        if value == 'value': val_desc=val_desc+'数值'
+        elif value == 'quantile': val_desc=val_desc+'分位数'
+        """
+        dftmp[val_desc]=dftmp['field']
+        if show_index:
+            index_desc=dftmp['index name'].values[0]
+            dftmp[index_desc]=dftmp['index']
+            df=dftmp[[val_desc,index_desc]]
+            
+            # 指数与指标差异大，设定twinx=True
+            twinx=True
+        else:
+            df=dftmp[[val_desc]]
+        
+    # 绘图
+    import datetime; todaydt = datetime.date.today()
+    sourcetxt=text_lang("数据来源：legulegu","Data source: legulegu")
+    footnote=sourcetxt+', '+str(todaydt)
+    
+    if show_index:
+        # 显示股票市场指数
+        twinx=True
+        
+    titletxt=text_lang("中国A股市场估值趋势","China A-share Market Valuation")
+    ylabeltxt=text_lang("估值指标","Valuation Indicator")
+    
+    if len(list(df)) == 1:
+        colname=collabel=list(df)[0]
+        #titletxt=titletxt+': '+colname
+        ylabeltxt=colname
+        plot_line(df,colname,collabel,ylabeltxt,titletxt,footnote, \
+                      power=power, \
+            attention_value=attention_value,attention_value_area=attention_value_area, \
+            attention_point=attention_point,attention_point_area=attention_point_area, \
+                      average_value=average_value, \
+                          
+                      loc=loc1, \
+                      mark_start=True,mark_top=True,mark_bottom=True,mark_end=mark_end, \
+                      facecolor=facecolor,maxticks=maxticks)
+    
+    elif twinx and len(list(df)) >= 2:
+        ticker1=ticker2=''
+        colname1=label1=list(df)[0]; df1=df[[colname1]]
+        colname2=label2=list(df)[1]; df2=df[[colname2]]
+        
+        plot_line2(df1,ticker1,colname1,label1, \
+                   df2,ticker2,colname2,label2, \
+                   ylabeltxt,titletxt,footnote, \
+                   power=power,datatag1=False,datatag2=False,yscalemax=5, \
+                   zeroline=False,twinx=twinx, \
+                       yline=999,attention_value_area='', \
+                       xline=999,attention_point_area='', \
+                   resample_freq='H',loc1=loc1,loc2=loc2, \
+                   color1='red',color2='blue',facecolor='whitesmoke', \
+                       maxticks=maxticks)
+    else:
+        x_label=footnote
+        axhline_value=0; axhline_label=''
+        draw_lines(df,ylabeltxt,x_label,axhline_value,axhline_label,titletxt, \
+                   band_area=band_area,loc=loc1, \
+            attention_value=attention_value,attention_value_area=attention_value_area, \
+            attention_point=attention_point,attention_point_area=attention_point_area, \
+                   annotate=annotate,annotate_value=annotate_value,plus_sign=False, \
+                   mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                   facecolor=facecolor,maxticks_enable=True,maxticks=maxticks)
+
+    return df
+
+
 if __name__ =="__main__":
     start='2020-1-1'; end='2022-10-9'
     measures=['pb','pe']; methods='lyr'; values='value'; statistics='median'
@@ -177,20 +476,27 @@ if __name__ =="__main__":
     measures='pe'; methods=['lyr','ttm']; values='value'; statistics='median'
 
 
-def valuation_market_china(start,end,measures=['pe','pb'], \
+def valuation_market_china(start='MRY',end='today',measures=['pe','pb'], \
                            methods='lyr',values='value',statistics='median', \
                            twinx=False,loc1='best',loc2='best'):
     """
+    ===========================================================================
     功能：比较中国全A股市场的估值指标变化趋势
-    ----------
-    start: 开始日期
-    end: 结束日期
+    start: 开始日期，格式YYYY-MM-DD。
+    或者简写版，例如'MRY'近1年、'L3Y'表示近3年等。
+    end: 结束日期，默认今天。
+    
     measures: 估值指标市盈率'pe'或市净率'pb'，不支持股息率
     methods: 滚动'ttm/静态取样'lyr'.
     values: 直接采用估值指标数值'value'或分位数'quantile'
     statistics: 采用中位数'median'或等权均值'equal-weighted'
-
+    twinx：是否使用双轴绘图法，默认否False。
+        如果同时选择了市盈率'pe'或市净率'pb'，建议打开该选项True。
+    loc1/loc2：图例1/2的位置，默认自动决定'best'。
+        如果自动位置不理想，可以手动设置位置。
     """
+    #处理日期
+    start,end=start_end_preprocess(start,end)
     
     #解析比较的指标，以第一个双指标为准
     found2=False
@@ -222,7 +528,7 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
                 found2=True
                 
     if not found2:
-        print("  #Warning(valuation_market_china)：no comparing parameters from either of",parmlist)
+        print("  #Warning(valuation_market_china)：parameters mismatch among",parmlist)
         #return None,None
     """            
     print("measures1=",measures1,"measures2=",measures2)
@@ -235,16 +541,19 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
         ylabeltxt='估值比率'
     else:
         ylabeltxt='分位数'
+        
+    print("  Working on valuating China stock market ... ...")
+        
     titletxt='中国全A股市场估值的变化趋势'
     
     import datetime
     today = datetime.date.today()
-    footnote="数据来源: 乐咕乐股，"+str(today)
+    footnote="数据来源: legulegu，"+str(today)
     
     #获取指标1
     df1=get_valuation_market_china(start,end,measure=measures1,method=methods1,value=values1,statistic=statistics1)
     if df1 is None:
-        print("  #Error(valuation_market_china)：no data available for the combination of",measures1,methods1,values1,statistics1)
+        print("  #Error(valuation_market_china)：no data available for the combine of",measures1,methods1,values1,statistics1)
         return None,None
     
     ticker1=df1['desc'].values[0]
@@ -260,7 +569,7 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
     #获取指标2
     df2=get_valuation_market_china(start,end,measure=measures2,method=methods2,value=values2,statistic=statistics2)
     if df2 is None:
-        print("  #Error(valuation_market_china)：no data available for the combination of",measures2,methods2,values2,statistics2)
+        print("  #Error(valuation_market_china)：data unavailable for the combine of",measures2,methods2,values2,statistics2)
         return None,None
     
     ticker2=df2['desc'].values[0]

{siat-3.8.27.dist-info → siat-3.8.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.8.27
+Version: 3.8.30
 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.8.27.dist-info → siat-3.8.30.dist-info}/RECORD

@@ -30,7 +30,7 @@ siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
 siat/economy.py,sha256=BFVQDxOTbuizyumpCgpZIauH6sqnwUXebpqRMmQCzys,84198
-siat/economy2.py,sha256=1wEYdfsgTxTy6FtXXOoCfd4v6xWQYUXLDR7GJSOHwGg,75147
+siat/economy2.py,sha256=tdfbDXfv_rI4FjeQEgMwcKnoGNRL_1U2vkrnAPgRmAs,81019
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -64,7 +64,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=Qw17Gq2jjh8ftWpAM0TfWP7bojGlS48hMpOUSJar5HM,117447
+siat/grafix.py,sha256=MIaNkxxt_n9zoYafsidPhn9xdX0rwjKHbbsNMhkYj0Q,119901
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=uWRtMMJqKr-puQn26g6Fq5N3mFB70c0B99zLQug8hAo,30774
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -140,12 +140,12 @@ siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,21
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=K7epQC_UtELjRR5cyjJp4gskSyJMxXy-jHIAS0SUEj8,51801
-siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
+siat/valuation_china.py,sha256=DURa9uplp7B9tgjWvEQVTRQPqFNpRGWnLdTXQHePrB0,83115
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.8.27.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.27.dist-info/METADATA,sha256=3SUzT5YcBbrdG3S5mrpUgvkFvBqEZPm2D8fZp9-i7mU,8321
-siat-3.8.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.27.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.27.dist-info/RECORD,,
+siat-3.8.30.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.30.dist-info/METADATA,sha256=VTBGp1ahs79HhChoP4vHnzBxdz2PAELL72yzNp4XYI0,8321
+siat-3.8.30.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.8.30.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.30.dist-info/RECORD,,