params supports version

Author: tigersk

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.0.2'
+__VERSION__ = '2.0.3'

tigeropen/common/consts/__init__.py

@@ -11,7 +11,7 @@
     Leverage, Profitability
 from .quote_keys import QuoteChangeKey, QuoteKeyType
 
-OPEN_API_SDK_VERSION = "2.0"
+OPEN_API_SERVICE_VERSION = "2.0"
 
 THREAD_LOCAL = threading.local()
 

tigeropen/common/model.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# 
+# @Date    : 2021/11/12
+# @Author  : sukai
+
+class BaseParams:
+    def __init__(self):
+        self._version = None  # api版本
+
+    @property
+    def version(self):
+        return self._version
+
+    @version.setter
+    def version(self, value):
+        self._version = value

tigeropen/quote/request/__init__.py

@@ -7,7 +7,7 @@
 
 import json
 from tigeropen.common.consts.params import *
-from tigeropen.common.consts import OPEN_API_SDK_VERSION
+from tigeropen.common.consts import OPEN_API_SERVICE_VERSION
 
 
 class OpenApiRequest:
@@ -26,7 +26,7 @@ def biz_model(self, value):
     def get_params(self):
         params = dict()
         params[P_METHOD] = self._method
-        params[P_VERSION] = OPEN_API_SDK_VERSION
+        params[P_VERSION] = getattr(self.biz_model, P_VERSION)
 
         if self.biz_model:
             params[P_BIZ_CONTENT] = json.dumps(obj=self.biz_model.to_openapi_dict(), ensure_ascii=False, sort_keys=True,

tigeropen/quote/request/model.py

@@ -4,10 +4,12 @@
 
 @author: gaoan
 """
+from tigeropen.common.model import BaseParams
 
 
-class MarketParams:
+class MarketParams(BaseParams):
     def __init__(self):
+        super(MarketParams, self).__init__()
         self._market = None  # 市场
         self._sec_type = None  # 交易品种
         self._lang = None  # 语言
@@ -346,8 +348,9 @@ def to_openapi_dict(self):
         return params
 
 
-class SingleContractParams:
+class SingleContractParams(BaseParams):
     def __init__(self):
+        super(SingleContractParams, self).__init__()
         self._symbol = None
         self._put_call = None  # for option
         self._expiry = None  # for option and future
@@ -461,7 +464,7 @@ def to_openapi_dict(self):
         return params
 
 
-class MultipleContractParams:
+class MultipleContractParams(BaseParams):
     def __init__(self):
         super(MultipleContractParams, self).__init__()
         self._contracts = None  # list of SingleQuoteParams
@@ -484,8 +487,9 @@ def to_openapi_dict(self):
         return params
 
 
-class FutureExchangeParams:
+class FutureExchangeParams(BaseParams):
     def __init__(self):
+        super(FutureExchangeParams, self).__init__()
         self._exchange_code = None  # 交易所
         self._lang = None  # 语言
 
@@ -516,7 +520,7 @@ def to_openapi_dict(self):
         return params
 
 
-class FutureTypeParams:
+class FutureTypeParams(BaseParams):
     def __init__(self):
         self._type = None  # 期货品种
         self._lang = None  # 语言
@@ -548,8 +552,9 @@ def to_openapi_dict(self):
         return params
 
 
-class FutureTradingTimeParams:
+class FutureTradingTimeParams(BaseParams):
     def __init__(self):
+        super(FutureTradingTimeParams, self).__init__()
         self._contract_code = None
         self._trading_date = None
 
@@ -674,8 +679,9 @@ def to_openapi_dict(self):
         return params
 
 
-class DepthQuoteParams:
+class DepthQuoteParams(BaseParams):
     def __init__(self):
+        super(DepthQuoteParams, self).__init__()
         self._symbols = None
         self._market = None
 

tigeropen/tiger_open_client.py

@@ -8,7 +8,8 @@
 import json
 import uuid
 
-from tigeropen.common.consts import OPEN_API_SDK_VERSION, THREAD_LOCAL
+from tigeropen import __VERSION__
+from tigeropen.common.consts import OPEN_API_SERVICE_VERSION, THREAD_LOCAL
 from tigeropen.common.consts.params import P_TIMESTAMP, P_TIGER_ID, P_METHOD, P_CHARSET, P_VERSION, P_SIGN_TYPE, \
     P_DEVICE_ID, P_NOTIFY_URL, COMMON_PARAM_KEYS, P_SIGN
 from tigeropen.common.exceptions import ResponseException, RequestException
@@ -36,7 +37,7 @@ def __init__(self, client_config, logger=None):
             'Content-type': 'application/json;charset=' + self.__config.charset,
             "Cache-Control": "no-cache",
             "Connection": "Keep-Alive",
-            "User-Agent": 'openapi-python-sdk-' + OPEN_API_SDK_VERSION
+            "User-Agent": 'openapi-python-sdk-' + __VERSION__
         }
         self.__device_id = self.__get_device_id()
 
@@ -50,7 +51,7 @@ def __get_common_params(self, params):
         common_params[P_TIGER_ID] = self.__config.tiger_id
         common_params[P_METHOD] = params[P_METHOD]
         common_params[P_CHARSET] = self.__config.charset
-        common_params[P_VERSION] = params[P_VERSION]
+        common_params[P_VERSION] = params[P_VERSION] if params.get(P_VERSION) is not None else OPEN_API_SERVICE_VERSION
         common_params[P_SIGN_TYPE] = self.__config.sign_type
         common_params[P_DEVICE_ID] = self.__device_id
         if has_value(params, P_NOTIFY_URL):

tigeropen/trade/request/model.py

@@ -4,10 +4,12 @@
 
 @author: gaoan
 """
+from tigeropen.common.model import BaseParams
 
 
-class AccountsParams:
+class AccountsParams(BaseParams):
     def __init__(self):
+        super(AccountsParams, self).__init__()
         self._account = None
         self._secret_key = None
 
@@ -36,8 +38,9 @@ def to_openapi_dict(self):
         return params
 
 
-class AssetParams:
+class AssetParams(BaseParams):
     def __init__(self):
+        super(AssetParams, self).__init__()
         self._account = None
         self._secret_key = None
         self._segment = False
@@ -104,8 +107,9 @@ def to_openapi_dict(self):
         return params
 
 
-class PositionParams:
+class PositionParams(BaseParams):
     def __init__(self):
+        super(PositionParams, self).__init__()
         self._account = None
         self._secret_key = None
         self._symbol = None
@@ -196,8 +200,9 @@ def to_openapi_dict(self):
         return params
 
 
-class ContractParams:
+class ContractParams(BaseParams):
     def __init__(self):
+        super(ContractParams, self).__init__()
         self._account = None
         self._secret_key = None
         self._symbol = None
@@ -324,8 +329,9 @@ def to_openapi_dict(self):
         return params
 
 
-class OrderParams:
+class OrderParams(BaseParams):
     def __init__(self):
+        super(OrderParams, self).__init__()
         self._account = None  # 账户
         self._secret_key = None
         self._id = None  # 订单号(全局)
@@ -404,8 +410,9 @@ def to_openapi_dict(self):
         return params
 
 
-class OrdersParams:
+class OrdersParams(BaseParams):
     def __init__(self):
+        super(OrdersParams, self).__init__()
         self._account = None  # 账户
         self._secret_key = None
         self._market = None  # 市场
@@ -556,8 +563,9 @@ def to_openapi_dict(self):
         return params
 
 
-class PlaceModifyOrderParams:
+class PlaceModifyOrderParams(BaseParams):
     def __init__(self):
+        super(PlaceModifyOrderParams, self).__init__()
         self.account = None
         self.secret_key = None
         self.id = None
@@ -661,8 +669,9 @@ def to_openapi_dict(self):
         return params
 
 
-class CancelOrderParams:
+class CancelOrderParams(BaseParams):
     def __init__(self):
+        super(CancelOrderParams, self).__init__()
         self._account = None
         self._secret_key = None
         self._id = None