feat(trade): add fund details feature and modify related modules

Author: tigersk

tigeropen/common/consts/service_types.py

@@ -34,6 +34,7 @@
 ESTIMATE_TRADABLE_QUANTITY = "estimate_tradable_quantity"
 TRANSFER_FUND = "transfer_fund"
 AGGREGATE_ASSETS = "aggregate_assets"
+FUND_DETAILS = "fund_details"
 
 USER_LICENSE = "user_license"
 

tigeropen/examples/quote_client_demo.py

@@ -230,15 +230,15 @@ def test_market_scanner():
                 base_filter1_value = item[base_filter1]
                 accumulate_filter_value = item[accumulate_filter]
                 print(
-                    f'page:{result.page}, symbol:{symbol}, base_filter1 value:{base_filter1_value}, accumulate_filter value:{accumulate_filter_value}')
+                    f'page:{result.startt}, symbol:{symbol}, base_filter1 value:{base_filter1_value}, accumulate_filter value:{accumulate_filter_value}')
             print(f'current page symbols:{result.symbols}')
             scanner_result_symbols.update(result.symbols)
         time.sleep(1)
         # 处理分页
-        if result.page >= result.total_page - 1:
+        if result.startt >= result.total_page - 1:
             is_last_page = True
         else:
-            begin_page = result.page + 1
+            begin_page = result.startt + 1
 
     print(f'scanned symbols:{scanner_result_symbols}')
 

tigeropen/quote/quote_client.py

@@ -1797,7 +1797,7 @@ def get_warrant_filter(self, symbol, page=None, page_size=None, sort_field_name=
         params = WarrantFilterParams()
         params.lang = get_enum_value(self._lang)
         params.symbol = symbol or (filter_params.symbol if filter_params else None)
-        params.page = page or (filter_params.page if filter_params else None)
+        params.page = page or (filter_params.startt if filter_params else None)
         params.page_size = page_size or (filter_params.page_size if filter_params else None)
         params.sort_field_name = sort_field_name or (filter_params.sort_field_name if filter_params else None)
         params.sort_dir = get_enum_value(sort_dir or (filter_params.sort_dir if filter_params else None))

tigeropen/trade/request/model.py

@@ -1549,3 +1549,110 @@ def to_openapi_dict(self):
         if self.seg_type:
             params['seg_type'] = self.seg_type
         return params
+
+class FundDetailsParams(BaseParams):
+    def __init__(self):
+        super().__init__()
+        self._account = None
+        self._secret_key = None
+        self._seg_types = None
+        self._fund_type = None
+        self._currency = None
+        self._start_date = None
+        self._end_date = None
+        self._start = None
+        self._limit = None
+
+    @property
+    def account(self):
+        return self._account
+
+    @account.setter
+    def account(self, value):
+        self._account = value
+
+    @property
+    def secret_key(self):
+        return self._secret_key
+
+    @secret_key.setter
+    def secret_key(self, value):
+        self._secret_key = value
+
+    @property
+    def seg_types(self):
+        return self._seg_types
+
+    @seg_types.setter
+    def seg_types(self, value):
+        self._seg_types = value
+
+    @property
+    def fund_type(self):
+        return self._fund_type
+
+    @fund_type.setter
+    def fund_type(self, value):
+        self._fund_type = value
+
+    @property
+    def currency(self):
+        return self._currency
+
+    @currency.setter
+    def currency(self, value):
+        self._currency = value
+
+    @property
+    def start_date(self):
+        return self._start_date
+
+    @start_date.setter
+    def start_date(self, value):
+        self._start_date = value
+
+    @property
+    def end_date(self):
+        return self._end_date
+
+    @end_date.setter
+    def end_date(self, value):
+        self._end_date = value
+
+    @property
+    def startt(self):
+        return self._start
+
+    @startt.setter
+    def startt(self, value):
+        self._start = value
+
+    @property
+    def limit(self):
+        return self._limit
+
+    @limit.setter
+    def limit(self, value):
+        self._limit = value
+
+    def to_openapi_dict(self):
+        params = super().to_openapi_dict()
+        if self.account:
+            params['account'] = self.account
+        if self.secret_key:
+            params['secret_key'] = self.secret_key
+        if self.seg_types:
+            params['seg_types'] = self.seg_types
+        if self.fund_type:
+            params['fund_type'] = self.fund_type
+        if self.currency:
+            params['currency'] = self.currency
+        if self.start_date:
+            params['start_date'] = self.start_date
+        if self.end_date:
+            params['end_date'] = self.end_date
+        if self._start is not None:
+            params['start'] = self._start
+        if self._limit:
+            params['limit'] = self._limit
+        return params

tigeropen/trade/response/fund_details_response.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+import pandas as pd
+
+from tigeropen.common.response import TigerResponse
+from tigeropen.common.util.string_utils import camel_to_underline, camel_to_underline_obj
+
+
+class FundDetailsResponse(TigerResponse):
+    def __init__(self):
+        super(FundDetailsResponse, self).__init__()
+        self.result = pd.DataFrame()
+        self._is_success = None
+
+    def parse_response_content(self, response_content):
+        response = super(FundDetailsResponse, self).parse_response_content(response_content)
+        if 'is_success' in response:
+            self._is_success = response['is_success']
+
+        if self.data:
+            data = {camel_to_underline(k): v for k, v in self.data.items()}
+            items = data.get('items')
+            if items:
+                self.result = pd.DataFrame([camel_to_underline_obj(i) for i in items])
+                self.result['page'] = data['page']
+                self.result['limit'] = data['limit']
+                self.result['item_count'] = data['item_count']
+                self.result['page_count'] = data['page_count']
+                self.result['timestamp'] = data['timestamp']

tigeropen/trade/response/funding_history_response.py

@@ -11,7 +11,7 @@
 class FundingHistoryResponse(TigerResponse):
     def __init__(self):
         super(FundingHistoryResponse, self).__init__()
-        self.data = None
+        self.result = None
         self._is_success = None
 
     def parse_response_content(self, response_content):
@@ -23,8 +23,8 @@ def parse_response_content(self, response_content):
             if isinstance(self.data, list):
                 # 将驼峰命名转换为下划线命名
                 items = [{camel_to_underline(k): v for k, v in item.items()} for item in self.data]
-                self.data = pd.DataFrame(items)
+                self.result = pd.DataFrame(items)
             else:
                 # 单个记录的情况
                 items = {camel_to_underline(k): v for k, v in self.data.items()}
-                self.data = pd.DataFrame([items]) 
+                self.result = pd.DataFrame([items])

tigeropen/trade/trade_client.py

@@ -12,7 +12,8 @@
     CANCEL_ORDER, MODIFY_ORDER, PLACE_ORDER, ACTIVE_ORDERS, INACTIVE_ORDERS, FILLED_ORDERS, CONTRACT, PREVIEW_ORDER, \
     PRIME_ASSETS, ORDER_TRANSACTIONS, QUOTE_CONTRACT, ANALYTICS_ASSET, SEGMENT_FUND_AVAILABLE, SEGMENT_FUND_HISTORY, \
     TRANSFER_FUND, \
-    TRANSFER_SEGMENT_FUND, CANCEL_SEGMENT_FUND, PLACE_FOREX_ORDER, ESTIMATE_TRADABLE_QUANTITY, AGGREGATE_ASSETS
+    TRANSFER_SEGMENT_FUND, CANCEL_SEGMENT_FUND, PLACE_FOREX_ORDER, ESTIMATE_TRADABLE_QUANTITY, AGGREGATE_ASSETS, \
+    FUND_DETAILS
 from tigeropen.common.exceptions import ApiException
 from tigeropen.common.util.common_utils import get_enum_value, date_str_to_timestamp
 from tigeropen.common.request import OpenApiRequest
@@ -21,13 +22,14 @@
 from tigeropen.trade.domain.order import Order
 from tigeropen.trade.request.model import ContractParams, AccountsParams, AssetParams, PositionParams, OrdersParams, \
     OrderParams, PlaceModifyOrderParams, CancelOrderParams, TransactionsParams, AnalyticsAssetParams, SegmentFundParams, \
-    ForexTradeOrderParams, EstimateTradableQuantityModel, FundingHistoryParams, AggregateAssetParams
+    ForexTradeOrderParams, EstimateTradableQuantityModel, FundingHistoryParams, AggregateAssetParams, FundDetailsParams
 from tigeropen.trade.response.account_profile_response import ProfilesResponse
 from tigeropen.trade.response.aggregate_assets_response import AggregateAssetsResponse
 from tigeropen.trade.response.analytics_asset_response import AnalyticsAssetResponse
 from tigeropen.trade.response.assets_response import AssetsResponse
 from tigeropen.trade.response.contracts_response import ContractsResponse
 from tigeropen.trade.response.forex_order_response import ForexOrderResponse
+from tigeropen.trade.response.fund_details_response import FundDetailsResponse
 from tigeropen.trade.response.order_id_response import OrderIdResponse
 from tigeropen.trade.response.order_preview_response import PreviewOrderResponse
 from tigeropen.trade.response.orders_response import OrdersResponse
@@ -935,11 +937,40 @@ def get_funding_history(self, seg_type=None):
             response = FundingHistoryResponse()
             response.parse_response_content(response_content)
             if response.is_success():
-                return response.data
+                return response.result
             else:
                 raise ApiException(response.code, response.message)
         return None
 
+    def get_fund_details(self, seg_types, account=None, fund_type=None, currency=None,
+                         start=0, limit=50, start_date=None, end_date=None, secret_key=None,
+                         lang=None):
+        params = FundDetailsParams()
+        params.account = account if account else self._account
+        params.secret_key = secret_key if secret_key else self._secret_key
+        if seg_types:
+            seg_types_list = seg_types if isinstance(seg_types, list) else [seg_types]
+            seg_types_params = [get_enum_value(t) for t in seg_types_list]
+            params.seg_types = seg_types_params
+        params.fund_type = get_enum_value(fund_type)
+        params.currency = get_enum_value(currency)
+        params.startt = start
+        params.limit = limit
+        params.start_date = start_date
+        params.end_date = end_date
+        params.lang = get_enum_value(lang) if lang else get_enum_value(self._lang)
+
+        request = OpenApiRequest(FUND_DETAILS, biz_model=params)
+        response_content = self.__fetch_data(request)
+        if response_content:
+            response = FundDetailsResponse()
+            response.parse_response_content(response_content)
+            if response.is_success():
+                return response.result
+            else:
+                raise ApiException(response.code, response.message)
+
+
     def __fetch_data(self, request):
         try:
             response = super(TradeClient, self).execute(request)