Merge branch 'develop'

DOC: fix import and support python3 for beginner tutorial

.gitignore

@@ -40,6 +40,7 @@ develop-eggs
 coverage.xml
 htmlcov
 nosetests.xml
+.python-version
 
 # C Extensions
 *.o

catalyst/__main__.py

@@ -394,6 +394,12 @@ def catalyst_magic(line, cell=None):
     help='The base currency used to calculate statistics '
          '(e.g. usd, btc, eth).',
 )
+@click.option(
+    '-e',
+    '--end',
+    type=Date(tz='utc', as_timestamp=True),
+    help='An optional end date at which to stop the execution.',
+)
 @click.option(
     '--live-graph/--no-live-graph',
     is_flag=True,
@@ -419,6 +425,7 @@ def live(ctx,
          exchange_name,
          algo_namespace,
          base_currency,
+         end,
          live_graph,
          simulate_orders):
     """Trade live with the given algorithm.
@@ -461,7 +468,7 @@ def live(ctx,
         bundle=None,
         bundle_timestamp=None,
         start=None,
-        end=None,
+        end=end,
         output=output,
         print_algo=print_algo,
         local_namespace=local_namespace,

catalyst/data/dispatch_bar_reader.py

@@ -88,11 +88,11 @@ class AssetDispatchBarReader(with_metaclass(ABCMeta)):
         if self._last_available_dt is not None:
             return self._last_available_dt
         else:
-            return min(r.last_available_dt for r in self._readers.values())
+            return min(r.last_available_dt for r in list(self._readers.values()))
 
     @lazyval
     def first_trading_day(self):
-        return max(r.first_trading_day for r in self._readers.values())
+        return max(r.first_trading_day for r in list(self._readers.values()))
 
     def get_value(self, sid, dt, field):
         asset = self._asset_finder.retrieve_asset(sid)

catalyst/data/loader.py

@@ -101,7 +101,7 @@ def load_crypto_market_data(trading_day=None, trading_days=None,
         trading_day = get_calendar('OPEN').trading_day
 
     # TODO: consider making configurable
-    bm_symbol = 'btc_usdt'
+    bm_symbol = 'btc_usd'
     # if trading_days is None:
     #    trading_days = get_calendar('OPEN').schedule
 
@@ -144,7 +144,7 @@ def load_crypto_market_data(trading_day=None, trading_days=None,
         #  breaks things and it's only needed here
         from catalyst.exchange.utils.factory import get_exchange
         exchange = get_exchange(
-            exchange_name='poloniex', base_currency='usdt'
+            exchange_name='bitfinex', base_currency='usd'
         )
         exchange.init()
 

catalyst/examples/buy_and_hodl.py

@@ -23,7 +23,7 @@ from catalyst.api import (order_target_value, symbol, record,
 
 
 def initialize(context):
-    context.ASSET_NAME = 'btc_usd'
+    context.ASSET_NAME = 'btc_usdt'
     context.TARGET_HODL_RATIO = 0.8
     context.RESERVE_RATIO = 1.0 - context.TARGET_HODL_RATIO
 
@@ -140,9 +140,9 @@ if __name__ == '__main__':
         initialize=initialize,
         handle_data=handle_data,
         analyze=analyze,
-        exchange_name='bitfinex',
+        exchange_name='poloniex',
         algo_namespace='buy_and_hodl',
-        base_currency='usd',
+        base_currency='usdt',
         start=pd.to_datetime('2015-03-01', utc=True),
         end=pd.to_datetime('2017-10-31', utc=True),
     )

catalyst/examples/buy_btc_simple.py

@@ -27,7 +27,7 @@ import pandas as pd
 
 
 def initialize(context):
-    context.asset = symbol('btc_usd')
+    context.asset = symbol('btc_usdt')
 
 
 def handle_data(context, data):
@@ -41,9 +41,9 @@ if __name__ == '__main__':
         data_frequency='daily',
         initialize=initialize,
         handle_data=handle_data,
-        exchange_name='bitfinex',
+        exchange_name='poloniex',
         algo_namespace='buy_and_hodl',
-        base_currency='usd',
+        base_currency='usdt',
         start=pd.to_datetime('2015-03-01', utc=True),
         end=pd.to_datetime('2017-10-31', utc=True),
     )

catalyst/examples/buy_low_sell_high.py

@@ -143,7 +143,7 @@ def analyze(context, stats):
 
 
 if __name__ == '__main__':
-    live = False
+    live = True
     if live:
         run_algorithm(
             capital_base=0.001,

catalyst/examples/dual_moving_average.py

@@ -84,7 +84,8 @@ def handle_data(context, data):
 def analyze(context, perf):
 
     # Get the base_currency that was passed as a parameter to the simulation
-    base_currency = context.exchanges.values()[0].base_currency.upper()
+    exchange = list(context.exchanges.values())[0]
+    base_currency = exchange.base_currency.upper()
 
     # First chart: Plot portfolio value using base_currency
     ax1 = plt.subplot(411)

catalyst/examples/mean_reversion_simple.py

@@ -39,7 +39,7 @@ def initialize(context):
 
     context.RSI_OVERSOLD = 55
     context.RSI_OVERBOUGHT = 60
-    context.CANDLE_SIZE = '5T'
+    context.CANDLE_SIZE = '15T'
 
     context.start_time = time.time()
 
@@ -114,7 +114,7 @@ def handle_data(context, data):
     # TODO: retest with open orders
     # Since we are using limit orders, some orders may not execute immediately
     # we wait until all orders are executed before considering more trades.
-    orders = get_open_orders(context.market)
+    orders = context.blotter.open_orders
     if len(orders) > 0:
         log.info('exiting because orders are open: {}'.format(orders))
         return
@@ -161,7 +161,7 @@ def analyze(context=None, perf=None):
 
     import matplotlib.pyplot as plt
     # The base currency of the algo exchange
-    base_currency = context.exchanges.values()[0].base_currency.upper()
+    base_currency = list(context.exchanges.values())[0].base_currency.upper()
 
     # Plot the portfolio value over time.
     ax1 = plt.subplot(611)
@@ -244,11 +244,11 @@ def analyze(context=None, perf=None):
 
 if __name__ == '__main__':
     # The execution mode: backtest or live
-    live = False
+    live = True
 
     if live:
         run_algorithm(
-            capital_base=0.1,
+            capital_base=0.01,
             initialize=initialize,
             handle_data=handle_data,
             analyze=analyze,
@@ -259,6 +259,7 @@ if __name__ == '__main__':
             live_graph=False,
             simulate_orders=False,
             stats_output=None,
+            # auth_aliases=dict(poloniex='auth2')
         )
 
     else:

catalyst/examples/mean_reversion_simple_custom_fees.py

@@ -161,7 +161,7 @@ def analyze(context=None, perf=None):
 
     import matplotlib.pyplot as plt
     # The base currency of the algo exchange
-    base_currency = context.exchanges.values()[0].base_currency.upper()
+    base_currency = list(context.exchanges.values())[0].base_currency.upper()
 
     # Plot the portfolio value over time.
     ax1 = plt.subplot(611)

catalyst/examples/rsi_profit_target.py

@@ -175,7 +175,7 @@ def handle_data(context, data):
 def analyze(context=None, results=None):
     import matplotlib.pyplot as plt
 
-    base_currency = context.exchanges.values()[0].base_currency.upper()
+    base_currency = list(context.exchanges.values())[0].base_currency.upper()
     # Plot the portfolio and asset data.
     ax1 = plt.subplot(611)
     results.loc[:, 'portfolio_value'].plot(ax=ax1)

catalyst/examples/simple_loop.py

@@ -57,7 +57,7 @@ def analyze(context, perf):
     log.info('the stats: {}'.format(get_pretty_stats(perf)))
 
     # The base currency of the algo exchange
-    base_currency = context.exchanges.values()[0].base_currency.upper()
+    base_currency = list(context.exchanges.values())[0].base_currency.upper()
 
     # Plot the portfolio value over time.
     ax1 = plt.subplot(611)

catalyst/examples/simple_universe.py

@@ -41,8 +41,8 @@ from catalyst.exchange.utils.exchange_utils import get_exchange_symbols
 
 def initialize(context):
     context.i = -1  # minute counter
-    context.exchange = context.exchanges.values()[0].name.lower()
+    context.exchange = list(context.exchanges.values())[0].name.lower()
-    context.base_currency = context.exchanges.values()[0].base_currency.lower()
+    context.base_currency = list(context.exchanges.values())[0].base_currency.lower()
 
 
 def handle_data(context, data):
@@ -65,7 +65,7 @@ def handle_data(context, data):
     minutes = 30
 
     # get lookback_days of history data: that is 'lookback' number of bins
-    lookback = one_day_in_minutes / minutes * lookback_days
+    lookback = int(one_day_in_minutes / minutes * lookback_days)
     if not context.i % minutes and context.universe:
         # we iterate for every pair in the current universe
         for coin in context.coins:

catalyst/exchange/ccxt/ccxt_exchange.py

@@ -6,6 +6,11 @@ from collections import defaultdict
 import ccxt
 import pandas as pd
 import six
+from ccxt import InvalidOrder, NetworkError, \
+    ExchangeError
+from logbook import Logger
+from six import string_types
+
 from catalyst.algorithm import MarketOrder
 from catalyst.assets._assets import TradingPair
 from catalyst.constants import LOG_LEVEL
@@ -13,16 +18,17 @@ from catalyst.exchange.exchange import Exchange
 from catalyst.exchange.exchange_bundle import ExchangeBundle
 from catalyst.exchange.exchange_errors import InvalidHistoryFrequencyError, \
     ExchangeSymbolsNotFound, ExchangeRequestError, InvalidOrderStyle, \
-    ExchangeNotFoundError, CreateOrderError, InvalidHistoryTimeframeError
+    ExchangeNotFoundError, CreateOrderError, InvalidHistoryTimeframeError, \
+    UnsupportedHistoryFrequencyError
 from catalyst.exchange.exchange_execution import ExchangeLimitOrder
 from catalyst.exchange.utils.exchange_utils import mixin_market_params, \
-    from_ms_timestamp, get_epoch, get_exchange_folder, get_catalyst_symbol, \
+    get_exchange_folder, get_catalyst_symbol, \
     get_exchange_auth
+from catalyst.exchange.utils.datetime_utils import from_ms_timestamp, \
+    get_epoch, \
+    get_periods_range
 from catalyst.finance.order import Order, ORDER_STATUS
-from ccxt import InvalidOrder, NetworkError, \
+from catalyst.finance.transaction import Transaction
-    ExchangeError
-from logbook import Logger
-from six import string_types
 
 log = Logger('CCXT', level=LOG_LEVEL)
 
@@ -55,6 +61,7 @@ class CCXT(Exchange):
                 'apiKey': key,
                 'secret': secret,
             })
+            self.api.enableRateLimit = True
 
         except Exception:
             raise ExchangeNotFoundError(exchange_name=exchange_name)
@@ -70,6 +77,7 @@ class CCXT(Exchange):
         self.max_requests_per_minute = 60
         self.low_balance_threshold = 0.1
         self.request_cpt = dict()
+        self._common_symbols = dict()
 
         self.bundle = ExchangeBundle(self.name)
         self.markets = None
@@ -215,6 +223,21 @@ class CCXT(Exchange):
         )
         return market
 
+    def substitute_currency_code(self, currency, source='catalyst'):
+        if source == 'catalyst':
+            currency = currency.upper()
+
+            key = self.api.common_currency_code(currency)
+            self._common_symbols[key] = currency.lower()
+            return key
+
+        else:
+            if currency in self._common_symbols:
+                return self._common_symbols[currency]
+
+            else:
+                return currency.lower()
+
     def get_symbol(self, asset_or_symbol, source='catalyst'):
         """
         The CCXT symbol.
@@ -222,6 +245,7 @@ class CCXT(Exchange):
         Parameters
         ----------
         asset_or_symbol
+        source
 
         Returns
         -------
@@ -231,7 +255,13 @@ class CCXT(Exchange):
         if source == 'ccxt':
             if isinstance(asset_or_symbol, string_types):
                 parts = asset_or_symbol.split('/')
-                return '{}_{}'.format(parts[0].lower(), parts[1].lower())
+                base_currency = self.substitute_currency_code(
+                    parts[0], source
+                )
+                quote_currency = self.substitute_currency_code(
+                    parts[1], source
+                )
+                return '{}_{}'.format(base_currency, quote_currency)
 
             else:
                 return asset_or_symbol.symbol
@@ -242,7 +272,13 @@ class CCXT(Exchange):
             ) else asset_or_symbol.symbol
 
             parts = symbol.split('_')
-            return '{}/{}'.format(parts[0].upper(), parts[1].upper())
+            base_currency = self.substitute_currency_code(
+                parts[0], source
+            )
+            quote_currency = self.substitute_currency_code(
+                parts[1], source
+            )
+            return '{}/{}'.format(base_currency, quote_currency)
 
     @staticmethod
     def map_frequency(value, source='ccxt', raise_error=True):
@@ -367,7 +403,7 @@ class CCXT(Exchange):
             timeframe, source='ccxt', raise_error=raise_error
         )
 
-    def get_candles(self, freq, assets, bar_count=None, start_dt=None,
+    def get_candles(self, freq, assets, bar_count=1, start_dt=None,
                     end_dt=None):
         is_single = (isinstance(assets, TradingPair))
         if is_single:
@@ -376,17 +412,46 @@ class CCXT(Exchange):
         symbols = self.get_symbols(assets)
         timeframe = CCXT.get_timeframe(freq)
 
-        ms = None
+        if timeframe not in self.api.timeframes:
+            freqs = [CCXT.get_frequency(t) for t in self.api.timeframes]
+            raise UnsupportedHistoryFrequencyError(
+                exchange=self.name,
+                freq=freq,
+                freqs=freqs,
+            )
+
+        if start_dt is not None and end_dt is not None:
+            raise ValueError(
+                'Please provide either start_dt or end_dt, not both.'
+            )
+
+        elif end_dt is not None:
+            # Make sure that end_dt really wants data in the past
+            # if it's close to now, we skip the 'since' parameters to
+            # lower the probability of error
+            bars_to_now = pd.date_range(
+                end_dt, pd.Timestamp.utcnow(), freq=freq
+            )
+            # See: https://github.com/ccxt/ccxt/issues/1360
+            if len(bars_to_now) > 1 or self.name in ['poloniex']:
+                dt_range = get_periods_range(
+                    end_dt=end_dt,
+                    periods=bar_count,
+                    freq=freq,
+                )
+                start_dt = dt_range[0]
+
+        since = None
         if start_dt is not None:
             delta = start_dt - get_epoch()
-            ms = int(delta.total_seconds()) * 1000
+            since = int(delta.total_seconds()) * 1000
 
         candles = dict()
-        for asset in assets:
+        for index, asset in enumerate(assets):
             ohlcvs = self.api.fetch_ohlcv(
-                symbol=symbols[0],
+                symbol=symbols[index],
                 timeframe=timeframe,
-                since=ms,
+                since=since,
                 limit=bar_count,
                 params={}
             )
@@ -403,6 +468,9 @@ class CCXT(Exchange):
                     close=ohlcv[4],
                     volume=ohlcv[5]
                 ))
+            candles[asset] = sorted(
+                candles[asset], key=lambda c: c['last_traded']
+            )
 
         if is_single:
             return six.next(six.itervalues(candles))
@@ -705,6 +773,12 @@ class CCXT(Exchange):
         else:
             adj_amount = abs(amount)
 
+        if adj_amount == 0:
+            raise CreateOrderError(
+                exchange=self.name,
+                e='order amount lower than the smallest lot: {}'.format(amount)
+            )
+
         try:
             result = self.api.create_order(
                 symbol=symbol,
@@ -759,13 +833,111 @@ class CCXT(Exchange):
 
         orders = []
         for order_status in result:
-            order, executed_price = self._create_order(order_status)
+            order, _ = self._create_order(order_status)
             if asset is None or asset == order.sid:
                 orders.append(order)
 
         return orders
 
-    def get_order(self, order_id, asset_or_symbol=None):
+    def _process_order_fallback(self, order):
+        """
+        Fallback method for exchanges which do not play nice with
+        fetch-my-trades. Apparently, about 60% of exchanges will return
+        the correct executed values with this method. Others will support
+        fetch-my-trades.
+
+        Parameters
+        ----------
+        order: Order
+
+        Returns
+        -------
+        float
+
+        """
+        exc_order, price = self.get_order(
+            order.id, order.asset, return_price=True
+        )
+        order.status = exc_order.status
+
+        order.commission = exc_order.commission
+        if order.amount != exc_order.amount:
+            log.warn(
+                'executed order amount {} differs '
+                'from original'.format(
+                    exc_order.amount, order.amount
+                )
+            )
+            order.amount = exc_order.amount
+
+        if order.status == ORDER_STATUS.FILLED:
+            transaction = Transaction(
+                asset=order.asset,
+                amount=order.amount,
+                dt=pd.Timestamp.utcnow(),
+                price=price,
+                order_id=order.id,
+                commission=order.commission
+            )
+        return [transaction]
+
+    def process_order(self, order):
+        # TODO: move to parent class after tracking features in the parent
+        if not self.api.hasFetchMyTrades:
+            return self._process_order_fallback(order)
+
+        try:
+            all_trades = self.get_trades(order.asset)
+        except ExchangeRequestError as e:
+            log.warn(
+                'unable to fetch account trades, trying an alternate '
+                'method to find executed order {} / {}: {}'.format(
+                    order.id, order.asset.symbol, e
+                )
+            )
+            return self._process_order_fallback(order)
+
+        transactions = []
+        trades = [t for t in all_trades if t['order'] == order.id]
+        if not trades:
+            log.debug(
+                'order {} / {} not found in trades'.format(
+                    order.id, order.asset.symbol
+                )
+            )
+            return transactions
+
+        trades.sort(key=lambda t: t['timestamp'], reverse=False)
+        order.filled = 0
+        order.commission = 0
+        for trade in trades:
+            # status property will update automatically
+            filled = trade['amount'] * order.direction
+            order.filled += filled
+
+            commission = 0
+            if 'fee' in trade and 'cost' in trade['fee']:
+                commission = trade['fee']['cost']
+                order.commission += commission
+
+            order.check_triggers(
+                price=trade['price'],
+                dt=pd.to_datetime(trade['timestamp'], unit='ms', utc=True),
+            )
+            transaction = Transaction(
+                asset=order.asset,
+                amount=filled,
+                dt=pd.Timestamp.utcnow(),
+                price=trade['price'],
+                order_id=order.id,
+                commission=commission
+            )
+            transactions.append(transaction)
+
+        order.broker_order_id = ', '.join([t['id'] for t in trades])
+        return transactions
+
+    def get_order(self, order_id, asset_or_symbol=None, return_price=False):
         if asset_or_symbol is None:
             log.debug(
                 'order not found in memory, the request might fail '
@@ -777,6 +949,12 @@ class CCXT(Exchange):
             order_status = self.api.fetch_order(id=order_id, symbol=symbol)
             order, executed_price = self._create_order(order_status)
 
+            if return_price:
+                return order, executed_price
+
+            else:
+                return order
+
         except (ExchangeError, NetworkError) as e:
             log.warn(
                 'unable to fetch order {} / {}: {}'.format(
@@ -785,8 +963,6 @@ class CCXT(Exchange):
             )
             raise ExchangeRequestError(error=e)
 
-        return order, executed_price
-
     def cancel_order(self, order_param, asset_or_symbol=None):
         order_id = order_param.id \
             if isinstance(order_param, Order) else order_param
@@ -822,48 +998,46 @@ class CCXT(Exchange):
         list[dict[str, float]
 
         """
-        tickers = dict()
+        tickers = {}
-        try:
+        for asset in assets:
-            for asset in assets:
+            symbol = self.get_symbol(asset)
-                symbol = self.get_symbol(asset)
+
-                # TODO: use fetch_tickers() for efficiency
+            # Test the CCXT throttling further to see if we need this
-                # I tried using fetch_tickers() but noticed some
+            self.ask_request()
-                # inconsistencies, see issue:
+
-                # https://github.com/ccxt/ccxt/issues/870
+            # TODO: use fetch_tickers() for efficiency
+            # I tried using fetch_tickers() but noticed some
+            # inconsistencies, see issue:
+            # https://github.com/ccxt/ccxt/issues/870
+            try:
                 ticker = self.api.fetch_ticker(symbol=symbol)
-                if not ticker:
+            except (ExchangeError, NetworkError) as e:
-                    log.warn('ticker not found for {} {}'.format(
+                log.warn(
-                        self.name, symbol
+                    'unable to fetch ticker {} / {}: {}'.format(
-                    ))
+                        self.name, asset.symbol, e
-                    continue
+                    )
-
-                ticker['last_traded'] = from_ms_timestamp(ticker['timestamp'])
-
-                if 'last_price' not in ticker:
-                    # TODO: any more exceptions?
-                    ticker['last_price'] = ticker['last']
-
-                if 'baseVolume' in ticker and ticker['baseVolume'] is not None:
-                    # Using the volume represented in the base currency
-                    ticker['volume'] = ticker['baseVolume']
-
-                elif 'info' in ticker and 'bidQty' in ticker['info'] \
-                        and 'askQty' in ticker['info']:
-                    ticker['volume'] = float(ticker['info']['bidQty']) + \
-                                       float(ticker['info']['askQty'])
-
-                else:
-                    ticker['volume'] = 0
-
-                tickers[asset] = ticker
-
-        except (ExchangeError, NetworkError) as e:
-            log.warn(
-                'unable to fetch ticker {} / {}: {}'.format(
-                    self.name, asset.symbol, e
                 )
-            )
+                continue
-            raise ExchangeRequestError(error=e)
+
+            ticker['last_traded'] = from_ms_timestamp(ticker['timestamp'])
+
+            if 'last_price' not in ticker:
+                # TODO: any more exceptions?
+                ticker['last_price'] = ticker['last']
+
+            if 'baseVolume' in ticker and ticker['baseVolume'] is not None:
+                # Using the volume represented in the base currency
+                ticker['volume'] = ticker['baseVolume']
+
+            elif 'info' in ticker and 'bidQty' in ticker['info'] \
+                    and 'askQty' in ticker['info']:
+                ticker['volume'] = float(ticker['info']['bidQty']) + \
+                                   float(ticker['info']['askQty'])
+
+            else:
+                ticker['volume'] = 0
+
+            tickers[asset] = ticker
 
         return tickers
 
@@ -893,3 +1067,27 @@ class CCXT(Exchange):
                 ))
 
         return result
+
+    def get_trades(self, asset, my_trades=True, start_dt=None, limit=None):
+        if not my_trades:
+            raise NotImplemented(
+                'get_trades only supports "my trades"'
+            )
+
+        # TODO: is it possible to sort this? Limit is useless otherwise.
+        ccxt_symbol = self.get_symbol(asset)
+        try:
+            trades = self.api.fetch_my_trades(
+                symbol=ccxt_symbol,
+                since=start_dt,
+                limit=limit,
+            )
+        except (ExchangeError, NetworkError) as e:
+            log.warn(
+                'unable to fetch trades {} / {}: {}'.format(
+                    self.name, asset.symbol, e
+                )
+            )
+            raise ExchangeRequestError(error=e)
+
+        return trades

catalyst/exchange/exchange.py

@@ -13,10 +13,11 @@ from catalyst.exchange.exchange_errors import MismatchingBaseCurrencies, \
     PricingDataNotLoadedError, \
     NoDataAvailableOnExchange, NoValueForField, LastCandleTooEarlyError, \
     TickerNotFoundError, NotEnoughCashError
-from catalyst.exchange.utils.bundle_utils import get_start_dt, \
+from catalyst.exchange.utils.datetime_utils import get_delta, \
-    get_delta, get_periods, get_periods_range
+    get_periods_range, \
+    get_periods, get_start_dt, get_frequency
 from catalyst.exchange.utils.exchange_utils import get_exchange_symbols, \
-    get_frequency, resample_history_df, has_bundle
+    resample_history_df, has_bundle
 from logbook import Logger
 
 log = Logger('Exchange', level=LOG_LEVEL)
@@ -233,11 +234,15 @@ class Exchange:
         """
         asset = None
 
+        # TODO: temp mapping, fix to use a single symbol convention
+        og_symbol = symbol
+        symbol = self.get_symbol(symbol) if not is_exchange_symbol else symbol
         log.debug(
             'searching assets for: {} {}'.format(
                 self.name, symbol
             )
         )
+        # TODO: simplify and loose the loop
         for a in self.assets:
             if asset is not None:
                 break
@@ -259,7 +264,8 @@ class Exchange:
 
             # The symbol provided may use the Catalyst or the exchange
             # convention
-            key = a.exchange_symbol if is_exchange_symbol else a.symbol
+            key = a.exchange_symbol if \
+                is_exchange_symbol else self.get_symbol(a)
             if not asset and key.lower() == symbol.lower():
                 if applies:
                     asset = a
@@ -275,7 +281,7 @@ class Exchange:
             supported_symbols = sorted([a.symbol for a in self.assets])
 
             raise SymbolNotFoundOnExchange(
-                symbol=symbol,
+                symbol=og_symbol,
                 exchange=self.name.title(),
                 supported_symbols=supported_symbols
             )
@@ -433,7 +439,7 @@ class Exchange:
         series = pd.Series(values, index=dates)
 
         periods = get_periods_range(
-            start_dt, end_dt, data_frequency
+            start_dt=start_dt, end_dt=end_dt, freq=data_frequency
         )
         # TODO: ensure that this working as expected, if not use fillna
         series = series.reindex(
@@ -497,39 +503,37 @@ class Exchange:
         freq, candle_size, unit, data_frequency = get_frequency(
             frequency, data_frequency
         )
-        adj_bar_count = candle_size * bar_count
-
-        start_dt = get_start_dt(end_dt, adj_bar_count, data_frequency)
-
         # The get_history method supports multiple asset
         candles = self.get_candles(
             freq=freq,
             assets=assets,
             bar_count=bar_count,
-            start_dt=start_dt if not is_current else None,
             end_dt=end_dt if not is_current else None,
         )
 
         series = dict()
         for asset in candles:
+            first_candle = candles[asset][0]
             asset_series = self.get_series_from_candles(
                 candles=candles[asset],
-                start_dt=start_dt,
+                start_dt=first_candle['last_traded'],
                 end_dt=end_dt,
                 data_frequency=frequency,
                 field=field,
             )
-            if end_dt is not None:
-                delta = get_delta(candle_size, data_frequency)
-                adj_end_dt = end_dt - delta
-                last_traded = asset_series.index[-1]
 
-                if last_traded < adj_end_dt:
+            # Checking to make sure that the dates match
-                    raise LastCandleTooEarlyError(
+            delta = get_delta(candle_size, data_frequency)
-                        last_traded=last_traded,
+            adj_end_dt = end_dt - delta
-                        end_dt=adj_end_dt,
+            last_traded = asset_series.index[-1]
-                        exchange=self.name,
+
-                    )
+            if last_traded < adj_end_dt:
+                raise LastCandleTooEarlyError(
+                    last_traded=last_traded,
+                    end_dt=adj_end_dt,
+                    exchange=self.name,
+                )
+
             series[asset] = asset_series
 
         df = pd.DataFrame(series)
@@ -583,11 +587,11 @@ class Exchange:
             A dataframe containing the requested data.
 
         """
+        # TODO: this function needs some work, we're currently using it just for benchmark data
         freq, candle_size, unit, data_frequency = get_frequency(
             frequency, data_frequency
         )
         adj_bar_count = candle_size * bar_count
-
         try:
             series = self.bundle.get_history_window_series_and_load(
                 assets=assets,
@@ -614,15 +618,14 @@ class Exchange:
                 # The get_history method supports multiple asset
                 # Use the original frequency to let each api optimize
                 # the size of result sets
-                trailing_bar_count = get_periods(
+                trailing_bars = get_periods(
                     trailing_dt, end_dt, freq
                 )
                 candles = self.get_candles(
                     freq=freq,
                     assets=asset,
-                    bar_count=trailing_bar_count,
+                    end_dt=end_dt,
-                    start_dt=start_dt,
+                    bar_count=trailing_bars if trailing_bars < 500 else 500,
-                    end_dt=end_dt
                 )
 
                 last_value = series[asset].iloc(0) if asset in series \
@@ -899,6 +902,22 @@ class Exchange:
         """
         pass
 
+    @abstractmethod
+    def process_order(self, order):
+        """
+        Similar to get_order but looks only for executed orders.
+
+        Parameters
+        ----------
+        order: Order
+
+        Returns
+        -------
+        float
+            Avg execution price
+
+        """
+
     @abstractmethod
     def cancel_order(self, order_param, symbol_or_asset=None):
         """Cancel an open order.
@@ -913,8 +932,7 @@ class Exchange:
         pass
 
     @abstractmethod
-    def get_candles(self, freq, assets, bar_count=None,
+    def get_candles(self, freq, assets, bar_count, start_dt=None, end_dt=None):
-                    start_dt=None, end_dt=None):
         """
         Retrieve OHLCV candles for the given assets
 
@@ -979,7 +997,7 @@ class Exchange:
     @abc.abstractmethod
     def get_orderbook(self, asset, order_type, limit):
         """
-        Retrieve the the orderbook for the given trading pair.
+        Retrieve the orderbook for the given trading pair.
 
         Parameters
         ----------
@@ -993,3 +1011,20 @@ class Exchange:
         list[dict[str, float]
         """
         pass
+
+    @abc.abstractmethod
+    def get_trades(self, asset, my_trades, start_dt, limit):
+        """
+        Retrieve a list of trades.
+
+        Parameters
+        ----------
+        my_trades: bool
+            List only my trades.
+        start_dt
+        limit
+
+        Returns
+        -------
+
+        """

catalyst/exchange/exchange_algorithm.py

@@ -303,6 +303,7 @@ class ExchangeTradingAlgorithmBacktest(ExchangeTradingAlgorithmBase):
         super(ExchangeTradingAlgorithmBacktest, self).__init__(*args, **kwargs)
 
         self.frame_stats = list()
+        self.state = {}
         log.info('initialized trading algorithm in backtest mode')
 
     def is_last_frame_of_day(self, data):
@@ -350,6 +351,7 @@ class ExchangeTradingAlgorithmLive(ExchangeTradingAlgorithmBase):
         self.live_graph = kwargs.pop('live_graph', None)
         self.stats_output = kwargs.pop('stats_output', None)
         self._analyze_live = kwargs.pop('analyze_live', None)
+        self.end = kwargs.pop('end', None)
 
         self._clock = None
         self.frame_stats = list()
@@ -470,6 +472,13 @@ class ExchangeTradingAlgorithmLive(ExchangeTradingAlgorithmBase):
         This allows us to stop/start algos without loosing their state.
 
         """
+        self.state = get_algo_object(
+            algo_name=self.algo_namespace,
+            key='context.state',
+        )
+        if self.state is None:
+            self.state = {}
+
         if self.perf_tracker is None:
             # Note from the Zipline dev:
             # HACK: When running with the `run` method, we set perf_tracker to
@@ -702,6 +711,10 @@ class ExchangeTradingAlgorithmLive(ExchangeTradingAlgorithmBase):
         if not self.is_running:
             return
 
+        if self.end is not None and self.end < data.current_dt:
+            log.info('Algorithm has reached specified end time. Finishing...')
+            self.interrupt_algorithm()
+
         # Resetting the frame stats every day to minimize memory footprint
         today = data.current_dt.floor('1D')
         if self.current_day is not None and today > self.current_day:
@@ -765,6 +778,11 @@ class ExchangeTradingAlgorithmLive(ExchangeTradingAlgorithmBase):
             obj=self.perf_tracker.todays_performance,
             rel_path='daily_performance'
         )
+        log.debug('saving context.state object')
+        save_algo_object(
+            algo_name=self.algo_namespace,
+            key='context.state',
+            obj=self.state)
 
     def _process_stats(self, data):
         today = data.current_dt.floor('1D')

catalyst/exchange/exchange_blotter.py

@@ -1,4 +1,8 @@
+import numpy as np
 import pandas as pd
+from logbook import Logger
+from redo import retry
+
 from catalyst.assets._assets import TradingPair
 from catalyst.constants import LOG_LEVEL
 from catalyst.exchange.exchange_errors import ExchangeRequestError
@@ -8,8 +12,6 @@ from catalyst.finance.order import ORDER_STATUS
 from catalyst.finance.slippage import SlippageModel
 from catalyst.finance.transaction import create_transaction, Transaction
 from catalyst.utils.input_validation import expect_types
-from logbook import Logger
-from redo import retry
 
 log = Logger('exchange_blotter', level=LOG_LEVEL)
 
@@ -93,7 +95,6 @@ class TradingPairFixedSlippage(SlippageModel):
 
     def simulate(self, data, asset, orders_for_asset):
         self._volume_for_bar = 0
-
         price = data.current(asset, 'close')
 
         dt = data.current_dt
@@ -103,18 +104,20 @@ class TradingPairFixedSlippage(SlippageModel):
 
             order.check_triggers(price, dt)
             if not order.triggered:
-                log.debug('order has not reached the trigger at current '
+                log.info(
-                          'price {}'.format(price))
+                    'order has not reached the trigger at current '
+                    'price {}'.format(price)
+                )
                 continue
 
             execution_price, execution_volume = self.process_order(data, order)
+            if execution_price is not None:
+                transaction = create_transaction(
+                    order, dt, execution_price, execution_volume
+                )
 
-            transaction = create_transaction(
+                self._volume_for_bar += abs(transaction.amount)
-                order, dt, execution_price, execution_volume
+                yield order, transaction
-            )
-
-            self._volume_for_bar += abs(transaction.amount)
-            yield order, transaction
 
     def process_order(self, data, order):
         price = data.current(order.asset, 'close')
@@ -205,34 +208,29 @@ class ExchangeBlotter(Blotter):
             for order in self.open_orders[asset]:
                 log.debug('found open order: {}'.format(order.id))
 
-                new_order, executed_price = exchange.get_order(order.id, asset)
+                transactions = exchange.process_order(order)
-                log.debug(
+                # This is a temporary measure, we should really update all
-                    'got updated order {} {}'.format(
+                # trades, not just when the order gets filled. I just think
-                        new_order, executed_price
+                # that this is safer until we have a robust way to track
+                # the trades already processed by the algo. We can't loose
+                # them if the algo shuts down.
+                if transactions and order.open_amount == 0:
+                    avg_price = np.average(
+                        a=[t.price for t in transactions],
+                        weights=[t.amount for t in transactions],
                     )
-                )
+                    ostatus = 'filled' if order.open_amount == 0 else 'partial'
-                order.status = new_order.status
+                    log.info(
-
+                        '{} order {} / {}: {}, avg price: {}'.format(
-                if order.status == ORDER_STATUS.FILLED:
+                            ostatus,
-                    order.commission = new_order.commission
+                            order.id,
-                    if order.amount != new_order.amount:
+                            asset.symbol,
-                        log.warn(
+                            order.filled,
-                            'executed order amount {} differs '
+                            avg_price,
-                            'from original'.format(
-                                new_order.amount, order.amount
-                            )
                         )
-                        order.amount = new_order.amount
-
-                    transaction = Transaction(
-                        asset=order.asset,
-                        amount=order.amount,
-                        dt=pd.Timestamp.utcnow(),
-                        price=executed_price,
-                        order_id=order.id,
-                        commission=order.commission
                     )
-                    yield order, transaction
+                    for transaction in transactions:
+                        yield order, transaction
 
                 elif order.status == ORDER_STATUS.CANCELLED:
                     yield order, None
@@ -253,8 +251,6 @@ class ExchangeBlotter(Blotter):
 
         for order, txn in self.check_open_orders():
             order.dt = txn.dt
-
-            # TODO: is the commission already on the order object?
             transactions.append(txn)
 
             if not order.open:

catalyst/exchange/exchange_bundle.py

@@ -21,9 +21,9 @@ from catalyst.exchange.exchange_errors import EmptyValuesInBundleError, \
     NoDataAvailableOnExchange, \
     PricingDataNotLoadedError, DataCorruptionError, PricingDataValueError
 from catalyst.exchange.utils.bundle_utils import range_in_bundle, \
-    get_bcolz_chunk, get_month_start_end, \
+    get_bcolz_chunk, get_df_from_arrays, get_assets
-    get_year_start_end, get_df_from_arrays, get_start_dt, get_period_label, \
+from catalyst.exchange.utils.datetime_utils import get_delta, get_start_dt, \
-    get_delta, get_assets
+    get_period_label, get_month_start_end, get_year_start_end
 from catalyst.exchange.utils.exchange_utils import get_exchange_folder, \
     save_exchange_symbols, mixin_market_params, get_catalyst_symbol
 from catalyst.utils.cli import maybe_show_progress
@@ -232,12 +232,12 @@ class ExchangeBundle:
 
                 problem = '{name} ({start_dt} to {end_dt}) has empty ' \
                           'periods: {dates}'.format(
-                            name=asset.symbol,
+                    name=asset.symbol,
-                            start_dt=asset.start_date.strftime(
+                    start_dt=asset.start_date.strftime(
-                                DATE_TIME_FORMAT),
+                        DATE_TIME_FORMAT),
-                            end_dt=end_dt.strftime(DATE_TIME_FORMAT),
+                    end_dt=end_dt.strftime(DATE_TIME_FORMAT),
-                            dates=[date.strftime(
+                    dates=[date.strftime(
-                                DATE_TIME_FORMAT) for date in dates])
+                        DATE_TIME_FORMAT) for date in dates])
 
                 if empty_rows_behavior == 'warn':
                     log.warn(problem)
@@ -286,12 +286,12 @@ class ExchangeBundle:
 
             problem = '{name} ({start_dt} to {end_dt}) has {threshold} ' \
                       'identical close values on: {dates}'.format(
-                        name=asset.symbol,
+                name=asset.symbol,
-                        start_dt=asset.start_date.strftime(DATE_TIME_FORMAT),
+                start_dt=asset.start_date.strftime(DATE_TIME_FORMAT),
-                        end_dt=end_dt.strftime(DATE_TIME_FORMAT),
+                end_dt=end_dt.strftime(DATE_TIME_FORMAT),
-                        threshold=threshold,
+                threshold=threshold,
-                        dates=[pd.to_datetime(date).strftime(DATE_TIME_FORMAT)
+                dates=[pd.to_datetime(date).strftime(DATE_TIME_FORMAT)
-                               for date in dates])
+                       for date in dates])
 
             problems.append(problem)
 
@@ -629,8 +629,8 @@ class ExchangeBundle:
                     show_progress,
                     label='Ingesting {frequency} price data on '
                           '{exchange}'.format(
-                            exchange=self.exchange_name,
+                        exchange=self.exchange_name,
-                            frequency=data_frequency,
+                        frequency=data_frequency,
                     )) as it:
                 for chunk in it:
                     problems += self.ingest_ctable(
@@ -964,15 +964,15 @@ class ExchangeBundle:
                                   data_frequency,
                                   trailing_bar_count=None,
                                   reset_reader=False):
+        if trailing_bar_count:
+            delta = get_delta(trailing_bar_count, data_frequency)
+            end_dt += delta
+
         start_dt = get_start_dt(end_dt, bar_count, data_frequency, False)
         start_dt, _ = self.get_adj_dates(
             start_dt, end_dt, assets, data_frequency
         )
 
-        if trailing_bar_count:
-            delta = get_delta(trailing_bar_count, data_frequency)
-            end_dt += delta
-
         # This is an attempt to resolve some caching with the reader
         # when auto-ingesting data.
         # TODO: needs more work

catalyst/exchange/exchange_data_portal.py

@@ -9,8 +9,8 @@ from catalyst.exchange.exchange_bundle import ExchangeBundle
 from catalyst.exchange.exchange_errors import (
     ExchangeRequestError,
     PricingDataNotLoadedError)
-from catalyst.exchange.utils.exchange_utils import get_frequency, \
+from catalyst.exchange.utils.exchange_utils import resample_history_df, group_assets_by_exchange
-    resample_history_df, group_assets_by_exchange
+from catalyst.exchange.utils.datetime_utils import get_frequency
 from logbook import Logger
 from redo import retry
 
@@ -291,6 +291,7 @@ class DataPortalExchangeBacktest(DataPortalExchangeBase):
         DataFrame
 
         """
+        # TODO: verify that the exchange supports the timeframe
         bundle = self.exchange_bundles[exchange_name]  # type: ExchangeBundle
 
         freq, candle_size, unit, adj_data_frequency = get_frequency(

catalyst/exchange/exchange_errors.py

@@ -100,6 +100,13 @@ class InvalidHistoryFrequencyError(ZiplineError):
     ).strip()
 
 
+class UnsupportedHistoryFrequencyError(ZiplineError):
+    msg = (
+        '{exchange} does not support candle frequency {freq}, please choose '
+        'from: {freqs}.'
+    ).strip()
+
+
 class InvalidHistoryTimeframeError(ZiplineError):
     msg = (
         'CCXT timeframe {timeframe} not supported by the exchange.'

catalyst/exchange/utils/bundle_utils.py

@@ -1,11 +1,19 @@
-import calendar
 import os
 import tarfile
-from datetime import timedelta, datetime, date
+from datetime import datetime
 
 import numpy as np
 import pandas as pd
-import pytz
+
+from catalyst.data.bundles.core import download_without_progress
+from catalyst.exchange.utils.exchange_utils import get_exchange_bundles_folder
+import os
+import tarfile
+from datetime import datetime
+
+import numpy as np
+import pandas as pd
+
 from catalyst.data.bundles.core import download_without_progress
 from catalyst.exchange.utils.exchange_utils import get_exchange_bundles_folder
 
@@ -13,41 +21,6 @@ EXCHANGE_NAMES = ['bitfinex', 'bittrex', 'poloniex']
 API_URL = 'http://data.enigma.co/api/v1'
 
 
-def get_date_from_ms(ms):
-    """
-    The date from the number of miliseconds from the epoch.
-
-    Parameters
-    ----------
-    ms: int
-
-    Returns
-    -------
-    datetime
-
-    """
-    return datetime.fromtimestamp(ms / 1000.0)
-
-
-def get_seconds_from_date(date):
-    """
-    The number of seconds from the epoch.
-
-    Parameters
-    ----------
-    date: datetime
-
-    Returns
-    -------
-    int
-
-    """
-    epoch = datetime.utcfromtimestamp(0)
-    epoch = epoch.replace(tzinfo=pytz.UTC)
-
-    return int((date - epoch).total_seconds())
-
-
 def get_bcolz_chunk(exchange_name, symbol, data_frequency, period):
     """
     Download and extract a bcolz bundle.
@@ -77,8 +50,8 @@ def get_bcolz_chunk(exchange_name, symbol, data_frequency, period):
     if not os.path.isdir(path):
         url = 'https://s3.amazonaws.com/enigmaco/catalyst-bundles/' \
               'exchange-{exchange}/{name}.tar.gz'.format(
-                exchange=exchange_name,
+            exchange=exchange_name,
-                name=name)
+            name=name)
 
         bytes = download_without_progress(url)
         with tarfile.open('r', fileobj=bytes) as tar:
@@ -87,178 +60,6 @@ def get_bcolz_chunk(exchange_name, symbol, data_frequency, period):
     return path
 
 
-def get_delta(periods, data_frequency):
-    """
-    Get a time delta based on the specified data frequency.
-
-    Parameters
-    ----------
-    periods: int
-    data_frequency: str
-
-    Returns
-    -------
-    timedelta
-
-    """
-    return timedelta(minutes=periods) \
-        if data_frequency == 'minute' else timedelta(days=periods)
-
-
-def get_periods_range(start_dt, end_dt, freq):
-    """
-    Get a date range for the specified parameters.
-
-    Parameters
-    ----------
-    start_dt: datetime
-    end_dt: datetime
-    freq: str
-
-    Returns
-    -------
-    DateTimeIndex
-
-    """
-    if freq == 'minute':
-        freq = 'T'
-
-    elif freq == 'daily':
-        freq = 'D'
-
-    return pd.date_range(start_dt, end_dt, freq=freq)
-
-
-def get_periods(start_dt, end_dt, freq):
-    """
-    The number of periods in the specified range.
-
-    Parameters
-    ----------
-    start_dt: datetime
-    end_dt: datetime
-    freq: str
-
-    Returns
-    -------
-    int
-
-    """
-    return len(get_periods_range(start_dt, end_dt, freq))
-
-
-def get_start_dt(end_dt, bar_count, data_frequency, include_first=True):
-    """
-    The start date based on specified end date and data frequency.
-
-    Parameters
-    ----------
-    end_dt: datetime
-    bar_count: int
-    data_frequency: str
-
-    Returns
-    -------
-    datetime
-
-    """
-    periods = bar_count
-    if periods > 1:
-        delta = get_delta(periods, data_frequency)
-        start_dt = end_dt - delta
-
-        if not include_first:
-            start_dt += get_delta(1, data_frequency)
-    else:
-        start_dt = end_dt
-
-    return start_dt
-
-
-def get_period_label(dt, data_frequency):
-    """
-    The period label for the specified date and frequency.
-
-    Parameters
-    ----------
-    dt: datetime
-    data_frequency: str
-
-    Returns
-    -------
-    str
-
-    """
-    if data_frequency == 'minute':
-        return '{}-{:02d}'.format(dt.year, dt.month)
-    else:
-        return '{}'.format(dt.year)
-
-
-def get_month_start_end(dt, first_day=None, last_day=None):
-    """
-    The first and last day of the month for the specified date.
-
-    Parameters
-    ----------
-    dt: datetime
-    first_day: datetime
-    last_day: datetime
-
-    Returns
-    -------
-    datetime, datetime
-
-    """
-    month_range = calendar.monthrange(dt.year, dt.month)
-
-    if first_day:
-        month_start = first_day
-    else:
-        month_start = pd.to_datetime(datetime(
-            dt.year, dt.month, 1, 0, 0, 0, 0
-        ), utc=True)
-
-    if last_day:
-        month_end = last_day
-    else:
-        month_end = pd.to_datetime(datetime(
-            dt.year, dt.month, month_range[1], 23, 59, 0, 0
-        ), utc=True)
-
-        if month_end > pd.Timestamp.utcnow():
-            month_end = pd.Timestamp.utcnow().floor('1D')
-
-    return month_start, month_end
-
-
-def get_year_start_end(dt, first_day=None, last_day=None):
-    """
-    The first and last day of the year for the specified date.
-
-    Parameters
-    ----------
-
-    dt: datetime
-    first_day: datetime
-    last_day: datetime
-
-    Returns
-    -------
-    datetime, datetime
-
-    """
-    year_start = first_day if first_day \
-        else pd.to_datetime(date(dt.year, 1, 1), utc=True)
-    year_end = last_day if last_day \
-        else pd.to_datetime(date(dt.year, 12, 31), utc=True)
-
-    if year_end > pd.Timestamp.utcnow():
-        year_end = pd.Timestamp.utcnow().floor('1D')
-
-    return year_start, year_end
-
-
 def get_df_from_arrays(arrays, periods):
     """
     A DataFrame from the specified OHCLV arrays.

catalyst/exchange/utils/datetime_utils.py

@@ -0,0 +1,327 @@
+import calendar
+import re
+from datetime import datetime, timedelta, date
+
+import pandas as pd
+import pytz
+
+from catalyst.exchange.exchange_errors import InvalidHistoryFrequencyError, \
+    InvalidHistoryFrequencyAlias
+
+
+def get_date_from_ms(ms):
+    """
+    The date from the number of miliseconds from the epoch.
+
+    Parameters
+    ----------
+    ms: int
+
+    Returns
+    -------
+    datetime
+
+    """
+    return datetime.fromtimestamp(ms / 1000.0)
+
+
+def get_seconds_from_date(date):
+    """
+    The number of seconds from the epoch.
+
+    Parameters
+    ----------
+    date: datetime
+
+    Returns
+    -------
+    int
+
+    """
+    epoch = datetime.utcfromtimestamp(0)
+    epoch = epoch.replace(tzinfo=pytz.UTC)
+
+    return int((date - epoch).total_seconds())
+
+
+def get_delta(periods, data_frequency):
+    """
+    Get a time delta based on the specified data frequency.
+
+    Parameters
+    ----------
+    periods: int
+    data_frequency: str
+
+    Returns
+    -------
+    timedelta
+
+    """
+    return timedelta(minutes=periods) \
+        if data_frequency == 'minute' else timedelta(days=periods)
+
+
+def get_periods_range(freq, start_dt=None, end_dt=None, periods=None):
+    """
+    Get a date range for the specified parameters.
+
+    Parameters
+    ----------
+    start_dt: datetime
+    end_dt: datetime
+    freq: str
+
+    Returns
+    -------
+    DateTimeIndex
+
+    """
+    if freq == 'minute':
+        freq = 'T'
+
+    elif freq == 'daily':
+        freq = 'D'
+
+    if start_dt is not None and end_dt is not None and periods is None:
+
+        return pd.date_range(start_dt, end_dt, freq=freq)
+
+    elif periods is not None and (start_dt is not None or end_dt is not None):
+        _, unit_periods, unit, _ = get_frequency(freq)
+        adj_periods = periods * unit_periods
+
+        # TODO: standardize time aliases to avoid any mapping
+        unit = 'd' if unit == 'D' else 'm'
+        delta = pd.Timedelta(adj_periods, unit)
+
+        if start_dt is not None:
+            return pd.date_range(
+                start=start_dt,
+                end=start_dt + delta,
+                freq=freq,
+                closed='left',
+            )
+
+        else:
+            return pd.date_range(
+                start=end_dt - delta,
+                end=end_dt,
+                freq=freq,
+            )
+
+    else:
+        raise ValueError(
+            'Choose only two parameters between start_dt, end_dt '
+            'and periods.'
+        )
+
+
+def get_periods(start_dt, end_dt, freq):
+    """
+    The number of periods in the specified range.
+
+    Parameters
+    ----------
+    start_dt: datetime
+    end_dt: datetime
+    freq: str
+
+    Returns
+    -------
+    int
+
+    """
+    return len(get_periods_range(start_dt=start_dt, end_dt=end_dt, freq=freq))
+
+
+def get_start_dt(end_dt, bar_count, data_frequency, include_first=True):
+    """
+    The start date based on specified end date and data frequency.
+
+    Parameters
+    ----------
+    end_dt: datetime
+    bar_count: int
+    data_frequency: str
+    include_first
+
+    Returns
+    -------
+    datetime
+
+    """
+    periods = bar_count
+    if periods > 1:
+        delta = get_delta(periods, data_frequency)
+        start_dt = end_dt - delta
+
+        if not include_first:
+            start_dt += get_delta(1, data_frequency)
+    else:
+        start_dt = end_dt
+
+    return start_dt
+
+
+def get_period_label(dt, data_frequency):
+    """
+    The period label for the specified date and frequency.
+
+    Parameters
+    ----------
+    dt: datetime
+    data_frequency: str
+
+    Returns
+    -------
+    str
+
+    """
+    if data_frequency == 'minute':
+        return '{}-{:02d}'.format(dt.year, dt.month)
+    else:
+        return '{}'.format(dt.year)
+
+
+def get_month_start_end(dt, first_day=None, last_day=None):
+    """
+    The first and last day of the month for the specified date.
+
+    Parameters
+    ----------
+    dt: datetime
+    first_day: datetime
+    last_day: datetime
+
+    Returns
+    -------
+    datetime, datetime
+
+    """
+    month_range = calendar.monthrange(dt.year, dt.month)
+
+    if first_day:
+        month_start = first_day
+    else:
+        month_start = pd.to_datetime(datetime(
+            dt.year, dt.month, 1, 0, 0, 0, 0
+        ), utc=True)
+
+    if last_day:
+        month_end = last_day
+    else:
+        month_end = pd.to_datetime(datetime(
+            dt.year, dt.month, month_range[1], 23, 59, 0, 0
+        ), utc=True)
+
+        if month_end > pd.Timestamp.utcnow():
+            month_end = pd.Timestamp.utcnow().floor('1D')
+
+    return month_start, month_end
+
+
+def get_year_start_end(dt, first_day=None, last_day=None):
+    """
+    The first and last day of the year for the specified date.
+
+    Parameters
+    ----------
+
+    dt: datetime
+    first_day: datetime
+    last_day: datetime
+
+    Returns
+    -------
+    datetime, datetime
+
+    """
+    year_start = first_day if first_day \
+        else pd.to_datetime(date(dt.year, 1, 1), utc=True)
+    year_end = last_day if last_day \
+        else pd.to_datetime(date(dt.year, 12, 31), utc=True)
+
+    if year_end > pd.Timestamp.utcnow():
+        year_end = pd.Timestamp.utcnow().floor('1D')
+
+    return year_start, year_end
+
+
+def get_frequency(freq, data_frequency=None):
+    """
+    Get the frequency parameters.
+
+    Notes
+    -----
+    We're trying to use Pandas convention for frequency aliases.
+
+    Parameters
+    ----------
+    freq: str
+    data_frequency: str
+
+    Returns
+    -------
+    str, int, str, str
+
+    """
+    if data_frequency is None:
+        data_frequency = 'daily' if freq.upper().endswith('D') else 'minute'
+
+    if freq == 'minute':
+        unit = 'T'
+        candle_size = 1
+
+    elif freq == 'daily':
+        unit = 'D'
+        candle_size = 1
+
+    else:
+        freq_match = re.match(r'([0-9].*)?(m|M|d|D|h|H|T)', freq, re.M | re.I)
+        if freq_match:
+            candle_size = int(freq_match.group(1)) if freq_match.group(1) \
+                else 1
+            unit = freq_match.group(2)
+
+        else:
+            raise InvalidHistoryFrequencyError(frequency=freq)
+
+    # TODO: some exchanges support H and W frequencies but not bundles
+    # Find a way to pass-through these parameters to exchanges
+    # but resample from minute or daily in backtest mode
+    # see catalyst/exchange/ccxt/ccxt_exchange.py:242 for mapping between
+    # Pandas offet aliases (used by Catalyst) and the CCXT timeframes
+    if unit.lower() == 'd':
+        unit = 'D'
+        alias = '{}D'.format(candle_size)
+
+        if data_frequency == 'minute':
+            data_frequency = 'daily'
+
+    elif unit.lower() == 'm' or unit == 'T':
+        unit = 'T'
+        alias = '{}T'.format(candle_size)
+
+        if data_frequency == 'daily':
+            data_frequency = 'minute'
+
+    # elif unit.lower() == 'h':
+    #     candle_size = candle_size * 60
+    #
+    #     alias = '{}T'.format(candle_size)
+    #     if data_frequency == 'daily':
+    #         data_frequency = 'minute'
+
+    else:
+        raise InvalidHistoryFrequencyAlias(freq=freq)
+
+    return alias, candle_size, unit, data_frequency
+
+
+def from_ms_timestamp(ms):
+    return pd.to_datetime(ms, unit='ms', utc=True)
+
+
+def get_epoch():
+    return pd.to_datetime('1970-1-1', utc=True)

catalyst/exchange/utils/exchange_utils.py

@@ -2,21 +2,20 @@ import hashlib
 import json
 import os
 import pickle
-import re
 import shutil
 from datetime import date, datetime
 
 import pandas as pd
 from catalyst.assets._assets import TradingPair
+from six import string_types
+from six.moves.urllib import request
+
 from catalyst.constants import DATE_FORMAT, SYMBOLS_URL
-from catalyst.exchange.exchange_errors import ExchangeSymbolsNotFound, \
+from catalyst.exchange.exchange_errors import ExchangeSymbolsNotFound
-    InvalidHistoryFrequencyError, InvalidHistoryFrequencyAlias
 from catalyst.exchange.utils.serialization_utils import ExchangeJSONEncoder, \
     ExchangeJSONDecoder
 from catalyst.utils.paths import data_root, ensure_directory, \
     last_modified_time
-from six import string_types
-from six.moves.urllib import request
 
 
 def get_sid(symbol):
@@ -129,7 +128,10 @@ def get_exchange_symbols(exchange_name, is_local=False, environ=None):
     if not is_local and (not os.path.isfile(filename) or pd.Timedelta(
                 pd.Timestamp('now', tz='UTC') - last_modified_time(
                 filename)).days > 1):
-        download_exchange_symbols(exchange_name, environ)
+        try:
+            download_exchange_symbols(exchange_name, environ)
+        except Exception as e:
+            pass
 
     if os.path.isfile(filename):
         with open(filename) as data_file:
@@ -189,7 +191,7 @@ def get_symbols_string(assets):
     return ', '.join([asset.symbol for asset in array])
 
 
-def get_exchange_auth(exchange_name, environ=None):
+def get_exchange_auth(exchange_name, alias=None, environ=None):
     """
     The de-serialized contend of the exchange's auth.json file.
 
@@ -204,7 +206,8 @@ def get_exchange_auth(exchange_name, environ=None):
 
     """
     exchange_folder = get_exchange_folder(exchange_name, environ)
-    filename = os.path.join(exchange_folder, 'auth.json')
+    name = 'auth' if alias is None else alias
+    filename = os.path.join(exchange_folder, '{}.json'.format(name))
 
     if os.path.isfile(filename):
         with open(filename) as data_file:
@@ -509,72 +512,6 @@ def get_common_assets(exchanges):
     return assets
 
 
-def get_frequency(freq, data_frequency):
-    """
-    Get the frequency parameters.
-
-    Notes
-    -----
-    We're trying to use Pandas convention for frequency aliases.
-
-    Parameters
-    ----------
-    freq: str
-    data_frequency: str
-
-    Returns
-    -------
-    str, int, str, str
-
-    """
-    if freq == 'minute':
-        unit = 'T'
-        candle_size = 1
-
-    elif freq == 'daily':
-        unit = 'D'
-        candle_size = 1
-
-    else:
-        freq_match = re.match(r'([0-9].*)?(m|M|d|D|h|H|T)', freq, re.M | re.I)
-        if freq_match:
-            candle_size = int(freq_match.group(1)) if freq_match.group(1) \
-                else 1
-            unit = freq_match.group(2)
-
-        else:
-            raise InvalidHistoryFrequencyError(frequency=freq)
-
-    # TODO: some exchanges support H and W frequencies but not bundles
-    # Find a way to pass-through these parameters to exchanges
-    # but resample from minute or daily in backtest mode
-    # see catalyst/exchange/ccxt/ccxt_exchange.py:242 for mapping between
-    # Pandas offet aliases (used by Catalyst) and the CCXT timeframes
-    if unit.lower() == 'd':
-        alias = '{}D'.format(candle_size)
-
-        if data_frequency == 'minute':
-            data_frequency = 'daily'
-
-    elif unit.lower() == 'm' or unit == 'T':
-        alias = '{}T'.format(candle_size)
-
-        if data_frequency == 'daily':
-            data_frequency = 'minute'
-
-    # elif unit.lower() == 'h':
-    #     candle_size = candle_size * 60
-    #
-    #     alias = '{}T'.format(candle_size)
-    #     if data_frequency == 'daily':
-    #         data_frequency = 'minute'
-
-    else:
-        raise InvalidHistoryFrequencyAlias(freq=freq)
-
-    return alias, candle_size, unit, data_frequency
-
-
 def resample_history_df(df, freq, field):
     """
     Resample the OHCLV DataFrame using the specified frequency.
@@ -648,14 +585,6 @@ def mixin_market_params(exchange_name, params, market):
                 params['lot'] = params['min_trade_size']
 
 
-def from_ms_timestamp(ms):
-    return pd.to_datetime(ms, unit='ms', utc=True)
-
-
-def get_epoch():
-    return pd.to_datetime('1970-1-1', utc=True)
-
-
 def group_assets_by_exchange(assets):
     exchange_assets = dict()
     for asset in assets:

catalyst/exchange/utils/factory.py

@@ -13,12 +13,12 @@ exchange_cache = dict()
 
 
 def get_exchange(exchange_name, base_currency=None, must_authenticate=False,
-                 skip_init=False):
+                 skip_init=False, auth_alias=None):
     key = (exchange_name, base_currency)
     if key in exchange_cache:
         return exchange_cache[key]
 
-    exchange_auth = get_exchange_auth(exchange_name)
+    exchange_auth = get_exchange_auth(exchange_name, alias=auth_alias)
 
     has_auth = (exchange_auth['key'] != '' and exchange_auth['secret'] != '')
     if must_authenticate and not has_auth:

catalyst/exchange/utils/stats_utils.py

@@ -287,7 +287,7 @@ def get_pretty_stats(stats, recorded_cols=None, num_rows=10, show_tail=True):
 
     """
     if isinstance(stats, pd.DataFrame):
-        stats = stats.T.to_dict().values()
+        stats = list(stats.T.to_dict().values())
         stats.sort(key=itemgetter('period_close'))
 
     if len(stats) > num_rows:
@@ -359,9 +359,13 @@ def stats_to_s3(uri, stats, algo_namespace, recorded_cols=None,
     pid = os.getpid()
 
     parts = uri.split('//')
-    obj = s3.Object(parts[1], '{}/{}-{}-{}.csv'.format(
+    path = '{folder}/{algo}/{time}-{algo}-{pid}.csv'.format(
-        folder, timestr, algo_namespace, pid
+        folder=folder,
-    ))
+        algo=algo_namespace,
+        time=timestr,
+        pid=pid,
+    )
+    obj = s3.Object(parts[1], path)
     obj.put(Body=bytes_to_write)
 
 

catalyst/exchange/utils/test_utils.py

@@ -62,14 +62,14 @@ def output_df(df, assets, name=None):
 
     """
     if isinstance(assets, TradingPair):
-        exchange_folder = assets.exchange
+        asset_folder = '{}_{}'.format(assets.exchange, assets.symbol)
-        asset_folder = assets.symbol
     else:
-        exchange_folder = ','.join([asset.exchange for asset in assets])
+        asset_folder = ','.join(
-        asset_folder = ','.join([asset.symbol for asset in assets])
+            ['{}_{}'.format(a.exchange, a.symbol) for a in assets]
+        )
 
     folder = os.path.join(
-        tempfile.gettempdir(), 'catalyst', exchange_folder, asset_folder
+        tempfile.gettempdir(), 'catalyst', asset_folder
     )
     ensure_directory(folder)
 
@@ -79,4 +79,4 @@ def output_df(df, assets, name=None):
     path = os.path.join(folder, '{}.csv'.format(name))
     df.to_csv(path)
 
-    return path
+    return path, folder

catalyst/pipeline/graph.py

@@ -142,7 +142,7 @@ class TermGraph(object):
         at the end of execution.
         """
         refcounts = self.graph.out_degree()
-        for t in self.outputs.values():
+        for t in list(self.outputs.values()):
             refcounts[t] += 1
 
         for t in initial_terms:
@@ -238,7 +238,7 @@ class ExecutionPlan(TermGraph):
                  min_extra_rows=0):
         super(ExecutionPlan, self).__init__(terms)
 
-        for term in terms.values():
+        for term in list(terms.values()):
             self.set_extra_rows(
                 term,
                 all_dates,

catalyst/sources/test_source.py

@@ -144,7 +144,7 @@ class SpecificEquityTrades(object):
             for identifier in self.identifiers:
                 assets_by_identifier[identifier] = env.asset_finder.\
                     lookup_generic(identifier, datetime.now())[0]
-            self.sids = [asset.sid for asset in assets_by_identifier.values()]
+            self.sids = [asset.sid for asset in list(assets_by_identifier.values())]
             for event in self.event_list:
                 event.sid = assets_by_identifier[event.sid].sid
 
@@ -167,7 +167,7 @@ class SpecificEquityTrades(object):
             for identifier in self.identifiers:
                 assets_by_identifier[identifier] = env.asset_finder.\
                     lookup_generic(identifier, datetime.now())[0]
-            self.sids = [asset.sid for asset in assets_by_identifier.values()]
+            self.sids = [asset.sid for asset in list(assets_by_identifier.values())]
 
         # Hash_value for downstream sorting.
         self.arg_string = hash_args(*args, **kwargs)

catalyst/support/binance_history.py

@@ -0,0 +1,57 @@
+import pandas as pd
+from catalyst import run_algorithm
+
+
+def initialize(context):
+    context.i = -1  # counts the minutes
+    context.exchange = 'cryptopia'
+    context.base_currency = 'btc'
+    context.coins = context.exchanges[context.exchange].assets
+    context.coins = [c for c in context.coins if
+                     c.quote_currency == context.base_currency]
+
+
+def handle_data(context, data):
+    # current date formatted into a string
+    today = data.current_dt
+
+    # update universe everyday
+    new_day = 60 * 24  # assuming data_frequency='minute'
+    if not context.i % new_day:
+        context.coins = context.exchanges[context.exchange].assets
+        context.coins = [c for c in context.coins if
+                         c.quote_currency == context.base_currency]
+
+    # get data every 30 minutes
+    minutes = 1
+    if not context.i % minutes:
+        # we iterate for every pair in the current universe
+        for coin in context.coins:
+            pair = str(coin.symbol)
+
+            price = data.current(coin, 'price')
+            print(today, pair, price)
+
+
+def analyze(context=None, results=None):
+    pass
+
+
+if __name__ == '__main__':
+    start_date = pd.to_datetime('2018-01-17', utc=True)
+    end_date = pd.to_datetime('2018-01-18', utc=True)
+
+    performance = run_algorithm(
+        capital_base=1.0,
+        # amount of base_currency, not always in dollars unless usd
+        initialize=initialize,
+        handle_data=handle_data,
+        analyze=analyze,
+        exchange_name='cryptopia',
+        data_frequency='minute',
+        base_currency='btc',
+        live=True,
+        live_graph=False,
+        simulate_orders=True,
+        algo_namespace='simple_universe'
+    )

catalyst/support/ccxt_issue_1358.py

@@ -0,0 +1,8 @@
+import ccxt
+
+bitfinex = ccxt.bitfinex()
+bitfinex.verbose = True
+ohlcvs = bitfinex.fetch_ohlcv('ETH/BTC', '30m', 1504224000000)
+
+dt = bitfinex.iso8601(ohlcvs[0][0])
+print(dt)  # should print '2017-09-01T00:00:00.000Z'

catalyst/support/history_multiple_assets.py

@@ -0,0 +1,50 @@
+import pandas as pd
+
+from catalyst import run_algorithm
+from catalyst.api import symbol
+
+
+def initialize(context):
+    context.asset1 = symbol('fct_btc')
+    context.asset2 = symbol('btc_usdt')
+    context.coins = [context.asset1, context.asset2]
+
+
+def handle_data(context, data):
+    df = data.history(context.coins,
+                      'close',
+                      bar_count=10,
+                      frequency='5T',
+                      )
+    print(df)
+    print(data.current(context.asset1, 'close'))
+    print(data.current(context.asset2, 'close'))
+    exit(0)
+
+
+if __name__ == '__main__':
+    LIVE = True
+    if LIVE:
+        run_algorithm(
+            capital_base=1,
+            initialize=initialize,
+            handle_data=handle_data,
+            exchange_name='poloniex',
+            algo_namespace='test_multi_assets',
+            base_currency='usdt',
+            live=True,
+            simulate_orders=True,
+        )
+    else:
+        run_algorithm(
+            capital_base=1,
+            data_frequency='minute',
+            initialize=initialize,
+            handle_data=handle_data,
+            exchange_name='poloniex',
+            algo_namespace='test_multi_assets',
+            base_currency='usdt',
+            live=False,
+            start=pd.to_datetime('2017-12-1', utc=True),
+            end=pd.to_datetime('2017-12-1', utc=True),
+        )

catalyst/support/issue_111.py

@@ -0,0 +1,44 @@
+from logbook import Logger
+
+from catalyst import run_algorithm
+from catalyst.api import order_target_percent
+
+NAMESPACE = 'goose7'
+log = Logger(NAMESPACE)
+
+from catalyst.api import record, symbol
+
+
+def initialize(context):
+    context.asset = symbol('trx_btc')
+
+
+def handle_data(context, data):
+    price = data.current(context.asset, 'price')
+    record(btc=price)
+
+    # Only ordering if it does not have any position to avoid trying some
+    # tiny orders with the leftover btc
+    pos_amount = context.portfolio.positions[context.asset].amount
+    if pos_amount > 0:
+        return
+
+    # Adding a limit price to workaround an issue with performance
+    # calculations of market orders
+    order_target_percent(
+        context.asset, 1, limit_price=price * 1.01
+    )
+
+
+if __name__ == '__main__':
+    run_algorithm(
+        capital_base=0.003,
+        initialize=initialize,
+        handle_data=handle_data,
+        exchange_name='binance',
+        live=True,
+        algo_namespace=NAMESPACE,
+        base_currency='btc',
+        live_graph=False,
+        simulate_orders=False,
+    )

catalyst/support/issue_112.py

@@ -0,0 +1,44 @@
+import pandas as pd
+
+from catalyst import run_algorithm
+from catalyst.api import symbol
+
+
+def initialize(context):
+    context.asset = symbol('btc_usdt')
+
+
+def handle_data(context, data):
+    df = data.history(context.asset,
+                      'close',
+                      bar_count=10,
+                      frequency='5T',
+                      )
+
+
+if __name__ == '__main__':
+    LIVE = True
+    if LIVE:
+        run_algorithm(
+            capital_base=1,
+            initialize=initialize,
+            handle_data=handle_data,
+            exchange_name='poloniex',
+            algo_namespace='test_algo',
+            base_currency='usdt',
+            live=True,
+            simulate_orders=True,
+        )
+    else:
+        run_algorithm(
+            capital_base=1,
+            data_frequency='minute',
+            initialize=initialize,
+            handle_data=handle_data,
+            exchange_name='poloniex',
+            algo_namespace='test_algo',
+            base_currency='usdt',
+            live=False,
+            start=pd.to_datetime('2017-12-1', utc=True),
+            end=pd.to_datetime('2017-12-1', utc=True),
+        )

catalyst/support/issue_169.py

@@ -0,0 +1,44 @@
+import pandas as pd
+from catalyst.utils.run_algo import run_algorithm
+from catalyst.api import symbol
+from exchange.utils.stats_utils import set_print_settings
+
+
+def initialize(context):
+    context.i = 0
+    context.data = []
+
+
+def handle_data(context, data):
+    prices = data.history(
+        symbol('xlm_eth'),
+        fields=['open', 'high', 'low', 'close'],
+        bar_count=50,
+        frequency='1T'
+    )
+    set_print_settings()
+    print(prices.tail(10))
+    context.data.append(prices)
+
+    context.i = context.i + 1
+    if context.i == 3:
+        context.interrupt_algorithm()
+
+
+def analyze(context, prefs):
+    for dataset in context.data:
+        print(dataset[-2:])
+
+
+if __name__ == '__main__':
+    run_algorithm(
+        capital_base=0.1,
+        initialize=initialize,
+        handle_data=handle_data,
+        analyze=analyze,
+        exchange_name='binance',
+        algo_namespace='Test candles',
+        base_currency='eth',
+        data_frequency='minute',
+        live=True,
+        simulate_orders=True)

catalyst/utils/run_algo.py

@@ -91,6 +91,7 @@ def _run(handle_data,
          live_graph,
          analyze_live,
          simulate_orders,
+         auth_aliases,
          stats_output):
     """Run a backtest for the given algorithm.
 
@@ -163,14 +164,19 @@ def _run(handle_data,
         raise ValueError('Please specify at least one exchange.')
 
     exchange_list = [x.strip().lower() for x in exchange.split(',')]
-
     exchanges = dict()
-    for exchange_name in exchange_list:
+    for name in exchange_list:
-        exchanges[exchange_name] = get_exchange(
+        if auth_aliases is not None and name in auth_aliases:
-            exchange_name=exchange_name,
+            auth_alias = auth_aliases[name]
+        else:
+            auth_alias = None
+
+        exchanges[name] = get_exchange(
+            exchange_name=name,
             base_currency=base_currency,
             must_authenticate=(live and not simulate_orders),
             skip_init=True,
+            auth_alias=auth_alias,
         )
 
     open_calendar = get_calendar('OPEN')
@@ -200,7 +206,8 @@ def _run(handle_data,
         start = pd.Timestamp.utcnow()
 
         # TODO: fix the end data.
-        end = start + timedelta(hours=8760)
+        if end is None:
+            end = start + timedelta(hours=8760)
 
         data = DataPortalExchangeLive(
             exchanges=exchanges,
@@ -228,6 +235,7 @@ def _run(handle_data,
             simulate_orders=simulate_orders,
             stats_output=stats_output,
             analyze_live=analyze_live,
+            end=end,
         )
     elif exchanges:
         # Removed the existing Poloniex fork to keep things simple
@@ -391,6 +399,7 @@ def run_algorithm(initialize,
                   live_graph=False,
                   analyze_live=None,
                   simulate_orders=True,
+                  auth_aliases=None,
                   stats_output=None,
                   output=os.devnull):
     """Run a trading algorithm.
@@ -524,5 +533,6 @@ def run_algorithm(initialize,
         live_graph=live_graph,
         analyze_live=analyze_live,
         simulate_orders=simulate_orders,
+        auth_aliases=auth_aliases,
         stats_output=stats_output
     )

docs/source/beginner-tutorial.rst

@@ -483,7 +483,7 @@ bitcoin price.
 
 Now we will run the simulation again, but this time we extend our original 
 algorithm with the addition of the ``analyze()`` function. Somewhat analogously 
-as how ``initialize()`` gets called once before the start of the algorith, 
+as how ``initialize()`` gets called once before the start of the algorithm, 
 ``analyze()`` gets called once at the end of the algorithm, and receives two 
 variables: ``context``, which we discussed at the very beginning, and ``perf``, 
 which is the pandas dataframe containing the performance data for our algorithm 
@@ -589,7 +589,7 @@ the ``examples`` directory:
     from catalyst import run_algorithm
     from catalyst.api import (order, record, symbol, order_target_percent, 
             get_open_orders)
-    from catalyst.exchange.stats_utils import extract_transactions
+    from catalyst.exchange.utils.stats_utils import extract_transactions
 
     NAMESPACE = 'dual_moving_average'
     log = Logger(NAMESPACE)
@@ -660,7 +660,8 @@ the ``examples`` directory:
     def analyze(context, perf):
 
         # Get the base_currency that was passed as a parameter to the simulation
-        base_currency = context.exchanges.values()[0].base_currency.upper()
+        exchange = list(context.exchanges.values())[0]
+        base_currency = exchange.base_currency.upper()
 
         # First chart: Plot portfolio value using base_currency
         ax1 = plt.subplot(411)

docs/source/development-guidelines.rst

@@ -84,6 +84,25 @@ To build and view the docs locally, run:
    $ {BROWSER} build/html/index.html
 
 
+There is a `documented issue <https://github.com/sphinx-doc/sphinx/issues/3212>`_ 
+with ``sphinx`` and ``docutils`` that causes the error below when trying to build 
+the docs.
+
+.. code-block:: text
+
+   Exception occurred:
+     File "(...)/env-c/lib/python2.7/site-packages/docutils/writers/_html_base.py", line 671, in depart_document
+       assert not self.context, 'len(context) = %s' % len(self.context)
+   AssertionError: len(context) = 3
+
+If you get this error, you need to downgrade your version of ``docutils`` as 
+follows, and build the docs again:
+
+.. code-block:: bash
+
+   $ pip install docutils==0.12
+
+
 Commit messages
 ---------------
 

docs/source/features.rst

@@ -44,11 +44,11 @@ For additional details on the functionality added on recent releases, see the
 Upcoming features
 ~~~~~~~~~~~~~~~~~
 
-* Additional datasets beyond pricing data (Dec. 2017)
+* Additional datasets beyond pricing data (Q1 2018)
-* API documentation (Jan. 2017)
+* API documentation (Q1 2018)
-* Support for decentralized exchanges (Jan. 2017)
+* Support for decentralized exchanges (Q1 2018)
-* Support for data ingestion of community-contributed data sets (Jan. 2017)
+* Support for data ingestion of community-contributed data sets (Q1 2018)
-* Pipeline support (Jan. 2018)
+* Pipeline support (Q1 2018)
 * Web UI (Q2 2018)
 
 

docs/source/install.rst

@@ -180,20 +180,6 @@ use a single tool to install Python and non-Python dependencies, or if you're
 already using `Anaconda <http://continuum.io/downloads>`_ as your Python 
 distribution, refer to the :ref:`Installing with Conda <conda>` section.
 
-Once you've installed the necessary additional dependencies for your system 
-(see below for your particular platform: :ref:`Linux`, :ref:`MacOS` or 
-:ref:`Windows`), you should be able to simply run
-
-.. code-block:: bash
-
-   $ pip install enigma-catalyst matplotlib
-
-Note that in the command above we install two different packages. The second 
-one, ``matplotlib`` is a visualization library. While it's not strictly 
-required to run catalyst simulations or live trading, it comes in very handy
-to visualize the performance of your algorithms, and for this reason we 
-recommend you install it, as well.
-
 If you use Python for anything other than Catalyst, we **strongly** recommend
 that you install in a `virtualenv
 <https://virtualenv.readthedocs.org/en/latest>`_.  The `Hitchhiker's Guide to
@@ -206,8 +192,21 @@ summarized version:
    $ pip install virtualenv
    $ virtualenv catalyst-venv
    $ source ./catalyst-venv/bin/activate
+
+Once you've installed the necessary additional dependencies for your system 
+(:ref:`Linux`, :ref:`MacOS` or :ref:`Windows`) **and have activated your virtualenv**, you should be able to simply run
+
+.. code-block:: bash
+
    $ pip install enigma-catalyst matplotlib
 
+Note that in the command above we install two different packages. The second 
+one, ``matplotlib`` is a visualization library. While it's not strictly 
+required to run catalyst simulations or live trading, it comes in very handy
+to visualize the performance of your algorithms, and for this reason we 
+recommend you install it, as well.
+
+
 Troubleshooting ``pip`` Install
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -219,13 +218,13 @@ Troubleshooting ``pip`` Install
 
    .. code-block:: bash
 
-      pip install --upgrade pip
+      $ pip install --upgrade pip
 
    On Windows, the recommended command is:
 
    .. code-block:: bash
 
-      python -m pip install --upgrade pip
+      $ python -m pip install --upgrade pip
 
 ----
 
@@ -251,7 +250,7 @@ Troubleshooting ``pip`` Install
 
    .. code-block:: bash
 
-      pip install --pre enigma-catalyst
+      $ pip install --pre enigma-catalyst
 
 ----
 
@@ -263,7 +262,7 @@ Troubleshooting ``pip`` Install
 
    .. code-block:: bash
 
-      pip install --upgrade pip setuptools
+      $ pip install --upgrade pip setuptools
 
 ----
 
@@ -278,7 +277,7 @@ Troubleshooting ``pip`` Install
 
    .. code-block:: bash
 
-      pip install -r requirements.txt
+      $ pip install -r requirements.txt
 
 ----
 
@@ -294,7 +293,7 @@ Troubleshooting ``pip`` Install
 
    .. code-block:: bash
 
-      sudo apt-get install python-dev
+      $ sudo apt-get install python-dev
 
 .. _pipenv:
 
@@ -376,14 +375,14 @@ outdated. Thus, you first need to run:
 
 .. code-block:: bash
 
-   pip install --upgrade pip setuptools
+   $ pip install --upgrade pip setuptools
 
 The default installation is also missing the C and C++ compilers, which you 
 install by:
 
 .. code-block:: bash
 
-   sudo yum install gcc gcc-c++
+   $ sudo yum install gcc gcc-c++
 
 Then you should follow the regular installation instructions outlined at the 
 beginning of this page.
@@ -408,20 +407,34 @@ following brew packages:
 
    $ brew install freetype pkg-config gcc openssl
 
-MacOS + virtualenv + matplotlib
+MacOS + virtualenv/conda + matplotlib
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A note about using matplotlib in virtual enviroments on MacOS: it may be 
+The first time that you try to run an algorithm that loads the ``matplotlib`` 
-necessary to run
+library, you may get the following error:
+
+.. code-block:: text
+
+  RuntimeError: Python is not installed as a framework. The Mac OS X backend 
+  will not be able to function correctly if Python is not installed as a 
+  framework. See the Python documentation for more information on installing 
+  Python as a framework on Mac OS X. Please either reinstall Python as a 
+  framework, or try one of the other backends. If you are using (Ana)Conda 
+  please install python.app and replace the use of 'python' with 'pythonw'. 
+  See 'Working with Matplotlib on OSX' in the Matplotlib FAQ for more 
+  information.
+
+This is a ``matplotlib``-specific error, that will go away once you run the 
+following command:
 
 .. code-block:: bash
 
-   echo "backend: TkAgg" > ~/.matplotlib/matplotlibrc
+   $ echo "backend: TkAgg" > ~/.matplotlib/matplotlibrc
 
 in order to override the default ``MacOS`` backend for your system, which 
-may not be accessible from inside the virtual environment. This will allow 
+may not be accessible from inside the virtual or conda environment. This will 
-Catalyst to open matplotlib charts from within a virtual environment, which 
+allow Catalyst to open matplotlib charts from within a virtual environment, 
-is useful for displaying the performance of your backtests.  To learn more 
+which is useful for displaying the performance of your backtests.  To learn more 
 about matplotlib backends, please refer to the
 `matplotlib backend documentation <https://matplotlib.org/faq/usage_faq.html#what-is-a-backend>`_.
 
@@ -475,6 +488,33 @@ mentioned above are as follows:
   - ``cd`` into the folder where you downloaded ``VCForPython27.msi``
   - Run ``msiexec /i VCForPython27.msi``
 
+Updating Catalyst
+-----------------
+
+Catalyst is currently in alpha and in under very active development. We release
+new minor versions every few days in response to the thorough battle testing 
+that our user community puts Catalyst in. As a result, you should expect to 
+update Catalyst frequently. Once installed, Catalyst can easily be updated as a 
+``pip`` package regardless of the environemnt used for installation. Make sure 
+you activate your environment first as you did in your first install, and then 
+execute:
+
+.. code-block:: bash
+
+   $ pip uninstall enigma-catalyst
+   $ pip install enigma-catalyst
+
+Alternatively, you could update Catalyst issuing the following command:
+
+.. code-block:: bash
+
+   $ pip install -U enigma-catalyst
+
+but this command will also upgrade all the Catalyst dependencies to the latest 
+versions available, and may have unexpected side effects if a newer version of a 
+dependency inadvertently breaks some functionality that Catalyst relies on. 
+Thus, the first method is the recommended one.
+
 Getting Help
 ------------
 

docs/source/live-trading.rst

@@ -4,11 +4,63 @@ This document explains how to get started with live trading.
 
 Supported Exchanges
 ^^^^^^^^^^^^^^^^^^^
-Catalyst can trade against these exchanges:
 
-- Bitfinex, id= ``bitfinex``
+Since version 0.4, Catalyst integrated with `CCXT <https://github.com/ccxt/ccxt>`_,
-- Bittrex, id= ``bittrex``
+a cryptocurrency trading library with support for more than 90 exchanges. The 
-- Poloniex, id= ``poloniex``
+range of CCXT and Catalyst support for each of those exchanges varies greatly. 
+The most supported exchanges are as follows:
+
+The exchanges available for backtesting are fully supported in live mode:
+
+- Bitfinex, id = ``bitfinex``
+- Bittrex, id = ``bittrex``
+- Poloniex, id = ``poloniex``
+
+Additionally, we have successfully tested the following exchanges:
+
+- Binance, id = ``binance``
+- Bitmex, id = ``bitmex``
+- GDAX, id = ``gdax``
+
+As Catalyst is currently in Alpha and in under active development, you are 
+encouraged to throughly test any exchange in *paper trading* mode before trading
+*live* with it.
+
+Paper Trading vs Live Trading modes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Catalyst currently supports three different modes in which you can execute your
+trading algorithm. The first is backtesting, which is covered extensively in the 
+tutorial, and uses historical data to run your algorithm. There is no 
+interaction with the exchange in backtesting mode, and this is the first mode 
+that you should test any new algorithm.
+
+Once you are confident with the simulations that you have obtained with your
+algorithm in backtesting, you may switch to live trading, where you have two
+different modes:
+* *Paper Trading*: The simulated algorithm runs in real time, and fetches 
+pricing data in real time from the exchange, but the orders never reach the 
+exchange, and are instead kept within Catalyst and simulated. No real currency
+is bought or sold. Think of it as a `backtesting happening in real time`.
+* *Live Trading*: This is the proper live trading mode in which an algorithm
+runs in real time, fetching pricing data from live exchanges and placing orders 
+against the exchange. Real currency is transacted on the exchange driven by the 
+algorithm.
+
+These three modes are controlled by the following variables:
+
++---------------+-------------------------+
+|    Mode       |       Parameters        |
++               +-------+-----------------+
+|               | live  | simulate_orders |
++---------------+-------+-----------------+
+| backtesting   | False | True (default)  |
++---------------+-------+-----------------+
+| paper trading | True  | True            |
++---------------+-------+-----------------+
+| live trading  | True  | False           |
++---------------+-------+-----------------+
+
 
 Authentication
 ^^^^^^^^^^^^^^
@@ -75,7 +127,8 @@ Note that the trading pairs are always referenced in the same manner.
 However, not all trading pairs are available on all exchanges. An
 error will occur if the specified trading pair is not trading
 on the exchange. To check which currency pairs are available on each 
-of the supported exchanges, see `Catalyst Market Coverage <https://www.enigma.co/catalyst/status`_.
+of the supported exchanges, see 
+`Catalyst Market Coverage <https://www.enigma.co/catalyst/status>`_.
 
 Trading an Algorithm
 ^^^^^^^^^^^^^^^^^^^^
@@ -105,20 +158,22 @@ What differs are the arguments provided to the catalyst client or
 
 Here is the breakdown of the new arguments:
 
-- ``live``: Boolean flag which enables live trading.
+- ``live``: Boolean flag which enables live trading. It defaults to ``False``.
 - ``capital_base``: The amount of base_currency assigned to the strategy.
   It has to be lower or equal to the amount of base currency available for
   trading on the exchange. For illustration, order_target_percent(asset, 1)
   will order the capital_base amount specified here of the specified asset.
-- ``exchange_name``: The name of the targeted exchange
+- ``exchange_name``: The name of the targeted exchange. See the 
-  (supported values: *bitfinex*, *bittrex*).
+  `CCXT Supported Exchanges <https://github.com/ccxt/ccxt/wiki/Exchange-Markets>`_ 
+  for the full list.
 - ``algo_namespace``: A arbitrary label assigned to your algorithm for
   data storage purposes.
 - ``base_currency``: The base currency used to calculate the
   statistics of your algorithm. Currently, the base currency of all
   trading pairs of your algorithm must match this value.
 - ``simulate_orders``: Enables the paper trading mode, in which orders are
-  simulated in Catalyst instead of processed on the exchange.
+  simulated in Catalyst instead of processed on the exchange. It defaults to 
+  ``True``.
 
 Here is a complete algorithm for reference:
 `Buy Low and Sell High <https://github.com/enigmampc/catalyst/blob/master/catalyst/examples/buy_low_sell_high_live.py>`_

docs/source/releases.rst

@@ -2,6 +2,36 @@
 Release Notes
 =============
 
+Version 0.4.6
+^^^^^^^^^^^^^
+**Release Date**: 2018-01-18
+
+Bug Fixes
+~~~~~~~~~
+- Fixed some Python3 issues
+- Reading the trade log to get executed order prices on exchanges like Binance (:issue:`151`)
+- Fixed issue with market order executing price (:issue:`150` and :issue:`111`)
+- Implemented standardized symbol mapping (:issue:`157`)
+- Improved error handling for unsupported timeframes (:issue:`159`)
+- Using Bitfinex instead of Poloniex to fetch btc_usdt benchmark (:issue:`161`)
+
+
+Build
+~~~~~
+- Added a `context.state` dict to keep arbitrary state values between runs
+- Added ability to stop live algo at specified end date
+
+Version 0.4.5
+^^^^^^^^^^^^^
+**Release Date**: 2018-01-12
+
+Bug Fixes
+~~~~~~~~~
+- Improved order execution for exchanges supporting trade lists (:issue:`151`)
+- Fixed an issue where requesting history of multiple assets repeats values
+- Raising an error for order amounts smaller than exchange lots
+- Handling multiple req errors with tickers more gracefully (:issue:`160`)
+
 Version 0.4.4
 ^^^^^^^^^^^^^
 **Release Date**: 2018-01-09

etc/python2.7-environment.yml

@@ -20,7 +20,7 @@ dependencies:
   - bcolz==0.12.1
   - bottleneck==1.2.1
   - chardet==3.0.4
-  - ccxt==1.10.565
+  - ccxt==1.10.774
   - click==6.7
   - contextlib2==0.5.5
   - cycler==0.10.0

etc/requirements.txt

@@ -81,6 +81,6 @@ empyrical==0.2.1
 tables==3.3.0
 
 #Catalyst dependencies
-ccxt==1.10.565
+ccxt==1.10.774
 boto3==1.4.8
 redo==1.6

etc/requirements_docs.txt

@@ -1,3 +1,4 @@
 Sphinx>=1.3.2
 numpydoc>=0.5.0
 sphinx-autobuild==0.6.0
+docutils==0.12

tests/exchange/test_bundle.py

@@ -10,7 +10,8 @@ from catalyst.exchange.exchange_bcolz import BcolzExchangeBarReader, \
 from catalyst.exchange.exchange_bundle import ExchangeBundle, \
     BUNDLE_NAME_TEMPLATE
 from catalyst.exchange.utils.bundle_utils import get_bcolz_chunk, \
-    get_start_dt, get_df_from_arrays
+    get_df_from_arrays
+from exchange.utils.datetime_utils import get_start_dt
 from catalyst.exchange.utils.exchange_utils import get_exchange_folder
 from catalyst.exchange.utils.factory import get_exchange
 from catalyst.exchange.utils.stats_utils import df_to_string

tests/exchange/test_ccxt.py

@@ -1,7 +1,9 @@
 import pandas as pd
 from logbook import Logger
 
-from base import BaseExchangeTestCase
+from catalyst.testing import ZiplineTestCase
+from catalyst.testing.fixtures import WithLogger
+from .base import BaseExchangeTestCase
 from catalyst.exchange.ccxt.ccxt_exchange import CCXT
 from catalyst.exchange.exchange_execution import ExchangeLimitOrder
 from catalyst.exchange.utils.exchange_utils import get_exchange_auth
@@ -13,7 +15,7 @@ log = Logger('test_ccxt')
 class TestCCXT(BaseExchangeTestCase):
     @classmethod
     def setup(self):
-        exchange_name = 'binance'
+        exchange_name = 'bitfinex'
         auth = get_exchange_auth(exchange_name)
         self.exchange = CCXT(
             exchange_name=exchange_name,
@@ -56,10 +58,10 @@ class TestCCXT(BaseExchangeTestCase):
     def test_get_candles(self):
         log.info('retrieving candles')
         candles = self.exchange.get_candles(
-            freq='5T',
+            freq='30T',
             assets=[self.exchange.get_asset('eth_btc')],
             bar_count=200,
-            start_dt=pd.to_datetime('2017-01-01', utc=True)
+            start_dt=pd.to_datetime('2017-09-01', utc=True)
         )
 
         for asset in candles:
@@ -70,12 +72,28 @@ class TestCCXT(BaseExchangeTestCase):
     def test_tickers(self):
         log.info('retrieving tickers')
         assets = [
-            self.exchange.get_asset('eng_eth'),
+            self.exchange.get_asset('iot_usd'),
         ]
         tickers = self.exchange.tickers(assets)
         assert len(tickers) == 1
         pass
 
+    def test_my_trades(self):
+        asset = self.exchange.get_asset('dsh_btc')
+
+        trades = self.exchange.get_trades(asset)
+        assert trades
+        pass
+
+    def test_get_executed_order(self):
+        log.info('retrieving executed order')
+        asset = self.exchange.get_asset('eng_eth')
+
+        order = self.exchange.get_order('165784', asset)
+        transactions = self.exchange.process_order(order)
+        assert transactions
+        pass
+
     def test_get_balances(self):
         log.info('testing wallet balances')
         # balances = self.exchange.get_balances()

tests/exchange/test_suites/test_suite_algo.py

@@ -12,7 +12,13 @@ from logbook import TestHandler, WARNING
 from pathtools.path import listdir
 
 filter_algos = [
-    'mean_reversion_simple_custom_fees.py',
+    'buy_and_hodl.py',
+    'buy_btc_simple.py',
+    'buy_low_sell_high.py',
+    'mean_reversion_simple.py',
+    'rsi_profit_target.py',
+    'simple_loop.py',
+    'simple_universe.py',
 ]
 
 
@@ -58,7 +64,7 @@ class TestSuiteAlgo(WithLogger, ZiplineTestCase):
                     initialize=algo.initialize,
                     handle_data=algo.handle_data,
                     analyze=TestSuiteAlgo.analyze,
-                    exchange_name='bitfinex',
+                    exchange_name='poloniex',
                     algo_namespace='test_{}'.format(namespace),
                     base_currency='eth',
                     start=pd.to_datetime('2017-10-01', utc=True),
@@ -67,6 +73,7 @@ class TestSuiteAlgo(WithLogger, ZiplineTestCase):
                 )
                 warnings = [record for record in log_catcher.records if
                             record.level == WARNING]
-                self.assertEqual(0, len(warnings))
 
+                if len(warnings) > 0:
+                    print('WARNINGS:\n{}'.format(warnings))
             pass

tests/exchange/test_suites/test_suite_bundle.py

@@ -1,5 +1,6 @@
 import random
 
+import os
 import pandas as pd
 from logbook import TestHandler
 from pandas.util.testing import assert_frame_equal
@@ -11,7 +12,6 @@ from catalyst.exchange.utils.exchange_utils import get_candles_df
 from catalyst.exchange.utils.factory import get_exchange
 from catalyst.exchange.utils.test_utils import output_df, \
     select_random_assets
-from catalyst.testing.fixtures import WithLogger, ZiplineTestCase
 
 pd.set_option('display.expand_frame_repr', False)
 pd.set_option('precision', 8)
@@ -19,12 +19,13 @@ pd.set_option('display.width', 1000)
 pd.set_option('display.max_colwidth', 1000)
 
 
-class TestSuiteBundle(WithLogger, ZiplineTestCase):
+class TestSuiteBundle:
     @staticmethod
-    def get_data_portal(exchange_names):
+    def get_data_portal(exchanges):
         open_calendar = get_calendar('OPEN')
-        asset_finder = ExchangeAssetFinder()
+        asset_finder = ExchangeAssetFinder(exchanges)
 
+        exchange_names = [exchange.name for exchange in exchanges]
         data_portal = DataPortalExchangeBacktest(
             exchange_names=exchange_names,
             asset_finder=asset_finder,
@@ -45,7 +46,9 @@ class TestSuiteBundle(WithLogger, ZiplineTestCase):
         assets
         end_dt
         bar_count
-        sample_minutes
+        freq
+        data_frequency
+        data_portal
 
         Returns
         -------
@@ -63,10 +66,6 @@ class TestSuiteBundle(WithLogger, ZiplineTestCase):
                 field='close',
                 data_frequency=data_frequency,
             )
-            print('bundle data:\n{}'.format(
-                data['bundle'].tail(10))
-            )
-
             candles = exchange.get_candles(
                 end_dt=end_dt,
                 freq=freq,
@@ -80,24 +79,37 @@ class TestSuiteBundle(WithLogger, ZiplineTestCase):
                 bar_count=bar_count,
                 end_dt=end_dt,
             )
-            print('exchange data:\n{}'.format(
-                data['exchange'].tail(10))
-            )
             for source in data:
                 df = data[source]
-                path = output_df(df, assets, '{}_{}'.format(freq, source))
+                path, folder = output_df(
-                print('saved {}:\n{}'.format(source, path))
+                    df, assets, '{}_{}'.format(freq, source)
+                )
+
+            print('saved {} test results: {}'.format(end_dt, folder))
 
             assert_frame_equal(
                 right=data['bundle'],
                 left=data['exchange'],
-                check_less_precise=True,
+                check_less_precise=1,
             )
+            try:
+                assert_frame_equal(
+                    right=data['bundle'],
+                    left=data['exchange'],
+                    check_less_precise=min([a.decimals for a in assets]),
+                )
+            except Exception as e:
+                print('Some differences were found within a 1 decimal point '
+                      'interval of confidence: {}'.format(e))
+                with open(os.path.join(folder, 'compare.txt'), 'w+') as handle:
+                    handle.write(e.args[0])
+
+            pass
 
     def test_validate_bundles(self):
         # exchange_population = 3
         asset_population = 3
-        data_frequency = random.choice(['minute', 'daily'])
+        data_frequency = random.choice(['minute'])
 
         # bundle = 'dailyBundle' if data_frequency
         #  == 'daily' else 'minuteBundle'
@@ -105,11 +117,9 @@ class TestSuiteBundle(WithLogger, ZiplineTestCase):
         #     population=exchange_population,
         #     features=[bundle],
         # )  # Type: list[Exchange]
-        exchanges = [get_exchange('bitfinex', skip_init=True)]
+        exchanges = [get_exchange('poloniex', skip_init=True)]
 
-        data_portal = TestSuiteBundle.get_data_portal(
+        data_portal = TestSuiteBundle.get_data_portal(exchanges)
-            [exchange.name for exchange in exchanges]
-        )
         for exchange in exchanges:
             exchange.init()
 

tests/exchange/test_suites/test_suite_exchange.py

@@ -15,6 +15,7 @@ from catalyst.exchange.utils.test_utils import select_random_exchanges, \
     handle_exchange_error, select_random_assets
 from catalyst.testing import ZiplineTestCase
 from catalyst.testing.fixtures import WithLogger
+from exchange.utils.factory import get_exchanges
 
 log = Logger('TestSuiteExchange')
 
@@ -83,12 +84,13 @@ class TestSuiteExchange(WithLogger, ZiplineTestCase):
 
     def test_tickers(self):
         exchange_population = 3
-        asset_population = 3
+        asset_population = 15
 
-        exchanges = select_random_exchanges(
+        # exchanges = select_random_exchanges(
-            exchange_population,
+        #     exchange_population,
-            features=['fetchTickers'],
+        #     features=['fetchTickers'],
-        )  # Type: list[Exchange]
+        # )  # Type: list[Exchange]
+        exchanges = list(get_exchanges(['bitfinex']).values())
         for exchange in exchanges:
             exchange.init()
 
@@ -184,13 +186,13 @@ class TestSuiteExchange(WithLogger, ZiplineTestCase):
                 )
                 sleep(1)
 
-                open_order, _ = exchange.get_order(order.id, asset)
+                open_order = exchange.get_order(order.id, asset)
                 self.assertEqual(0, open_order.status)
 
                 exchange.cancel_order(open_order, asset)
                 sleep(1)
 
-                canceled_order, _ = exchange.get_order(open_order.id, asset)
+                canceled_order = exchange.get_order(open_order.id, asset)
                 warnings = [record for record in log_catcher.records if
                             record.level == WARNING]