Skip to content

Commit 2847b35

Browse files
committed
Merge branch 'feature_lang' into 'dev'
Feature lang See merge request server/openapi/openapi-python-sdk!124
2 parents c022e76 + 923445c commit 2847b35

File tree

8 files changed

+91
-118
lines changed

8 files changed

+91
-118
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.1.5 (2022-08-01)
2+
### Modify
3+
- 交易相关接口支持全局语言配置, 可通过 ClientConfig.language 改变默认语言
4+
5+
16
## 2.1.4 (2022-07-18)
27
### New
38
- 新增历史资产分析接口 `TradeClient.get_analytics_asset`

tigeropen/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
55
@author: gaoan
66
"""
7-
__VERSION__ = '2.1.4'
7+
__VERSION__ = '2.1.5'

tigeropen/common/model.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
# @Date : 2021/11/12
44
# @Author : sukai
55

6+
67
class BaseParams:
78
def __init__(self):
89
self._version = None # api版本
10+
self._lang = None # language
911

1012
@property
1113
def version(self):
@@ -14,3 +16,19 @@ def version(self):
1416
@version.setter
1517
def version(self, value):
1618
self._version = value
19+
20+
@property
21+
def lang(self):
22+
return self._lang
23+
24+
@lang.setter
25+
def lang(self, value):
26+
self._lang = value
27+
28+
def to_openapi_dict(self):
29+
params = dict()
30+
if self.lang:
31+
params['lang'] = self.lang
32+
if self.version:
33+
params['version'] = self.version
34+
return params

tigeropen/fundamental/request/model.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def end_date(self, value):
6161
self._end_date = value
6262

6363
def to_openapi_dict(self):
64-
params = dict()
64+
params = super().to_openapi_dict()
6565

6666
if self.symbols:
6767
params['symbols'] = self.symbols
@@ -125,7 +125,7 @@ def period_type(self, value):
125125
self._period_type = value
126126

127127
def to_openapi_dict(self):
128-
params = dict()
128+
params = super().to_openapi_dict()
129129

130130
if self.symbols:
131131
params['symbols'] = self.symbols
@@ -192,7 +192,7 @@ def end_date(self, value):
192192
self._end_date = value
193193

194194
def to_openapi_dict(self):
195-
params = dict()
195+
params = super().to_openapi_dict()
196196

197197
if self.symbols:
198198
params['symbols'] = self.symbols
@@ -253,7 +253,7 @@ def symbol(self, value):
253253
self._symbol = value
254254

255255
def to_openapi_dict(self):
256-
params = dict()
256+
params = super().to_openapi_dict()
257257

258258
if self.industry_level:
259259
params['industry_level'] = self.industry_level

tigeropen/quote/quote_client.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
from tigeropen.quote.response.symbols_response import SymbolsResponse
6767
from tigeropen.quote.response.trading_calendar_response import TradingCalendarResponse
6868
from tigeropen.tiger_open_client import TigerOpenClient
69+
from tigeropen.tiger_open_config import LANGUAGE
6970

7071

7172
class QuoteClient(TigerOpenClient):
@@ -77,7 +78,7 @@ def __init__(self, client_config, logger=None, is_grab_permission=True):
7778
if client_config:
7879
self._lang = client_config.language
7980
else:
80-
self._lang = Language.zh_CN
81+
self._lang = LANGUAGE
8182
self.permissions = None
8283
if is_grab_permission and self.permissions is None:
8384
self.permissions = self.grab_quote_permission()
@@ -125,7 +126,7 @@ def get_symbols(self, market=Market.ALL):
125126
"""
126127
params = MarketParams()
127128
params.market = get_enum_value(market)
128-
129+
params.lang = get_enum_value(self._lang)
129130
request = OpenApiRequest(ALL_SYMBOLS, biz_model=params)
130131
response_content = self.__fetch_data(request)
131132
if response_content:
@@ -173,7 +174,7 @@ def get_trade_metas(self, symbols):
173174
"""
174175
params = MultipleQuoteParams()
175176
params.symbols = symbols
176-
177+
params.lang = get_enum_value(self._lang)
177178
request = OpenApiRequest(QUOTE_STOCK_TRADE, biz_model=params)
178179
response_content = self.__fetch_data(request)
179180
if response_content:
@@ -390,7 +391,7 @@ def get_timeline_history(self, symbols, date, right=QuoteRight.BR):
390391
params.symbols = symbols
391392
params.date = date
392393
params.right = get_enum_value(right)
393-
394+
params.lang = get_enum_value(self._lang)
394395
request = OpenApiRequest(HISTORY_TIMELINE, biz_model=params)
395396
response_content = self.__fetch_data(request)
396397
if response_content:
@@ -582,7 +583,7 @@ def get_depth_quote(self, symbols, market):
582583
params = DepthQuoteParams()
583584
params.symbols = symbols if isinstance(symbols, list) else [symbols]
584585
params.market = get_enum_value(market)
585-
586+
params.lang = get_enum_value(self._lang)
586587
request = OpenApiRequest(QUOTE_DEPTH, biz_model=params)
587588
response_content = self.__fetch_data(request)
588589
if response_content:
@@ -604,7 +605,7 @@ def get_option_expirations(self, symbols):
604605
"""
605606
params = MultipleQuoteParams()
606607
params.symbols = symbols
607-
608+
params.lang = get_enum_value(self._lang)
608609
request = OpenApiRequest(OPTION_EXPIRATION, biz_model=params)
609610
response_content = self.__fetch_data(request)
610611
if response_content:
@@ -650,6 +651,7 @@ def get_option_chain(self, symbol, expiry, option_filter=None, **kwargs):
650651
param.expiry = expiry
651652
params.contracts = [param]
652653
params.option_filter = option_filter if option_filter else OptionFilter(**kwargs)
654+
params.lang = get_enum_value(self._lang)
653655
params.version = OPEN_API_SERVICE_VERSION_V3
654656
request = OpenApiRequest(OPTION_CHAIN, biz_model=params)
655657
response_content = self.__fetch_data(request)
@@ -702,7 +704,6 @@ def get_option_briefs(self, identifiers):
702704
param.strike = strike
703705
contracts.append(param)
704706
params.contracts = contracts
705-
706707
request = OpenApiRequest(OPTION_BRIEF, biz_model=params)
707708
response_content = self.__fetch_data(request)
708709
if response_content:
@@ -750,7 +751,6 @@ def get_option_bars(self, identifiers, begin_time=-1, end_time=4070880000000):
750751
param.end_time = end_time
751752
contracts.append(param)
752753
params.contracts = contracts
753-
754754
request = OpenApiRequest(OPTION_KLINE, biz_model=params)
755755
response_content = self.__fetch_data(request)
756756
if response_content:
@@ -787,7 +787,7 @@ def get_option_trade_ticks(self, identifiers):
787787
param.strike = strike
788788
contracts.append(param)
789789
params.contracts = contracts
790-
790+
params.lang = get_enum_value(self._lang)
791791
request = OpenApiRequest(OPTION_TRADE_TICK, biz_model=params)
792792
response_content = self.__fetch_data(request)
793793
if response_content:
@@ -927,7 +927,7 @@ def get_future_trading_times(self, identifier, trading_date=None):
927927
params = FutureTradingTimeParams()
928928
params.contract_code = identifier
929929
params.trading_date = trading_date
930-
930+
params.lang = get_enum_value(self._lang)
931931
request = OpenApiRequest(FUTURE_TRADING_DATE, biz_model=params)
932932
response_content = self.__fetch_data(request)
933933
if response_content:
@@ -969,7 +969,7 @@ def get_future_bars(self, identifiers, period=BarPeriod.DAY, begin_time=-1, end_
969969
params.end_time = end_time
970970
params.limit = limit
971971
params.page_token = page_token if len(params.contract_codes) == 1 else None
972-
972+
params.lang = get_enum_value(self._lang)
973973
request = OpenApiRequest(FUTURE_KLINE, biz_model=params)
974974
response_content = self.__fetch_data(request)
975975
if response_content:
@@ -1031,7 +1031,7 @@ def get_future_trade_ticks(self, identifiers, begin_index=0, end_index=30, limit
10311031
params.begin_index = begin_index
10321032
params.end_index = end_index
10331033
params.limit = limit
1034-
1034+
params.lang = get_enum_value(self._lang)
10351035
request = OpenApiRequest(FUTURE_TICK, biz_model=params)
10361036
response_content = self.__fetch_data(request)
10371037
if response_content:
@@ -1066,7 +1066,7 @@ def get_future_brief(self, identifiers):
10661066
"""
10671067
params = FutureQuoteParams()
10681068
params.contract_codes = identifiers
1069-
1069+
params.lang = get_enum_value(self._lang)
10701070
request = OpenApiRequest(FUTURE_REAL_TIME_QUOTE, biz_model=params)
10711071
response_content = self.__fetch_data(request)
10721072
if response_content:
@@ -1101,7 +1101,7 @@ def get_corporate_split(self, symbols, market, begin_date, end_date):
11011101
params.market = get_enum_value(market)
11021102
params.begin_date = begin_date
11031103
params.end_date = end_date
1104-
1104+
params.lang = get_enum_value(self._lang)
11051105
request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
11061106
response_content = self.__fetch_data(request)
11071107
if response_content:
@@ -1138,7 +1138,7 @@ def get_corporate_dividend(self, symbols, market, begin_date, end_date):
11381138
params.market = get_enum_value(market)
11391139
params.begin_date = begin_date
11401140
params.end_date = end_date
1141-
1141+
params.lang = get_enum_value(self._lang)
11421142
request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
11431143
response_content = self.__fetch_data(request)
11441144
if response_content:
@@ -1162,7 +1162,7 @@ def get_corporate_earnings_calendar(self, market, begin_date, end_date):
11621162
params.market = get_enum_value(market)
11631163
params.begin_date = begin_date
11641164
params.end_date = end_date
1165-
1165+
params.lang = get_enum_value(self._lang)
11661166
request = OpenApiRequest(CORPORATE_ACTION, biz_model=params)
11671167
response_content = self.__fetch_data(request)
11681168
if response_content:
@@ -1193,7 +1193,7 @@ def get_financial_daily(self, symbols, market, fields, begin_date, end_date):
11931193
params.fields = [get_enum_value(field) for field in fields]
11941194
params.begin_date = begin_date
11951195
params.end_date = end_date
1196-
1196+
params.lang = get_enum_value(self._lang)
11971197
request = OpenApiRequest(FINANCIAL_DAILY, biz_model=params)
11981198
response_content = self.__fetch_data(request)
11991199
if response_content:
@@ -1225,7 +1225,7 @@ def get_financial_report(self, symbols, market, fields, period_type):
12251225
params.market = get_enum_value(market)
12261226
params.fields = [get_enum_value(field) for field in fields]
12271227
params.period_type = get_enum_value(period_type)
1228-
1228+
params.lang = get_enum_value(self._lang)
12291229
request = OpenApiRequest(FINANCIAL_REPORT, biz_model=params)
12301230
response_content = self.__fetch_data(request)
12311231
if response_content:
@@ -1247,6 +1247,7 @@ def get_industry_list(self, industry_level=IndustryLevel.GGROUP):
12471247
"""
12481248
params = IndustryParams()
12491249
params.industry_level = get_enum_value(industry_level)
1250+
params.lang = get_enum_value(self._lang)
12501251
request = OpenApiRequest(INDUSTRY_LIST, biz_model=params)
12511252
response_content = self.__fetch_data(request)
12521253
if response_content:
@@ -1270,6 +1271,7 @@ def get_industry_stocks(self, industry, market=Market.US):
12701271
params = IndustryParams()
12711272
params.market = get_enum_value(market)
12721273
params.industry_id = industry
1274+
params.lang = get_enum_value(self._lang)
12731275
request = OpenApiRequest(INDUSTRY_STOCKS, biz_model=params)
12741276
response_content = self.__fetch_data(request)
12751277
if response_content:
@@ -1294,6 +1296,7 @@ def get_stock_industry(self, symbol, market=Market.US):
12941296
params = IndustryParams()
12951297
params.symbol = symbol
12961298
params.market = get_enum_value(market)
1299+
params.lang = get_enum_value(self._lang)
12971300
request = OpenApiRequest(STOCK_INDUSTRY, biz_model=params)
12981301
response_content = self.__fetch_data(request)
12991302
if response_content:
@@ -1356,6 +1359,7 @@ def get_trading_calendar(self, market, begin_date=None, end_date=None):
13561359
params.market = get_enum_value(market)
13571360
params.begin_date = begin_date
13581361
params.end_date = end_date
1362+
params.lang = get_enum_value(self._lang)
13591363
request = OpenApiRequest(TRADING_CALENDAR, biz_model=params)
13601364
response_content = self.__fetch_data(request)
13611365
if response_content:

0 commit comments

Comments
 (0)