Merge branch 'main_merge_250104' into 'main'

feat: Added support for webull JP client v2 API, currently limited to webull jp CASH accounts.

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

Author: 方佳

webull-python-sdk-core/webullsdkcore/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.9"
+__version__ = "0.1.10"
 
 import logging
 

webull-python-sdk-demos/setup.py

@@ -15,8 +15,8 @@
     LONG_DESCRIPTION = fp.read()
 
 requires = [
-    "webull-python-sdk-mdata==0.1.9",
-    "webull-python-sdk-trade==0.1.9"
+    "webull-python-sdk-mdata==0.1.10",
+    "webull-python-sdk-trade==0.1.10"
 ]
 
 setup_args = {

webull-python-sdk-demos/tests/trade/request/test_get_account_list.py

@@ -0,0 +1,35 @@
+# 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 unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.get_account_list import GetAccountList
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+api_client = ApiClient(your_app_key, your_app_secret)
+
+
+class TestGetSubscriptions(unittest.TestCase):
+    def test_get_app_subscriptions(self):
+        request = GetAccountList()
+        request.set_endpoint(optional_api_endpoint)
+        try:
+            response = api_client.get_response(request)
+            print(response.json())
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())

webull-python-sdk-demos/tests/trade/request/test_order_operation.py

@@ -81,9 +81,3 @@ def test_order_operation(self):
         res = order_operation.cancel_order(account_id, cancel_client_order_id)
         if res.status_code == 200:
             print('cancel order response:', res.json())
-
-
-
-
-
-

webull-python-sdk-demos/tests/trade/request/v2/__init__.py

@@ -0,0 +1,42 @@
+# 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 unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdktrade.trade.v2.account_info_v2 import AccountV2
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+
+
+class TestAccountInfo(unittest.TestCase):
+    def test_account_info(self):
+        account = AccountV2(api_client)
+        res = account.get_account_list()
+        if res.status_code == 200:
+            print('account list:', res.json())
+
+        res = account.get_account_balance(account_id)
+        if res.status_code == 200:
+            print('account balance:', res.json())
+
+        res = account.get_account_position(account_id)
+        if res.status_code == 200:
+            print('account position:', res.json())

webull-python-sdk-demos/tests/trade/request/v2/test_account_info.py

@@ -0,0 +1,47 @@
+# 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
+import unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.cancel_order_request import CancelOrderRequest
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+client_order_id = "88a0b06eb35b448b8aacd9f2ae4d2deb"
+
+
+class TestOrderOperation(unittest.TestCase):
+    def test_cancel_order(self):
+        request = CancelOrderRequest()
+        request.set_endpoint(optional_api_endpoint)
+        request.set_account_id(account_id)
+        request.set_client_order_id(client_order_id)
+        post_body = request.get_body_params()
+        print(json.dumps(post_body, indent=4))
+        params = request.get_query_params()
+        print(params)
+        try:
+            response = api_client.get_response(request)
+            print(json.dumps(response.json(), indent=4))
+
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())

webull-python-sdk-demos/tests/trade/request/v2/test_cancel_order.py

@@ -0,0 +1,41 @@
+# 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 unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.get_account_balance_request import AccountBalanceRequest
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+
+
+class TestAccountBalanceRequest(unittest.TestCase):
+    def test_get_account_balance(self):
+        request = AccountBalanceRequest()
+        request.set_endpoint(optional_api_endpoint)
+        request.set_account_id(account_id)
+        request.set_total_asset_currency()
+        try:
+            response = api_client.get_response(request)
+            print(response.json())
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())

webull-python-sdk-demos/tests/trade/request/v2/test_get_account_balance.py

@@ -0,0 +1,40 @@
+# 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 unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.get_account_positions_request import AccountPositionsRequest
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+
+
+class TestAccountPositionsRequest(unittest.TestCase):
+    def test_get_account_positions(self):
+        request = AccountPositionsRequest()
+        request.set_endpoint(optional_api_endpoint)
+        request.set_account_id(account_id)
+        try:
+            response = api_client.get_response(request)
+            print(response.json())
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())

webull-python-sdk-demos/tests/trade/request/v2/test_get_account_positions.py

@@ -0,0 +1,43 @@
+# 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
+import unittest
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.get_order_history_request import OrderHistoryRequest
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+
+
+class TestOrderOperation(unittest.TestCase):
+    def test_order_history(self):
+        request = OrderHistoryRequest()
+        request.set_endpoint(optional_api_endpoint)
+        request.set_account_id(account_id)
+        params = request.get_query_params()
+        print(params)
+        try:
+            response = api_client.get_response(request)
+            print(json.dumps(response.json(), indent=4))
+
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())

webull-python-sdk-demos/tests/trade/request/v2/test_order_history.py

@@ -0,0 +1,64 @@
+# 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
+import unittest
+import uuid
+
+from webullsdkcore.client import ApiClient
+from webullsdkcore.exception.exceptions import ServerException
+from webullsdktrade.request.v2.palce_order_request import PlaceOrderRequest
+
+optional_api_endpoint = "<api_endpoint>"
+your_app_key = "<your_app_key>"
+your_app_secret = "<your_app_secret>"
+account_id = "<your_account_id>"
+#'jp'
+region_id = "<region_id>"
+api_client = ApiClient(your_app_key, your_app_secret, region_id)
+api_client.add_endpoint(region_id, optional_api_endpoint)
+client_order_id = uuid.uuid4().hex
+new_orders = {
+    "client_order_id": client_order_id,
+    "symbol": "7011",
+    "instrument_type": "EQUITY",
+    "market": "JP",
+    "order_type": "LIMIT",
+    "limit_price": "2080",
+    "quantity": "100",
+    "support_trading_session": "N",
+    "side": "BUY",
+    "time_in_force": "DAY",
+    "entrust_type": "QTY",
+    "account_tax_type": "GENERAL"
+}
+
+
+class TestOrderOperation(unittest.TestCase):
+    def test_place_order(self):
+        request = PlaceOrderRequest()
+        request.set_endpoint(optional_api_endpoint)
+        request.set_account_id(account_id)
+        request.set_new_orders(new_orders)
+        request.finalize_order()
+        post_body = request.get_body_params()
+        print(json.dumps(post_body, indent=4))
+        params = request.get_query_params()
+        print(params)
+
+        try:
+            response = api_client.get_response(request)
+            print(response.json())
+
+        except ServerException as se:
+            print(se.get_error_code(), ":", se.get_error_msg())