Merge branch 'main_merge_260704' into 'main'

[OpenAPI&FIX-260704 version]: Trading API新增接口：Get Account Cash Activities (支持connect 第三方客户需求）

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

Author: 方佳

samples/__init__.py

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

samples/trade/activities_client.py

@@ -0,0 +1,59 @@
+# 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())

webull/__init__.py

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

webull/core/__init__.py

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

webull/data/__init__.py

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

webull/trade/__init__.py

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

webull/trade/request/get_activities_request.py

@@ -0,0 +1,39 @@
+# 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 GetActivitiesRequest(ApiRequest):
+    def __init__(self):
+        ApiRequest.__init__(self, "/openapi/trade/activities/cash", version='v2', method="GET", query_params={})
+
+    def set_account_id(self, account_id):
+        self.add_query_param("account_id", account_id)
+
+    def set_activity_types(self, activity_types):
+        self.add_query_param("activity_types", activity_types)
+
+    def set_start_time(self, start_time):
+        self.add_query_param("start_time", start_time)
+
+    def set_end_time(self, end_time):
+        self.add_query_param("end_time", end_time)
+
+    def set_last_activity_id(self, last_activity_id):
+        self.add_query_param("last_activity_id", last_activity_id)
+
+    def set_page_size(self, page_size):
+        self.add_query_param("page_size", page_size)

webull/trade/trade/activity.py

@@ -0,0 +1,49 @@
+# 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.trade.request.get_activities_request import GetActivitiesRequest
+
+
+class Activity:
+    def __init__(self, api_client):
+        self.client = api_client
+
+    def get_activities(self, account_id, activity_types=None, start_time=None, end_time=None,
+                       last_activity_id=None, page_size=10):
+        """
+        Query cash activities by type with pagination support.
+        This interface is currently supported only for Webull US.
+
+        :param account_id: Account ID
+        :param activity_types: Activity types filter, comma-separated string (optional)
+        :param start_time: Start time filter (optional)
+        :param end_time: End time filter (optional)
+        :param last_activity_id: The last activity ID of the previous page for cursor-based pagination (optional)
+        :param page_size: Number of entries per page, default value is 10
+        """
+        get_activities_request = GetActivitiesRequest()
+        get_activities_request.set_account_id(account_id)
+        if activity_types is not None:
+            get_activities_request.set_activity_types(activity_types)
+        if start_time is not None:
+            get_activities_request.set_start_time(start_time)
+        if end_time is not None:
+            get_activities_request.set_end_time(end_time)
+        if last_activity_id is not None:
+            get_activities_request.set_last_activity_id(last_activity_id)
+        get_activities_request.set_page_size(page_size)
+        response = self.client.get_response(get_activities_request)
+        return response

webull/trade/trade_client.py

@@ -16,6 +16,7 @@
 
 from webull.core.http.initializer.client_initializer import ClientInitializer
 from webull.trade.trade.account_info import Account
+from webull.trade.trade.activity import Activity
 from webull.trade.trade.order_operation import OrderOperation
 from webull.trade.trade.trade_calendar import TradeCalendar
 from webull.trade.trade.trade_instrument import TradeInstrument
@@ -33,6 +34,7 @@ def __init__(self, api_client):
         self.order = OrderOperation(api_client)
         self.order_v2 = OrderOperationV2(api_client)
         self.order_v3 = OrderOperationV3(api_client)
+        self.activity = Activity(api_client)
         self.trade_instrument = TradeInstrument(api_client)
         self.trade_calendar = TradeCalendar(api_client)