Merge branch 'main_merge_20260110' into 'main'

feat: Add batch order, snapshots support pre-market, after-market, and night trading sessions.

See merge request webull/webull-openapi-python-sdk!12

Author: 方佳

samples/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.7'
+__version__ = '1.0.8'

samples/trade/trade_client_v3.py

@@ -208,7 +208,38 @@
     if res.status_code == 200:
         print('get master order detail res:', res.json())
 
-
+    # batch place order
+    batch_place_orders = [
+        {
+            "combo_type": "NORMAL",
+            "client_order_id": uuid.uuid4().hex,
+            "instrument_type": "EQUITY",
+            "market": "US",
+            "symbol": "AAPL",
+            "order_type": "MARKET",
+            "entrust_type": "QTY",
+            "support_trading_session": "CORE",
+            "time_in_force": "DAY",
+            "side": "BUY",
+            "quantity": "1"
+        },
+        {
+            "combo_type": "NORMAL",
+            "client_order_id": uuid.uuid4().hex,
+            "instrument_type": "EQUITY",
+            "market": "US",
+            "symbol": "TESL",
+            "order_type": "MARKET",
+            "entrust_type": "QTY",
+            "support_trading_session": "CORE",
+            "time_in_force": "DAY",
+            "side": "BUY",
+            "quantity": "1"
+        }
+    ]
+    res = trade_client.order_v3.batch_place_order(account_id, batch_place_orders)
+    if res.status_code == 200:
+        print('batch place normal equity order res:', res.json())
 
 
     # ============================================================

webull/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.7'
+__version__ = '1.0.8'

webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.7'
+__version__ = '1.0.8'
 
 import logging
 

webull/data/__init__.py

@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = '1.0.7'
+__version__ = '1.0.8'

webull/data/quotes/subscribe/message.proto

@@ -18,6 +18,22 @@ message Snapshot {
   string volume = 8;
   string change = 9;
   string change_ratio = 10;
+
+  string ext_trade_time = 11;
+  string ext_price = 12;
+  string ext_high = 13;
+  string ext_low = 14;
+  string ext_volume = 15;
+  string ext_change = 16;
+  string ext_change_ratio = 17;
+
+  string ovn_trade_time = 18;
+  string ovn_price = 19;
+  string ovn_high = 20;
+  string ovn_low = 21;
+  string ovn_volume = 22;
+  string ovn_change = 23;
+  string ovn_change_ratio = 24;
 }
 
 message Quote {

webull/data/quotes/subscribe/message_pb2.py

@@ -21,22 +21,40 @@
 class SnapshotResult:
     def __init__(self, pb_snapshot):
         self.basic = BasicResult(pb_snapshot.basic)
+        self.last_trade_time = int(pb_snapshot.trade_time) if pb_snapshot.trade_time else None
+        self.price = Decimal(pb_snapshot.price) if pb_snapshot.price else None
         self.open = Decimal(pb_snapshot.open) if pb_snapshot.open else None
         self.high = Decimal(pb_snapshot.high) if pb_snapshot.high else None
         self.low = Decimal(pb_snapshot.low) if pb_snapshot.low else None
-        self.price = Decimal(pb_snapshot.price) if pb_snapshot.price else None
-        self.pre_close = Decimal(
-            pb_snapshot.pre_close) if pb_snapshot.pre_close else None
-        self.volume = Decimal(
-            pb_snapshot.volume) if pb_snapshot.volume else None
-        self.change = Decimal(
-            pb_snapshot.change) if pb_snapshot.change else None
-        self.change_ratio = Decimal(
-            pb_snapshot.change_ratio) if pb_snapshot.change_ratio else None
+        self.pre_close = Decimal(pb_snapshot.pre_close) if pb_snapshot.pre_close else None
+        self.close = Decimal(pb_snapshot.open) if pb_snapshot.open else None
+        self.volume = Decimal(pb_snapshot.volume) if pb_snapshot.volume else None
+        self.change = Decimal(pb_snapshot.change) if pb_snapshot.change else None
+        self.change_ratio = Decimal(pb_snapshot.change_ratio) if pb_snapshot.change_ratio else None
+        self.ext_trade_time = int(pb_snapshot.ext_trade_time) if pb_snapshot.ext_trade_time else None
+        self.ext_price = Decimal(pb_snapshot.ext_price) if pb_snapshot.ext_price else None
+        self.ext_high = Decimal(pb_snapshot.ext_high) if pb_snapshot.ext_high else None
+        self.ext_low = Decimal(pb_snapshot.ext_low) if pb_snapshot.ext_low else None
+        self.ext_volume = Decimal(pb_snapshot.ext_volume) if pb_snapshot.ext_volume else None
+        self.ext_change = Decimal(pb_snapshot.ext_change) if pb_snapshot.ext_change else None
+        self.ext_change_ratio = Decimal(pb_snapshot.ext_change_ratio) if pb_snapshot.ext_change_ratio else None
+        self.ovn_trade_time = int(pb_snapshot.ovn_trade_time) if pb_snapshot.ovn_trade_time else None
+        self.ovn_price = Decimal(pb_snapshot.ovn_price) if pb_snapshot.ovn_price else None
+        self.ovn_high = Decimal(pb_snapshot.ovn_high) if pb_snapshot.ovn_high else None
+        self.ovn_low = Decimal(pb_snapshot.ovn_low) if pb_snapshot.ovn_low else None
+        self.ovn_volume = Decimal(pb_snapshot.ovn_volume) if pb_snapshot.ovn_volume else None
+        self.ovn_change = Decimal(pb_snapshot.ovn_change) if pb_snapshot.ovn_change else None
+        self.ovn_change_ratio = Decimal(pb_snapshot.ovn_change_ratio) if pb_snapshot.ovn_change_ratio else None
 
     def get_basic(self):
         return self.basic
 
+    def get_last_trade_time(self):
+        return self.last_trade_time
+
+    def get_price(self):
+        return self.price
+
     def get_open(self):
         return self.open
 
@@ -46,12 +64,12 @@ def get_high(self):
     def get_low(self):
         return self.low
 
-    def get_price(self):
-        return self.price
-
     def get_pre_close(self):
         return self.pre_close
 
+    def get_close(self):
+        return self.close
+
     def get_volume(self):
         return self.volume
 
@@ -61,9 +79,55 @@ def get_change(self):
     def get_change_ratio(self):
         return self.change_ratio
 
+    def get_ext_trade_time(self):
+        return self.ext_trade_time
+
+    def get_ext_price(self):
+        return self.ext_price
+
+    def get_ext_high(self):
+        return self.ext_high
+
+    def get_ext_low(self):
+        return self.ext_low
+
+    def get_ext_volume(self):
+        return self.ext_volume
+
+    def get_ext_change(self):
+        return self.ext_change
+
+    def get_ext_change_ratio(self):
+        return self.ext_change_ratio
+
+    def get_ovn_trade_time(self):
+        return self.ovn_trade_time
+
+    def get_ovn_price(self):
+        return self.ovn_price
+
+    def get_ovn_high(self):
+        return self.ovn_high
+
+    def get_ovn_low(self):
+        return self.ovn_low
+
+    def get_ovn_volume(self):
+        return self.ovn_volume
+
+    def get_ovn_change(self):
+        return self.ovn_change
+
+    def get_ovn_change_ratio(self):
+        return self.ovn_change_ratio
+
     def __repr__(self):
-        return "%s, open:%s, high:%s, low:%s, price:%s, pre_close:%s, volume:%s, change:%s, change_ratio:%s" \
-            % (self.basic, self.open, self.high, self.low, self.price, self.pre_close, self.volume, self.change, self.change_ratio)
+        attrs = ['last_trade_time', 'price', 'open', 'high', 'low', 'pre_close', 'close', 'volume', 'change', 'change_ratio']
+        ext_attrs = [f"ext_{name}" for name in ['trade_time', 'price', 'high', 'low', 'volume', 'change', 'change_ratio']]
+        ovn_attrs = [f"ovn_{name}" for name in ['trade_time', 'price', 'high', 'low', 'volume', 'change', 'change_ratio']]
+        all_attrs = attrs + ext_attrs + ovn_attrs
+        attr_str = ', '.join(f"{name}:{getattr(self, name)}" for name in all_attrs)
+        return f"{self.basic}, {attr_str}"
 
     def __str__(self):
         return self.__repr__()

webull/data/quotes/subscribe/snapshot_result.py

@@ -1 +1 @@
-__version__ = '1.0.7'
+__version__ = '1.0.8'

webull/trade/__init__.py

@@ -0,0 +1,52 @@
+# Copyright 2022 Webull
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# 	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import json
+# coding=utf-8
+
+from webull.core.request import ApiRequest
+
+
+class BatchPlaceOrderRequest(ApiRequest):
+    def __init__(self):
+        super().__init__("/openapi/trade/order/batch-place", version='v2', method="POST", body_params={})
+
+    def set_account_id(self, account_id):
+        self.add_body_params("account_id", account_id)
+
+    def set_batch_orders(self, batch_orders):
+        self.add_body_params("batch_orders", batch_orders)
+
+    def add_custom_headers_from_order(self, batch_orders):
+        if not batch_orders:
+            return
+
+        if isinstance(batch_orders, list) and batch_orders[0]:
+            first_order = batch_orders[0]
+            leg_list = first_order.get("legs")
+            if leg_list is not None and isinstance(leg_list, list):
+                for sub_leg in leg_list:
+                    if (sub_leg and isinstance(sub_leg, dict)
+                            and sub_leg.get("instrument_type") == "OPTION"):
+                        instrument_type = sub_leg.get("instrument_type")
+                        market = sub_leg.get("market")
+                        category = market + "_" + instrument_type
+                        if category is not None:
+                            self.add_header("category", category)
+                return
+
+            market = first_order.get("market")
+            instrument_type = first_order.get("instrument_type")
+            category = market + "_" + instrument_type
+            if category is not None:
+                self.add_header("category", category)