Merge branch 'feat_us' into 'master'

us support;order preview

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

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.8 (2025-05-29)
+### New
+- 支持 TBUS 牌照配置
+- 支持订单预览
+
 ## 3.3.7 (2025-05-12)
 ### New
 - 订单回调添加属性 `attrList`

tigeropen/__init__.py

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

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/tiger_open_config.py

@@ -14,26 +14,31 @@
 from jproperties import Properties
 from pytz import timezone
 from tigeropen import __VERSION__
-from tigeropen.common.consts import Language, ServiceType
+from tigeropen.common.consts import Language, ServiceType, License
 from tigeropen.common.util.account_util import AccountUtil
 from tigeropen.common.util.common_utils import get_enum_value
 from tigeropen.common.util.signature_utils import read_private_key
 from tigeropen.common.util.web_utils import do_get
 
 DEFAULT_DOMAIN = 'openapi.tigerfintech.com'
+DEFAULT_US_DOMAIN = 'openapi.tradeup.com'
 DEFAULT_SANDBOX_DOMAIN = 'openapi-sandbox.tigerfintech.com'
-DOMAIN_GARDEN_ADDRESS = 'https://cg.play-analytics.com/'
+DOMAIN_GARDEN_ADDRESS = 'https://cg.play-analytics.com'
 
 HTTPS_PROTOCAL = 'https://'
 SSL_PROTOCAL = 'ssl'
 GATEWAY_SUFFIX = '/gateway'
 DOMAIN_SEPARATOR = '-'
 
-# 老虎证券开放平台网关地址
+# 网关地址
 SERVER_URL = HTTPS_PROTOCAL + DEFAULT_DOMAIN + GATEWAY_SUFFIX
-# 老虎证券开放平台 socket 连接域名端口
+# socket 域名端口
 SOCKET_HOST_PORT = (SSL_PROTOCAL, DEFAULT_DOMAIN, 9883)
-# 老虎证券开放平台公钥
+# US 网关地址
+US_SERVER_URL = HTTPS_PROTOCAL + DEFAULT_US_DOMAIN + GATEWAY_SUFFIX
+# US socket 域名端口
+US_SOCKET_HOST_PORT = (SSL_PROTOCAL, DEFAULT_US_DOMAIN, 9983)
+# 开放平台公钥
 TIGER_PUBLIC_KEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNF3G8SoEcCZh2rshUbayDgLLrj6rKgzNMxDL2HS' \
                    'nKcB0+GPOsndqSv+a4IBu9+I3fyBp5hkyMMG2+AXugd9pMpy6VxJxlNjhX1MYbNTZJUT4nudki4uh+LM' \
                    'OkIBHOceGNXjgB+cXqmlUnjlqha/HgboeHSnSgpM3dKSJQlIOsDwIDAQAB'
@@ -126,6 +131,11 @@ def __init__(self, sandbox_debug=None, enable_dynamic_domain=True, props_path='.
         if self.enable_dynamic_domain:
             self.domain_conf = self.query_domains()
             self.refresh_server_info()
+        elif self.is_us():
+            self.server_url = US_SERVER_URL
+            self.quote_server_url = US_SERVER_URL
+            self.socket_host_port = US_SOCKET_HOST_PORT
+
         self.inited = False
 
     @property
@@ -404,7 +414,10 @@ def query_domains(self):
         }
         """
         try:
-            result = json.loads(do_get(DOMAIN_GARDEN_ADDRESS, headers=dict(), params=dict(), timeout=1)) \
+            url = DOMAIN_GARDEN_ADDRESS
+            if self.is_us():
+                url += '?appName=tradeup'
+            result = json.loads(do_get(url, headers=dict(), params=dict(), timeout=1)) \
                 .get('items')
             if result:
                 for item in result:
@@ -441,6 +454,9 @@ def _get_domain_by_type(self, service_type, license, is_paper=False):
     def sdk_version(self):
         return __VERSION__
 
+    def is_us(self):
+        return self.license and License.TBUS.value == get_enum_value(self.license)
+
 
 def get_client_config(private_key_path, tiger_id, account, sandbox_debug=False, sign_type=None, timeout=None,
                       language=None, charset=None, server_url=None, socket_host_port=None, secret_key=None,

tigeropen/trade/response/order_preview_response.py

@@ -1,11 +1,5 @@
 from tigeropen.common.response import TigerResponse
-
-PREVIEW_ORDER_FIELD_MAPPING = {"initMarginBefore": "init_margin_before", "commissionCurrency": "commission_currency",
-                               "maintMargin": "maint_margin", "equityWithLoan": "equity_with_loan",
-                               "minCommission": "min_commission", "maintMarginBefore": "maint_margin_before",
-                               "initMargin": "init_margin", "equityWithLoanBefore": "equity_with_loan_before",
-                               "marginCurrency": "margin_currency", "maxCommission": "max_commission",
-                               "warningText": "warning_text"}
+from tigeropen.common.util.string_utils import camel_to_underline_obj
 
 
 class PreviewOrderResponse(TigerResponse):
@@ -20,7 +14,4 @@ def parse_response_content(self, response_content):
             self._is_success = response['is_success']
 
         if self.data:
-            for key, value in self.data.items():
-                field = PREVIEW_ORDER_FIELD_MAPPING.get(key, key)
-                self.preview_order[field] = value
-
+            self.preview_order = camel_to_underline_obj(self.data)

tigeropen/trade/trade_client.py

@@ -578,8 +578,18 @@ def preview_order(self, order):
         params.percent_offset = order.percent_offset
         params.time_in_force = order.time_in_force
         params.outside_rth = order.outside_rth
+        params.order_legs = order.order_legs
+        params.algo_params = order.algo_params
         params.secret_key = order.secret_key if order.secret_key else self._secret_key
+        params.adjust_limit = order.adjust_limit
+        params.user_mark = order.user_mark
+        params.expire_time = order.expire_time
         params.lang = get_enum_value(self._lang)
+        params.combo_type = get_enum_value(order.combo_type)
+        params.contract_legs = order.contract_legs
+        params.total_cash_amount = order.total_cash_amount
+        params.trading_session_type = get_enum_value(order.trading_session_type)
+
         request = OpenApiRequest(PREVIEW_ORDER, biz_model=params)
         response_content = self.__fetch_data(request)
         if response_content: