siat 3.1.2__py3-none-any.whl → 3.1.4__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

@@ -4,7 +4,7 @@
 所属工具包：证券投资分析工具SIAT 
 SIAT：Security Investment Analysis Tool
 创建日期：2020年10月17日
-最新修订日期：2020年10月21日
+最新修订日期：2024年5月26日
 作者：王德宏 (WANG Dehong, Peter)
 作者单位：北京外国语大学国际商学院
 版权所有：王德宏
@@ -20,10 +20,25 @@ from siat.translate import *
 from siat.grafix import *
 from siat.bond_base import *
 #==============================================================================
+def compare_fund_holding_china(ticker,quarters,rank=10):
+    """
+    功能：套壳函数fund_stock_holding_compare_china
+    """
+    if len(quarters) < 2:
+        print("  #Warning(compare_fund_holding_china): need 2 quarters to compare at",quarters)
+        return None
+    if quarters[0] >= quarters[1]:
+        print("  #Warning(compare_fund_holding_china):",quarters[0],"is supposed to be earlier than",quarters[1])
+        return None
+        
+    df=fund_stock_holding_compare_china(fund=ticker,quarter1=quarters[0],quarter2=quarters[1],rank=rank)
+    
+    return df
+
 if __name__=='__main__':
     fund='000592.SS'
-    quarter1='2022Q4'
-    quarter2='2023Q1'
+    quarter1='2023Q4'
+    quarter2='2024Q1'
     
     df=fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10)
 
@@ -36,7 +51,7 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     quarter1,str,靠前的季度, 格式为 'YYYYQ1',例如: '2021Q2';
     quarter2,str,靠后的季度, 格式为 'YYYYQ1',例如: '2021Q2';
     """
-    print("Searching fund stock holding info, it may take time, please wait ...\n")
+    print("Searching fund holding info, which may take time, please wait ...\n")
     
     import akshare as ak
     import pandas as pd    
@@ -97,6 +112,7 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     
     df1 = df1[['股票代码', '股票名称','持股数','持仓市值','占净值比例']]
     df1 = df1.rename(columns={'持股数':s1_share,'持仓市值':s1_value,'占净值比例':s1_ratio})
+    
     df2 =data[data['季度']==s2]
     if len(df2)==0:
         print("  #Error(fund_stock_holding_compare_china): no data available for",s2)
@@ -105,10 +121,10 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     df2 = df2[['股票代码', '股票名称','持股数','持仓市值','占净值比例']]
     df2 = df2.rename(columns={'持股数':s2_share,'持仓市值':s2_value,'占净值比例':s2_ratio})
 
-    df_merge = pd.merge(df1,df2,on='股票代码',how='outer')
+    df_merge = pd.merge(df1,df2,on=['股票代码','股票名称'],how='outer')
 
-# Q2 和 Q4，即半年度和年度报告，是需要披露全部持仓的
-# 合并后，在dataframe 中 NaN 的数据应为 0
+    # Q2 和 Q4，即半年度和年度报告，是需要披露全部持仓的
+    # 合并后，在dataframe 中 NaN 的数据应为 0
 
     if s1.endswith('Q2') or s1.endswith('Q4'):
         df_merge[s1_share] = df_merge[s1_share].fillna(0)
@@ -123,17 +139,19 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     df_merge.fillna(0,inplace=True)    
 
     df_merge['持股数变化'] = df_merge[s2_share] - df_merge[s1_share]
+    df_merge['持仓比例变化'] = df_merge[s2_ratio] - df_merge[s1_ratio]
+    df_merge['持仓市值变化'] = df_merge[s2_value] - df_merge[s1_value]
     df_merge = df_merge.sort_values(s2_value,ascending=False)
     
-    df_merge['股票名称'] = df_merge['股票名称_y']
-    df_merge.loc[df_merge['股票名称'].isna(),'股票名称'] = df_merge.loc[df_merge['股票名称'].isna(),'股票名称_x']
-    df_merge = df_merge[['股票代码', '股票名称', s1_share,s1_value, s1_ratio,s2_share,s2_value,s2_ratio, '持股数变化']]
+    #df_merge['股票名称'] = df_merge['股票名称_y']
+    #df_merge.loc[df_merge['股票名称'].isna(),'股票名称'] = df_merge.loc[df_merge['股票名称'].isna(),'股票名称_x']
+    df_merge = df_merge[['股票名称','股票代码',s1_share,s2_share,'持股数变化',s1_ratio,s2_ratio,'持仓比例变化',s1_value,s2_value,'持仓市值变化']]
     
     df_merge.reset_index(drop=True,inplace=True)
     if rank>0:
         df=df_merge.head(rank)
     else:
-        df=df_merge.head(-rank)
+        df=df_merge.tail(-rank)
     """
     #持股数和持仓比例取整数
     df.fillna(0)
@@ -177,29 +195,69 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
         
     # 替换空值
     df.fillna('---')
-    
+    """
     print("===== 中国基金持仓股票分析："+name+'，'+s1+"对比"+s2,"(按后者持仓比例高低排列，"+order+str(rank)+"名股票) =====\n")
     print(df.to_string(index=False))
     import datetime; today = datetime.date.today()
     print("\n*** 注：持股数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%，包括A股与非A股")
     print("    数据来源：天天基金/东方财富, 期间持仓股票总计"+str(len(df_merge))+"只,",today)      
+    """
+    titletxt="基金持仓分析："+name+'，'+s1+"对比"+s2+"（按后者持仓比例降序排列，"+order+str(rank)+"名成份证券）"
+    
+    footnote1="【注】持仓数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%；"
+    footnote2="期间内（曾经）持仓证券数合计"+str(len(df_merge))+"只"+'\n'
+    import datetime; todaydt = datetime.date.today()
+    footnote9="数据来源：天天基金/东方财富，"+str(todaydt)+"统计"
+    footnote=footnote1+footnote2+footnote9
+    
+    #调整字段顺序
+    collist=list(df)
+    df['序号']=df.index + 1
+    df=df[['序号']+collist]
+    """
+    shares=[]; ratios=[]; values=[]
+    for c in collist:
+        if "持股数" in c:
+            shares=shares+[c]
+        if "持仓比例" in c:
+            ratios=ratios+[c]
+        if "持仓市值" in c:
+            values=values+[c]
+    collist1=['序号','股票名称','股票代码']+shares+ratios+values
+    df=df[collist1]
+    """
+    df.replace(0,'---',inplace=True); df.replace('0','---',inplace=True)
+    
+    df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=2, \
+                       first_col_align='center',second_col_align='left', \
+                       last_col_align='right',other_col_align='right', \
+                       titile_font_size='14px',heading_font_size='12px', \
+                       data_font_size='12px')     
     
     return df_merge
 
 #==============================================================================
+def fund_holding_china(ticker,rank=10,pastyears=2):
+    """
+    功能：套壳函数fund_stock_holding_rank_china
+    """
+    df,data=fund_stock_holding_rank_china(fund=ticker,rank=rank,year_num=pastyears)
+    
+    return df,data
 
 if __name__=='__main__':
     fund='000592.SS'
     year_num=2
+    rank=10
     
     df=fund_stock_holding_rank_china(fund,year_num=2)
     
 # 获取单只基金的十大股票名称信息
-def fund_stock_holding_rank_china(fund,year_num=2):
+def fund_stock_holding_rank_china(fund,rank=10,year_num=2):
     """
     比较股票型基金fund近year_num年持仓的前10大股票排名变化
     """
-    print("Searching fund stock holding info, it may take time, please wait ...\n")
+    print("Searching fund stock holding info, which takes time, please wait ...\n")
     code=fund[:6]
     
     import akshare as ak
@@ -268,7 +326,7 @@ def fund_stock_holding_rank_china(fund,year_num=2):
         dft.sort_values(by='占净值比例',ascending=False,inplace=True)
         dft.reset_index(drop=True,inplace=True)
         dft['序号']=dft.index + 1
-        dft2=dft.head(10)
+        dft2=dft.head(rank)
         
         if len(data2)==0:
             data2=dft2
@@ -281,7 +339,7 @@ def fund_stock_holding_rank_china(fund,year_num=2):
     # 合成信息
     data2['持股状况']=data2.apply(lambda x: x['股票名称']+'('+str(x['占净值比例'])+'，'+str(x['持股数'])+')',axis=1)
     
-    df = data2.set_index(['序号','季度']).stack().unstack([1,2]).head(10)
+    df = data2.set_index(['序号','季度']).stack().unstack([1,2]).head(rank)
     
     #df = df.loc[:,(slice(None), '股票名称')] # 只选取 股票名称
     df = df.loc[:,(slice(None), '持股状况')] # 只选取 持股状况
@@ -314,15 +372,28 @@ def fund_stock_holding_rank_china(fund,year_num=2):
     """
     name=get_fund_name_china2(fund)
     
-    print("=== 基金持仓股票排行分析："+name+"，按照占净值比例高低排列 ===\n")
+    #print("=== 基金持仓股票排行分析："+name+"，按照占净值比例高低排列 ===\n")
+    titletxt="基金持仓分析："+name+"，按照占净值比例降序排列，前"+str(rank)+"名成份证券"
+    import datetime; todaydt = datetime.date.today()
+    #print("\n*** 注：包括A股与非A股。持股结构：股票简称(占净值比例%，持股数万股),",str(todaydt)) 
+    footnote="【注】持仓结构：证券简称(占净值比例%，持仓数万股)，"+str(todaydt)+"统计"
+
+    #最新的日期方前面
+    collist=list(df)
+    collist.sort(reverse=True)
+    df=df[collist]
     
+    df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor='papayawhip',decimals=3, \
+                       first_col_align='center',second_col_align='left', \
+                       last_col_align='left',other_col_align='left', \
+                       titile_font_size='16px',heading_font_size='15px', \
+                       data_font_size='15px')     
+      
+    """    
     alignlist=['center']+['left']*(len(list(df))-1)
     print(df.to_markdown(index=False,tablefmt='plain',colalign=alignlist))
     #print(df.to_string(index=False))
-    
-    import datetime; today = datetime.date.today()
-    print("\n*** 注：包括A股与非A股。持股结构：股票简称(占净值比例%，持股数万股),",today)          
-    #print("\n*** 注：包括A股与非A股。数据来源：天天基金/东方财富,",today)
+    """
     
     return df,data
 
@@ -398,12 +469,22 @@ def reits_jsl_china(fund='',rank=10):
     return dfb  
 
 #==============================================================================
+def reit_rank_china(indicator='最新价',rank=10):
+    """
+    功能：套壳函数reits_list_china
+    """
+    
+    df=reits_list_china(indicator=indicator,rank=rank)
+    
+    return df
+
+
 if __name__=='__main__':
     rank=10
     
     df=reits_list_china(rank=10)
 
-def reits_list_china(rank=10,sort='最新价'):
+def reits_list_china(indicator='最新价',rank=10):
     """
     功能：REITs基金信息概述和列表
     目前能正常工作
@@ -415,26 +496,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 +535,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 +553,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')     
@@ -577,14 +666,16 @@ 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)
-        print("  Supported info type:",typelist)
+        print("  #Error(oef_rank_china): unsupported indicator",info_type)
+        print("  Supported indicators:",typelist)
         return None
     
     print("Searching for open-ended fund (OEF) information in China ...")
@@ -650,7 +741,7 @@ def oef_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
                 break
         if not found:
             print("  #Error(oef_rank_china): unsupported fund type",fund_type)
-            print("  Supported fund type:",fundtypelist)
+            print("  Supported fund types:",fundtypelist)
             return None
         fund_filter=lambda x: fund_type in x
         df.dropna(inplace=True)
@@ -664,26 +755,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="中国开放式基金排名：增长率%"         
     
@@ -700,6 +795,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:
@@ -738,7 +837,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')
@@ -787,15 +886,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)
@@ -814,6 +917,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()
@@ -823,7 +927,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)
@@ -853,13 +956,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, \
+                   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, \
+                   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 == '收益率':
@@ -875,10 +1056,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
     
     #绘制同类排名图：近三个月收益率
@@ -922,8 +1104,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
@@ -932,78 +1115,73 @@ 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日年化%")
+        print("  Supported indicators:",indicator_list)
+        #indicator="7日年化%"
+        return None
     
     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')    
@@ -1020,34 +1198,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) 
     
@@ -1057,11 +1239,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
     
@@ -1072,14 +1259,16 @@ 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)
-        print("  Supported info type:",typelist)
+        print("  #Error(etf_rank_china): unsupported indicator",info_type)
+        print("  Supported indicators:",typelist)
         return None
     
     print("Searching for exchange traded fund (ETF) information in China ...")
@@ -1105,7 +1294,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']
@@ -1120,7 +1309,7 @@ def etf_rank_china(info_type='单位净值',fund_type='全部类型',rank=10):
                 break
         if not found:
             print("  #Error(etf_rank_china): unsupported fund type",fund_type)
-            print("  Supported fund type:",fundtypelist)
+            print("  Supported fund types:",fundtypelist)
             return None
         fund_filter=lambda x: fund_type in x
         df['基金类型s']=df['类型'].apply(fund_filter)
@@ -1135,7 +1324,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]
@@ -1144,7 +1333,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]
@@ -1153,7 +1342,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]
@@ -1161,7 +1350,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]
@@ -1178,6 +1367,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:
@@ -1208,13 +1401,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')
@@ -1232,33 +1425,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")
@@ -1275,14 +1473,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
     

{siat-3.1.2.dist-info → siat-3.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.1.2
+Version: 3.1.4
 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.2.dist-info → siat-3.1.4.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=RK2A111np2U8Jfi9S7Yt_yYa_iuxEy0mhTg24i3O4VU,87982
+siat/fund_china.py,sha256=uO2RexvO0ldclJwKAtbmdmaP9UvfkHq_uQDKOEVG5Sc,97516
 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.2.dist-info/METADATA,sha256=22Vwc49Bl5YYuI9AR9Mgb8nqq7L8FwIvnFut8X854z8,1447
-siat-3.1.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.2.dist-info/RECORD,,
+siat-3.1.4.dist-info/METADATA,sha256=GjZl5T5oguZg8fcFxvDskZKFVJizNcgQEU-IxlH0RSI,1447
+siat-3.1.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.4.dist-info/RECORD,,