webull-openapi-python-sdk 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

webull/data/__init__.py

@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = '1.0.1'
+__version__ = '1.0.3'

webull/data/data_client.py

@@ -11,6 +11,9 @@
 # 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.
+
+# coding=utf-8
+
 import logging
 import sys
 

webull/data/request/get_batch_historical_bars_request.py

@@ -17,7 +17,7 @@ from webull.core.request import ApiRequest
 
 class BatchHistoricalBarsRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/batch-bars", version='v2', method="POST", body_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/stock/batch-bars", version='v2', method="POST", body_params={})
 
     def set_symbols(self, symbol):
         self.add_body_params("symbols", symbol)

webull/data/request/get_historical_bars_request.py

@@ -17,7 +17,7 @@ from webull.core.request import ApiRequest
 
 class GetHistoricalBarsRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/bars", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/stock/bars", version='v2', method="GET", query_params={})
 
     def set_symbol(self, symbol):
         self.add_query_param("symbol", symbol)

webull/data/request/get_instruments_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class GetInstrumentsRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/instrument/list", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/instrument/stock/list", version='v2', method="GET", query_params={})
 
     def set_symbols(self, symbols):
         if isinstance(symbols, str):

webull/data/request/get_quotes_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class GetQuotesRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/quotes", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/stock/quotes", version='v2', method="GET", query_params={})
 
     def set_symbol(self, symbol):
         self.add_query_param("symbol", symbol)

webull/data/request/get_snapshot_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class GetSnapshotRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/snapshot", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/stock/snapshot", version='v2', method="GET", query_params={})
 
     def set_symbols(self, symbols):
         if isinstance(symbols, str):

webull/data/request/get_tick_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class GetTickRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/tick", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/stock/tick", version='v2', method="GET", query_params={})
 
     def set_symbol(self, symbol):
         self.add_query_param("symbol", symbol)

webull/trade/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 

webull/trade/request/palce_order_request.py

@@ -13,13 +13,14 @@
 # limitations under the License.
 
 # coding=utf-8
-import inspect
-import json
 
 from webull.core.context.request_context_holder import RequestContextHolder
 from webull.core.request import ApiRequest
 
 class PlaceOrderRequest(ApiRequest):
+    """
+    Deprecated. Use :func:`place_order_request` instead.
+    """
     def __init__(self):
         ApiRequest.__init__(self, "/trade/order/place", version='v2', method="POST", body_params={})
         self._stock_order = {}

webull/trade/request/place_order_request.py

@@ -0,0 +1,92 @@
+# 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.
+
+# coding=utf-8
+import inspect
+import json
+
+from webull.core.context.request_context_holder import RequestContextHolder
+from webull.core.request import ApiRequest
+
+class PlaceOrderRequest(ApiRequest):
+
+    def __init__(self):
+        ApiRequest.__init__(self, "/trade/order/place", version='v2', method="POST", body_params={})
+        self._stock_order = {}
+        self.add_body_params("stock_order", self._stock_order)
+
+    def add_stock_order_params(self, k, v):
+        self._stock_order[k] = v
+
+    def set_category(self, category):
+        self.add_body_params("category", category)
+
+    def set_account_id(self, account_id):
+        self.add_body_params("account_id", account_id)
+
+    def set_client_order_id(self, client_order_id):
+        self.add_stock_order_params("client_order_id", client_order_id)
+
+    def set_side(self, side):
+        self.add_stock_order_params("side", side)
+
+    def set_tif(self, tif):
+        self.add_stock_order_params("tif", tif)
+
+    def set_extended_hours_trading(self, extended_hours_trading):
+        self.add_stock_order_params("extended_hours_trading", extended_hours_trading)
+
+    def set_instrument_id(self, instrument_id):
+        self.add_stock_order_params("instrument_id", instrument_id)
+
+    def set_order_type(self, order_type):
+        self.add_stock_order_params("order_type", order_type)
+
+    def set_limit_price(self, limit_price):
+        self.add_stock_order_params("limit_price", limit_price)
+
+    def set_qty(self, quantity):
+        self.add_stock_order_params("qty", quantity)
+
+    def set_stop_price(self, stop_price):
+        self.add_stock_order_params("stop_price", stop_price)
+
+    def set_trailing_type(self, trailing_type):
+        self.add_stock_order_params("trailing_type", trailing_type)
+
+    def set_trailing_stop_step(self, trailing_stop_step):
+        self.add_stock_order_params("trailing_stop_step", trailing_stop_step)
+
+    def set_stock_order(self, client_order_id,  instrument_id, qty, side, tif, extended_hours_trading,
+                        order_type, limit_price, stop_price, trailing_type,trailing_stop_step):
+        self._stock_order.update({k: v for k, v in locals().items() if v is not None and k != 'self'})
+
+    def add_custom_headers_from_context(self):
+        try:
+            headers_map = RequestContextHolder.get()
+            if not headers_map:
+                return
+            for key, value in headers_map.items():
+                self.add_header(key, value)
+        finally:
+            RequestContextHolder.clear()
+
+    def add_custom_headers(self, headers_map):
+        if not headers_map:
+            return
+        for key, value in headers_map.items():
+            self.add_header(key, value)
+
+
+

webull/trade/request/v2/cancel_option_request.py

@@ -19,10 +19,10 @@ from webull.core.request import ApiRequest
 
 class CancelOptionRequest(ApiRequest):
     def __init__(self):
-        super().__init__("/openapi/account/orders/option/cancel", version='v2', method="POST", body_params={})
+        super().__init__("/openapi/trade/option/order/cancel", version='v2', method="POST", body_params={})
 
     def set_client_order_id(self, client_order_id):
         self.add_body_params("client_order_id", client_order_id)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
+        self.add_body_params("account_id", account_id)

webull/trade/request/v2/cancel_order_request.py

@@ -18,10 +18,10 @@ from webull.core.request import ApiRequest
 
 class CancelOrderRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/openapi/account/orders/cancel", version='v2', method="POST", body_params={})
+        ApiRequest.__init__(self, "/openapi/trade/stock/order/cancel", version='v2', method="POST", body_params={})
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
+        self.add_body_params("account_id", account_id)
 
     def set_client_order_id(self, client_order_id):
         self.add_body_params("client_order_id", client_order_id)

webull/trade/request/v2/get_account_balance_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class AccountBalanceRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/openapi/account/balance", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/assets/balance", version='v2', method="GET", query_params={})
 
     def set_account_id(self, account_id):
         self.add_query_param("account_id", account_id)

webull/trade/request/v2/get_account_list.py

@@ -17,6 +17,9 @@ from webull.core.request import ApiRequest
 
 
 class GetAccountList(ApiRequest):
+    """
+    Deprecated. Use :func:`get_account_list_request` instead.
+    """
     def __init__(self):
         ApiRequest.__init__(self, "/openapi/account/list", version='v2', method="GET", query_params={})
 

webull/trade/request/v2/get_account_list_request.py

@@ -0,0 +1,23 @@
+# 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.
+
+# coding=utf-8
+from webull.core.request import ApiRequest
+
+
+class GetAccountListRequest(ApiRequest):
+    def __init__(self):
+        ApiRequest.__init__(self, "/openapi/account/list", version='v2', method="GET", query_params={})
+
+        

webull/trade/request/v2/get_account_positions_request.py

@@ -18,7 +18,7 @@ from webull.core.request import ApiRequest
 
 class AccountPositionsRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/openapi/account/positions", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/assets/positions", version='v2', method="GET", query_params={})
 
     def set_account_id(self, account_id):
         self.add_query_param("account_id", account_id)

webull/trade/request/v2/get_order_detail_request.py

@@ -17,7 +17,7 @@ from webull.core.request import ApiRequest
 
 class OrderDetailRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/openapi/account/orders/detail", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/trade/order/detail", version='v2', method="GET", query_params={})
 
     def set_account_id(self, account_id):
         self.add_query_param("account_id", account_id)

webull/trade/request/v2/get_order_history_request.py

@@ -17,7 +17,7 @@ from webull.core.request import ApiRequest
 
 class OrderHistoryRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/openapi/account/orders/history", version='v2', method="GET", query_params={})
+        ApiRequest.__init__(self, "/openapi/trade/order/history", version='v2', method="GET", query_params={})
 
     def set_account_id(self, account_id):
         self.add_query_param("account_id", account_id)
@@ -32,4 +32,7 @@ class OrderHistoryRequest(ApiRequest):
         self.add_query_param("end_date", end_date)
 
     def set_last_client_order_id(self, last_client_order_id):
-        self.add_query_param("last_client_order_id", last_client_order_id)
+        self.add_query_param("last_client_order_id", last_client_order_id)
+
+    def set_last_order_id(self, last_order_id):
+        self.add_query_param("last_order_id", last_order_id)

webull/trade/request/v2/get_order_open_request.py

@@ -0,0 +1,32 @@
+# 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.
+
+from webull.core.request import ApiRequest
+
+
+class OrderOpenRequest(ApiRequest):
+    def __init__(self):
+        ApiRequest.__init__(self, "/openapi/trade/order/open", version='v2', method="GET", query_params={})
+
+    def set_account_id(self, account_id):
+        self.add_query_param("account_id", account_id)
+
+    def set_page_size(self, page_size):
+        self.add_query_param("page_size", page_size)
+
+    def set_last_order_id(self, last_order_id):
+        self.add_query_param("last_order_id", last_order_id)
+
+    def set_last_client_order_id(self, last_client_order_id):
+        self.add_query_param("last_client_order_id", last_client_order_id)

webull/trade/request/v2/palce_order_request.py

@@ -11,54 +11,27 @@
 # 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 typing import List
 
-from webull.core.context.request_context_holder import RequestContextHolder
 from webull.core.request import ApiRequest
 
 
-class CloseContract:
-    def __init__(self, contract_id: str, quantity: str):
-        self.contract_id = contract_id
-        self.quantity = quantity
-
-    def to_dict(self):
-        return {
-            "contract_id": self.contract_id,
-            "quantity": self.quantity
-        }
-
 class PlaceOrderRequest(ApiRequest):
+    """
+    Deprecated. Use :func:`place_order_request` instead.
+    """
     def __init__(self):
-        super().__init__("/openapi/account/orders/place", version='v2', method="POST", body_params={})
-        self._new_orders = []
-        self._current_order = {}
-        self.add_body_params("new_orders", self._new_orders)
+        super().__init__("/openapi/trade/stock/order/place", version='v2', method="POST", body_params={})
 
-    def add_new_order_params(self, key, value):
-        self._current_order[key] = value
+    def set_new_orders(self, new_orders):
+        self.add_body_params("new_orders", new_orders)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
-
-    def set_close_contracts(self, close_contracts: List[CloseContract]):
-        if not isinstance(close_contracts, list):
-            raise TypeError("close_contracts must be a list of CloseContract objects.")
-        self.add_new_order_params("close_contracts", [contract.to_dict() for contract in close_contracts])
-
-    def set_new_orders(self, current_order):
-        self._current_order.update({k: v for k, v in current_order.items() if v is not None and k != 'self'})
-        if 'close_contracts' in current_order and current_order['close_contracts'] is not None:
-            self.set_close_contracts(current_order['close_contracts'])
+        self.add_body_params("account_id", account_id)
 
-    def finalize_order(self):
-        if self._current_order:
-            self._new_orders.append(self._current_order)
-            self._current_order = {}
-        else:
-            raise ValueError("No order fields have been set.")
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)
 
     def add_custom_headers_from_order(self, new_orders):
         if not new_orders:
@@ -68,20 +41,4 @@ class PlaceOrderRequest(ApiRequest):
             market = new_orders.get("market")
             category = market + "_" + "STOCK"
             if category is not None:
-                self.add_header("category", category)
-
-    def add_custom_headers_from_context(self):
-        try:
-            headers_map = RequestContextHolder.get()
-            if not headers_map:
-                return
-            for key, value in headers_map.items():
-                self.add_header(key, value)
-        finally:
-            RequestContextHolder.clear()
-
-    def add_custom_headers(self, headers_map):
-        if not headers_map:
-            return
-        for key, value in headers_map.items():
-            self.add_header(key, value)
+                self.add_header("category", category)

webull/trade/request/v2/place_option_request.py

@@ -11,9 +11,7 @@
 # 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
 
-from webull.core.context.request_context_holder import RequestContextHolder
 # coding=utf-8
 
 from webull.core.request import ApiRequest
@@ -21,16 +19,19 @@ from webull.core.request import ApiRequest
 
 class PlaceOptionRequest(ApiRequest):
     def __init__(self):
-        super().__init__("/openapi/account/orders/option/place", version='v2', method="POST", body_params={})
+        super().__init__("/openapi/trade/option/order/place", version='v2', method="POST", body_params={})
 
     def set_new_orders(self, new_orders):
         self.add_body_params("new_orders", new_orders)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
+        self.add_body_params("account_id", account_id)
 
-    def add_custom_headers_from_order(self, new_orders):
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)
 
+    def add_custom_headers_from_order(self, new_orders):
         if not new_orders:
             return
 
@@ -45,20 +46,4 @@ class PlaceOptionRequest(ApiRequest):
                         market = sub_order.get("market")
                         category = market + "_" + instrument_type
                         if category is not None:
-                            self.add_header("category", category)
-
-    def add_custom_headers_from_context(self):
-        try:
-            headers_map = RequestContextHolder.get()
-            if not headers_map:
-                return
-            for key, value in headers_map.items():
-                self.add_header(key, value)
-        finally:
-            RequestContextHolder.clear()
-
-    def add_custom_headers(self, headers_map):
-        if not headers_map:
-            return
-        for key, value in headers_map.items():
-            self.add_header(key, value)
+                            self.add_header("category", category)

webull/trade/request/v2/place_order_request.py

@@ -0,0 +1,44 @@
+# 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.
+# coding=utf-8
+
+from webull.core.request import ApiRequest
+
+
+class PlaceOrderRequest(ApiRequest):
+    def __init__(self):
+        super().__init__("/openapi/trade/stock/order/place", version='v2', method="POST", body_params={})
+        self._new_orders = []
+        self._current_order = {}
+        self.add_body_params("new_orders", self._new_orders)
+
+    def set_new_orders(self, new_orders):
+        self.add_body_params("new_orders", new_orders)
+
+    def set_account_id(self, account_id):
+        self.add_body_params("account_id", account_id)
+
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)
+
+    def add_custom_headers_from_order(self, new_orders):
+        if not new_orders:
+            return
+
+        if not isinstance(new_orders, (list, tuple)):
+            market = new_orders.get("market")
+            category = market + "_" + "STOCK"
+            if category is not None:
+                self.add_header("category", category)

webull/trade/request/v2/preview_option_request.py

@@ -19,10 +19,14 @@ from webull.core.request import ApiRequest
 
 class PreviewOptionRequest(ApiRequest):
     def __init__(self):
-        super().__init__("/openapi/account/orders/option/preview", version='v2', method="POST", body_params={})
+        super().__init__("/openapi/trade/option/order/preview", version='v2', method="POST", body_params={})
 
     def set_new_orders(self, new_orders):
         self.add_body_params("new_orders", new_orders)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
+        self.add_body_params("account_id", account_id)
+
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)

webull/trade/request/v2/preview_order_request.py

@@ -11,49 +11,19 @@
 # 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.
-from typing import List
 
 from webull.core.request import ApiRequest
 
-
-class CloseContract:
-    def __init__(self, contract_id: str, quantity: str):
-        self.contract_id = contract_id
-        self.quantity = quantity
-
-    def to_dict(self):
-        return {
-            "contract_id": self.contract_id,
-            "quantity": self.quantity
-        }
-
-
 class PreviewOrderRequest(ApiRequest):
     def __init__(self):
-        super().__init__("/openapi/account/orders/preview", version='v2', method="POST", body_params={})
-        self._new_orders = []
-        self._current_order = {}
-        self.add_body_params("new_orders", self._new_orders)
+        super().__init__("/openapi/trade/stock/order/preview", version='v2', method="POST", body_params={})
 
-    def add_new_order_params(self, k, v):
-        self._current_order[k] = v
+    def set_new_orders(self, new_orders):
+        self.add_body_params("new_orders", new_orders)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
-
-    def set_close_contracts(self, close_contracts: List[CloseContract]):
-        if not isinstance(close_contracts, list):
-            raise TypeError("close_contracts must be a list of CloseContract objects.")
-        self.add_new_order_params("close_contracts", [contract.to_dict() for contract in close_contracts])
-
-    def set_new_orders(self, current_order):
-        self._current_order.update({k: v for k, v in current_order.items() if v is not None and k != 'self'})
-        if 'close_contracts' in current_order and current_order['close_contracts'] is not None:
-            self.set_close_contracts(current_order['close_contracts'])
+        self.add_body_params("account_id", account_id)
 
-    def finalize_order(self):
-        if self._current_order:
-            self._new_orders.append(self._current_order)
-            self._current_order = {}
-        else:
-            raise ValueError("No order fields have been set.")
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)

webull/trade/request/v2/replace_option_request.py

@@ -19,10 +19,14 @@ from webull.core.request import ApiRequest
 
 class ReplaceOptionRequest(ApiRequest):
     def __init__(self):
-        super().__init__("/openapi/account/orders/option/replace", version='v2', method="POST", body_params={})
+        super().__init__("/openapi/trade/option/order/replace", version='v2', method="POST", body_params={})
 
     def set_modify_orders(self, modify_orders):
         self.add_body_params("modify_orders", modify_orders)
 
     def set_account_id(self, account_id):
-        self.add_query_param("account_id", account_id)
+        self.add_body_params("account_id", account_id)
+
+    def set_client_combo_order_id(self, client_combo_order_id):
+        if client_combo_order_id:
+            self.add_body_params("client_combo_order_id", client_combo_order_id)