Merge branch 'dev' into 'master'

Dev

See merge request server/openapi/openapi-python-sdk!166

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.3.4 (2023-03-20)
+### New
+- 支持AM/AL(盘前竞价单)
+### Fix
+- 修复PushClient报错模块找不到的问题
+
 ## 2.3.3 (2023-03-10)
 ### Modify
 - 支持多进程运行场景下的 token 刷新，需安装 pip install watchdog 已开启 token 文件监听

requirements.txt

@@ -10,5 +10,5 @@ getmac
 cryptography
 backoff
 jproperties
-protobuf==4.21.12
-google-cloud==0.34.0
+protobuf
+google-cloud

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.3.3'
+__VERSION__ = '2.3.4'

tigeropen/common/consts/__init__.py

@@ -187,6 +187,8 @@ class OrderType(Enum):
     STP = 'STP'  # 止损单
     STP_LMT = 'STP_LMT'  # 止损限价单
     TRAIL = 'TRAIL'  # 跟踪止损单
+    AM = 'AM'  # Auction Market ，竞价市价单
+    AL = 'AL'  # Auction Limit ，竞价限价单
 
 
 @unique

tigeropen/common/util/order_utils.py

@@ -74,6 +74,34 @@ def trail_order(account, contract, action, quantity, trailing_percent=None, aux_
     return Order(account, contract, action, 'TRAIL', quantity, trailing_percent=trailing_percent, aux_price=aux_price)
 
 
+def auction_limit_order(account, contract, action, quantity, limit_price, time_in_force='DAY'):
+    """
+    竞价限价单 Auction Limit
+    :param account:
+    :param contract:
+    :param action: BUY/SELL
+    :param quantity:
+    :param limit_price: 限价的价格
+    :param time_in_force: only support 'DAY' or 'OPG' (Opening Price Gap, 盘前竞价有效)
+    :return:
+    """
+    return Order(account, contract, action, 'AL', quantity, limit_price=limit_price, outside_rth=True,
+                 time_in_force=time_in_force)
+
+
+def auction_market_order(account, contract, action, quantity, time_in_force='DAY'):
+    """
+    竞价市价单 Auction Market
+    :param account:
+    :param contract:
+    :param action: BUY/SELL
+    :param quantity:
+    :param time_in_force: only support 'DAY' or 'OPG' (Opening Price Gap, 盘前竞价有效)
+    :return:
+    """
+    return Order(account, contract, action, 'AM', quantity, outside_rth=True, time_in_force=time_in_force)
+
+
 def order_leg(leg_type, price, time_in_force='DAY', outside_rth=None, limit_price=None, trailing_percent=None,
               trailing_amount=None):
     """