Merge branch 'dev' into 'master'

Dev

See merge request server/openapi/openapi-python-sdk!168

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2.3.5 (2023-03-28)
+### New
+- TradeClient 新增不同品种(股票SEC/期货FUT/基金FUND)账户间资金划转接口
+  `TradeClient.get_segment_fund_available`  获取可划转资金  
+  `TradeClient.transfer_segment_fund`  划转资金  
+  `TradeClient.cancel_segment_fund`  取消划转  
+  `TradeClient.get_segment_fund_history`  获取划转历史  
+  
+- TradeClient 新增换汇下单接口
+  `TradeClient.place_forex_order`
+  
+- `QuoteClient.get_option_bars` 期权k线接口新增参数 `period`, 支持获取分钟k线
+
+
 ## 2.3.4 (2023-03-20)
 ### New
 - 支持AM/AL(盘前竞价单)

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.3.4'
+__VERSION__ = '2.3.5'

tigeropen/common/consts/service_types.py

@@ -26,6 +26,11 @@
 FILLED_ORDERS = "filled_orders"  # 已成交订单
 ORDER_TRANSACTIONS = "order_transactions"  # 订单成交记录
 ANALYTICS_ASSET = "analytics_asset"
+SEGMENT_FUND_HISTORY = "segment_fund_history"
+SEGMENT_FUND_AVAILABLE = "segment_fund_available"
+TRANSFER_SEGMENT_FUND = "transfer_segment_fund"
+CANCEL_SEGMENT_FUND = "cancel_segment_fund"
+PLACE_FOREX_ORDER = "place_forex_order"
 
 USER_LICENSE = "user_license"
 

tigeropen/common/util/web_utils.py

@@ -77,9 +77,13 @@ def do_request(method, url, query_string=None, headers=None, params=None, timeou
         raise RequestException('[' + THREAD_LOCAL.uuid + ']' + method + ' request failed. url: ' + url
                                + ' headers: ' + str(headers)
                                + ' params: ' + str(params) + ' detail: ' + str(e))
-    response = connection.getresponse()
-    result = response.read()
-
+    try:
+        response = connection.getresponse()
+        result = response.read()
+    except Exception as e:
+        raise ResponseException('[' + THREAD_LOCAL.uuid + '] read response error ' +
+                                ' headers: ' + str(headers) +
+                                ' params: ' + str(params))
     if response.status != 200:
         if charset:
             result = result.decode(charset)