diff --git a/catalyst/__main__.py b/catalyst/__main__.py index 7fd27c2e..db37f24d 100644 --- a/catalyst/__main__.py +++ b/catalyst/__main__.py @@ -255,8 +255,9 @@ def run(ctx, ctx.fail("must specify a base currency with '-c' in backtest mode") if capital_base is None: - ctx.fail("must specify a capital base with '--capital-base'" - " in backtest mode") + ctx.fail("must specify a capital base with '--capital-base'") + + click.echo('Running in backtesting mode.') perf = _run( initialize=None, @@ -429,11 +430,22 @@ def live(ctx, if exchange_name is None: ctx.fail("must specify an exchange name '-x'") + if algo_namespace is None: ctx.fail("must specify an algorithm name '-n' in live execution mode") + if base_currency is None: ctx.fail("must specify a base currency '-c' in live execution mode") + if capital_base is None: + ctx.fail("must specify a capital base with '--capital-base'") + + if simulate_orders: + click.echo('Running in paper trading mode.') + + else: + click.echo('Running in live trading mode.') + perf = _run( initialize=None, handle_data=None, diff --git a/catalyst/utils/run_algo.py b/catalyst/utils/run_algo.py index ec20ad85..153e3af6 100644 --- a/catalyst/utils/run_algo.py +++ b/catalyst/utils/run_algo.py @@ -141,7 +141,8 @@ def _run(handle_data, else: click.echo(algotext) - mode = 'live' if live else 'backtest' + mode = 'paper-trading' if simulate_orders else 'live-trading' \ + if live else 'backtest' log.info('running algo in {mode} mode'.format(mode=mode)) exchange_name = exchange