siat 3.1.1__py3-none-any.whl → 3.1.3__py3-none-any.whl

siat/common.py

@@ -3866,4 +3866,14 @@ def df_index_timezone_remove(df):
 
     return df
 #==============================================================================
+
+def df_swap_columns(df, col1, col2):
+    """
+    功能：交换df中的两个列的位置
+    """
+    cols = df.columns.tolist()
+    i1, i2 = cols.index(col1), cols.index(col2)
+    cols[i2], cols[i1] = cols[i1], cols[i2]
+    
+    return df[cols]
 #==============================================================================

siat/fund_china.py

@@ -403,7 +403,7 @@ if __name__=='__main__':
     
     df=reits_list_china(rank=10)
 
-def reits_list_china(rank=10,sort='最新价'):
+def reits_list_china(indicator='最新价',rank=10):
     """
     功能：REITs基金信息概述和列表
     目前能正常工作
@@ -415,26 +415,37 @@ def reits_list_china(rank=10,sort='最新价'):
         print("  #Error(reits_profile_china): akshare does not work properly now")
         return None
     df2.drop('序号', axis=1, inplace=True)
+    df2['成交额']=df2['成交额'].apply(lambda x: int(x))
+    df2.fillna("---",inplace=True)
     
-    sortlist=list(df2)
-    if sort not in sortlist:
-        print("  #Error(reits_list_china):",sort,"is not supported")
-        print("  Supported sort method:",sortlist)
+    df2=df_swap_columns(df2, col1='代码', col2='名称')
+    num=len(df2)
+
+    indicatorlist=list(df2)
+    if indicator not in indicatorlist:
+        print("  #Error(reits_list_china):",indicator,"is not supported")
+        print("  Supported indicators:",indicatorlist)
         return None
     
-    #df2.sort_values(by=['昨收'],ascending=False,inplace=True)
-    df2.sort_values(by=[sort],ascending=False,inplace=True)
+    #df2.indicator_values(by=['昨收'],ascending=False,inplace=True)
+    df2.sort_values(by=[indicator],ascending=False,inplace=True)
     df2.reset_index(drop=True,inplace=True)
-    #df2['序号']=df2.index + 1
-    num=len(df2)
+    collist=list(df2)
     
+    for i in ['名称','代码',indicator]:
+        collist.remove(i)
+    collist1=['名称','代码',indicator]+collist 
+    
+    df2['序号']=df2.index + 1
+    df2=df2[['序号']+collist1]
+    """
     #设置打印对齐
     pd.set_option('display.max_columns', 1000)
     pd.set_option('display.width', 1000)
     pd.set_option('display.max_colwidth', 1000)
     pd.set_option('display.unicode.ambiguous_as_wide', True)
     pd.set_option('display.unicode.east_asian_width', True)
-        
+    """    
     if rank > 0:
         order='前'
         dfb=df2.head(rank)
@@ -443,11 +454,8 @@ def reits_list_china(rank=10,sort='最新价'):
         rank=-rank
         dfb=df2.tail(rank)
     
-    dfb.fillna("---",inplace=True)
-    dfb['成交额']=dfb['成交额'].apply(lambda x: int(x))
-    
     #print("\n===== 中国REITs基金列表(按最新价高低排列，"+order+str(rank)+"名) =====\n")
-    titletxt="中国REITs基金列表（按"+sort+"降序排列，"+order+str(rank)+"名）"
+    titletxt="中国REITs基金列表（按"+indicator+"降序排列，"+order+str(rank)+"名）"
     """
     print(dfb.to_string(index=False))
     """
@@ -464,10 +472,10 @@ def reits_list_china(rank=10,sort='最新价'):
     """    
     import datetime; todaydt = datetime.date.today()
     #print("\n*** 数据来源：东方财富, 总计"+str(num)+"只REITs基金,",today)  
-    footnote="数据来源：东方财富, 总计"+str(num)+"只REITs基金，"+str(todaydt)  
+    footnote="数据来源：东方财富，共找到"+str(num)+"只REITs基金，"+str(todaydt)  
 
     df_display_CSS(dfb,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
-                       first_col_align='left',second_col_align='left', \
+                       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')     
@@ -481,7 +489,7 @@ if __name__=='__main__':
     fund_type='债券型'
     printout=True
 
-def pof_list_china(fund_type='全部类型',printout=True):
+def pof_list_china(rank=10,fund_type='全部类型',printout=True):
     """
     功能：抓取公募基金列表，按照基金类型列表，按照基金名称拼音排序
     """
@@ -517,6 +525,7 @@ def pof_list_china(fund_type='全部类型',printout=True):
         df2=df[df['基金类型'].apply(lambda x: fund_type in x)]
     else:
         df2=df
+        
     df3=df2[['基金简称','基金代码','基金类型']]
     df3.reset_index(drop=True,inplace=True) 
     
@@ -526,13 +535,9 @@ def pof_list_china(fund_type='全部类型',printout=True):
         if fund_type != '全部类型':
             print(texttranslate("共找到")+str(num)+texttranslate("支基金, 类型为")+fund_type)
             return df3
-        """
-        print("\n",texttranslate("======= 中国公募基金种类概况 ======="))
-        print(texttranslate("公募基金总数："),"{:,}".format(num))
-        print(texttranslate("其中包括："))
-        """
-        titletxt="中国公募基金的种类与分布概况"
-        footnote1="【注】公募基金总数："+str("{:,}".format(num))+'\n'
+        
+        titletxt="中国公募基金的类型与分布（前"+str(rank)+"名）"
+        footnote1="共有"+str(len(typelist))+"种类型，"+str("{:,}".format(num))+'支基金\n'
         
         maxlen=0
         for t in typelist:
@@ -541,8 +546,10 @@ def pof_list_china(fund_type='全部类型',printout=True):
         maxlen=maxlen+1
         
         #排序
-        dfg=pd.DataFrame(df.groupby("基金类型").size())
-        dfg.sort_values(by=[0], ascending=False, inplace=True)
+        dfg0=pd.DataFrame(df.groupby("基金类型").size())
+        dfg0.sort_values(by=[0], ascending=False, inplace=True)
+        dfg=dfg0.head(rank)
+        
         typelist2=list(dfg.index)
         try:
             typelist2.remove('')
@@ -556,11 +563,11 @@ def pof_list_china(fund_type='全部类型',printout=True):
         collist=list(dfg)
         dfg['序号']=dfg.index+1
         dfg=dfg[['序号']+collist]
-        
+
+        footnote2="表中类型的数量占比为"+str(round(dfg['基金数量'].sum()/num*100,2))+"%\n"        
         import datetime; todaydt = datetime.date.today()
-        #print(texttranslate("数据来源：东方财富/天天基金,"),today)
-        footnote2="数据来源：东方财富/天天基金，"+str(todaydt)
-        footnote=footnote1+footnote2
+        footnote9="数据来源：东方财富/天天基金，"+str(todaydt)
+        footnote=footnote1+footnote2+footnote9
         
         df_display_CSS(dfg,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
                            first_col_align='center',second_col_align='left', \
@@ -578,10 +585,12 @@ if __name__=='__main__':
     info_type='单位净值'
     fund_type='股票型'
 
-def oef_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
+def oef_rank_china(indicator='单位净值',fund_type='全部类型',rank=5):
     """
     功能：中国开放式基金排名，单位净值，累计净值，手续费
     """
+    info_type=indicator
+    
     typelist=['单位净值','累计净值','手续费','增长率']
     if info_type not in typelist:
         print("  #Error(oef_rank_china): unsupported info type",info_type)
@@ -665,26 +674,30 @@ def oef_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     if info_type == '单位净值':
         df['单位净值']=df['单位净值'].apply(lambda x: round(x,2))
         df.sort_values(by=['单位净值'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','基金类型','单位净值','申购状态','赎回状态']]
+        #dfprint=df[['基金简称','基金代码','基金类型','单位净值','申购状态','赎回状态']]
+        dfprint=df[['基金简称','基金代码','基金类型','单位净值','累计净值']]
         #print(texttranslate("\n===== 中国开放式基金排名：单位净值 ====="))
         titletxt="中国开放式基金排名：单位净值"
     
     if info_type == '累计净值':
         df['累计净值']=df['累计净值'].apply(lambda x: round(x,2))
         df.sort_values(by=['累计净值'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','基金类型','累计净值','申购状态','赎回状态']]
+        #dfprint=df[['基金简称','基金代码','基金类型','累计净值','申购状态','赎回状态']]
+        dfprint=df[['基金简称','基金代码','基金类型','累计净值','单位净值']]
         #print(texttranslate("\n===== 中国开放式基金排名：累计净值 =====")) 
         titletxt="中国开放式基金排名：累计净值"
     
     if info_type == '手续费':
         df.sort_values(by=['手续费'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','基金类型','手续费','申购状态','赎回状态']]
+        #dfprint=df[['基金简称','基金代码','基金类型','手续费','申购状态','赎回状态']]
+        dfprint=df[['基金简称','基金代码','基金类型','手续费','单位净值']]
         #print(texttranslate("\n===== 中国开放式基金排名：手续费 =====")) 
         titletxt="中国开放式基金排名：手续费"         
     
     if info_type == '增长率':
         df.sort_values(by=['日增长率'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','基金类型','日增长率','申购状态','赎回状态']]
+        #dfprint=df[['基金简称','基金代码','基金类型','日增长率','申购状态','赎回状态']]
+        dfprint=df[['基金简称','基金代码','基金类型','日增长率','单位净值']]
         #print(texttranslate("\n===== 中国开放式基金排名：增长率% ====="))  
         titletxt="中国开放式基金排名：增长率%"         
     
@@ -701,6 +714,10 @@ def oef_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     dfprint.reset_index(drop=True,inplace=True)
     dfprint.index=dfprint.index + 1
     
+    collist=list(dfprint)
+    dfprint['序号']=dfprint.index
+    dfprint=dfprint[['序号']+collist]
+    
     if rank >= 0:
         dfprint10=dfprint.head(rank)
     else:
@@ -739,7 +756,7 @@ def oef_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     footnote=footnote1+footnote2+footnote3+footnote4
     
     df_display_CSS(dfprint10,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=4, \
-                       first_col_align='left',second_col_align='right', \
+                       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')
@@ -788,15 +805,19 @@ if __name__=='__main__':
     twinx=False
     zeroline=False
 
-def oef_trend_china(fund,start,end='today',trend_type='净值', \
+def oef_trend_china(ticker,start,end='today',indicator='净值', \
                     power=0,twinx=False, \
-                    loc1='upper left',loc2='lower left'):
+                    average_value=True,facecolor='whitesmoke',
+                    loc1='best',loc2='best'):
     """
     功能：开放式基金业绩趋势，单位净值，累计净值，近三个月收益率，同类排名，总排名
     """
+    fund=ticker
     fromdate,todate=start_end_preprocess(start,end)
+    trend_type=indicator
+    
     #检查走势类型
-    trendlist=["净值","收益率","排名"]
+    trendlist=["净值","单位净值","累计净值","收益率","排名"]
     if trend_type not in trendlist:
         print("  #Error(oef_trend_china): unsupported trend type:",trend_type)
         print("  Supported trend types:",trendlist)
@@ -815,6 +836,7 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
     """
     print("Searching for open-ended fund (OEF) trend info in China ...")
     import akshare as ak   
+    import pandas as pd
 
     #开放式基金-历史数据
     import datetime; today = datetime.date.today()
@@ -824,7 +846,6 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
     fund_name=ticker_name(fund1,'fund')
 
     #绘制单位/累计净值对比图
-    import pandas as pd
     if trend_type == '净值':
         df1 = ak.fund_open_fund_info_em(fund1, indicator="单位净值走势")
         df1.rename(columns={'净值日期':'date','单位净值':'单位净值'}, inplace=True)
@@ -854,13 +875,91 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
         titletxt=texttranslate("开放式基金的净值趋势：")+fund_name
         
         #footnote=source+', '+str(today)
-        footnote='注意：图中为基金市场交易价格，存在溢价或折价，可能与基金公司公布的净值存在差异\n'+source+', '+str(today)
+        footnote='注意：图中为交易市场数据，存在溢价或折价，可能与基金公司公布的净值存在差异\n'+source+', '+str(today)
+        
+        plot_line2(dfp,ticker1,colname1,label1, \
+                   dfp,ticker2,colname2,label2, \
+                   ylabeltxt,titletxt,footnote,power=power,twinx=twinx, \
+                   facecolor=facecolor, \
+                   loc1=loc1,loc2=loc2)
+        return df
+
+    #绘制单位净值图
+    if trend_type == '单位净值':
+        df1 = ak.fund_open_fund_info_em(fund1, indicator="单位净值走势")
+        df1.rename(columns={'净值日期':'date','单位净值':'单位净值'}, inplace=True)
+        df1['日期']=df1['date']
+        df1.set_index(['date'],inplace=True) 
+        """
+        df2 = ak.fund_open_fund_info_em(fund1, indicator="累计净值走势")
+        df2.rename(columns={'净值日期':'date','累计净值':'累计净值'}, inplace=True)
+        df2.set_index(['date'],inplace=True)       
+        """
+        #合并
+        #df = pd.merge(df1,df2,left_index=True,right_index=True,how='inner')
+        df = df1
+        df['日期']=df['日期'].apply(lambda x: pd.to_datetime(x))
+        
+        dfp=df[(df['日期'] >= start)]
+        dfp=dfp[(dfp['日期'] <= end)]
+        if len(dfp) == 0:
+            print("  #Error(oef_trend_china): no info found for",fund,"in the period:",fromdate,todate)
+            return
+        
+        #绘图
+        ticker1=fund1; colname1='单位净值';label1=texttranslate('单位净值')
+        #ticker2=fund1; colname2='累计净值';label2=texttranslate('累计净值')
+        #ylabeltxt='人民币元'
+        ylabeltxt=texttranslate('单位净值')
+        
+        titletxt=texttranslate("开放式基金的净值趋势：")+fund_name
+        
+        #footnote=source+', '+str(today)
+        footnote='图中为交易市场数据，存在溢价或折价，可能与基金公司公布的净值存在差异\n'+source+', '+str(today)
         
+        plot_line(dfp,colname1,label1,ylabeltxt,titletxt,footnote,power=power,loc=loc1, \
+                  average_value=average_value,facecolor=facecolor)    
+        """
         plot_line2(dfp,ticker1,colname1,label1, \
-               dfp,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,power=power,twinx=twinx, \
+                   dfp,ticker2,colname2,label2, \
+                   ylabeltxt,titletxt,footnote,power=power,twinx=twinx, \
+                   facecolor=facecolor, \
                    loc1=loc1,loc2=loc2)
+        """
         return df
+
+    #绘制累计净值图
+    if trend_type == '累计净值':
+        df2 = ak.fund_open_fund_info_em(fund1, indicator="累计净值走势")
+        df2.rename(columns={'净值日期':'date','累计净值':'累计净值'}, inplace=True)
+        df2['日期']=df2['date']
+        df2.set_index(['date'],inplace=True)     
+        
+        #合并
+        df = df2
+        df['日期']=df['日期'].apply(lambda x: pd.to_datetime(x))
+        
+        dfp=df[(df['日期'] >= start)]
+        dfp=dfp[(dfp['日期'] <= end)]
+        if len(dfp) == 0:
+            print("  #Error(oef_trend_china): no info found for",fund,"in the period:",fromdate,todate)
+            return
+        
+        #绘图
+        ticker2=fund1; colname2='累计净值';label2=texttranslate('累计净值')
+        #ylabeltxt='人民币元'
+        ylabeltxt=texttranslate('累计净值')
+        
+        titletxt=texttranslate("开放式基金的净值趋势：")+fund_name
+        
+        #footnote=source+', '+str(today)
+        footnote='图中为交易市场数据，存在溢价或折价，可能与基金公司公布的净值存在差异\n'+source+', '+str(today)
+        
+        plot_line(dfp,colname2,label2,ylabeltxt,titletxt,footnote,power=power,loc=loc1, \
+                  average_value=average_value,facecolor=facecolor)    
+
+        return df
+    
     
     #绘制累计收益率单线图
     if trend_type == '收益率':
@@ -876,10 +975,11 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
             return        
     
         colname='累计收益率'; collabel=texttranslate('累计收益率%')
-        ylabeltxt=texttranslate('收益率%')
+        ylabeltxt=texttranslate('累计收益率%')
         titletxt=texttranslate("开放式基金的累计收益率趋势：")+fund_name
-        footnote=source+', '+str(today)
-        plot_line(dfp,colname,collabel,ylabeltxt,titletxt,footnote,power=power,loc=loc1)    
+        footnote=source+'，'+str(today)
+        plot_line(dfp,colname,collabel,ylabeltxt,titletxt,footnote,power=power,loc=loc1, \
+                  average_value=average_value,facecolor=facecolor)    
         return df
     
     #绘制同类排名图：近三个月收益率
@@ -923,8 +1023,9 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
         dfp1=pd.DataFrame(dfp[colname1])
         dfp2=pd.DataFrame(dfp[colname2])        
         plot_line2(dfp1,ticker1,colname1,label1, \
-               dfp2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,power=power,twinx=twinx, \
+                   dfp2,ticker2,colname2,label2, \
+                   ylabeltxt,titletxt,footnote,power=power,twinx=twinx, \
+                   facecolor=facecolor, \
                    loc1=loc1,loc2=loc2)            
         
         return df
@@ -933,78 +1034,71 @@ def oef_trend_china(fund,start,end='today',trend_type='净值', \
 if __name__=='__main__':
     pass
 
-def mmf_rank_china(rank=10):
+def mmf_rank_china(indicator="7日年化%",rank=5):
     """
     功能：中国货币型基金排名，7日年化收益率%
+    货币基金的万份收益指的是基金公司每日公布的当日每万份基金单位产生的收益金额，即万份基金单位收益。
+    注意:万份基金单位收益与万份基金累计收益是不一样的，投资者想要买货币基金应改看基金的万份基金单位收益。
+    货币基金具体的收益计算方式是：
+    货币基金收益=已确认金额/10000*当日万分收益。
+    另外，货币基金每日公布一次收益，周末及节假日，通常在节后首个交易日公布周末或这节假日期间的累计收益。
     """
+    indicator_list=["万份收益","7日年化%"]
+    if indicator not in indicator_list:
+        print("  #Warning(mmf_rank_china): unsupported indicator",indicator,"reset to","7日年化%")
+        indicator="7日年化%"
     
     print("Searching for money market fund (OEF) information in China ...")
     import akshare as ak   
+    import pandas as pd
     
     #获取货币型基金实时信息
     df = ak.fund_money_fund_daily_em()
     collist=list(df)
-    nvname=collist[3]
-    if df[nvname].eq('').all():
-        nvname=collist[6]
-    nvdate=nvname[:10]
+    nvname1=collist[2]
+    nvname2=collist[3]
+    if df[nvname1].eq('').all():
+        nvname1=collist[5]
+        nvname2=collist[6]
+    nvdate=nvname1[:10]
+    
     #修改列名
-    df.rename(columns={nvname:'7日年化%'}, inplace=True) 
+    df.rename(columns={nvname1:'万份收益',nvname2:'7日年化%'}, inplace=True) 
     #dfa=df.drop(df[df['7日年化%']==''].index)
-    dfb=df[['基金代码','基金简称','7日年化%','成立日期','基金经理','手续费']]
-    
-    dfb.sort_values(by=['7日年化%'],ascending=False,inplace=True)
-    dfprint=dfb[['基金简称','基金代码','7日年化%','基金经理','手续费']]
-    #print(texttranslate("\n======= 中国货币型基金排名：7日年化收益率 ======="))
-    titletxt="中国货币型基金排名：7日年化收益率"
-        
-    #设置打印对齐
-    import pandas as pd
-    pd.set_option('display.max_columns', 1000)
-    pd.set_option('display.width', 1000)
-    pd.set_option('display.max_colwidth', 1000)
-    pd.set_option('display.unicode.ambiguous_as_wide', True)
-    pd.set_option('display.unicode.east_asian_width', True)
-    
+    dfb=df[['基金代码','基金简称','万份收益','7日年化%','成立日期','基金经理','手续费']].copy()
+    dfb=dfb[dfb['7日年化%'] != '---']
+    
+    if indicator=='7日年化%':
+        dfb.sort_values(by=['7日年化%'],ascending=False,inplace=True)
+        dfprint=dfb[['基金简称','基金代码','7日年化%','万份收益']].copy()
+        titletxt="中国货币型基金排名：7日年化收益率"
+    if indicator=='万份收益':
+        dfb.sort_values(by=['万份收益'],ascending=False,inplace=True)
+        dfprint=dfb[['基金简称','基金代码','万份收益','7日年化%']].copy()
+        titletxt="中国货币型基金排名：万份收益金额（元）"
+        
+    #设置打印
     dfprint.dropna(inplace=True)
     dfprint.reset_index(drop=True,inplace=True)
     dfprint.index=dfprint.index + 1
     
-    if rank >=0:
+    collist=list(dfprint)
+    dfprint['序号']=dfprint.index
+    dfprint=dfprint[['序号']+collist]
+    
+    if rank >0:
         dfprint10=dfprint.head(rank)
     else:
         dfprint10=dfprint.tail(-rank)
-    #print(dfprint10.to_string(index=False))
-    """
-    print(dfprint10)
-    """
-    """
-    print('')   #在标题与表格之间空一行
-    alignlist=['right','left','center','center','center','right']
-    try:   
-        print(dfprint10.to_markdown(index=True,tablefmt='plain',colalign=alignlist))
-    except:
-        #解决汉字编码gbk出错问题
-        print_df=dfprint10.to_markdown(index=True,tablefmt='plain',colalign=alignlist)
-        print_df2=print_df.encode("utf-8",errors="strict")
-        print(print_df2)       
-    
-    print('')   #在表格与脚注之间空一行
-    print(texttranslate("共找到披露收益率信息的货币型基金数量:"),len(dfprint))
-    
-    print(texttranslate("收益率日期:"),nvdate,'\b. ',end='')    
-    import datetime
-    today = datetime.date.today()
-    print(texttranslate("数据来源：东方财富/天天基金,"),today)        
-    """
-    footnote1="披露收益率信息的货币型基金数量："+str(len(dfprint))+'\n'
-    footnote2="收益率日期："+str(nvdate)+'，'
+
+    footnote1="披露收益信息的货币型基金数量："+str(len(dfprint))+'，'
+    footnote2=str(nvdate)+'\n'
     import datetime; todaydt = datetime.date.today()
-    footnote3="数据来源：东方财富/天天基金，"+str(todaydt)
+    footnote3="数据来源：东方财富/天天基金，"+str(todaydt)+"统计"
     footnote=footnote1+footnote2+footnote3
     
     df_display_CSS(dfprint10,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=4, \
-                       first_col_align='left',second_col_align='right', \
+                       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')    
@@ -1021,34 +1115,38 @@ if __name__=='__main__':
     todate='2020-10-16'
     power=0
 
-def mmf_trend_china(fund,start,end='today',power=0):
+def mmf_trend_china(ticker,start,end='today',indicator='7日年化%',power=0, \
+                    average_value=True,facecolor='whitesmoke'):
     """
     功能：货币型基金业绩趋势，7日年化收益率
     """
+    fund=ticker
+    
     fromdate,todate=start_end_preprocess(start,end)
     #检查日期
     result,start,end=check_period(fromdate,todate)
     if not result:
         print("  #Error(mmf_trend_china): invalid date period:",fromdate,todate)
         return None
-    import datetime
+    import datetime; todaydt = datetime.date.today()
     startdate=datetime.datetime.strftime(start,"%Y-%m-%d")
     enddate=str(datetime.datetime.strftime(end,"%Y-%m-%d"))
     
     print("Searching for money market fund (MMF) trend info in China ...")
     import akshare as ak   
+    import pandas as pd
 
     #基金历史数据
-    import datetime; today = datetime.date.today()
     source=texttranslate("数据来源：东方财富/天天基金")
     
     #绘制收益率单线图
     fund1=fund[:6]
     df = ak.fund_money_fund_info_em(fund1)
-    df.sort_values(by=['净值日期'],ascending=True,inplace=True)
     df['7日年化%']=df['7日年化收益率'].astype("float")
+    df['万份收益']=df['每万份收益'].astype("float")
+
+    df.sort_values(by=['净值日期'],ascending=True,inplace=True)
     
-    import pandas as pd
     df['date']=pd.to_datetime(df['净值日期'])
     df.set_index(['date'],inplace=True) 
     
@@ -1058,11 +1156,16 @@ def mmf_trend_china(fund,start,end='today',power=0):
         print("  #Error(mmf_trend_china): no info found for",fund,"in the period:",fromdate,todate)
         return    
     
-    colname='7日年化%'; collabel=texttranslate('7日年化%')
+    if indicator=='7日年化%':
+        colname='7日年化%'; collabel='7日年化%'
+    else:
+        colname='万份收益'; collabel="万份收益（元）"
+        
     ylabeltxt=''
-    titletxt=texttranslate("货币型基金的7日年化收益率趋势：")+get_fund_name_china2(fund)
-    footnote=source+', '+str(today)
-    plot_line(dfp,colname,collabel,ylabeltxt,titletxt,footnote,power=power)    
+    titletxt="货币型基金的收益趋势："+get_fund_name_china2(fund)+"，"+collabel
+    footnote=source+', '+str(todaydt)
+    plot_line(dfp,colname,collabel,ylabeltxt,titletxt,footnote,power=power, \
+              average_value=average_value,facecolor=facecolor)    
     
     return df
     
@@ -1073,10 +1176,12 @@ if __name__=='__main__':
     fund_type='增长率'
     rank=10
 
-def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
+def etf_rank_china(indicator='单位净值',fund_type='全部类型',rank=5):
     """
     功能：中国ETF基金排名，单位净值，累计净值，手续费
     """
+    info_type=indicator
+    
     typelist=['单位净值','累计净值','市价','增长率']
     if info_type not in typelist:
         print("  #Error(etf_rank_china): unsupported info type",info_type)
@@ -1106,7 +1211,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     
     #修改列名
     df3=df2.rename(columns={nvname1:'单位净值',nvname2:'累计净值'}) 
-    df=df3[['基金简称','基金代码','类型','单位净值','累计净值','增长率','市价']]
+    df=df3[['基金简称','基金代码','类型','单位净值','累计净值','增长率','市价']].copy()
     
     # 过滤idx行
     df=df[df.index != 'idx']
@@ -1136,7 +1241,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
         df=df.replace('---',0)
         df['单位净值']=df['单位净值'].astype(float)
         df.sort_values(by=['单位净值'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','类型','单位净值','市价']]
+        dfprint=df[['基金简称','基金代码','类型','单位净值','市价']].copy()
         #print(texttranslate("\n===== 中国ETF基金排名：单位净值 ====="))
         titletxt="中国ETF基金排名：单位净值"
         dfprint=dfprint[dfprint['单位净值'] != 0]
@@ -1145,7 +1250,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
         df=df.replace('---',0)
         df['累计净值']=df['累计净值'].astype(float)
         df.sort_values(by=['累计净值'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','类型','累计净值','单位净值']]
+        dfprint=df[['基金简称','基金代码','类型','累计净值','单位净值']].copy()
         #print(texttranslate("\n===== 中国ETF基金排名：累计净值 ====="))  
         titletxt="中国ETF基金排名：累计净值"
         dfprint=dfprint[dfprint['累计净值'] != 0]
@@ -1154,7 +1259,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
         df=df.replace('---',0)
         df['市价']=df['市价'].astype(float)
         df.sort_values(by=['市价'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','类型','市价','单位净值']]
+        dfprint=df[['基金简称','基金代码','类型','市价','单位净值']].copy()
         #print(texttranslate("\n===== 中国ETF基金排名：市价 ====="))  
         titletxt="中国ETF基金排名：市价"   
         dfprint=dfprint[dfprint['市价'] != 0]
@@ -1162,7 +1267,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     if info_type == '增长率':
         df['增长率']=df['增长率'].astype(str)
         df.sort_values(by=['增长率'],ascending=False,inplace=True)
-        dfprint=df[['基金简称','基金代码','类型','增长率','市价','单位净值']]
+        dfprint=df[['基金简称','基金代码','类型','增长率','市价','单位净值']].copy()
         #print(texttranslate("\n===== 中国ETF基金排名：增长率 =====")) 
         titletxt="中国ETF基金排名：增长率"
         dfprint=dfprint[dfprint['增长率'] != 0]
@@ -1179,6 +1284,10 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     dfprint.reset_index(drop=True,inplace=True)
     dfprint.index=dfprint.index + 1
     
+    collist=list(dfprint)
+    dfprint['序号']=dfprint.index
+    dfprint=dfprint[['序号']+collist]
+    
     if rank >=0:
         dfprint10=dfprint.head(rank)
     else:
@@ -1209,13 +1318,13 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
     """
     footnote1="披露净值信息的ETF基金数量："+str(len(dfprint))+'，'
     footnote2="基金类型："+str(fund_type)+'\n'
-    footnote3="净值日期："+str(nvdate)+'，'
+    footnote3="披露日期："+str(nvdate)+'，'
     import datetime; todaydt = datetime.date.today()
     footnote4="数据来源：东方财富/天天基金，"+str(todaydt)
     footnote=footnote1+footnote2+footnote3+footnote4
     
     df_display_CSS(dfprint10,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
-                       first_col_align='left',second_col_align='right', \
+                       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')
@@ -1233,33 +1342,38 @@ if __name__=='__main__':
     fromdate='2020-1-1'
     todate='2020-10-16'
 
-def etf_trend_china(fund,start,end='today',loc1='best',loc2='best',twinx=False,graph=True):
+def etf_trend_china(ticker,start,end='today',indicator='净值',power=0, \
+                    average_value=True,facecolor='whitesmoke', \
+                    loc1='best',loc2='best',twinx=False,graph=True):
     """
     功能：ETF基金业绩趋势，单位净值，累计净值
     """
+    fund=ticker
     fromdate,todate=start_end_preprocess(start,end='today')
     
+    indicator_list=['净值','单位净值','累计净值']
+    if indicator not in indicator_list:
+        indicator='净值'
+    
     #检查日期
     result,start,end=check_period(fromdate,todate)
     if not result:
         print("  #Error(oef_trend_china): invalid date period:",fromdate,todate)
         return None
     #转换日期格式
-    import datetime
+    import datetime; todaydt = datetime.date.today()
     startdate=str(datetime.datetime.strftime(start,"%Y-%m-%d"))
     enddate=str(datetime.datetime.strftime(end,"%Y-%m-%d"))
 
     print("Searching for exchange traded fund (ETF) trend info in China ...")
     import akshare as ak   
+    import pandas as pd
 
-    import datetime; today = datetime.date.today()
     source=texttranslate("数据来源：东方财富/天天基金")
-
     
     #获取基金数据
     fund1=fund[:6]
     df = etf_hist_df = ak.fund_etf_fund_info_em(fund1)
-    import pandas as pd
     df['date']=pd.to_datetime(df['净值日期'])
     df.set_index(['date'],inplace=True) 
     df['单位净值']=df['单位净值'].astype("float")
@@ -1276,14 +1390,25 @@ def etf_trend_china(fund,start,end='today',loc1='best',loc2='best',twinx=False,g
     if graph:
         ticker1=fund1; colname1='单位净值';label1=texttranslate('单位净值')
         ticker2=fund1; colname2='累计净值';label2=texttranslate('累计净值')
-        ylabeltxt=texttranslate('人民币元')
         titletxt=texttranslate("ETF基金的净值趋势：")+get_fund_name_china2(fund)
-        footnote=source+', '+str(today)
-        
-        plot_line2(dfp,ticker1,colname1,label1, \
-                   dfp,ticker2,colname2,label2, \
-                   ylabeltxt,titletxt,footnote, twinx=twinx, \
-                       loc1=loc1,loc2=loc2)
+        footnote=source+', '+str(todaydt)
+
+        if indicator=='净值':
+            ylabeltxt=texttranslate('净值（元）')
+            plot_line2(dfp,ticker1,colname1,label1, \
+                       dfp,ticker2,colname2,label2, \
+                       ylabeltxt,titletxt,footnote, twinx=twinx, \
+                       facecolor=facecolor,loc1=loc1,loc2=loc2)
+    
+        if indicator=='单位净值':  
+            ylabeltxt=texttranslate('单位净值（元）')
+            plot_line(dfp,colname1,label1,ylabeltxt,titletxt,footnote,power=power,loc=loc1, \
+                      average_value=average_value,facecolor=facecolor)    
+    
+        if indicator=='累计净值':  
+            ylabeltxt=texttranslate('累计净值（元）')
+            plot_line(dfp,colname2,label2,ylabeltxt,titletxt,footnote,power=power,loc=loc1, \
+                      average_value=average_value,facecolor=facecolor)    
     
     return dfp
     
@@ -1292,12 +1417,12 @@ if __name__=='__main__':
     
 #==============================================================================
 
-def fund_summary_china():
+def fund_summary_china(rank=10):
     """
     功能：中国基金投资机构概况
     爬虫来源地址：https://zhuanlan.zhihu.com/p/97487003
     """
-    print("Searching for fund investment institutions in China ...")
+    print("Searching for investment fund institutions in China ...")
     import akshare as ak
 
     #会员机构综合查询：
@@ -1309,7 +1434,7 @@ def fund_summary_china():
     try:
         amac_df = ak.amac_member_info()
     except:
-        print("  #Error(): data source tentatively inaccessible, try later")
+        print("  #Error(fund_summary_china): data source tentatively inaccessible, try later")
         return None
     
     """    
@@ -1318,114 +1443,50 @@ def fund_summary_china():
                 '证券公司私募基金子公司','证券公司资管子公司','境外机构']
     """
     typelist=list(set(list(amac_df["机构类型"])))
-    """
-    maxlen=0
-    for t in typelist:
-        #tlen=strlen(t)
-        tlen=hzlen(t)
-        if tlen > maxlen: maxlen=tlen
-    maxlen=maxlen+1
-    """
     
     import pandas as pd
-    pd.set_option('display.max_columns',1000)   # 设置最大显示列数的多少
-    pd.set_option('display.width',1000)         # 设置宽度,就是说不换行,比较好看数据
-    pd.set_option('display.max_rows',500)       # 设置行数的多少
-    pd.set_option('display.colheader_justify','left')
-    """  
-    print(texttranslate("\n===== 中国基金投资机构概况 ====="))
-    print(texttranslate("机构（会员）数量："),end='')
-    num=len(list(set(list(amac_df["机构（会员）名称"]))))
-    print("{:,}".format(num))
-        
-    print(texttranslate("其中包括："))
-    """
-    titletxt="中国基金投资机构概况"
-    num=len(list(set(list(amac_df["机构（会员）名称"]))))
-    footnote1="机构（会员）数量："+str(num)
-    
-    amac_sum_df=pd.DataFrame(columns=['机构类型','数量','占比%'])
+    titletxt="中国基金机构类型与分布（前"+str(rank)+"名）"
+    
+    amac_sum_df=pd.DataFrame(columns=['机构类型','机构数量','数量占比%'])
+    totalnum=0
     for t in typelist:
         df_sub=amac_df[amac_df['机构类型']==t]
         n=len(list(set(list(df_sub['机构（会员）名称']))))
-        pct=round(n/num*100,2)
+        if n==0: continue
+        totalnum=totalnum+n
         
-        s=pd.Series({'机构类型':t,'数量':n,'占比%':pct})
+        s=pd.Series({'机构类型':t,'机构数量':n})
         try:
             amac_sum_df=amac_sum_df.append(s,ignore_index=True)
         except:
             amac_sum_df=amac_sum_df._append(s,ignore_index=True)        
-        """
-        tlen=hzlen(t)
-        prefix=' '*4+t+'.'*(maxlen-tlen)+':'
-        print(prefix,"{:,}".format(n),"\b,",round(n/num*100,2),'\b%')     
-        """
-        #print('{t:<{len}}\t'.format(t=t,len=maxlen-len(t.encode('GBK'))+len(t)),"{:,}".format(n),"\b,",round(n/num*100,2),'\b%')
-        #print('{t:<{len}}\t'.format(t=t,len=maxlen-len(t.encode('GBK'))+len(t)),str(n).rjust(6,' '),"\t",(str(round(n/num*100,2))+'%').rjust(6,' '))
     
-    amac_sum_df.sort_values(by=['数量'],ascending=False,inplace=True)
+    amac_sum_df['数量占比%']=amac_sum_df['机构数量'].apply(lambda x: round(x/totalnum*100,2))
+    
+    amac_sum_df.sort_values(by=['机构数量'],ascending=False,inplace=True)
     amac_sum_df.reset_index(drop=True,inplace=True)        
-    amac_sum_df.index=amac_sum_df.index + 1   
-    """
-    from IPython.display import display
-    display(amac_sum_df.head(10))
-    """
-    """
-    pandas2prettytable(amac_sum_df.head(10),titletxt='',firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=False)
-    """
-    """
-    alignlist=['left','left']+['center']*(len(list(amac_sum_df.head(10)))-3)+['right']
-    try:   
-        print(amac_sum_df.head(10).to_markdown(index=True,tablefmt='plain',colalign=alignlist))
-    except:
-        #解决汉字编码gbk出错问题
-        print_df=amac_sum_df.head(10).to_markdown(index=True,tablefmt='plain',colalign=alignlist)
-        print_df2=print_df.encode("utf-8",errors="strict")
-        print(print_df2)
+    amac_sum_df.index=amac_sum_df.index + 1  
+    
+    collist=list(amac_sum_df)
+    amac_sum_df['序号']=amac_sum_df.index
+    amac_sum_df=amac_sum_df[['序号']+collist]
+    
+    df10=amac_sum_df.head(rank)
+
+    footnote1="共有"+str(len(typelist))+'个类型，'
+    footnote2=str(totalnum)+'家机构；'
+    footnote3="表中类型数量占比"+str(round(df10['机构数量'].sum()/totalnum*100,2))+'%\n'
     
-    import datetime; today = datetime.date.today()
-    source=texttranslate("\n数据来源：中国证券投资基金业协会")
-    footnote=source+', '+str(today)  
-    print(footnote)
-    """
     import datetime; todaydt = datetime.date.today()
-    footnote2="数据来源：中国证券投资基金业协会，"+str(todaydt)
-    footnote=footnote1+'\n'+footnote2
-    df10=amac_sum_df.head(10)
+    footnote9="数据来源：中国证券投资基金业协会，"+str(todaydt)
+    footnote=footnote1+footnote2+footnote3+footnote9
     
     df_display_CSS(df10,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
-                       first_col_align='left',second_col_align='right', \
+                       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')
     
-    """    
-    print(texttranslate("\n===== 中国基金投资机构会员代表概况 ====="))
-    print(texttranslate("会员代表人数："),end='')
-    num=len(list(set(list(amac_df["会员代表"]))))
-    print("{:,}".format(num))        
-        
-    print(texttranslate("其中工作在："))
-    amac_mbr_df=pd.DataFrame(columns=['机构类型','数量','占比%'])
-    for t in typelist:
-        df_sub=amac_df[amac_df['机构类型']==t]
-        n=len(list(set(list(df_sub['会员代表']))))
-        pct=round(n/num*100,2)
-        
-        s=pd.Series({'机构类型':t,'数量':n,'占比%':pct})
-        try:
-            amac_mbr_df=amac_sum_df.append(s,ignore_index=True)
-        except:
-            amac_mbr_df=amac_mbr_df._append(s,ignore_index=True)        
-
-    amac_mbr_df.sort_values(by=['数量'],ascending=False,inplace=True)
-    amac_mbr_df.reset_index(drop=True,inplace=True)        
-    amac_mbr_df.index=amac_mbr_df.index + 1  
-
-    pandas2prettytable(amac_mbr_df.head(10),titletxt='',firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=False)
-    print(footnote)        
-    """
-    
     return amac_df
 
 
@@ -1789,7 +1850,7 @@ def pef_product_china(rank=20,facecolor='papayawhip',DEBUG=False):
     dfprint=dfprint[['序号']+collist]
     
     pctsum=round(subttl10['数量占比‰'].sum(),2)   
-    footnote1="找到产品"+str("{:,}".format(totalnum))+"个，上述产品合计占比"+str(pctsum)+'%'+'\n'
+    footnote1="找到产品"+str("{:,}".format(totalnum))+"个，上述产品合计占比"+str(pctsum)+'‰'+'\n'
     footnote=footnote1+footnote9
     
     df_display_CSS(dfprint,titletxt=titletxt,footnote=footnote,facecolor=facecolor,decimals=2, \

{siat-3.1.1.dist-info → siat-3.1.3.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=UOI4sCz3ld7yezlARqPHvgHzfduDiGeRqNa82dDTCZ8,25849
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=0_fT64-X80rOPOqc6x6D_3WOLN2mKQ4UWZTuRqoLIAc,142992
+siat/common.py,sha256=kGsyiuYJX-Y8VNb2mmspSp7rNc5r8eexxEt9JiKmwHM,143250
 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
@@ -52,7 +52,7 @@ siat/financials_test.py,sha256=HJ3CPo_Xckz2wXi3AEP6ZNWCF1Duc1pLi0Y10USiImc,23829
 siat/fred_test.py,sha256=KF50ssSbsfpa_kT6iuomD0vG4eXztAcOasZxg1OGX5w,1201
 siat/fund.py,sha256=wMDORsCBV8ZXfgwbtq-0bu3qqWY66dHnbqgllW0gWCo,24637
 siat/fund_china.pickle,sha256=QI3IjV46EeJ5ryO3xocmByc-6b_6_nDxgcXDhBHzop0,2380915
-siat/fund_china.py,sha256=e-Ngpm34Kby8CFkso3M6KA4MWOPSi-M9FxS8Nv7Yr5M,90910
+siat/fund_china.py,sha256=_obFT-JBjhvzX71HVyqafwFXKE3YCIMpVhsKz_Wir-4,94035
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
 siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
@@ -132,7 +132,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.1.1.dist-info/METADATA,sha256=9fUOM1J5SJKvPEnZpip7QZ4nd_W7tCtWaK6kSPCphNQ,1447
-siat-3.1.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.1.dist-info/RECORD,,
+siat-3.1.3.dist-info/METADATA,sha256=h-Ogl_X_X9zSfrdOjdfY0uOX4hRUPUTlOHnKoMkzS9g,1447
+siat-3.1.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.3.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.3.dist-info/RECORD,,