Skip to content

Commit

Permalink
fixes #25
Browse files Browse the repository at this point in the history
  • Loading branch information
@timkpaine
timkpaine committed Jun 23, 2019
1 parent 3cecf67 commit 05bf0b2
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 25 deletions.
4 changes: 2 additions & 2 deletions aat/ui/handlers/accounts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class AccountsHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/exchanges.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class ExchangesHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/instruments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class InstrumentsHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, exchange, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/last_price.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class LastPriceHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/strategies.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class StrategiesHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/strategy_trade_request.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class StrategyTradeRequestHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/strategy_trade_response.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class StrategyTradeResponseHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, **psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, **psp_kwargs):
Expand Down
4 changes: 2 additions & 2 deletions aat/ui/handlers/trades.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class TradesHandler(PerspectiveHTTPMixin, HTTPHandler):
Extends:
HTTPHandler
'''
def initialize(self, trading_engine, psp_kwargs):
def initialize(self, trading_engine, psp_kwargs=None):
self.te = trading_engine
self.psp_kwargs = psp_kwargs
self.psp_kwargs = psp_kwargs or {}

@run_on_executor
def get_data(self, exchange=None, pair=None, **psp_kwargs):
Expand Down
29 changes: 20 additions & 9 deletions aat/ui/server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,32 @@ def __init__(self,

super(ServerApplication, self).__init__(
extra_handlers + [
(r"/api/v1/json/accounts", AccountsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'transfer_as_arrow': False}}),
(r"/api/v1/arrow/accounts", AccountsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'transfer_as_arrow': True}}),
(r"/api/v1/json/exchanges", ExchangesHandler, {'trading_engine': trading_engine}),
(r"/api/v1/json/instruments", InstrumentsHandler, {'trading_engine': trading_engine}),
(r"/api/v1/json/accounts", AccountsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'id'}}),
(r"/api/v1/arrow/accounts", AccountsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'id', 'transfer_as_arrow': True}}),
(r"/api/v1/json/exchanges", ExchangesHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'id'}}),
(r"/api/v1/arrow/exchanges", ExchangesHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'id', 'transfer_as_arrow': True}}),
(r"/api/v1/json/instruments", InstrumentsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'underlying'}}),
(r"/api/v1/arrow/instruments", InstrumentsHandler, {'trading_engine': trading_engine, 'psp_kwargs': {'index': 'underlying', 'transfer_as_arrow': True}}),
(r"/api/v1/json/strategies", StrategiesHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid'}}),
(r"/api/v1/arrow/strategies", StrategiesHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid', 'transfer_as_arrow': True}}),
(r"/api/v1/json/strategy-trade-requests", StrategyTradeRequestHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid'}}),
'psp_kwargs': {'index': 'time', 'view': 'hypergrid'}}),
(r"/api/v1/arrow/strategy-trade-requests", StrategyTradeRequestHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'index': 'time', 'view': 'hypergrid', 'transfer_as_arrow': True}}),
(r"/api/v1/json/strategy-trade-responses", StrategyTradeResponseHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid'}}),
'psp_kwargs': {'index': 'time', 'view': 'hypergrid'}}),
(r"/api/v1/arrow/strategy-trade-responses", StrategyTradeResponseHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'index': 'time', 'view': 'hypergrid', 'transfer_as_arrow': True}}),
(r"/api/v1/json/last-price-all", LastPriceHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid'}}),

'psp_kwargs': {'index': 'instrument', 'view': 'hypergrid'}}),
(r"/api/v1/arrow/last-price-all", LastPriceHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'index': 'instrument', 'view': 'hypergrid', 'transfer_as_arrow': True}}),
(r"/api/v1/json/trades", TradesHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'view': 'hypergrid', 'limit': 100}}),
'psp_kwargs': {'index': 'time', 'view': 'hypergrid', 'limit': 100}}),
(r"/api/v1/arrow/trades", TradesHandler, {'trading_engine': trading_engine,
'psp_kwargs': {'index': 'time', 'view': 'hypergrid', 'limit': 100, 'transfer_as_arrow': True}}),
(r"/static/(.*)", tornado.web.StaticFileHandler, {"path": static}),
(r"/(.*)", HTMLOpenHandler, {'template': '404.html'})
], **settings)
1 change: 1 addition & 0 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ matplotlib>=2.2.2
numpy>=1.14.5
pandas>=0.23.3
perspective-python>=0.1.6
pyarrow>=0.11.1
scipy>=1.1.0
seaborn>=0.8.1
sphinx>=1.7.5
Expand Down

0 comments on commit 05bf0b2

Please sign in to comment.