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

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,33 @@ 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='MRM',end='today', \
+                       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 ...")
+    start,end=start_end_preprocess(start,end)
+    
+    print("Searching for contract "+code+", it may take time ...")
     #日期变换
     start1=convert_date_ts(start)
     end1=convert_date_ts(end)
@@ -265,7 +267,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 +281,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 +320,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 +447,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,11 +485,14 @@ 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='MRM',end='today', \
+                         power=0,loc1='upper left',loc2='upper right'):
     """
     综合程序：
     绘制中国外盘期货的交易趋势：收盘价vs成交量
     """
+    start,end=start_end_preprocess(start,end)
+    
     print("Searching for contract "+code+", it costs great time, just take a break...")
     #日期变换
     flag,start1,end1=check_period(start,end)