Merge branch 'dev' into 'master'

Dev

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

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.5 (2022-08-01) 
+### Modify
+- 交易相关接口支持全局语言配置, 可通过 ClientConfig.language 改变默认语言
+
+
 ## 2.1.4 (2022-07-18)
 ### New
 - 新增历史资产分析接口 `TradeClient.get_analytics_asset`

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.1.4'
+__VERSION__ = '2.1.5'

tigeropen/common/model.py

@@ -3,9 +3,11 @@
 # @Date    : 2021/11/12
 # @Author  : sukai
 
+
 class BaseParams:
     def __init__(self):
         self._version = None  # api版本
+        self._lang = None  # language
 
     @property
     def version(self):
@@ -14,3 +16,19 @@ def version(self):
     @version.setter
     def version(self, value):
         self._version = value
+
+    @property
+    def lang(self):
+        return self._lang
+
+    @lang.setter
+    def lang(self, value):
+        self._lang = value
+
+    def to_openapi_dict(self):
+        params = dict()
+        if self.lang:
+            params['lang'] = self.lang
+        if self.version:
+            params['version'] = self.version
+        return params

tigeropen/fundamental/request/model.py

@@ -61,7 +61,7 @@ def end_date(self, value):
         self._end_date = value
 
     def to_openapi_dict(self):
-        params = dict()
+        params = super().to_openapi_dict()
 
         if self.symbols:
             params['symbols'] = self.symbols
@@ -125,7 +125,7 @@ def period_type(self, value):
         self._period_type = value
 
     def to_openapi_dict(self):
-        params = dict()
+        params = super().to_openapi_dict()
 
         if self.symbols:
             params['symbols'] = self.symbols
@@ -192,7 +192,7 @@ def end_date(self, value):
         self._end_date = value
 
     def to_openapi_dict(self):
-        params = dict()
+        params = super().to_openapi_dict()
 
         if self.symbols:
             params['symbols'] = self.symbols
@@ -253,7 +253,7 @@ def symbol(self, value):
         self._symbol = value
 
     def to_openapi_dict(self):
-        params = dict()
+        params = super().to_openapi_dict()
 
         if self.industry_level:
             params['industry_level'] = self.industry_level

tigeropen/quote/quote_client.py

@@ -66,6 +66,7 @@
 from tigeropen.quote.response.symbols_response import SymbolsResponse
 from tigeropen.quote.response.trading_calendar_response import TradingCalendarResponse
 from tigeropen.tiger_open_client import TigerOpenClient
+from tigeropen.tiger_open_config import LANGUAGE
 
 
 class QuoteClient(TigerOpenClient):
@@ -77,7 +78,7 @@ def __init__(self, client_config, logger=None, is_grab_permission=True):
         if client_config:
             self._lang = client_config.language
         else:
-            self._lang = Language.zh_CN
+            self._lang = LANGUAGE
         self.permissions = None
         if is_grab_permission and self.permissions is None:
             self.permissions = self.grab_quote_permission()
@@ -125,7 +126,7 @@ def get_symbols(self, market=Market.ALL):
         """
         params = MarketParams()
         params.market = get_enum_value(market)
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(ALL_SYMBOLS, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -173,7 +174,7 @@ def get_trade_metas(self, symbols):
         """
         params = MultipleQuoteParams()
         params.symbols = symbols
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(QUOTE_STOCK_TRADE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -390,7 +391,7 @@ def get_timeline_history(self, symbols, date, right=QuoteRight.BR):
         params.symbols = symbols
         params.date = date
         params.right = get_enum_value(right)
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(HISTORY_TIMELINE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -582,7 +583,7 @@ def get_depth_quote(self, symbols, market):
         params = DepthQuoteParams()
         params.symbols = symbols if isinstance(symbols, list) else [symbols]
         params.market = get_enum_value(market)
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(QUOTE_DEPTH, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -604,7 +605,7 @@ def get_option_expirations(self, symbols):
         """
         params = MultipleQuoteParams()
         params.symbols = symbols
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(OPTION_EXPIRATION, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -650,6 +651,7 @@ def get_option_chain(self, symbol, expiry, option_filter=None, **kwargs):
             param.expiry = expiry
         params.contracts = [param]
         params.option_filter = option_filter if option_filter else OptionFilter(**kwargs)
+        params.lang = get_enum_value(self._lang)
         params.version = OPEN_API_SERVICE_VERSION_V3
         request = OpenApiRequest(OPTION_CHAIN, biz_model=params)
         response_content = self.__fetch_data(request)
@@ -702,7 +704,6 @@ def get_option_briefs(self, identifiers):
             param.strike = strike
             contracts.append(param)
         params.contracts = contracts
-
         request = OpenApiRequest(OPTION_BRIEF, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -750,7 +751,6 @@ def get_option_bars(self, identifiers, begin_time=-1, end_time=4070880000000):
             param.end_time = end_time
             contracts.append(param)
         params.contracts = contracts
-
         request = OpenApiRequest(OPTION_KLINE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -787,7 +787,7 @@ def get_option_trade_ticks(self, identifiers):
             param.strike = strike
             contracts.append(param)
         params.contracts = contracts
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(OPTION_TRADE_TICK, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -927,7 +927,7 @@ def get_future_trading_times(self, identifier, trading_date=None):
         params = FutureTradingTimeParams()
         params.contract_code = identifier
         params.trading_date = trading_date
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FUTURE_TRADING_DATE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -969,7 +969,7 @@ def get_future_bars(self, identifiers, period=BarPeriod.DAY, begin_time=-1, end_
         params.end_time = end_time
         params.limit = limit
         params.page_token = page_token if len(params.contract_codes) == 1 else None
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FUTURE_KLINE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1031,7 +1031,7 @@ def get_future_trade_ticks(self, identifiers, begin_index=0, end_index=30, limit
         params.begin_index = begin_index
         params.end_index = end_index
         params.limit = limit
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FUTURE_TICK, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1066,7 +1066,7 @@ def get_future_brief(self, identifiers):
         """
         params = FutureQuoteParams()
         params.contract_codes = identifiers
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FUTURE_REAL_TIME_QUOTE, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1101,7 +1101,7 @@ def get_corporate_split(self, symbols, market, begin_date, end_date):
         params.market = get_enum_value(market)
         params.begin_date = begin_date
         params.end_date = end_date
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1138,7 +1138,7 @@ def get_corporate_dividend(self, symbols, market, begin_date, end_date):
         params.market = get_enum_value(market)
         params.begin_date = begin_date
         params.end_date = end_date
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1162,7 +1162,7 @@ def get_corporate_earnings_calendar(self, market, begin_date, end_date):
         params.market = get_enum_value(market)
         params.begin_date = begin_date
         params.end_date = end_date
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1193,7 +1193,7 @@ def get_financial_daily(self, symbols, market, fields, begin_date, end_date):
         params.fields = [get_enum_value(field) for field in fields]
         params.begin_date = begin_date
         params.end_date = end_date
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FINANCIAL_DAILY, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1225,7 +1225,7 @@ def get_financial_report(self, symbols, market, fields, period_type):
         params.market = get_enum_value(market)
         params.fields = [get_enum_value(field) for field in fields]
         params.period_type = get_enum_value(period_type)
-
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(FINANCIAL_REPORT, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1247,6 +1247,7 @@ def get_industry_list(self, industry_level=IndustryLevel.GGROUP):
         """
         params = IndustryParams()
         params.industry_level = get_enum_value(industry_level)
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(INDUSTRY_LIST, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1270,6 +1271,7 @@ def get_industry_stocks(self, industry, market=Market.US):
         params = IndustryParams()
         params.market = get_enum_value(market)
         params.industry_id = industry
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(INDUSTRY_STOCKS, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1294,6 +1296,7 @@ def get_stock_industry(self, symbol, market=Market.US):
         params = IndustryParams()
         params.symbol = symbol
         params.market = get_enum_value(market)
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(STOCK_INDUSTRY, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content:
@@ -1356,6 +1359,7 @@ def get_trading_calendar(self, market, begin_date=None, end_date=None):
         params.market = get_enum_value(market)
         params.begin_date = begin_date
         params.end_date = end_date
+        params.lang = get_enum_value(self._lang)
         request = OpenApiRequest(TRADING_CALENDAR, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content: