Added token to ws client and historical candles endpoint

Author: nishant-shrimpy

README.md

@@ -480,6 +480,20 @@ orderbooks = client.get_historical_orderbooks(
 )
 ```
 
+* [`get_historical_candles`](https://developers.shrimpy.io/docs/#get-historical-candles)
+
+```python
+candles = client.get_historical_candles(
+    'Bittrex',
+    'LTC',
+    'BTC',
+    '2019-05-19T00:00:00.000Z',
+    '2019-05-20T00:00:00.000Z',
+    100,
+    '1m'
+)
+```
+
 ### Management Methods
 
 * [`get_status`](https://developers.shrimpy.io/docs/#get-status)
@@ -507,12 +521,23 @@ The client handles pings to the Shrimpy server based on the [`API Documentation`
 import shrimpy
 
 
-client = shrimpy.ShrimpyWsClient()
+public_key = '6d73c2464a71b94a81aa7b13d...'
+private_key = 'e6238b0de3cdf19c7861f8e8f5d137ce7113ac1e884b191a14bbb2...'
+
+# This is a sample handler, it simply prints the incoming message to the console
+def error_handler(err):
+    print(err)
+
 
 # This is a sample handler, it simply prints the incoming message to the console
 def handler(msg):
     print(msg)
 
+
+api_client = shrimpy.ShrimpyApiClient(public_key, private_key)
+raw_token = api_client.get_token()
+client = shrimpy.ShrimpyWsClient(error_handler, raw_token['token'])
+
 subscribe_data = {
     "type": "subscribe",
     "exchange": "coinbasepro",

setup.py

@@ -13,7 +13,7 @@
 
 setuptools.setup(
     name="shrimpy_python",
-    version="0.0.7",
+    version="0.0.8",
     author="ShrimpyOfficial",
     author_email="support@shrimpy.io",
     description="The Official Shrimpy API Python Client",

shrimpy/shrimpy_api_client.py

@@ -399,6 +399,25 @@ def get_historical_orderbooks(self, exchange, base_trading_symbol, quote_trading
         return self._call_endpoint('GET', query_string)
 
 
+    def get_historical_candles(self, exchange, base_trading_symbol, quote_trading_symbol, start_time, end_time, limit, interval):
+        endpoint = 'historical/candles'
+        params = {
+            'exchange': exchange,
+            'baseTradingSymbol': base_trading_symbol,
+            'quoteTradingSymbol': quote_trading_symbol,
+            'startTime': start_time,
+            'endTime': end_time,
+            'limit': limit,
+            'interval': interval
+        }
+        query_string = self._create_query_string(
+            endpoint,
+            params
+        )
+
+        return self._call_endpoint('GET', query_string)
+
+
     def get_historical_instruments(self, exchange=None, base_trading_symbol=None, quote_trading_symbol=None):
         endpoint = 'historical/instruments'
         params = {}
@@ -429,6 +448,16 @@ def get_usage(self):
         return self._call_endpoint('GET', endpoint)
 
 
+    #############
+    # WebSocket #
+    #############
+
+    def get_token(self):
+        endpoint = 'ws/token'
+
+        return self._call_endpoint('GET', endpoint)
+
+
     ###########
     # Helpers #
     ###########

shrimpy/shrimpy_ws_client.py

@@ -35,8 +35,8 @@ class ShrimpyWsClient():
     are defined, errors must be handled explicitly.
     '''
 
-    def __init__(self, error_handler=None):
-        self.base_uri = 'wss://ws-feed.shrimpy.io/'
+    def __init__(self, error_handler=None, token=None):
+        self.base_url = 'wss://ws-feed.shrimpy.io'
         self.subscription_handlers = {}
         self.error_handler = error_handler
         self.pending_messages_to_send = []
@@ -45,6 +45,7 @@ def __init__(self, error_handler=None):
         self.is_closed = False
         self.connection = None
         self.connection_close_timeout = 10
+        self.token = token
 
     def connect(self):
         self.socket_thread = threading.Thread(target=self._run_socket_thread)
@@ -97,7 +98,11 @@ async def _connect(self):
         '''
             Handle connecting to shrimpy websocket server
         '''
-        self.connection = await websockets.client.connect(self.base_uri)
+        url = self.base_url
+        if (self.token):
+            url = self.base_url + "?token=" + self.token
+
+        self.connection = await websockets.client.connect(url)
         if (self.connection is None) or (not self.connection.open):
             raise ConnectionFailureException('Failed to start the connection. Please reconnect.')
 
@@ -114,6 +119,11 @@ async def _disconnect(self):
                 # Exceptions during connection termination aren't very useful
                 pass
 
+    async def _reconnect(self, token=None):
+        self.token = token
+        await self._disconnect()
+        await self._connect()
+
     async def _receive_message_handler(self):
         '''
             The core loop that runs the websocket logic