Merge branch 'dev' into 'master'

Dev

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

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.0 (2022-11-01)
+### New
+- 长链接支持期货逐笔推送. 可通过 `PushClient.subscribe_tick` 订阅，使用 `PushClient.tick_changed` 接收回调
+
+
 ## 2.1.9 (2022-10-12)
 ### New
 - 支持多牌照配置, 分牌照请求不同域名. 可通过 client_config.license 指定牌照

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.1.9'
+__VERSION__ = '2.2.0'

tigeropen/examples/push_client_demo.py

@@ -89,6 +89,17 @@ def on_tick_changed(symbol, items):
           'part_code_name': 'NASDAQ Stock Market, LLC (NASDAQ)', 'cond': 'US_FORM_T', 'time': 1656405616573,
           'server_timestamp': 1656405573461,
           'type': 'TradeTick', 'quote_level': 'usStockQuote', 'sn': 343, 'timestamp': 1656405617385}]
+
+      Futures tick items example:
+          [{'tick_type': None, 'price': 15544.0, 'volume': 1, 'part_code': None, 'part_code_name': None, 'cond': None,
+           'time': 1667285183000, 'sn': 636960, 'server_timestamp': 1667285184162, 'quote_level': 'quote-fut-tick',
+            'type': 'TradeTick', 'timestamp': 1667285184156},
+            {'tick_type': None, 'price': 15544.0, 'volume': 1, 'part_code': None, 'part_code_name': None, 'cond': None,
+             'time': 1667285183000, 'sn': 636961, 'server_timestamp': 1667285184162, 'quote_level': 'quote-fut-tick',
+              'type': 'TradeTick', 'timestamp': 1667285184156},
+            {'tick_type': None, 'price': 15544.0, 'volume': 2, 'part_code': None, 'part_code_name': None,
+              'cond': None, 'time': 1667285183000, 'sn': 636962, 'server_timestamp': 1667285184162,
+              'quote_level': 'quote-fut-tick', 'type': 'TradeTick', 'timestamp': 1667285184156}]
     :return:
     """
     print(symbol, items)
@@ -227,6 +238,7 @@ def disconnect_callback():
 
     # 订阅逐笔数据
     push_client.subscribe_tick(['AMD', 'QQQ'])
+    push_client.subscribe_tick(['HSImain'])
 
     # 订阅资产变动
     push_client.subscribe_asset()

tigeropen/push/push_client.py

@@ -482,8 +482,7 @@ def _generate_headers(self, extra_headers=None):
             headers.update(extra_headers)
         return headers
 
-    @staticmethod
-    def _convert_tick(tick):
+    def _convert_tick(self, tick):
         data = json.loads(tick)
         symbol = data.pop('symbol')
         data = camel_to_underline_obj(data)
@@ -493,29 +492,50 @@ def _convert_tick(tick):
         price_items = [('price', (item + price_base) / price_offset) for item in data.pop('prices')]
         time_items = [('time', item) for item in accumulate(data.pop('times'))]
         volumes = [('volume', item) for item in data.pop('volumes')]
-        tick_type_items = [('tick_type', item) for item in data.pop('tick_type')]
-        part_codes = data.pop('part_code')
+        tick_types = data.pop('tick_type') if 'tick_type' in data else None
+        if tick_types:
+            tick_type_items = [('tick_type', item) for item in tick_types]
+        else:
+            tick_type_items = [('tick_type', None) for _ in range(len(time_items))]
+        part_codes = data.pop('part_code') if 'part_code' in data else None
         if part_codes:
             part_code_items = [('part_code', get_part_code(item)) for item in part_codes]
             part_code_name_items = [('part_code_name', get_part_code_name(item)) for item in part_codes]
         else:
             part_code_items = [('part_code', None) for _ in range(len(time_items))]
             part_code_name_items = [('part_code_name', None) for _ in range(len(time_items))]
-
-        conds = data.pop('cond')
+        conds = data.pop('cond') if 'cond' in data else None
         cond_map = get_trade_condition_map(data.get('quote_level'))
         if conds:
             cond_items = [('cond', get_trade_condition(item, cond_map)) for item in conds]
         else:
             cond_items = [('cond', None) for _ in range(len(time_items))]
         sn = data.pop('sn')
         sn_list = [('sn', sn + i) for i in range(len(time_items))]
+        merged_vols = data.pop('merged_vols') if 'merged_vols' in data else None
+        if merged_vols:
+            merged_vols_items = [('merged_vols', item) for item in merged_vols]
+        else:
+            merged_vols_items = [('merged_vols', None) for _ in range(len(time_items))]
         tick_data = zip_longest(tick_type_items, price_items, volumes, part_code_items,
-                                part_code_name_items, cond_items, time_items, sn_list)
+                                part_code_name_items, cond_items, time_items, sn_list, merged_vols_items)
         items = []
         for item in tick_data:
-            item_dict = dict(item)
+            try:
+                item_dict = dict(item)
+            except:
+                self.logger.error('convert tick error')
+                continue
             item_dict.update(data)
-            items.append(item_dict)
+            if item_dict.get('merged_vols'):
+                vols = item_dict.pop('merged_vols').get('vols')
+                for i, vol in enumerate(vols):
+                    sub_item = dict(item_dict)
+                    sub_item['sn'] = sub_item['sn'] * 10 + i
+                    sub_item['volume'] = vol
+                    items.append(sub_item)
+            else:
+                item_dict.pop('merged_vols', None)
+                items.append(item_dict)
         return symbol, items