modify trade_client method param, remove secret_key

Author: tigersk

tigeropen/common/util/order_utils.py

@@ -8,7 +8,7 @@
 from tigeropen.common.consts import OrderStatus
 
 
-def market_order(account, contract, action, quantity, secret_key=None):
+def market_order(account, contract, action, quantity):
     """
     市价单
     :param account:
@@ -17,10 +17,10 @@ def market_order(account, contract, action, quantity, secret_key=None):
     :param quantity:
     :return:
     """
-    return Order(account, contract, action, 'MKT', quantity, secret_key=secret_key)
+    return Order(account, contract, action, 'MKT', quantity)
 
 
-def limit_order(account, contract, action, quantity, limit_price, secret_key=None):
+def limit_order(account, contract, action, quantity, limit_price):
     """
     限价单
     :param account:
@@ -30,10 +30,10 @@ def limit_order(account, contract, action, quantity, limit_price, secret_key=Non
     :param limit_price: 限价的价格
     :return:
     """
-    return Order(account, contract, action, 'LMT', quantity, limit_price=limit_price, secret_key=secret_key)
+    return Order(account, contract, action, 'LMT', quantity, limit_price=limit_price)
 
 
-def stop_order(account, contract, action, quantity, aux_price, secret_key=None):
+def stop_order(account, contract, action, quantity, aux_price):
     """
     止损单
     :param account:
@@ -43,10 +43,10 @@ def stop_order(account, contract, action, quantity, aux_price, secret_key=None):
     :param aux_price: 触发止损单的价格
     :return:
     """
-    return Order(account, contract, action, 'STP', quantity, aux_price=aux_price, secret_key=secret_key)
+    return Order(account, contract, action, 'STP', quantity, aux_price=aux_price)
 
 
-def stop_limit_order(account, contract, action, quantity, limit_price, aux_price, secret_key=None):
+def stop_limit_order(account, contract, action, quantity, limit_price, aux_price):
     """
     限价止损单
     :param account:
@@ -57,11 +57,10 @@ def stop_limit_order(account, contract, action, quantity, limit_price, aux_price
     :param aux_price: 触发止损单的价格
     :return:
     """
-    return Order(account, contract, action, 'STP_LMT', quantity, limit_price=limit_price, aux_price=aux_price,
-                 secret_key=secret_key)
+    return Order(account, contract, action, 'STP_LMT', quantity, limit_price=limit_price, aux_price=aux_price)
 
 
-def trail_order(account, contract, action, quantity, trailing_percent=None, aux_price=None, secret_key=None):
+def trail_order(account, contract, action, quantity, trailing_percent=None, aux_price=None):
     """
     移动止损单
     :param account:
@@ -72,8 +71,7 @@ def trail_order(account, contract, action, quantity, trailing_percent=None, aux_
     :param aux_price: 价差  aux_price 和 trailing_percent 两者互斥
     :return:
     """
-    return Order(account, contract, action, 'TRAIL', quantity, trailing_percent=trailing_percent, aux_price=aux_price,
-                 secret_key=secret_key)
+    return Order(account, contract, action, 'TRAIL', quantity, trailing_percent=trailing_percent, aux_price=aux_price)
 
 
 def order_leg(leg_type, price, time_in_force='DAY', outside_rth=None):
@@ -87,7 +85,7 @@ def order_leg(leg_type, price, time_in_force='DAY', outside_rth=None):
     return OrderLeg(leg_type=leg_type, price=price, time_in_force=time_in_force, outside_rth=outside_rth)
 
 
-def limit_order_with_legs(account, contract, action, quantity, limit_price, order_legs=None, secret_key=None):
+def limit_order_with_legs(account, contract, action, quantity, limit_price, order_legs=None):
     """
     限价单 + 附加订单(仅环球账户支持)
     :param account:
@@ -100,8 +98,7 @@ def limit_order_with_legs(account, contract, action, quantity, limit_price, orde
     """
     if order_legs and len(order_legs) > 2:
         raise Exception('2 order legs at most')
-    return Order(account, contract, action, 'LMT', quantity, limit_price=limit_price, order_legs=order_legs,
-                 secret_key=secret_key)
+    return Order(account, contract, action, 'LMT', quantity, limit_price=limit_price, order_legs=order_legs)
 
 
 def algo_order_params(start_time=None, end_time=None, no_take_liq=None, allow_past_end_time=None, participation_rate=None):
@@ -118,7 +115,7 @@ def algo_order_params(start_time=None, end_time=None, no_take_liq=None, allow_pa
                       allow_past_end_time=allow_past_end_time, participation_rate=participation_rate)
 
 
-def algo_order(account, contract, action, quantity, strategy, algo_params=None, limit_price=None, secret_key=None):
+def algo_order(account, contract, action, quantity, strategy, algo_params=None, limit_price=None):
     """
     算法订单
     :param account:
@@ -131,7 +128,7 @@ def algo_order(account, contract, action, quantity, strategy, algo_params=None,
     :return:
     """
     return Order(account, contract, action, order_type=strategy, quantity=quantity, algo_params=algo_params,
-                 limit_price=limit_price, outside_rth=False, secret_key=secret_key)
+                 limit_price=limit_price, outside_rth=False)
 
 
 def get_order_status(value):

tigeropen/trade/trade_client.py

@@ -153,7 +153,7 @@ def get_contract(self, symbol, sec_type=SecurityType.STK, currency=None, exchang
         return None
 
     def get_positions(self, account=None, sec_type=SecurityType.STK, currency=Currency.ALL, market=Market.ALL,
-                      symbol=None, sub_accounts=None, secret_key=None):
+                      symbol=None, sub_accounts=None):
         """
         获取持仓数据
         :param account:
@@ -174,7 +174,7 @@ def get_positions(self, account=None, sec_type=SecurityType.STK, currency=Curren
         """
         params = PositionParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         if sec_type:
             params.sec_type = sec_type.value
         params.sub_accounts = sub_accounts
@@ -196,7 +196,7 @@ def get_positions(self, account=None, sec_type=SecurityType.STK, currency=Curren
 
         return None
 
-    def get_assets(self, account=None, sub_accounts=None, segment=False, market_value=False, secret_key=None):
+    def get_assets(self, account=None, sub_accounts=None, segment=False, market_value=False):
         """
         获取账户资产信息
         :param account:
@@ -229,7 +229,7 @@ def get_assets(self, account=None, sub_accounts=None, segment=False, market_valu
         """
         params = AssetParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         params.sub_accounts = sub_accounts
         params.segment = segment
         params.market_value = market_value
@@ -247,7 +247,7 @@ def get_assets(self, account=None, sub_accounts=None, segment=False, market_valu
         return None
 
     def get_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None, start_time=None, end_time=None,
-                   limit=100, is_brief=False, states=None, secret_key=None):
+                   limit=100, is_brief=False, states=None):
         """
         获取订单列表
         :param account:
@@ -264,7 +264,7 @@ def get_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None
         """
         params = OrdersParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         if sec_type:
             params.sec_type = sec_type.value
         params.market = market.value
@@ -286,14 +286,14 @@ def get_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None
         return None
 
     def get_open_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None, start_time=None,
-                        end_time=None, parent_id=None, secret_key=None):
+                        end_time=None, parent_id=None):
         """
         获取待成交订单列表. 参数同 get_orders
         :param parent_id: 主订单 order_id
         """
         params = OrdersParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         if sec_type:
             params.sec_type = sec_type.value
         params.market = market.value
@@ -313,13 +313,13 @@ def get_open_orders(self, account=None, sec_type=None, market=Market.ALL, symbol
         return None
 
     def get_cancelled_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None, start_time=None,
-                             end_time=None, secret_key=None):
+                             end_time=None):
         """
         获取已撤销订单列表. 参数同 get_orders
         """
         params = OrdersParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         if sec_type:
             params.sec_type = sec_type.value
         params.market = market.value
@@ -338,13 +338,13 @@ def get_cancelled_orders(self, account=None, sec_type=None, market=Market.ALL, s
         return None
 
     def get_filled_orders(self, account=None, sec_type=None, market=Market.ALL, symbol=None, start_time=None,
-                          end_time=None, secret_key=None):
+                          end_time=None):
         """
         获取已成交订单列表. 参数同 get_orders
         """
         params = OrdersParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         if sec_type:
             params.sec_type = sec_type.value
         params.market = market.value
@@ -362,7 +362,7 @@ def get_filled_orders(self, account=None, sec_type=None, market=Market.ALL, symb
                 raise ApiException(response.code, response.message)
         return None
 
-    def get_order(self, account=None, id=None, order_id=None, is_brief=False, secret_key=None):
+    def get_order(self, account=None, id=None, order_id=None, is_brief=False):
         """
         获取指定订单
         :param account:
@@ -373,7 +373,7 @@ def get_order(self, account=None, id=None, order_id=None, is_brief=False, secret
         """
         params = OrderParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         params.id = id
         params.order_id = order_id
         params.is_brief = is_brief
@@ -390,7 +390,7 @@ def get_order(self, account=None, id=None, order_id=None, is_brief=False, secret
 
     def create_order(self, account, contract, action, order_type, quantity, limit_price=None, aux_price=None,
                      trail_stop_price=None, trailing_percent=None, percent_offset=None, time_in_force=None,
-                     outside_rth=None, order_legs=None, algo_params=None, secret_key=None):
+                     outside_rth=None, order_legs=None, algo_params=None):
         """
         创建订单对象.
         :param account:
@@ -407,11 +407,10 @@ def create_order(self, account, contract, action, order_type, quantity, limit_pr
         :param outside_rth: 是否允许盘前盘后交易(美股专属)
         :param order_legs: 附加订单
         :param algo_params: 算法订单参数
-        :param secret_key: 机构密钥
         """
         params = AccountsParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         request = OpenApiRequest(ORDER_NO, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -560,7 +559,7 @@ def modify_order(self, order, quantity=None, limit_price=None, aux_price=None,
 
         return False
 
-    def cancel_order(self, account=None, id=None, order_id=None, secret_key=None):
+    def cancel_order(self, account=None, id=None, order_id=None):
         """
         取消订单
         :param account:
@@ -570,7 +569,7 @@ def cancel_order(self, account=None, id=None, order_id=None, secret_key=None):
         """
         params = CancelOrderParams()
         params.account = account if account else self._account
-        params.secret_key = secret_key if secret_key else self._secret_key
+        params.secret_key = self._secret_key
         params.order_id = order_id
         params.id = id
         request = OpenApiRequest(CANCEL_ORDER, biz_model=params)