Merge branch 'master' into feat_mcp

Author: tigersk

tests/test_quote_client.py

@@ -58,9 +58,9 @@
 PRIVATE_KEY_PATH = "your private key path"
 TIGER_ID = "your tiger id"
 ACCOUNT = "your account"
-client_config = get_client_config(private_key_path=PRIVATE_KEY_PATH, tiger_id=TIGER_ID, account=ACCOUNT)
-quote_client = QuoteClient(client_config, logger=client_logger)
-trade_client = TradeClient(client_config, logger=client_logger)
+_client_config = get_client_config(private_key_path=PRIVATE_KEY_PATH, tiger_id=TIGER_ID, account=ACCOUNT)
+quote_client = QuoteClient(_client_config, logger=client_logger)
+trade_client = TradeClient(_client_config, logger=client_logger)
 
 
 def request(symbols, method, **kwargs):

tests/test_trade_client.py

@@ -44,10 +44,10 @@ def __init__(self):
         self.low_price = None  # 最低价
         self.change = None  # 涨跌额
 
-        self.bid_price = None  # 卖盘价
-        self.bid_size = None  # 卖盘数量
-        self.ask_price = None  # 买盘价
-        self.ask_size = None  # 买盘数量
+        self.bid_price = None  # 买盘价
+        self.bid_size = None  # 买盘数量
+        self.ask_price = None  # 卖盘价
+        self.ask_size = None  # 卖盘数量
 
         self.halted = None  # 是否停牌 0: 正常,3: 停牌,4: 退市
         self.delay = None  # 延时分钟

tigeropen/examples/nasdaq100.py

@@ -458,7 +458,7 @@ 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,
+def get_client_config(private_key_path=None, tiger_id=None, account=None, sandbox_debug=False, sign_type=None, timeout=None,
                       language=None, charset=None, server_url=None, socket_host_port=None, secret_key=None,
                       enable_dynamic_domain=True, timezone=None, license=None, props_path=None):
     """

tigeropen/quote/domain/quote_brief.py

@@ -104,8 +104,11 @@ def __repr__(self):
         else:
             return '%s/%s/%s' % (identifier, self.sec_type, self.currency)
 
+    def to_dict(self):
+        return self.__dict__
+
     def to_str(self):
-        return str(self.__dict__)
+        return str(self.to_dict())
 
     def is_cn_stock(self):
         """

tigeropen/quote/quote_client.py

@@ -48,14 +48,8 @@ def __init__(self, account, contract, quantity=0, average_cost=None, market_pric
         self.is_level0_price = kwargs.get('is_level0_price', None)
 
     def __repr__(self):
-        template = "contract: {contract}, quantity: {quantity}, average_cost: {average_cost}, " \
-                   "market_price: {market_price}"
-        return template.format(
-            contract=self.contract,
-            quantity=self.quantity,
-            average_cost=self.average_cost,
-            market_price=self.market_price
-        )
+        return f"Position({self.__dict__})"
+
 
     def __str__(self):
         return self.__repr__()

tigeropen/tiger_open_config.py

@@ -30,6 +30,8 @@ def parse_response_content(self, response_content):
 
             if 'orderId' in data_json:
                 self.order_id = data_json['orderId']
+            elif 'order_id' in data_json:
+                self.order_id = data_json['order_id']
 
             if 'id' in data_json:
                 self.id = data_json['id']