webull-openapi-python-sdk 1.0.0__tar.gz → 1.0.2__tar.gz

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webull-openapi-python-sdk
-Version: 1.0.0
+Version: 1.0.2
 Summary: Webull Python SDK.
 Home-page: 
 Author: Webull

webull_openapi_python_sdk-1.0.2/samples/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.2"

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/samples/trade/trade_client_v2.py

@@ -107,6 +107,10 @@ if __name__ == '__main__':
     if res.status_code == 200:
         print("order_history_res=" + json.dumps(res.json(), indent=4))
 
+    res = trade_client.order_v2.get_order_open(account_id=account_id)
+    if res.status_code == 200:
+        print("order_open_res=" + json.dumps(res.json(), indent=4))
+
     # order detail
     res = trade_client.order_v2.get_order_detail(account_id=account_id, client_order_id=client_order_id)
     if res.status_code == 200:

webull_openapi_python_sdk-1.0.2/webull/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.2"

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.0"
+__version__ = "1.0.2"
 
 import logging
 

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull/core/data/endpoints.json

@@ -9,7 +9,7 @@
         },
         "hk": {
             "api": "api.webull.hk",
-            "quotes-api": "quotes-api.webull.hk",
+            "quotes-api": "data-api.webull.hk",
             "events-api": "events-api.webull.hk"
         },
         "jp": {

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull/core/http/initializer/token/token_manager.py

@@ -61,7 +61,7 @@ class TokenManager:
         server_access_token = self.fetch_token_from_server(api_client, local_token)
         self.save_token_to_local(server_access_token)
 
-        if server_access_token.get("status") != 1:
+        if server_access_token.get("status") != "NORMAL":
             msg = ("init_token status not verified error. token:%s expires:%s status:%s" %
                    (desensitize.desensitize_token(server_access_token.get("token")), server_access_token.get("expires"), server_access_token.get("status")))
             logger.error(msg)
@@ -88,11 +88,7 @@ class TokenManager:
                 else:
                     expires = 0
 
-                str_status = f.readline().strip()
-                if str_status and str_status.isdigit():
-                    status = int(str_status)
-                else:
-                    status = 0
+                status = f.readline().strip()
 
             logger.info("load_token_from_local read local token result. token:%s expires:%s status:%s",
                         desensitize.desensitize_token(token), expires, status)
@@ -119,7 +115,7 @@ class TokenManager:
         token_operation = TokenOperation(api_client)
 
         create_access_token = self.create_token(token_operation, local_token)
-        if create_access_token.get("status") == 1:
+        if create_access_token.get("status") == "NORMAL":
             logger.info("fetch_token_from_server create_token status is verified, no further check required, returning directly. token:%s expires:%s status:%s",
                         desensitize.desensitize_token(create_access_token.get("token")), create_access_token.get("expires"), create_access_token.get("status"))
             return create_access_token
@@ -185,8 +181,16 @@ class TokenManager:
                         check_access_token.get("expires"), check_access_token.get("status")))
                 logger.error(msg)
                 raise ClientException("ERROR_CHECK_TOKEN", msg)
+            # PENDING -> 0
+            # NORMAL -> 1
+            # INVALID -> 2
+            # EXPIRED -> 3
+            if check_access_token.get("status") == "INVALID" or check_access_token.get("status") == "EXPIRED" :
+                msg = "fetch_token_from_server check_token status invalidate. status:%s" % check_access_token.get("status")
+                logger.error(msg)
+                raise ClientException("ERROR_CHECK_TOKEN", msg)
 
-            if check_access_token.get("status") == 1:
+            if check_access_token.get("status") == "NORMAL":
                 logger.info(
                     "fetch_token_from_server check_token status is verified, no further check required, returning directly. token:%s expires:%s status:%s",
                     desensitize.desensitize_token(create_access_token.get("token")), create_access_token.get("expires"),

webull_openapi_python_sdk-1.0.2/webull/data/__init__.py

@@ -0,0 +1,3 @@
+# coding=utf-8
+
+__version__ = '1.0.2'

webull_openapi_python_sdk-1.0.2/webull/trade/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "1.0.2"
+

webull_openapi_python_sdk-1.0.2/webull/trade/request/v2/get_order_open_request.py

@@ -0,0 +1,29 @@
+# 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/account/orders/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)

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull/trade/trade/v2/order_operation_v2.py

@@ -17,6 +17,7 @@ from webull.trade.request.v2.cancel_option_request import CancelOptionRequest
 from webull.trade.request.v2.cancel_order_request import CancelOrderRequest
 from webull.trade.request.v2.get_order_detail_request import OrderDetailRequest
 from webull.trade.request.v2.get_order_history_request import OrderHistoryRequest
+from webull.trade.request.v2.get_order_open_request import OrderOpenRequest
 from webull.trade.request.v2.palce_order_request import PlaceOrderRequest
 from webull.trade.request.v2.place_option_request import PlaceOptionRequest
 from webull.trade.request.v2.preview_option_request import PreviewOptionRequest
@@ -118,6 +119,26 @@ class OrderOperationV2:
             order_history_request.set_last_client_order_id(last_client_order_id=last_client_order_id)
         response = self.client.get_response(order_history_request)
         return response
+
+    def get_order_open(self, account_id, page_size=None, last_order_id=None):
+        """
+        Paging query pending orders.
+
+        :param account_id: Account ID
+        :param page_size: Limit the number of records per query to 10 by default.
+        :param start_date: Start date (if empty, the default is the last 7 days), in the format of yyyy-MM-dd.
+        :param last_client_order_id: The last order ID from the previous response. For the first page query,
+        this parameter is not required.
+        """
+        order_open_request = OrderOpenRequest()
+        order_open_request.set_account_id(account_id=account_id)
+        if page_size:
+            order_open_request.set_page_size(page_size=page_size)
+        if last_order_id:
+            order_open_request.set_last_order_id(last_order_id=last_order_id)
+        response = self.client.get_response(order_open_request)
+        return response
+
     def query_order_detail(self, account_id, client_order_id):
         """
         This interface is currently available only to individual and institutional clients

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull_openapi_python_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webull-openapi-python-sdk
-Version: 1.0.0
+Version: 1.0.2
 Summary: Webull Python SDK.
 Home-page: 
 Author: Webull

{webull_openapi_python_sdk-1.0.0 → webull_openapi_python_sdk-1.0.2}/webull_openapi_python_sdk.egg-info/SOURCES.txt

@@ -280,6 +280,7 @@ webull/trade/request/v2/get_account_list.py
 webull/trade/request/v2/get_account_positions_request.py
 webull/trade/request/v2/get_order_detail_request.py
 webull/trade/request/v2/get_order_history_request.py
+webull/trade/request/v2/get_order_open_request.py
 webull/trade/request/v2/palce_order_request.py
 webull/trade/request/v2/place_option_request.py
 webull/trade/request/v2/preview_option_request.py

webull_openapi_python_sdk-1.0.0/samples/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"

webull_openapi_python_sdk-1.0.0/webull/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.0"

webull_openapi_python_sdk-1.0.0/webull/data/__init__.py

@@ -1,3 +0,0 @@
-# coding=utf-8
-
-__version__ = '1.0.0'

webull_openapi_python_sdk-1.0.0/webull/trade/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "1.0.0"
-