Merge branch 'feat_sub_id' into 'master'

subscribe request return id

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

Author: tigersk

CHANGELOG.md

@@ -1,7 +1,7 @@
-## 3.3.7 (2025-05-08)
+## 3.3.7 (2025-05-12)
 ### New
 - 订单回调添加属性 `attrList`
-
+- `QuoteClient` 各订阅方法返回订阅id
 
 ## 3.3.6 (2025-04-28)
 ### New

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '3.3.6'
+__VERSION__ = '3.3.7'

tigeropen/push/protobuf_push_client.py

@@ -213,6 +213,7 @@ def subscribe_asset(self, account=None):
         """
         req = ProtoMessageUtil.build_subscribe_trade_message(SocketCommon.DataType.Asset, account)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_asset(self, account=None):
         """
@@ -221,6 +222,7 @@ def unsubscribe_asset(self, account=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_trade_message(SocketCommon.DataType.Asset, account)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_position(self, account=None):
         """
@@ -229,6 +231,7 @@ def subscribe_position(self, account=None):
         """
         req = ProtoMessageUtil.build_subscribe_trade_message(SocketCommon.DataType.Position, account)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_position(self, account=None):
         """
@@ -237,6 +240,7 @@ def unsubscribe_position(self, account=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_trade_message(SocketCommon.DataType.Position, account)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_order(self, account=''):
         """
@@ -245,6 +249,7 @@ def subscribe_order(self, account=''):
         """
         req = ProtoMessageUtil.build_subscribe_trade_message(SocketCommon.DataType.OrderStatus, account)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_order(self, account=None):
         """
@@ -253,6 +258,7 @@ def unsubscribe_order(self, account=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_trade_message(SocketCommon.DataType.OrderStatus, account)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_transaction(self, account=None):
         """
@@ -261,6 +267,7 @@ def subscribe_transaction(self, account=None):
         """
         req = ProtoMessageUtil.build_subscribe_trade_message(SocketCommon.DataType.OrderTransaction, account)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_transaction(self, account=None):
         """
@@ -269,6 +276,7 @@ def unsubscribe_transaction(self, account=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_trade_message(SocketCommon.DataType.OrderTransaction, account)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_quote(self, symbols):
         """
@@ -278,6 +286,7 @@ def subscribe_quote(self, symbols):
         """
         req = ProtoMessageUtil.build_subscribe_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_tick(self, symbols):
         """
@@ -287,6 +296,7 @@ def subscribe_tick(self, symbols):
         """
         req = ProtoMessageUtil.build_subscribe_tick_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_depth_quote(self, symbols):
         """
@@ -296,6 +306,7 @@ def subscribe_depth_quote(self, symbols):
         """
         req = ProtoMessageUtil.build_subscribe_depth_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_option(self, symbols):
         """
@@ -305,6 +316,7 @@ def subscribe_option(self, symbols):
         """
         req = ProtoMessageUtil.build_subscribe_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_future(self, symbols):
         """
@@ -314,6 +326,7 @@ def subscribe_future(self, symbols):
         """
         req = ProtoMessageUtil.build_subscribe_quote_message(symbols, data_type=SocketCommon.Future)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_stock_top(self, market, indicators):
         """
@@ -328,6 +341,7 @@ def subscribe_stock_top(self, market, indicators):
         req = ProtoMessageUtil.build_subscribe_quote_message(symbols=indicator_names, data_type=SocketCommon.StockTop,
                                                              market=market)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_stock_top(self, market, indicators):
         """
@@ -342,6 +356,7 @@ def unsubscribe_stock_top(self, market, indicators):
         req = ProtoMessageUtil.build_unsubscribe_quote_message(symbols=indicator_names, data_type=SocketCommon.StockTop,
                                                                market=market)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_option_top(self, market, indicators):
         """
@@ -356,6 +371,7 @@ def subscribe_option_top(self, market, indicators):
         req = ProtoMessageUtil.build_subscribe_quote_message(symbols=indicator_names, data_type=SocketCommon.OptionTop,
                                                              market=market)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_option_top(self, market, indicators):
         """
@@ -370,6 +386,7 @@ def unsubscribe_option_top(self, market, indicators):
         req = ProtoMessageUtil.build_unsubscribe_quote_message(symbols=indicator_names, data_type=SocketCommon.OptionTop,
                                                                market=market)
         self._connection.send_frame(req)
+        return req.id
 
     def query_subscribed_quote(self):
         """
@@ -378,6 +395,7 @@ def query_subscribed_quote(self):
         """
         req = ProtoMessageUtil.build_subscribe_query_message()
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_quote(self, symbols=None):
         """
@@ -386,6 +404,7 @@ def unsubscribe_quote(self, symbols=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_tick(self, symbols=None):
         """
@@ -394,6 +413,7 @@ def unsubscribe_tick(self, symbols=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_tick_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_depth_quote(self, symbols=None):
         """
@@ -402,6 +422,7 @@ def unsubscribe_depth_quote(self, symbols=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_depth_quote_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_kline(self, symbols=None):
         """
@@ -411,6 +432,7 @@ def subscribe_kline(self, symbols=None):
         """
         req = ProtoMessageUtil.build_subscribe_kline_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_kline(self, symbols=None):
         """
@@ -420,14 +442,17 @@ def unsubscribe_kline(self, symbols=None):
         """
         req = ProtoMessageUtil.build_unsubscribe_kline_message(symbols)
         self._connection.send_frame(req)
+        return req.id
 
     def subscribe_market(self, market):
         req = ProtoMessageUtil.build_subscribe_market_message(market)
         self._connection.send_frame(req)
+        return req.id
 
     def unsubscribe_market(self, market):
         req = ProtoMessageUtil.build_unsubscribe_market_message(market)
         self._connection.send_frame(req)
+        return req.id
 
     def _convert_tick(self, data: TradeTickData):
         symbol = data.symbol