Logging inside SDK

Author: sinall

README.md

@@ -16,7 +16,7 @@
 
 #### 步骤
 * 将 shipane_sdk/client.py 上传至聚宽“投资研究”根目录，并重命名为 shipane_sdk.py。
-* 将 shipane_sdk/joinquant_executor.py 中的 class JoinQuantExecutor 定义追加到 shpane_sdk.py 中。
+* 将 shipane_sdk/joinquant_executor.py 追加到 shpane_sdk.py 中。
 * 用法请参考 examples/simply_joinquant_strategy.py。
 
 ### 二. 抓取方式

examples/simply_joinquant_strategy.py

@@ -20,14 +20,8 @@ def process_initialize(context):
 def handle_data(context, data):
     # 保存 order 对象
     current_order = order('000001.XSHE', 100)
-    log.info('JointQuant executed:\n%s', str(current_order))
-
     # 实盘易依据聚宽的 order 对象下单
-    response = g.__executor.execute(current_order)
-    if response is not None:
-        log.info('ShiPanE response:\nstatus_code: %d\ntext: %s', response.status_code, response.text)
-    else:
-        log.error('ShiPanE did not response')
+    g.__executor.execute(current_order)
 
     current_order = order(g.security, -100)
     g.__executor.execute(current_order)

shipane_sdk/joinquant_executor.py

@@ -1,15 +1,25 @@
 # -*- coding: utf-8 -*-
 
-from .client import Client
+try:
+    from .client import Client
+except:
+    pass
+
+try:
+    from kuanke.user_space_api import *
+except:
+    pass
 
 
-#
-# 聚宽整合请从这里开始拷贝
-#
 class JoinQuantExecutor(object):
     def __init__(self, **kwargs):
+        if 'log' in globals():
+            self._log = log
+        else:
+            import logging
+            self._log = logging.getLogger()
         self._client = Client(**kwargs)
-        self.order_id_map = dict()
+        self._order_id_map = dict()
 
     @property
     def client(self):
@@ -21,6 +31,7 @@ def client(self):
 
     def execute(self, order):
         if order is None:
+            self._log.info('[实盘易] 委托为空，忽略下单请求')
             return
 
         try:
@@ -29,25 +40,31 @@ def execute(self, order):
             else:
                 response = self._client.sell(order.security, order.price, order.amount)
 
+            if response is not None:
+                self._log.info('[实盘易] 响应如下：\nstatus_code: %d\ntext: %s', response.status_code, response.text)
+            else:
+                self._log.error('[实盘易] 未响应')
+
             if response is None:
                 return None
 
             if response.status_code == 200:
-                self.order_id_map[order.order_id] = response.json()['id'];
+                self._order_id_map[order.order_id] = response.json()['id'];
 
             return response
-        except:
-            pass
+        except Exception, e:
+            self._log.error("[实盘易] 下单异常：" + str(e))
 
     def cancel(self, order):
         if order is None:
+            self._log.info('[实盘易] 委托为空，忽略撤单请求')
             return
 
         try:
             order_id = order if isinstance(order, int) else order.order_id
-            if order_id in self.order_id_map:
-                return self._client.cancel(self.order_id_map[order_id])
+            if order_id in self._order_id_map:
+                return self._client.cancel(self._order_id_map[order_id])
             else:
-                pass
-        except:
-            pass
+                self._log.warn('[实盘易] 未找到对应的委托编号')
+        except Exception, e:
+            self._log.error("[实盘易] 撤单异常：" + str(e))

tests/test_joinquant_executor.py

@@ -2,13 +2,16 @@
 
 import collections
 import inspect
+import logging
 import unittest
 
 import shipane_sdk
 
 
 class JoinQuantExecutorTest(unittest.TestCase):
     def setUp(self):
+        logging.basicConfig()
+
         self.Order = collections.namedtuple('Order', ['is_buy', 'security', 'price', 'amount'])
         self.executor = shipane_sdk.JoinQuantExecutor(host='192.168.1.102')