Merge branch 'master' into feat_mcp

Author: tigersk

CHANGELOG.md

@@ -1,9 +1,30 @@
+## 3.4.0 (2025-06-17)
+### New
+- `QuoteClient.get_bars` 增加 `date` 参数，用于查询历史分钟K线
+- 一部分接口增加 `lang` 参数，支持指定语言
+### Mod
+- `TigerOpenClientConfig` 配置里默认语言改为英文
+
+## 3.3.9 (2025-06-12)
+### New
+- 订单回调增加属性 `timeInForce`
+
+## 3.3.8 (2025-05-29)
+### New
+- 支持 TBUS 牌照配置
+- 支持订单预览
+
+## 3.3.7 (2025-05-12)
+### New
+- 订单回调添加属性 `attrList`
+- `QuoteClient` 各订阅方法返回订阅id
+
 ## 3.3.6 (2025-04-28)
 ### New
 - `TradeClient.get_fund_details` 资金明细
 - `QuoteClient` 期权相关接口支持时区参数
 ### Mod
-= 废弃 sandbox_config 配置
+- 废弃 sandbox_config 配置
 
 ## 3.3.5 (2025-04-11)
 ### New

tigeropen/__init__.py

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

tigeropen/common/consts/__init__.py

@@ -211,6 +211,9 @@ class OrderType(Enum):
 class License(Enum):
     TBNZ = 'TBNZ'
     TBSG = 'TBSG'
+    TBHK = 'TBHK'
+    TBAU = 'TBAU'
+    TBUS = 'TBUS'
 
 
 @unique

tigeropen/examples/quote_client_demo.py

@@ -25,8 +25,8 @@
                     filemode='a', )
 logger = logging.getLogger('TigerOpenApi')
 
-client_config = get_client_config()
-openapi_client = QuoteClient(client_config, logger=logger)
+_demo_config = get_client_config()
+openapi_client = QuoteClient(_demo_config, logger=logger)
 
 
 def get_quote():

tigeropen/examples/trade_client_demo.py

@@ -27,13 +27,13 @@
                     filemode='a', )
 logger = logging.getLogger('TigerOpenApi')
 
-client_config = get_client_config(private_key_path='your private key file path',
-                                  tiger_id='your tiger id',
-                                  account='your account')
+_demo_config = get_client_config(private_key_path='your private key file path',
+                                 tiger_id='your tiger id',
+                                 account='your account')
 
 
 def get_contract_apis():
-    openapi_client = TradeClient(client_config, logger=logger)
+    openapi_client = TradeClient(_demo_config, logger=logger)
     contract = openapi_client.get_contracts('AAPL')[0]
     print(contract)
     contract = openapi_client.get_contract('AAPL', SecurityType.STK, currency=Currency.USD)
@@ -43,7 +43,7 @@ def get_contract_apis():
     print(contracts)
 
 def get_account_apis():
-    openapi_client = TradeClient(client_config, logger=logger)
+    openapi_client = TradeClient(_demo_config, logger=logger)
     openapi_client.get_managed_accounts()
     # 获取订单
     openapi_client.get_orders()
@@ -73,7 +73,7 @@ def get_account_apis():
 
 def test_get_orders_by_page():
     """分页获取订单"""
-    trade_client = TradeClient(client_config)
+    trade_client = TradeClient(_demo_config)
     result = list()
     # 每次返回数量(需 <= 300)
     limit = 300
@@ -96,8 +96,8 @@ def test_get_orders_by_page():
 
 
 def trade_apis():
-    account = client_config.account
-    openapi_client = TradeClient(client_config, logger=logger)
+    account = _demo_config.account
+    openapi_client = TradeClient(_demo_config, logger=logger)
 
     # 通过请求获取合约
     contract = openapi_client.get_contracts('AAPL')[0]
@@ -159,8 +159,8 @@ def trade_apis():
 
 
 def algo_order_demo():
-    account = client_config.account
-    openapi_client = TradeClient(client_config, logger=logger)
+    account = _demo_config.account
+    openapi_client = TradeClient(_demo_config, logger=logger)
     contract = stock_contract(symbol='AAPL', currency='USD')
     params = algo_order_params(start_time=1686147201000, end_time=1686150801000, no_take_liq=True,
                                allow_past_end_time=True, participation_rate=0.1)
@@ -175,9 +175,9 @@ def get_account_info():
     :return:
     """
     from tigeropen.common.consts.service_types import ACCOUNTS
-    openapi_client = TigerOpenClient(client_config)
+    openapi_client = TigerOpenClient(_demo_config)
     account = AccountsParams()
-    account.account = client_config.account
+    account.account = _demo_config.account
     request = OpenApiRequest(method=ACCOUNTS, biz_model=account)
 
     response_content = None
@@ -197,7 +197,7 @@ def get_account_info():
 
 
 class TestTradeClient(unittest.TestCase):
-    trade_client = TradeClient(client_config)
+    trade_client = TradeClient(_demo_config)
 
     def test_transfer_segment_fund(self):
         """资金划转"""

tigeropen/push/pb/OrderStatusData.proto

@@ -46,4 +46,6 @@ message OrderStatusData {
   double totalCashAmount = 39;
   double filledCashAmount = 40;
   double gst = 41;
+  repeated string attrList = 42;
+  string timeInForce = 43;
 }

tigeropen/push/pb/OrderStatusData_pb2.py

@@ -1,11 +1,12 @@
+from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from typing import ClassVar as _ClassVar, Optional as _Optional
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Optional as _Optional
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class OrderStatusData(_message.Message):
-    __slots__ = ("id", "account", "symbol", "expiry", "strike", "right", "identifier", "multiplier", "action", "market", "currency", "segType", "secType", "orderType", "isLong", "totalQuantity", "totalQuantityScale", "filledQuantity", "filledQuantityScale", "avgFillPrice", "limitPrice", "stopPrice", "realizedPnl", "status", "replaceStatus", "cancelStatus", "outsideRth", "canModify", "canCancel", "liquidation", "name", "source", "errorMsg", "attrDesc", "commissionAndFee", "openTime", "timestamp", "userMark", "totalCashAmount", "filledCashAmount", "gst")
+    __slots__ = ("id", "account", "symbol", "expiry", "strike", "right", "identifier", "multiplier", "action", "market", "currency", "segType", "secType", "orderType", "isLong", "totalQuantity", "totalQuantityScale", "filledQuantity", "filledQuantityScale", "avgFillPrice", "limitPrice", "stopPrice", "realizedPnl", "status", "replaceStatus", "cancelStatus", "outsideRth", "canModify", "canCancel", "liquidation", "name", "source", "errorMsg", "attrDesc", "commissionAndFee", "openTime", "timestamp", "userMark", "totalCashAmount", "filledCashAmount", "gst", "attrList", "timeInForce")
     ID_FIELD_NUMBER: _ClassVar[int]
     ACCOUNT_FIELD_NUMBER: _ClassVar[int]
     SYMBOL_FIELD_NUMBER: _ClassVar[int]
@@ -47,6 +48,8 @@ class OrderStatusData(_message.Message):
     TOTALCASHAMOUNT_FIELD_NUMBER: _ClassVar[int]
     FILLEDCASHAMOUNT_FIELD_NUMBER: _ClassVar[int]
     GST_FIELD_NUMBER: _ClassVar[int]
+    ATTRLIST_FIELD_NUMBER: _ClassVar[int]
+    TIMEINFORCE_FIELD_NUMBER: _ClassVar[int]
     id: int
     account: str
     symbol: str
@@ -88,4 +91,6 @@ class OrderStatusData(_message.Message):
     totalCashAmount: float
     filledCashAmount: float
     gst: float
-    def __init__(self, id: _Optional[int] = ..., account: _Optional[str] = ..., symbol: _Optional[str] = ..., expiry: _Optional[str] = ..., strike: _Optional[str] = ..., right: _Optional[str] = ..., identifier: _Optional[str] = ..., multiplier: _Optional[int] = ..., action: _Optional[str] = ..., market: _Optional[str] = ..., currency: _Optional[str] = ..., segType: _Optional[str] = ..., secType: _Optional[str] = ..., orderType: _Optional[str] = ..., isLong: bool = ..., totalQuantity: _Optional[int] = ..., totalQuantityScale: _Optional[int] = ..., filledQuantity: _Optional[int] = ..., filledQuantityScale: _Optional[int] = ..., avgFillPrice: _Optional[float] = ..., limitPrice: _Optional[float] = ..., stopPrice: _Optional[float] = ..., realizedPnl: _Optional[float] = ..., status: _Optional[str] = ..., replaceStatus: _Optional[str] = ..., cancelStatus: _Optional[str] = ..., outsideRth: bool = ..., canModify: bool = ..., canCancel: bool = ..., liquidation: bool = ..., name: _Optional[str] = ..., source: _Optional[str] = ..., errorMsg: _Optional[str] = ..., attrDesc: _Optional[str] = ..., commissionAndFee: _Optional[float] = ..., openTime: _Optional[int] = ..., timestamp: _Optional[int] = ..., userMark: _Optional[str] = ..., totalCashAmount: _Optional[float] = ..., filledCashAmount: _Optional[float] = ..., gst: _Optional[float] = ...) -> None: ...
+    attrList: _containers.RepeatedScalarFieldContainer[str]
+    timeInForce: str
+    def __init__(self, id: _Optional[int] = ..., account: _Optional[str] = ..., symbol: _Optional[str] = ..., expiry: _Optional[str] = ..., strike: _Optional[str] = ..., right: _Optional[str] = ..., identifier: _Optional[str] = ..., multiplier: _Optional[int] = ..., action: _Optional[str] = ..., market: _Optional[str] = ..., currency: _Optional[str] = ..., segType: _Optional[str] = ..., secType: _Optional[str] = ..., orderType: _Optional[str] = ..., isLong: bool = ..., totalQuantity: _Optional[int] = ..., totalQuantityScale: _Optional[int] = ..., filledQuantity: _Optional[int] = ..., filledQuantityScale: _Optional[int] = ..., avgFillPrice: _Optional[float] = ..., limitPrice: _Optional[float] = ..., stopPrice: _Optional[float] = ..., realizedPnl: _Optional[float] = ..., status: _Optional[str] = ..., replaceStatus: _Optional[str] = ..., cancelStatus: _Optional[str] = ..., outsideRth: bool = ..., canModify: bool = ..., canCancel: bool = ..., liquidation: bool = ..., name: _Optional[str] = ..., source: _Optional[str] = ..., errorMsg: _Optional[str] = ..., attrDesc: _Optional[str] = ..., commissionAndFee: _Optional[float] = ..., openTime: _Optional[int] = ..., timestamp: _Optional[int] = ..., userMark: _Optional[str] = ..., totalCashAmount: _Optional[float] = ..., filledCashAmount: _Optional[float] = ..., gst: _Optional[float] = ..., attrList: _Optional[_Iterable[str]] = ..., timeInForce: _Optional[str] = ...) -> None: ...