siat 3.10.25__py3-none-any.whl → 3.10.75__py3-none-any.whl

siat/fund_china.py

@@ -1390,7 +1390,7 @@ def oef_trend_china(ticker,start,end='today',indicator='净值', \
         df1['总排名']=df1['总排名'].astype('int64')
         df1.set_index(['date'],inplace=True) 
         
-        df2 = ak.fund_open_fund_info_em(fund=fund1, indicator="同类排名百分比")
+        df2 = ak.fund_open_fund_info_em(fund1, indicator="同类排名百分比")
         df2.rename(columns={'报告日期':'date','同类型排名-每日近3月收益排名百分比':'同类排名百分比'}, inplace=True)
         df2.set_index(['date'],inplace=True)       
         
@@ -1543,7 +1543,7 @@ def mmf_trend_china(ticker,start,end='today',indicator='7日年化%',power=0, \
     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 ...")
+    print("Searching for money market fund (MMF) info in China ...")
     import akshare as ak   
     import pandas as pd
 
@@ -2461,14 +2461,14 @@ def fund_info_china0():
     wmf_df = ak.fund_financial_fund_daily_em()
     #理财型基金-历史数据
     #净值日期，7日年化收益率，申购状态，赎回状态
-    wmf_hist_df = ak.fund_financial_fund_info_em(fund="000134")
+    wmf_hist_df = ak.fund_financial_fund_info_em("000134")
     
     ###########分级基金(结构化基金)-实时数据
     #基金代码，基金简称，单位净值，累计净值，市价，折价率，手续费
     gsf_df = ak.fund_graded_fund_daily_em()
     #分级基金-历史数据
     #净值日期，7日年化收益率，申购状态，赎回状态
-    gsf_hist_df = ak.fund_graded_fund_info_em(fund="150232")
+    gsf_hist_df = ak.fund_graded_fund_info_em("150232")
     
     ###抓取沪深股市所有指数关联的公募基金列表（含ETF、增强、分级等）
     #代码来源：https://blog.csdn.net/leeleilei/article/details/106124894
@@ -2584,7 +2584,7 @@ def fund_info_china(fund):
     
     # 基金评级
     df6=pd.DataFrame()
-    titletxt6="***** 基金概况与评级"
+    titletxt6="基金概况与评级"
     footnote6="注：评级机构为上海证券、招商证券和济安金信，数字表示星星个数，在同类基金中通常越高越好"
     try:
         dft6 = ak.fund_rating_all()
@@ -2594,13 +2594,17 @@ def fund_info_china(fund):
         
         if len(dft6t) >= 1:
             df6=dft6t
-            printInMarkdown(df6,titletxt=titletxt6,footnote=footnote6)
+            #printInMarkdown(df6,titletxt=titletxt6,footnote=footnote6)
+            df_display_CSS(df6,titletxt=titletxt6,footnote=footnote6,facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+
     except:
         pass
     
     # 指数型基金信息
     df2=pd.DataFrame()
-    titletxt2="***** 指数型基金的相关信息"
+    titletxt2="指数型基金的相关信息"
     footnote2="注：单位净值元，日/今年来/今年来的增长率及手续费为百分比"
     try:
         dft2 = ak.fund_info_index_em(symbol="全部", indicator="全部")
@@ -2608,13 +2612,17 @@ def fund_info_china(fund):
         dft2t=dft2[dft2['基金代码']==fund1]
         
         if len(dft2t) >= 1:
-            df2=dft2t[['基金代码','单位净值','日期','日增长率','今年来','今年来','手续费']]
-            printInMarkdown(df2,titletxt=titletxt2,footnote=footnote2)
+            df2=dft2t[['基金代码','单位净值','日期','日增长率','今年来','手续费']]
+            #printInMarkdown(df2,titletxt=titletxt2,footnote=footnote2)
+            df_display_CSS(df2,titletxt=titletxt2,footnote=footnote2,facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+            
     except:
         pass
     
     # 基金持仓：股票
-    titletxt3="***** 基金持仓情况：股票"
+    titletxt3="基金持仓情况：股票"
     footnote3="注：占净值比例为百分比，持股数为万股，(持仓)市值为万元"
     df3=pd.DataFrame()
     import datetime; today = datetime.date.today()
@@ -2626,12 +2634,16 @@ def fund_info_china(fund):
         if len(dft3) >= 1:
             df3=dft3
             df3['持仓类型']='股票'
-            printInMarkdown(df3,titletxt=titletxt3,footnote=footnote3)
+            #printInMarkdown(df3,titletxt=titletxt3,footnote=footnote3)
+            df_display_CSS(df3,titletxt=titletxt3,footnote=footnote3,facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+
     except:
         pass
     
     # 基金持仓：债券
-    titletxt4="***** 基金持仓情况：债券"
+    titletxt4="基金持仓情况：债券"
     df4=pd.DataFrame()
     try:
         dft4 = ak.fund_portfolio_bond_hold_em(symbol=fund1,date=thisYear)
@@ -2640,13 +2652,19 @@ def fund_info_china(fund):
         if len(dft4) >= 1:
             df4=dft4
             df4['持仓类型']='债券'
-            printInMarkdown(df4,titletxt=titletxt4)
+            #printInMarkdown(df4,titletxt=titletxt4)
+            df_display_CSS(df4,titletxt=titletxt4,footnote='',facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+
     except:
+        print('')
+        print(titletxt4)
         print("\n #Warning(fund_info_china): unable to retrieve bond holding info for",fund,"@",thisYear)
 
     
     # 基金持仓：行业配置
-    titletxt5="***** 基金的行业配置情况"
+    titletxt5="基金的行业配置情况"
     footnote5="注：占净值比例为百分比，市值为万元"
     df5=pd.DataFrame()
     try:
@@ -2656,12 +2674,16 @@ def fund_info_china(fund):
         if len(dft5) >= 1:
             df5=dft5
             df5['持仓类型']='行业配置'   
-            printInMarkdown(df5,titletxt=titletxt5,footnote=footnote5)
+            #printInMarkdown(df5,titletxt=titletxt5,footnote=footnote5)
+            df_display_CSS(df5,titletxt=titletxt5,footnote=footnote5,facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+
     except:
         pass
     
     # 基金经理
-    titletxt7="***** 基金经理的相关情况"
+    titletxt7="基金经理的相关情况"
     source="数据来源：东方财富/天天基金"
     footnote7="注：从业时间为天数，现任基金资产总规模为该基金经理管辖所有基金的总规模(亿元)，最佳回报为历史业绩(百分比)\n"+source+"，"+str(today)
     
@@ -2674,13 +2696,20 @@ def fund_info_china(fund):
             current=dft7t['现任基金'].values[0]
             df7=dft7t[['姓名','所属公司','累计从业时间','现任基金资产总规模','现任基金最佳回报']]
             
-            printInMarkdown(df7,titletxt=titletxt7)
+            #printInMarkdown(df7,titletxt=titletxt7)
+            df_display_CSS(df7,titletxt=titletxt7,footnote='',facecolor='papayawhip', \
+                               first_col_align='left',second_col_align='left', \
+                               last_col_align='center',other_col_align='center')
+
+            
             print(' ')
             print("基金经理当前兼任情况：")
             num=print_long_text(current)
             print(' ')
             print(footnote7)
     except:
+        print('')
+        print(titletxt7)
         print("\n #Warning(fund_info_china): unable to retrieve job info for",fmanager)
     
     return 

siat/future_china.py

@@ -149,8 +149,13 @@ def future_type_china_2(df,code):
     
     contract='合约'
     print(contract+' '*(maxlen-hzlen(contract))+':',code)
+    import numpy as np
     for c in cols:
-        print(c+' '*(maxlen-hzlen(c))+':',df1[c].values[0])
+        value=df1[c].values[0]
+        if value != np.nan:
+            print(c+' '*(maxlen-hzlen(c))+':',df1[c].values[0])
+        else:
+            continue
 
     import datetime
     today = datetime.date.today()
@@ -163,14 +168,14 @@ if __name__=='__main__':
 
 #======================================================================================
 if __name__=='__main__':
-    code='BX2007'
     tradedate=''
-    tradedate='2023-6-10'
+    tradedate='2025-6-12'
+    
+    future_type_china(tradedate)
 
-def future_type_china(code='',tradedate=''):
+def future_type_china(tradedate=''):
     """
-    综合程序：
-    合约code为空或品种symbol不存在时列示中国内盘期货的全部代码，否则列示该合约品种明细
+    功能：中国内盘期货的常见品种，含合约品种明细
     """
     
     # 检查交易日期
@@ -195,36 +200,30 @@ def future_type_china(code='',tradedate=''):
     while df is None:
         today=date_adjust(today, adjust=-1)
         df=future_type_china_0(today)
-
-    symbol=get_future_symbol(code)
-    df1=df[df['代码']==symbol]  
     
-    if len(df1)==0:
-        if not (code==''):
-            print("  Warning(future_type_china):",code,'not found')
-        future_type_china_1(df)
-        return df
-    
-    future_type_china_2(df,code)
-    return df1
+    df.drop(['调整备注','特殊合约参数调整'], axis=1, inplace=True)
+    titletxt="中国内盘常见期货品种"
+    footnote="数据来源：国泰君安, "+str(tradedate)
+    df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor='papayawhip', \
+                       first_col_align='center',second_col_align='center', \
+                       last_col_align='center',other_col_align='center')
+        
+    return df
 
-if __name__=='__main__':
-    code='Bx2007'
-    df=future_type_china(code) 
 
 #======================================================================================
 if __name__=='__main__':
     code='PG'
-    start='2023-5-1'
-    end='2023-5-18'
-    power=0
+    start='2025-5-1'
+    end='2025-5-30'
+    power=1
 
-def future_price_china(code,start,end,power=0):
+def future_price_china(code,start,end,power=0,loc1='upper left',loc2='upper right'):
     """
     综合程序：
     绘制内盘期货交易曲线：收盘价vs结算价vs成交量
     """
-    print("Searching for contract "+code+", it may cost great deal of time, take a break ...")
+    print("Searching for contract "+code+", it may take time ...")
     #日期变换
     start1=convert_date_ts(start)
     end1=convert_date_ts(end)
@@ -265,7 +264,7 @@ def future_price_china(code,start,end,power=0):
         p=ak.get_futures_daily(start_date=start1,end_date=end1,market=market)
     except:
         print("  #Warning(future_price_china): data source has no response at the moment for",code)
-        print("  Try another type of future, or try it later")
+        print("  Solution: make date period shorter (e.g. within same month), and try again")
         return None
         
     if p is None:
@@ -279,7 +278,8 @@ def future_price_china(code,start,end,power=0):
         contracts=set(list(p[p['variety']==variety]['symbol']))
         contracts1=sorted(contracts) 
         print("\n提示：当前可用的"+varietyname+variety+'期货合约：'+mktnamefull+', '+str(end))
-        print(contracts1)
+        #print(contracts1)
+        printlist(contracts1,numperline=10,beforehand='',separator=' ')
         return None        
     
     #转换日期格式
@@ -317,19 +317,19 @@ def future_price_china(code,start,end,power=0):
     plot_line2(p2a,acode,"close","收盘价", \
                p2b,acode,"settle","结算价", \
                '价格',titletxt,footnote, \
-               power=power,twinx=False)
+               power=power,twinx=False,loc1=loc1,loc2=loc2)
     #"""
     #收盘价vs成交量
     plot_line2(p2a,acode,"close","收盘价", \
                p2c,acode,"volume","成交量", \
                '',titletxt,footnote, \
-               power=power,twinx=True)
+               power=power,twinx=True,loc1=loc1,loc2=loc2)
     #"""
     #收盘价vs持仓量
     plot_line2(p2a,acode,"close","收盘价", \
                p2e,acode,"open_interest","持仓量", \
                '',titletxt,footnote, \
-               power=power,twinx=True)
+               power=power,twinx=True,loc1=loc1,loc2=loc2)
     #"""
     return p2
 
@@ -444,41 +444,29 @@ if __name__=='__main__':
     
 #======================================================================================
 if __name__=='__main__':
-    code='ZSD'
+    
+    future_type_foreign()
 
-def future_type_foreign(code=''):
+def future_type_foreign():
     """
-    综合程序：
-    合约code为空或不存在时列示中国外盘期货的所有品种，否则列示一个品种的明细条款
+    功能：中国外盘期货的常见品种，含合约明细
     """
     
     df=future_type_foreign_1()
+    #cols=['交易代码','交易品种','上市交易所','交易单位','报价单位','合约交割月份']
+    cols=['交易代码','交易品种','上市交易所','交易单位','报价单位']
+    df1=df[cols]
+    df1.reset_index(drop=True,inplace=True)
 
-    df1=df[df['交易代码']==code]  
-    
-    if len(df1)==0:
-        if not (code==''):
-            print("  Warning(future_type_foreign):",code,'not found')
-        
-        #设置打印对齐
-        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)
-        
-        print("\n===== 中国外盘期货品种一览表 =====\n")
-        df2=df[['交易代码','交易品种','上市交易所']]
-        print(df2.to_string(index=False))
-        
-        import datetime
-        today = datetime.date.today()
-        print('\n*** 数据来源：新浪财经,',today)
-        
-        return df
+    titletxt="中国外盘期货常见品种"
+    import datetime
+    todaydt = datetime.date.today()
+    footnote="数据来源：新浪财经, "+str(todaydt)
     
-    future_type_foreign_2(df,symbol=code)
+    df_display_CSS(df1,titletxt=titletxt,footnote=footnote, \
+                   facecolor='papayawhip', \
+                       first_col_align='center',second_col_align='center', \
+                       last_col_align='center',other_col_align='center')
     
     return df1
 
@@ -494,7 +482,7 @@ if __name__=='__main__':
     end='2021-9-27'
     power=0
 
-def future_price_foreign(code,start,end,power=0,loc1='best',loc2='best'):
+def future_price_foreign(code,start,end,power=0,loc1='upper left',loc2='upper right'):
     """
     综合程序：
     绘制中国外盘期货的交易趋势：收盘价vs成交量