webull-openapi-python-sdk 2.0.13__py3-none-any.whl → 2.0.15__py3-none-any.whl

samples/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.13'
+__version__ = '2.0.15'

samples/data/data_client.py

@@ -265,6 +265,11 @@ if __name__ == '__main__':
     if res.status_code == 200:
         print('get_forecast_eps:', res.json())
 
+    # Option Instrument - Query option contracts by underlying symbol and filters
+    res = data_client.instrument.get_option_contracts(Category.US_OPTION.name,"AAPL")
+    if res.status_code == 200:
+        print('get_option_contracts:', res.json())
+
     # Screener - Market Sectors
     res = data_client.screener.get_market_sectors(Category.US_STOCK.name)
     if res.status_code == 200:

samples/trade/trade_event_client.py

@@ -15,7 +15,7 @@
 import logging
 
 from webull.trade.events.types import ORDER_STATUS_CHANGED, EVENT_TYPE_ORDER, EVENT_TYPE_POSITION, \
-    POSITION_STATUS_CHANGED
+    POSITION_STATUS_CHANGED, EVENT_TYPE_OPTION, OPTION_STATUS_CHANGED
 from webull.trade.trade_events_client import TradeEventsClient
 
 your_app_key = "<your_app_key>"
@@ -35,6 +35,8 @@ def my_on_events_message(event_type, subscribe_type, payload, raw_message):
         print(payload)
     if EVENT_TYPE_POSITION == event_type and POSITION_STATUS_CHANGED == subscribe_type:
         print('event payload:%s' % payload)
+    if EVENT_TYPE_OPTION == event_type and OPTION_STATUS_CHANGED == subscribe_type:
+        print('option payload:%s' % payload)
 
 if __name__ == '__main__':
 

webull/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.13'
+__version__ = '2.0.15'

webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.0.13'
+__version__ = '2.0.15'
 
 import logging
 

webull/core/auth/composer/default_signature_composer.py

@@ -59,10 +59,7 @@ def _refresh_sign_headers(host, headers, app_key_id, signer_spec):
     sign_headers[hd.APP_KEY] = app_key_id
     sign_headers[hd.TIMESTAMP] = common.get_iso_8601_date()
 
-    if common.is_not_upgrade_api_host(host):
-        signer_spec = sha_hmac256_new
-    else:
-        signer_spec = sha_hmac1
+    signer_spec = sha_hmac256_new
 
     sign_headers[hd.SIGN_VERSION] = signer_spec.get_signer_version()
     sign_headers[hd.SIGN_ALGORITHM] = signer_spec.get_signer_name()

webull/core/utils/common.py

@@ -16,7 +16,7 @@
 import base64
 import hashlib
 import socket
-from datetime import datetime
+from datetime import datetime, timezone
 import uuid
 import json
 from webull.core.compat import ensure_bytes, ensure_string
@@ -33,21 +33,21 @@ def get_uuid():
 def get_iso_8601_date(dt_as_utc=None):
     if dt_as_utc:
         return dt_as_utc.strftime(FORMAT_ISO_8601)
-    d = datetime.utcnow()
+    d = datetime.now(timezone.utc)
     return d.strftime(FORMAT_ISO_8601)
 
 def get_iso_8601_date_with_millis(dt_as_utc=None):
     if dt_as_utc:
         d = dt_as_utc
     else:
-        d = datetime.utcnow()
+        d = datetime.now(timezone.utc)
     ret = d.strftime(FORMAT_ISO_8601_MILLIS)
     if len(ret) != 27:
         raise RuntimeError("failed to convent timestamp, result: %s" % ret)
     return ret[:-4] + ret[-1:]
 
 def parse_timestamp_to_dt(timestamp_of_millis):
-    return datetime.utcfromtimestamp(timestamp_of_millis / 1000.0)
+    return datetime.fromtimestamp(timestamp_of_millis / 1000.0, tz=timezone.utc).replace(tzinfo=None)
 
 def md5_sum(content):
     content_bytes = ensure_bytes(content)
@@ -63,17 +63,4 @@ def sha256_hex(content):
     return hashlib.sha256(content_bytes).hexdigest()
 
 def json_dumps_compact(content):
-    return json.dumps(content, ensure_ascii=False, separators=(',', ':'))
-
-def is_not_upgrade_api_host(host):
-    upgrade_hosts = {
-        "api.webull.com","events-api.webull.com",
-        "api.webull.hk","events-api.webull.hk",
-        "pre-openapi-us-alb.webullbroker.com","pre-openapi-us-events.webullbroker.com",
-        "pre-openapi-alb.webullbroker.com","pre-openapi-events.webullbroker.com",
-        "us-openapi-alb.uat.webullbroker.com","us-openapi-events.uat.webullbroker.com",
-        "hk-openapi.uat.webullbroker.com", "hk-openapi-events-api.uat.webullbroker.com",
-        "api.sandbox.webull.hk", "events-api.sandbox.webull.hk"
-
-    }
-    return host not in upgrade_hosts
+    return json.dumps(content, ensure_ascii=False, separators=(',', ':'))

webull/core/utils/desensitize.py

@@ -21,11 +21,9 @@ def desensitize_token(token, keep_length=6, mask_length=6):
 
     total_length = len(token)
 
-    # 如果字符串长度不足需要保留长度的两倍，则返回全部内容
     if total_length <= keep_length * 2:
         return token
 
-    # 提取前保留部分、后保留部分，并用星号连接
     front_part = token[:keep_length]
     rear_part = token[-keep_length:] if keep_length > 0 else ''
     mask = '*' * mask_length

webull/data/__init__.py

@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = '2.0.13'
+__version__ = '2.0.15'

webull/data/quotes/instrument.py

@@ -25,6 +25,7 @@ from webull.data.request.get_futures_instruments_request import GetFuturesInstru
 from webull.data.request.get_futures_products_request import GetFuturesProductsRequest
 from webull.data.request.get_futures_instruments_by_code_request import GetFuturesInstrumentsByCodeRequest
 from webull.data.request.get_futures_product_class import GetFuturesProductClassRequest
+from webull.data.request.get_option_contracts_request import GetOptionContractsRequest
 
 
 class Instrument:
@@ -218,6 +219,48 @@ class Instrument:
         response = self.client.get_response(event_instrument_request)
         return response
 
+    def get_option_contracts(self, category=Category.US_OPTION.name, underlying_symbols=None, status=None,
+                               start_date=None, end_date=None, root_symbol=None, option_symbol=None,
+                               option_type=None, style=None, strike_price_gte=None, strike_price_lte=None,
+                               ppind=None, show_deliverables=None, page_size=10, last_instrument_id=None):
+        """
+        Query option contracts list by conditions such as underlying_symbols, status, expiration date, etc.
+
+        :param category: Market category. Value: US_OPTION.
+        :param underlying_symbols: Underlying symbol(s), comma-separated for multiple, e.g. AAPL,MSFT.
+        :param status: Contract status: LISTING (default), DELISTING.
+        :param start_date: Exact expiration date, format YYYY-MM-DD.
+        :param end_date: Expiration date lower bound (inclusive), format YYYY-MM-DD.
+        :param root_symbol: Root symbol filter (series symbol, e.g. SPXW), mainly for index options and non-standard contracts after CA.
+        :param option_symbol: Option symbol, e.g. AAPL250620C00150000.
+        :param option_type: Contract type: CALL / PUT.
+        :param style: Exercise style: AMERICAN / EUROPEAN.
+        :param strike_price_gte: Strike price lower bound (inclusive).
+        :param strike_price_lte: Strike price upper bound (inclusive).
+        :param ppind: Penny Program Indicator: true = Penny Pilot, false = non-Penny Pilot.
+        :param show_deliverables: Whether to return deliverables array in response: true / false, default false.
+        :param page_size: Page size, default 10, max 1000.
+        :param last_instrument_id: Last instrument_id from previous page for pagination.
+        """
+        request = GetOptionContractsRequest()
+        request.set_category(category)
+        request.set_underlying_symbols(underlying_symbols)
+        request.set_status(status)
+        request.set_start_date(start_date)
+        request.set_end_date(end_date)
+        request.set_root_symbol(root_symbol)
+        request.set_option_symbol(option_symbol)
+        request.set_option_type(option_type)
+        request.set_style(style)
+        request.set_strike_price_gte(strike_price_gte)
+        request.set_strike_price_lte(strike_price_lte)
+        request.set_ppind(ppind)
+        request.set_show_deliverables(show_deliverables)
+        request.set_page_size(page_size)
+        request.set_last_instrument_id(last_instrument_id)
+        response = self.client.get_response(request)
+        return response
+
     def get_company_profile(self, symbol, category=Category.US_STOCK.name):
         """
         Get company profile for one instrument.

webull/data/quotes/market_streaming_data.py

@@ -27,7 +27,7 @@ class MarketDataStreaming:
        :param session_id: Create the sessionId used for the connection
        :param symbols: Such as: [AAPL,TSLA]
        :param category: Security type, enumeration
-       :param sub_types: Unsubscribe data type, such as: [SNAPSHOT]、SubType Required when unsubscribe_all is empty
+       :param sub_types: Unsubscribe data type, such as: [SNAPSHOT] SubType Required when unsubscribe_all is empty
         or not true
        :param depth: Level 2 subscription levels.
         10 levels by default, up to 50 levels for U.S. stocks.
@@ -51,7 +51,7 @@ class MarketDataStreaming:
         :param session_id: Create the sessionId used for the connection
         :param symbols: Such as: [AAPL,TSLA]
         :param category: Security type, enumeration
-        :param sub_types: Unsubscribe data type, such as: [SNAPSHOT]、SubType Required when unsubscribe_all is empty
+        :param sub_types: Unsubscribe data type, such as: [SNAPSHOT] SubType Required when unsubscribe_all is empty
          or not true
         :param unsubscribe_all: boolean false (true means canceling all real-time market subscriptions.
          When unsubscribe_all is true, symbols, category, sub_types can be empty)

webull/data/quotes/subscribe/ask_bid_result.py

@@ -44,7 +44,7 @@ class AskBidResult:
 
     def __repr__(self):
         result = f"price:{self.price},size:{self.size}"
-        # 可选字段
+
         if self.order:
             result += f",order:{str(self.order)}"
         if self.broker:

webull/data/quotes/subscribe/basic_result.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # coding=utf-8
-from datetime import datetime
+from datetime import datetime, timezone
 
 
 class BasicResult:
@@ -33,7 +33,7 @@ class BasicResult:
         return self.timestamp
 
     def get_timestamp_as_utc(self):
-        return datetime.utcfromtimestamp(self.timestamp / 1000.0)
+        return datetime.fromtimestamp(self.timestamp / 1000.0, tz=timezone.utc).replace(tzinfo=None)
 
     def get_trading_session(self):
         return self.trading_session

webull/data/request/get_option_contracts_request.py

@@ -0,0 +1,82 @@
+# 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 GetOptionContractsRequest(ApiRequest):
+    def __init__(self):
+        ApiRequest.__init__(self, "/openapi/instrument/option/contracts", version="v2", method="GET",
+                           query_params={})
+
+    def set_category(self, category):
+        self.add_query_param("category", category)
+
+    def set_underlying_symbols(self, underlying_symbols):
+        if underlying_symbols:
+            self.add_query_param("underlying_symbols", underlying_symbols)
+
+    def set_status(self, status):
+        if status:
+            self.add_query_param("status", status)
+
+    def set_start_date(self, start_date):
+        if start_date:
+            self.add_query_param("start_date", start_date)
+
+    def set_end_date(self, end_date):
+        if end_date:
+            self.add_query_param("end_date", end_date)
+
+    def set_root_symbol(self, root_symbol):
+        if root_symbol:
+            self.add_query_param("root_symbol", root_symbol)
+
+    def set_option_symbol(self, option_symbol):
+        if option_symbol:
+            self.add_query_param("option_symbol", option_symbol)
+
+    def set_option_type(self, option_type):
+        if option_type:
+            self.add_query_param("option_type", option_type)
+
+    def set_style(self, style):
+        if style:
+            self.add_query_param("style", style)
+
+    def set_strike_price_gte(self, strike_price_gte):
+        if strike_price_gte is not None:
+            self.add_query_param("strike_price_gte", strike_price_gte)
+
+    def set_strike_price_lte(self, strike_price_lte):
+        if strike_price_lte is not None:
+            self.add_query_param("strike_price_lte", strike_price_lte)
+
+    def set_ppind(self, ppind):
+        if ppind is not None:
+            self.add_query_param("ppind", ppind)
+
+    def set_show_deliverables(self, show_deliverables):
+        if show_deliverables is not None:
+            self.add_query_param("show_deliverables", show_deliverables)
+
+    def set_page_size(self, page_size):
+        if page_size:
+            self.add_query_param("page_size", page_size)
+
+    def set_last_instrument_id(self, last_instrument_id):
+        if last_instrument_id:
+            self.add_query_param("last_instrument_id", last_instrument_id)

webull/trade/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.13'
+__version__ = '2.0.15'

webull/trade/events/types.py

@@ -16,6 +16,8 @@
 
 EVENT_TYPE_ORDER = 1024
 EVENT_TYPE_POSITION = 1028
+EVENT_TYPE_OPTION = 1032
 
 ORDER_STATUS_CHANGED = 1
 POSITION_STATUS_CHANGED = 2
+OPTION_STATUS_CHANGED = 4

webull/trade/request/palce_order_request.py

@@ -19,7 +19,7 @@ from webull.core.request import ApiRequest
 
 class PlaceOrderRequest(ApiRequest):
     """
-    Deprecated. Use :func:`place_order_request` instead.
+    Deprecated. Use :class:`PlaceOrderRequestV2` instead.
     """
     def __init__(self):
         ApiRequest.__init__(self, "/trade/order/place", version='v2', method="POST", body_params={})

webull/trade/request/place_order_request.py

@@ -20,7 +20,9 @@ from webull.core.context.request_context_holder import RequestContextHolder
 from webull.core.request import ApiRequest
 
 class PlaceOrderRequest(ApiRequest):
-
+    """
+    Deprecated. Use :class:`PlaceOrderRequestV2` instead.
+    """
     def __init__(self):
         ApiRequest.__init__(self, "/trade/order/place", version='v2', method="POST", body_params={})
         self._stock_order = {}

webull/trade/request/replace_order_request.py

@@ -17,6 +17,9 @@ from webull.core.request import ApiRequest
 
 
 class ReplaceOrderRequest(ApiRequest):
+    """
+    Deprecated. Use :class:`ReplaceOrderRequestV2` instead.
+    """
     def __init__(self):
         ApiRequest.__init__(self, "/trade/order/replace", version='v2', method="POST", body_params={})
         self._stock_order = {}

webull/trade/trade/account_info.py

@@ -14,8 +14,6 @@
 
 # coding=utf-8
 
-from json.tool import main
-from webull.trade.common.currency import Currency
 from webull.trade.request.get_account_balance_request import AccountBalanceRequest
 from webull.trade.request.get_account_positions_request import AccountPositionsRequest
 from webull.trade.request.get_account_profile_request import AccountProfileRequest
@@ -23,6 +21,9 @@ from webull.trade.request.get_app_subscriptions import GetAppSubscriptions
 
 
 class Account:
+    """
+    Deprecated. Use :class:`AccountV2` instead.
+    """
     def __init__(self, api_client):
         self.client = api_client
 

webull/trade/trade/trade_instrument.py

@@ -39,7 +39,7 @@ class TradeInstrument:
         :param symbol: The ticker symbol or code representing a specific financial instrument or security.
         :param market: e.g. US, HK.
         :param instrument_super_type: Asset Class (e.g. EQUITY, OPTION.)
-        :param instrument_type: Type of underlying equity，required when querying for options information (e.g., WARRANT, UNITS, ETF, CALL_OPTION, PUT_OPTION).
+        :param instrument_type: Type of underlying equity,required when querying for options information (e.g., WARRANT, UNITS, ETF, CALL_OPTION, PUT_OPTION).
         :param strike_price: Option Strike Price, required when querying for options information.
         :param init_exp_date: Option Expiration Date, Format: yyyy-MM-dd, required when querying for options information.
         """

webull/trade/trade/v2/order_operation_v2.py

@@ -26,6 +26,9 @@ from webull.trade.request.v2.replace_order_request import ReplaceOrderRequest
 
 
 class OrderOperationV2:
+    """
+    Deprecated. Use :class:`OrderOperationV3` instead.
+    """
     def __init__(self, api_client):
         self.client = api_client
 

webull/trade/trade_events_client.py

@@ -71,19 +71,12 @@ class TradeEventsClient():
         self._on_log = None
 
     def _build_request(self, app_key, app_secret, accounts):
-        if self._region_id == 'us':
-            subscribeType = 3
-        else:
-            subscribeType = 1
         request = pb.SubscribeRequest(
-            subscribeType= subscribeType, # 1、2、3 allowed now
+            subscribeType= 7, # 1 2 4 allowed now
             timestamp=int(time.time() * 1000),  # millis
             accounts=accounts,
         )
-        if common.is_not_upgrade_api_host(self._host):
-            signer_spec = sha_hmac256_new
-        else:
-            signer_spec = sha_hmac1
+        signer_spec = sha_hmac256_new
 
         signature, metadata = calc_signature(app_key, app_secret, request, signer_spec)
         

{webull_openapi_python_sdk-2.0.13.dist-info → webull_openapi_python_sdk-2.0.15.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: webull-openapi-python-sdk
-Version: 2.0.13
+Version: 2.0.15
 Summary: Webull Python SDK.
 Home-page: 
 Author: Webull
 Author-email: 
 License: Apache License 2.0
 Platform: any
-Requires-Python: >=3.8,<3.14
+Requires-Python: >=3.8,<3.15
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
@@ -18,11 +18,13 @@ Requires-Dist: urllib3>=2.0
 Requires-Dist: requests>=2.31.0
 Requires-Dist: six>=1.16.0
 Requires-Dist: cryptography<42,>=3.4; python_version < "3.12"
-Requires-Dist: cryptography<43,>=41.0; python_version >= "3.12"
+Requires-Dist: cryptography<43,>=41.0; python_version >= "3.12" and python_version < "3.14"
+Requires-Dist: cryptography<55,>=43.0; python_version >= "3.14"
 Requires-Dist: protobuf<5,>=4.21.12; python_version < "3.12"
 Requires-Dist: protobuf<6,>=4.25.0; python_version >= "3.12"
 Requires-Dist: grpcio<1.60,>=1.51.1; python_version < "3.12"
-Requires-Dist: grpcio<1.70,>=1.60.0; python_version >= "3.12"
+Requires-Dist: grpcio<1.70,>=1.60.0; python_version >= "3.12" and python_version < "3.14"
+Requires-Dist: grpcio<2,>=1.75.1; python_version >= "3.14"
 Dynamic: author
 Dynamic: description-content-type
 Dynamic: license

{webull_openapi_python_sdk-2.0.13.dist-info → webull_openapi_python_sdk-2.0.15.dist-info}/RECORD

@@ -1,10 +1,10 @@
-samples/__init__.py,sha256=F9oasgdSO040QuU150cChv-xopNDOmPbPvzmyDiEYjM,23
+samples/__init__.py,sha256=UbB6jFpQ8cK33UyDgk-QLaF9QUzpaGzEMM2RlCS1qJI,23
 samples/account/__init__.py,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 samples/account/account_client.py,sha256=vwh-nI_JnjwcIeOr1sQPMzG8pAqZwliUusE49ZmYE3s,1796
 samples/assets/__init__.py,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 samples/assets/assets_client.py,sha256=p9LS2Td3gbUMkHn4LD_9RMCFuaQRUbsKvG4PhZBGJDc,1974
 samples/data/__init__.py,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
-samples/data/data_client.py,sha256=amhccRnIlpP9QDb5yB8vtvWKQgqPbEigABfjlSWON2I,12411
+samples/data/data_client.py,sha256=6NLHqfXyxIIE6lLAAqU7wT-GaKAgw4h2-UdbIlKeyug,12662
 samples/data/data_client_event.py,sha256=u6Bebo2hTE0Ri1bQHa8nhFEe-fBbdxfNwLpTZh3E1WY,3046
 samples/data/data_streaming_client.py,sha256=2da21SE_Mneo7zbM_l1rkpdBBbI4avrpnSPMxsZIalw,4085
 samples/data/data_streaming_client_async.py,sha256=o_u1ch8JdbcYnLCvDCCUzO-Z1IG7BUKncu_GB_kCbOs,4443
@@ -15,16 +15,15 @@ samples/order/order_stock_client.py,sha256=hYwVwVFVERk-YS7gRcW-LuGfAvcF8VJHZs1qw
 samples/screener/__init__.py,sha256=68et0-FOloDo6Yo6vqmHPM45z-8zorzbhrZmUrLApEQ,583
 samples/screener/screener_client.py,sha256=NGwjY7YaG_3l9c-QePpmpPG4Gtk_BZaM7-jQbMb2kzw,3636
 samples/trade/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-samples/trade/activities_client.py,sha256=HOF0-T_-v9Am3Raob-iq2IM4PetfhQWbRw2rkMaufzk,2093
 samples/trade/trade_client.py,sha256=LyWSvZJH4ByCkRORqP9WdkXfx65A2b6fhc9_GzL8DOM,6258
 samples/trade/trade_client_v2.py,sha256=IO-zmRiUnCmIetTdiYunPh8jVK2VaPrOR77Dwvz1auY,10771
 samples/trade/trade_client_v3.py,sha256=yAkVwWhZBGD929oMmlUj4GvJVWWZiV8PLlv_BeXbDZ8,32069
 samples/trade/trade_client_v3_event.py,sha256=91HlT04KlK8Q5gUnsB8F5ErCFdJRnpDABKkBfYRc-YE,3932
-samples/trade/trade_event_client.py,sha256=BWdD1L41LXmDlaig6ku9T3t3fSCCZEdj5nxH1xI1AZA,2653
+samples/trade/trade_event_client.py,sha256=ni7OEc4nnz2Hpbh0Kzl6DXB-FuDPc2UGBaLFnCrdFZ4,2824
 samples/watchlist/__init__.py,sha256=rtV5s4_CJgDAT4DGEJa_pNLJU71Wdr5OLz_IQ1EajFQ,567
 samples/watchlist/watchlist_client.py,sha256=lpzJs7SXuSka2KKkJ0u9s83A9iHta5qrjvIdkbfNcwg,3246
-webull/__init__.py,sha256=F9oasgdSO040QuU150cChv-xopNDOmPbPvzmyDiEYjM,23
-webull/core/__init__.py,sha256=Qhu2u_ECRyTmwLpFqEvg3uf4DNpsW3CQr6STtRrF6eo,226
+webull/__init__.py,sha256=UbB6jFpQ8cK33UyDgk-QLaF9QUzpaGzEMM2RlCS1qJI,23
+webull/core/__init__.py,sha256=7GR8jJZUa8AP7XH_dYHIheIy2fjj-pt7LnRs1iqsUXI,226
 webull/core/client.py,sha256=zxSBiII9KDxc5tHpTerJfV_PKPt8E9e3oTOpiakAtJw,16758
 webull/core/compat.py,sha256=_r6Y_f3vTo_DoxOaCvLjnvOo1KRkD2Z9kXSh8OijEIA,3088
 webull/core/headers.py,sha256=Wj2zev1XYyYsy2b9YKnoK3GqjVsXZO_o2WziMmuVBTw,2061
@@ -36,7 +35,7 @@ webull/core/auth/algorithm/sha_hmac1.py,sha256=oYHpbwwOK2w9dtSnaOMwGLaw-opBwOxJW
 webull/core/auth/algorithm/sha_hmac256.py,sha256=jkkWDQOYuJI6nrKVx89KnLI4sTAFi_zmxNc5bPGX0cw,2638
 webull/core/auth/algorithm/sha_hmac256_new.py,sha256=t8s_YegLV5_qtLLp2CQHKY66OTu_eZyUbGjsHWuSpt8,2155
 webull/core/auth/composer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webull/core/auth/composer/default_signature_composer.py,sha256=QQrbdsCX50MHGJMhMnIOy_ox0LB7QYUsDeJAPc6XSBU,5323
+webull/core/auth/composer/default_signature_composer.py,sha256=4MfiW5tU24glGwMwp0VpICHwqMPnNAWDcjk11I7AJ7k,5232
 webull/core/auth/signers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/core/auth/signers/app_key_signer.py,sha256=ojdG3yFefU7olqnQbRElCuJf9VD7UqueFE39-IP_Bfk,2841
 webull/core/auth/signers/signer.py,sha256=4fo94UqLcwUAYziAlCd9GAqNLM8PbLLVHChdjvcfvhY,1790
@@ -86,11 +85,11 @@ webull/core/retry/retry_condition.py,sha256=Hel380uhtcgmrK0NZiuY015vyBQWzM2dv4np
 webull/core/retry/retry_policy.py,sha256=y1Kwc7lw1N4sgvR71AcUbsv8cYYLAJRdDMx7VWO6ubs,2549
 webull/core/retry/retry_policy_context.py,sha256=rVAqF6NE6Aw-OUJY1TaxEhSLLCuYe8Kfs6Poqol0WOk,2036
 webull/core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webull/core/utils/common.py,sha256=T5VVcYQVhA9fhiUHZN9gBuoh0uzVgbCM01o1qK08NAE,2725
+webull/core/utils/common.py,sha256=bb64grSP7PjaAIe8YYKDNzQ4qwgN7-qW0r24idTEqEY,2177
 webull/core/utils/data.py,sha256=YUyoWY68_2RkKanh3jsDscgGx__FIPh5VNEGXr1Qotc,852
-webull/core/utils/desensitize.py,sha256=f8_ps9BrG3WfXD8ZAw873-_YoGeke1Q55CeDwRmYkqA,1104
+webull/core/utils/desensitize.py,sha256=186BKVDomhhKnIi_4-1bWJ7P5s01rStjeIwJkTEGoIA,952
 webull/core/utils/validation.py,sha256=gJcIrHYtgo48yVJ0q6O-f5buTYWOcr6ShhDIBhTp-Yg,1957
-webull/data/__init__.py,sha256=A1ewcdVQ2-bAKc0T1HpPB3BsNC-a_6o-DRL8CcYULZE,39
+webull/data/__init__.py,sha256=pTCqPwFkJNj2TmBwRatgvf1G2QKpmv_2KagYNi2acvU,39
 webull/data/data_client.py,sha256=FzatKHXgu5xv-FKFaX-mFYdhLTdz7zpRUox9AGWrReQ,2429
 webull/data/data_streaming_client.py,sha256=TQBAilvOLCbcMqacByrniXGr9VjSwjym-4-LUOiqKx8,4456
 webull/data/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -117,15 +116,15 @@ webull/data/quotes/crypto_market_data.py,sha256=UQlxUz0GntvwcRS-Vh_h7cXbhQ045MqP
 webull/data/quotes/event_market_data.py,sha256=lARSHqnVxRZZNOIi9uP-Rs5StMIUWtmwrw-p8droqtc,4650
 webull/data/quotes/fundamentals.py,sha256=Dod6lcTwPDvyOjFQxDwW6GrIoDAknIGZOL1M9VRRdX4,14597
 webull/data/quotes/futures_market_data.py,sha256=fc9giYNy1LcdLHOJV31zMbPBKtWDH8kBW5xRFgHzQUA,5596
-webull/data/quotes/instrument.py,sha256=BHQ4INg3ct2b0E22E6IHMtYz47q8hA3HIf1wzbw6Ns4,12665
+webull/data/quotes/instrument.py,sha256=ZEm3PRIUOcDQQGjNGemwM1o0UceI_InRig0yxVhNmpw,15322
 webull/data/quotes/market_data.py,sha256=L7f5V5tmG01lev9-IJU3w6up7EnX42WfI7GtW2mEcw8,14748
-webull/data/quotes/market_streaming_data.py,sha256=cI9xxGpKV_KDS8cgh9azHifBji0yeSuKmH7Jxaqij38,3139
+webull/data/quotes/market_streaming_data.py,sha256=khgTGqrPRiKkRVnG5Post5Vpu9lCAP288B_OE20_JM8,3135
 webull/data/quotes/option_market_data.py,sha256=4fW_GI3u1T-5dluhLRQ60Gbb2bsnhWkSrILYJq-96pw,3305
 webull/data/quotes/screener.py,sha256=h73YyhW6jBkJH1NvDOceR5lePRXGgtiWrLKQwbn9pAU,9831
 webull/data/quotes/watchlist.py,sha256=RkuPV7OwC6e4NEpeldTUNWEsYAqGQbVqyOHs9edMuhE,6344
 webull/data/quotes/subscribe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webull/data/quotes/subscribe/ask_bid_result.py,sha256=J6Ms_01a44IvzNcw9krwMM0CuA_-zh-5eBGqx2kQbv4,1759
-webull/data/quotes/subscribe/basic_result.py,sha256=l9pxGlt8HLHwE3plq_6J0OPZ_X4ZjjRfa1f9nExu2dE,1450
+webull/data/quotes/subscribe/ask_bid_result.py,sha256=o-Wj2-l6aLkp9ENoIJlMRb4WTmVoZYlfy4OQpTQtPak,1737
+webull/data/quotes/subscribe/basic_result.py,sha256=8aF4wiPiREjWkTyNCyxhCgSU8sPknJUerXHmLBHVBOs,1495
 webull/data/quotes/subscribe/broker_result.py,sha256=E6pM0Ydr6tU_bPSOeyu1KJf7oYgbO-lIXLIdJQANH4I,1013
 webull/data/quotes/subscribe/event_depth_decoder.py,sha256=-2mOw4o32HWO1a7MuB3hgFoST0ct96Z3PrBFzfCNMJs,1061
 webull/data/quotes/subscribe/event_depth_result.py,sha256=30hUvNqQZNnwGNngmqPO3eFtCkJXd6OjjV8FadN7uXE,1510
@@ -194,6 +193,7 @@ webull/data/request/get_instruments_request.py,sha256=PmDXrv9hUTHNtwppjV6GMQqTcN
 webull/data/request/get_noii_bars_request.py,sha256=_ubNykIQCCDg9cRgeR49FVloF21s2REWlp_KTnUlYEg,1845
 webull/data/request/get_noii_snapshot_request.py,sha256=IQ2HrAyyO2GzC8HEsjz4S0Owc0Zk25d-1ULjTqThmZU,2057
 webull/data/request/get_option_bars_request.py,sha256=ObE4blYHZ_OcKG8Cp6St7ujDTIFIZyBP4MGhx8k9X6k,2556
+webull/data/request/get_option_contracts_request.py,sha256=MzsJ4IZirTgbK0DHS7IPkSgzQNYF4uj3UCD9BMV3Ekw,2847
 webull/data/request/get_option_snapshot_request.py,sha256=XHmtHKN8fF6-rIWfstFr_bLFtgEIx-u61H6Y7WnOrlE,1816
 webull/data/request/get_option_tick_request.py,sha256=MuSFYnM8m1UwOJ2NjzhOJYlWhbYDyiqPbNkKoPQUupI,1648
 webull/data/request/get_quotes_request.py,sha256=g4J7lAQZBqoeM67Xm2E-Y2pwNxsqkrECf_r5DTTrS5M,1244
@@ -218,9 +218,9 @@ webull/data/request/watchlist/get_watchlist_request.py,sha256=XxzS4gxFbdQSajpFSm
 webull/data/request/watchlist/remove_watchlist_instruments_request.py,sha256=qOtQYDBp-PSawAgljnLmtfUce8dAblWI_zB0nnIv3G0,1451
 webull/data/request/watchlist/update_watchlist_instruments_request.py,sha256=KoihfB8MszsAooQGUUMjFmnid_a7xk4YSdEMDO1gh-k,1493
 webull/data/request/watchlist/update_watchlist_request.py,sha256=0s3ftkxiz9hjtXhLORrIUphyDIldRA8pJ4mP5zfbsyU,1466
-webull/trade/__init__.py,sha256=ETOzoBNhLSJycFTTlQ9F3NIdUYtPhNYYTm7erVExyfg,22
+webull/trade/__init__.py,sha256=p2D-zgjkknmTvHuGvNpDvkb-XR4BZlFn9B2Wa14Wxak,22
 webull/trade/trade_client.py,sha256=ck8yRjm-aibv8LGOP0Gk5zg6bv4-bTVjULFpZlCAK2c,2278
-webull/trade/trade_events_client.py,sha256=G9ovuxrnQh8iA1so2Ar-41jWRzDCYQYSHTkQLGlwhhA,9983
+webull/trade/trade_events_client.py,sha256=sHoKPKQQ2Ye_c9tt9MYxFeza3T5lLR5VosNro7H1gN4,9748
 webull/trade/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/trade/common/account_type.py,sha256=haVAB33MERN6XyPsbrfVQhK9_CpU90VltI6_KDkxzlE,715
 webull/trade/common/category.py,sha256=lrSKMO11wMpw9iWWeefTdWXedJAFfWRlJ76swfqVP0c,947
@@ -244,7 +244,7 @@ webull/trade/events/default_retry_policy.py,sha256=zWoaJFJSUTtHw_qLj9_AIPBzFW6UH
 webull/trade/events/events_pb2.py,sha256=NLolj5VOws1LJT5YIvnuZab9YYhR4lm2-iCkztaARPo,2440
 webull/trade/events/events_pb2_grpc.py,sha256=ebxp_VCJHBQFCKvxBKRUMhW67TZoUn6NwCBvKpiTEpg,2482
 webull/trade/events/signature_composer.py,sha256=GL7_lC3zHyyVy0IcxYdavtJNFWCnQZ6m5nLfC--_eG4,2639
-webull/trade/events/types.py,sha256=NkBeC3mQPflcg7NDTChVS-DAtDPX_G-od9YJt_FLZTc,689
+webull/trade/events/types.py,sha256=3GlnmE7oaACsXBW5uy-S5BBdNLffFhsQwadICSAADSo,740
 webull/trade/request/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/trade/request/cancel_order_request.py,sha256=JbyeVNOVu9xvwzba7Ntw2Sh4BrNVUbBTkYLTKgXIU5U,1016
 webull/trade/request/get_account_balance_request.py,sha256=S9M1rz6HFlIwRpWfkQKVfRo996_DWF8Qe6bGirSnkV0,1042
@@ -259,10 +259,10 @@ webull/trade/request/get_trade_calendar_request.py,sha256=h70H27CWDeIYipxDINcjdQ
 webull/trade/request/get_trade_instrument_detail_request.py,sha256=pDQKeNC3v5hCWnt_lkQddoOdMlwZ6pK_hnysiDCXrOU,910
 webull/trade/request/get_trade_security_detail_request.py,sha256=X_8wBBPLTAJZf-l0e7t4R2T_W8XWRl-hgAuLztfAnWE,1534
 webull/trade/request/get_tradeable_instruments_request.py,sha256=7z57iT2Wqb43Kz-kdu09gkTGRPNzo4Aipq4VDbbqAMo,1030
-webull/trade/request/palce_order_request.py,sha256=vkxUb0H7Ias75IsE7e-vkViYsMWFhquAF1WEzb-_hNw,3322
-webull/trade/request/place_order_request.py,sha256=1wPtF0cTYTYWKh2NfLLYwiAn73ID6XNVXTNdYi4OHW4,3277
+webull/trade/request/palce_order_request.py,sha256=Qa6jrrUEDbmEpjRiCP73zrh_4dPGgRr-98RAZE4yedw,3323
+webull/trade/request/place_order_request.py,sha256=m4RTdUDnUZDcZ02lRbynRZQtPMfht-hjT8r37aMh6kQ,3350
 webull/trade/request/place_order_request_v2.py,sha256=gUuIWLARiOCumnXKNkJDgWJ2eV7dz4U4pNH6GpWxS5s,2192
-webull/trade/request/replace_order_request.py,sha256=LGDynTVm0AXyfv3inpCa-KVanKMqxJ3N1G6x99eKqo8,2578
+webull/trade/request/replace_order_request.py,sha256=aD94L2dsIekK6_6pezlzceKqay6KMKax_MHV9My6CAA,2654
 webull/trade/request/replace_order_request_v2.py,sha256=5R94VCYyStImQptcEMsTWRjNj7weYFCO6-2mLySmcj8,1612
 webull/trade/request/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/trade/request/v2/cancel_option_request.py,sha256=XfE_7YtaTwU0a1dPJ8nqGso4Knri5xfVACA3ZbxqU4M,1015
@@ -292,19 +292,19 @@ webull/trade/request/v3/place_order_request.py,sha256=kauvIDIcaBKU6gd7v9xvG8cJFT
 webull/trade/request/v3/preview_order_request.py,sha256=ZgzwrlAed8IJ8ORDRjJ7rIuF_w8ySZktLDBsf6F7FGo,1132
 webull/trade/request/v3/replace_order_request.py,sha256=Xsa-vKGTMAwv-dJuSm8cx8rHVoFhk-cFjnHOpsUaZwM,1212
 webull/trade/trade/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webull/trade/trade/account_info.py,sha256=C3YcBDZfYOe5QSJEbysblye-W90RbQ7xNing5gLsIng,3622
+webull/trade/trade/account_info.py,sha256=M67jtCpbttp7tDCNNW99A1oLX-62c26yR1XXZ-xkK18,3609
 webull/trade/trade/activity.py,sha256=pyvsJcMhyKoKdxurJPgXexsoUy6EefwKneqqSJpdA0U,2154
 webull/trade/trade/order_operation.py,sha256=QrL4Da87RTOSupiAbuXtZigo9602Byp14DQGyR99hkI,12849
 webull/trade/trade/trade_calendar.py,sha256=rGSiR5GZggQnZOmmpbC-06trgPQgFTvdpUzGMpw2ycw,1415
-webull/trade/trade/trade_instrument.py,sha256=293IaiLnhw0mAc1IuF3LSgwgve_XZ1Dyf1VeFtmClc8,3474
+webull/trade/trade/trade_instrument.py,sha256=AV-Y-x_hWBnF9T2g8SbYGKEGFmEQJi0QhtfTCoZicZo,3472
 webull/trade/trade/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/trade/trade/v2/account_info_v2.py,sha256=fs2-XaxklItuhaspzPkthXA5SgbnIffL6NTyKYR3bDw,3276
-webull/trade/trade/v2/order_operation_v2.py,sha256=m54RH2j45CBBWEnqe4KxrsltAF44XKtPMT4kv8t7djQ,12745
+webull/trade/trade/v2/order_operation_v2.py,sha256=ZWH-6dp5rvokb5YX5HO2Op-KPLjGR4gpJ06Kc_IUilQ,12816
 webull/trade/trade/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webull/trade/trade/v3/order_opration_v3.py,sha256=NsInXC5sPCW8y55jU71BnR0sQYhtWclqCmyK7V09MLc,8275
-webull_openapi_python_sdk-2.0.13.dist-info/licenses/LICENSE,sha256=ALOnsLtb1aHxmDJg3-oMi0BO-i-cjfyZaOBfnnavKMc,11359
-webull_openapi_python_sdk-2.0.13.dist-info/licenses/NOTICE,sha256=X5TApte6CPV10b96Cb70IRLusXmiRmK_R-dB-1tQM_I,2018
-webull_openapi_python_sdk-2.0.13.dist-info/METADATA,sha256=ax-GvRxzowuykj36heNhXVhnd8J9ttaF6Hg6lZmqj6M,1033
-webull_openapi_python_sdk-2.0.13.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-webull_openapi_python_sdk-2.0.13.dist-info/top_level.txt,sha256=h8pEjNDGWS2ZUZ2vYFpUShoMQT0ZRIQaD57QJWD8_aI,15
-webull_openapi_python_sdk-2.0.13.dist-info/RECORD,,
+webull_openapi_python_sdk-2.0.15.dist-info/licenses/LICENSE,sha256=ALOnsLtb1aHxmDJg3-oMi0BO-i-cjfyZaOBfnnavKMc,11359
+webull_openapi_python_sdk-2.0.15.dist-info/licenses/NOTICE,sha256=X5TApte6CPV10b96Cb70IRLusXmiRmK_R-dB-1tQM_I,2018
+webull_openapi_python_sdk-2.0.15.dist-info/METADATA,sha256=03StTJM9Sw6Xf02mwbve8IfA2eb-zH3GcEtOgPbCgxA,1212
+webull_openapi_python_sdk-2.0.15.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+webull_openapi_python_sdk-2.0.15.dist-info/top_level.txt,sha256=h8pEjNDGWS2ZUZ2vYFpUShoMQT0ZRIQaD57QJWD8_aI,15
+webull_openapi_python_sdk-2.0.15.dist-info/RECORD,,

samples/trade/activities_client.py

@@ -1,59 +0,0 @@
-# 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.client import ApiClient
-from webull.trade.trade_client import TradeClient
-
-optional_api_endpoint = "<api_endpoint>"
-your_app_key = "<your_app_key>"
-your_app_secret = "<your_app_secret>"
-region_id = "<region_id>"
-account_id = "<your_account_id>"
-
-api_client = ApiClient(your_app_key, your_app_secret, region_id)
-api_client.add_endpoint(region_id, optional_api_endpoint)
-
-if __name__ == '__main__':
-    trade_client = TradeClient(api_client)
-
-    # Query cash activities with default parameters
-    res = trade_client.activity.get_activities(account_id)
-    if res.status_code == 200:
-        print('get activities:', res.json())
-
-    # Query cash activities with activity type filter
-    res = trade_client.activity.get_activities(account_id, activity_types="TRADE,DEPOSIT")
-    if res.status_code == 200:
-        print('get activities by type:', res.json())
-
-    # Query cash activities with time range filter
-    res = trade_client.activity.get_activities(
-        account_id,
-        start_time="2026-06-30T12:00:00.000Z",
-        end_time="2026-07-03T12:00:00.000Z",
-        page_size=20
-    )
-    if res.status_code == 200:
-        print('get activities by time range:', res.json())
-
-    # Query cash activities with cursor-based pagination
-    res = trade_client.activity.get_activities(
-        account_id,
-        last_activity_id="<last_activity_id_from_previous_page>",
-        page_size=10
-    )
-    if res.status_code == 200:
-        print('get activities next page:', res.json())