Comply API of StrategyEase-7.0.0.0

Author: sinall

setup.py

@@ -73,7 +73,7 @@ def main():
         packages=find_packages(exclude=['contrib', 'docs', 'tests']),
 
         install_requires=['requests', 'six', 'apscheduler', 'lxml', 'cssselect', 'bs4', 'html5lib', 'pandas',
-                          'rqopen-client', 'tushare', 'pyyaml'],
+                          'rqopen-client', 'tushare', 'pyyaml', 'deprecation'],
 
         extras_require={
             'dev': [],

strategyease_sdk/client.py

@@ -10,6 +10,7 @@
 import requests
 import six
 import tushare as ts
+from deprecation import deprecated
 from lxml import etree
 from pandas.compat import StringIO
 from requests import Request
@@ -93,6 +94,7 @@ def get_account(self, client=None, timeout=None):
         response = self.__send_request(request, timeout)
         return response.json()
 
+    @deprecated(details="You should use get_portfolio")
     def get_positions(self, client=None, media_type=MediaType.DEFAULT, timeout=None):
         request = Request('GET', self.__create_url(client, 'positions'))
         request.headers['Accept'] = media_type.value
@@ -105,6 +107,18 @@ def get_positions(self, client=None, media_type=MediaType.DEFAULT, timeout=None)
             return portfolio
         return json
 
+    def get_portfolio(self, client=None, media_type=MediaType.DEFAULT, timeout=None):
+        request = Request('GET', self.__create_url(client, 'portfolios'))
+        request.headers['Accept'] = media_type.value
+        response = self.__send_request(request, timeout)
+        json = response.json()
+        if media_type == MediaType.DEFAULT:
+            sub_accounts = pd.DataFrame(json['subAccounts']).T
+            positions = pd.DataFrame(json['dataTable']['rows'], columns=json['dataTable']['columns'])
+            portfolio = {'sub_accounts': sub_accounts, 'positions': positions}
+            return portfolio
+        return json
+
     def get_orders(self, client=None, status="", timeout=None):
         request = Request('GET', self.__create_url(client, 'orders', status=status))
         response = self.__send_request(request, timeout)
@@ -135,8 +149,8 @@ def cancel_all(self, client=None, timeout=None):
         request = Request('DELETE', self.__create_order_url(client))
         self.__send_request(request, timeout)
 
-    def query(self, client=None, navigation=None, timeout=None):
-        request = Request('GET', self.__create_url(client, 'reports', navigation=navigation))
+    def query(self, client=None, type=None, navigation=None, timeout=None):
+        request = Request('GET', self.__create_url(client, 'reports', type=type, navigation=navigation))
         response = self.__send_request(request, timeout)
         json = response.json()
         df = pd.DataFrame(json['dataTable']['rows'], columns=json['dataTable']['columns'])
@@ -236,7 +250,7 @@ def __create_order_url(self, client=None, order_id=None, **params):
         return self.__create_url(client, 'orders', order_id, **params)
 
     def __create_url(self, client, resource, resource_id=None, **params):
-        all_params = copy.deepcopy(params)
+        all_params = dict((k, v) for k, v in params.items() if v is not None)
         all_params.update(client=(client or self._client))
         all_params.update(key=(self._key or ''))
         if resource_id is None:

tests/strategyease_sdk/test_client.py

@@ -35,9 +35,9 @@ def test_get_account(self):
         except HTTPError as e:
             self.fail()
 
-    def test_get_positions(self):
+    def test_get_portfolios(self):
         try:
-            data = self.client.get_positions(self.client_param)
+            data = self.client.get_portfolio(self.client_param)
             assert_that(data['sub_accounts'], has_row(u'人民币'))
             assert_that(data['positions'], has_column(u'证券代码'))
         except HTTPError as e:
@@ -109,9 +109,16 @@ def test_cancel_all(self):
         except HTTPError as e:
             self.fail()
 
-    def test_query(self):
+    def test_query_by_type(self):
         try:
-            df = self.client.query(self.client_param, '查询>资金股份')
+            df = self.client.query(self.client_param, type='FUND')
+            assert_that(df, has_column(u'币种'))
+        except HTTPError as e:
+            self.fail()
+
+    def test_query_by_navigation(self):
+        try:
+            df = self.client.query(self.client_param, navigation='查询>资金股份')
             assert_that(df, has_column(u'证券代码'))
         except HTTPError as e:
             self.fail()