Skip to content

Commit f687e17

Browse files
author
方佳
committed
Merge branch 'main_merge_251212_01' into 'main'
feat: Optimize the request parameters See merge request webull/webull-openapi-python-sdk!8
2 parents 7e0100e + b1dba73 commit f687e17

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

webull/data/quotes/instrument.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@ class Instrument:
2323
def __init__(self, api_client):
2424
self.client = api_client
2525

26-
def get_instrument(self, symbols, category=Category.US_STOCK.name, status=None, last_instrument_id=None,
27-
count=1000):
26+
def get_instrument(self, symbols=None, category=Category.US_STOCK.name, status=None, last_instrument_id=None,
27+
page_size=1000):
2828
"""
2929
Query the underlying information according to the security symbol list and security type.
3030
3131
:param symbols: Securities symbol, such as: 00700,00981.
3232
:param category: Security type, enumeration.
3333
:param status: Tradable status.
3434
:param last_instrument_id: Last instrument id for pagination.
35-
:param count: Page size, default 1000.
35+
:param page_size: Page size, default 1000.
3636
"""
3737
instruments_request = GetInstrumentsRequest()
3838
instruments_request.set_symbols(symbols)
3939
instruments_request.set_category(category)
4040
instruments_request.set_status(status)
4141
instruments_request.set_last_instrument_id(last_instrument_id)
42-
instruments_request.set_count(count)
42+
instruments_request.set_page_size(page_size)
4343
response = self.client.get_response(instruments_request)
4444
return response
4545

4646
def get_crypto_instrument(self, symbols=None, status=None, last_instrument_id=None,
47-
category=Category.US_CRYPTO.name, count=1000):
47+
category=Category.US_CRYPTO.name, page_size=1000):
4848
"""
4949
Query the crypto underlying information according to the security symbol.
5050
:param symbols: Securities symbol, such as: BTCUSD,ETHUSD.
@@ -53,14 +53,14 @@ def get_crypto_instrument(self, symbols=None, status=None, last_instrument_id=No
5353
:param category: (str, required) Instrument type.
5454
Possible values: ["US_CRYPTO"]
5555
Example: "US_CRYPTO"
56-
:param count: Page size, default 1000.
56+
:param page_size: Page size, default 1000.
5757
"""
5858
crypto_instruments_request = GetCryptoInstrumentsRequest()
5959
crypto_instruments_request.set_symbols(symbols)
6060
crypto_instruments_request.set_category(category)
6161
crypto_instruments_request.set_status(status)
6262
crypto_instruments_request.set_last_instrument_id(last_instrument_id)
63-
crypto_instruments_request.set_count(count)
63+
crypto_instruments_request.set_page_size(page_size)
6464
response = self.client.get_response(crypto_instruments_request)
6565
return response
6666

webull/data/request/get_crypto_instruments_request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ def set_last_instrument_id(self, last_instrument_id):
3939
if last_instrument_id:
4040
self.add_query_param("last_instrument_id", last_instrument_id)
4141

42-
def set_count(self, count):
43-
if count:
44-
self.add_query_param("count", count)
42+
def set_page_size(self, page_size):
43+
if page_size:
44+
self.add_query_param("page_size", page_size)

webull/data/request/get_instruments_request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ def set_last_instrument_id(self, last_instrument_id):
3737
if last_instrument_id:
3838
self.add_query_param("last_instrument_id", last_instrument_id)
3939

40-
def set_count(self, count):
41-
if count:
42-
self.add_query_param("count", count)
40+
def set_page_size(self, page_size):
41+
if page_size:
42+
self.add_query_param("page_size", page_size)

0 commit comments

Comments
 (0)