From 14e21765f207a29ac85900528114ac8449f0a00b Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 17 Sep 2018 19:44:40 +0200 Subject: [PATCH 1/2] Fix missing column to load current backtesting export files --- scripts/plot_dataframe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py index 0f0a3d4cb..68713f296 100755 --- a/scripts/plot_dataframe.py +++ b/scripts/plot_dataframe.py @@ -73,7 +73,7 @@ def load_trades(args: Namespace, pair: str, timerange: TimeRange) -> pd.DataFram file = Path(args.exportfilename) # must align with columns in backtest.py columns = ["pair", "profit", "opents", "closets", "index", "duration", - "open_rate", "close_rate", "open_at_end"] + "open_rate", "close_rate", "open_at_end", "sell_reason"] with file.open() as f: data = json.load(f) trades = pd.DataFrame(data, columns=columns) From 176bae2d598dac5d5d42c2d35b93d5915efd56e1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 17 Sep 2018 19:57:47 +0200 Subject: [PATCH 2/2] Set default-db url in configuration, not arguments * Fixes a bug in plot_dataframe.py (#1217) * db_url is eventually overwritten here anyway. --- freqtrade/arguments.py | 1 - freqtrade/configuration.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/freqtrade/arguments.py b/freqtrade/arguments.py index 501c1784f..bb571b4ea 100644 --- a/freqtrade/arguments.py +++ b/freqtrade/arguments.py @@ -119,7 +119,6 @@ class Arguments(object): help='Override trades database URL, this is useful if dry_run is enabled' ' or in custom deployments (default: %(default)s)', dest='db_url', - default=constants.DEFAULT_DB_PROD_URL, type=str, metavar='PATH', ) diff --git a/freqtrade/configuration.py b/freqtrade/configuration.py index 3da432b1d..4e1137f33 100644 --- a/freqtrade/configuration.py +++ b/freqtrade/configuration.py @@ -110,9 +110,12 @@ class Configuration(object): '(not applicable with Backtesting and Hyperopt)' ) - if self.args.db_url != constants.DEFAULT_DB_PROD_URL: + if self.args.db_url and self.args.db_url != constants.DEFAULT_DB_PROD_URL: config.update({'db_url': self.args.db_url}) logger.info('Parameter --db-url detected ...') + else: + # Set default here + config.update({'db_url': constants.DEFAULT_DB_PROD_URL}) if config.get('dry_run', False): logger.info('Dry run is enabled')