siat 3.8.28__py3-none-any.whl → 3.8.35__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:
         #未查到翻译词汇，返回原词