log file conf;

fix future contract field

Author: tigersk

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.2.6'
+__VERSION__ = '2.2.7'

tigeropen/quote/response/future_briefs_response.py

@@ -9,11 +9,13 @@
 from tigeropen.common.response import TigerResponse
 
 COLUMNS = ['identifier', 'ask_price', 'ask_size', 'bid_price', 'bid_size', 'pre_close', 'latest_price', 'latest_size',
-           'latest_time', 'volume', 'open_interest', 'open', 'high', 'low', 'limit_up', 'limit_down']
+           'latest_time', 'volume', 'open_interest', 'open', 'high', 'low', 'limit_up', 'limit_down', 'settlement',
+           'settle_date']
 BRIEF_FIELD_MAPPINGS = {'askPrice': 'ask_price', 'askSize': 'ask_size', 'bidPrice': 'bid_price', 'bidSize': 'bid_size',
                         'latestPrice': 'latest_price', 'openInterest': 'open_interest', 'preClose': 'pre_close',
                         'right': 'put_call', 'latestTime': 'latest_time', 'latestSize': 'latest_size',
-                        'limitUp': 'limit_up', 'limitDown': 'limit_down', 'contractCode': 'identifier'}
+                        'limitUp': 'limit_up', 'limitDown': 'limit_down', 'contractCode': 'identifier',
+                        'settleDate': 'settle_date'}
 
 
 class FutureBriefsResponse(TigerResponse):

tigeropen/quote/response/future_contract_response.py

@@ -8,9 +8,9 @@
 
 from tigeropen.common.response import TigerResponse
 
-COLUMNS = ['contract_code', 'symbol', 'type', 'name', 'contract_month', 'multiplier', 'exchange', 'currency',
+COLUMNS = ['contract_code', 'symbol', 'type', 'name', 'contract_month', 'multiplier', 'exchange', 'exchange_code', 'currency',
            'first_notice_date', 'last_bidding_close_time', 'last_trading_date', 'trade', 'continuous', 'min_tick']
-CONTRACT_FIELD_MAPPINGS = {'contractCode': 'contract_code', 'exchangeCode': 'exchange', 'ibCode': 'symbol',
+CONTRACT_FIELD_MAPPINGS = {'contractCode': 'contract_code', 'exchangeCode': 'exchange_code', 'ibCode': 'symbol',
                            'contractMonth': 'contract_month', 'firstNoticeDate': 'first_notice_date',
                            'lastBiddingCloseTime': 'last_bidding_close_time', 'lastTradingDate': 'last_trading_date',
                            'minTick': 'min_tick'}

tigeropen/tiger_open_client.py

@@ -6,6 +6,7 @@
 """
 import datetime
 import json
+import logging
 import uuid
 
 from tigeropen import __VERSION__
@@ -26,6 +27,8 @@
     def get_mac_address():
         return ':'.join(("%012x" % uuid.getnode())[i:i + 2] for i in range(0, 12, 2))
 
+LOG_FORMATTER = logging.Formatter('%(asctime)s %(name)s %(levelname)s: %(message)s')
+
 
 class TigerOpenClient:
     """
@@ -35,7 +38,14 @@ class TigerOpenClient:
 
     def __init__(self, client_config, logger=None):
         self.__config = client_config
-        self.__logger = logger
+        if logger:
+            if client_config.log_level:
+                logger.setLevel(logging.getLevelName(client_config.log_level))
+            if client_config.log_path:
+                file_handler = logging.FileHandler(client_config.log_path)
+                file_handler.setFormatter(LOG_FORMATTER)
+                logger.addHandler(file_handler)
+            self.__logger = logger
         self.__headers = {
             'Content-type': 'application/json;charset=' + self.__config.charset,
             "Cache-Control": "no-cache",

tigeropen/tiger_open_config.py

@@ -5,6 +5,8 @@
 @author: gaoan
 """
 import json
+import logging
+
 from pytz import timezone
 from tigeropen.common.consts import Language, ServiceType
 from tigeropen.common.util.account_util import AccountUtil
@@ -90,6 +92,9 @@ def __init__(self, sandbox_debug=False, enable_dynamic_domain=True):
             self.domain_conf = self.query_domains()
             self.refresh_server_info()
 
+        self.log_level = None
+        self.log_path = None
+
     @property
     def tiger_id(self):
         return self._tiger_id