diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 5473e95e1..ffe942773 100755 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -65,8 +65,8 @@ ARGS_BUILD_CONFIG = ["config"] ARGS_BUILD_STRATEGY = ["user_data_dir", "strategy", "template"] +ARGS_CONVERT_DATA_TRADES = ["pairs", "format_from_trades", "format_to", "erase", "exchange"] ARGS_CONVERT_DATA = ["pairs", "format_from", "format_to", "erase", "exchange"] - ARGS_CONVERT_DATA_OHLCV = ARGS_CONVERT_DATA + ["timeframes", "trading_mode", "candle_types"] ARGS_CONVERT_TRADES = ["pairs", "timeframes", "exchange", "dataformat_ohlcv", "dataformat_trades"] @@ -265,7 +265,7 @@ class Arguments: parents=[_common_parser], ) convert_trade_data_cmd.set_defaults(func=partial(start_convert_data, ohlcv=False)) - self._build_args(optionlist=ARGS_CONVERT_DATA, parser=convert_trade_data_cmd) + self._build_args(optionlist=ARGS_CONVERT_DATA_TRADES, parser=convert_trade_data_cmd) # Add trades-to-ohlcv subcommand convert_trade_data_cmd = subparsers.add_parser( diff --git a/freqtrade/commands/cli_options.py b/freqtrade/commands/cli_options.py index 586318e30..53147856d 100755 --- a/freqtrade/commands/cli_options.py +++ b/freqtrade/commands/cli_options.py @@ -421,6 +421,12 @@ AVAILABLE_CLI_OPTIONS = { 'desired timeframe as specified as --timeframes/-t.', action='store_true', ), + "format_from_trades": Arg( + '--format-from', + help='Source format for data conversion.', + choices=constants.AVAILABLE_DATAHANDLERS + ['csv'], + required=True, + ), "format_from": Arg( '--format-from', help='Source format for data conversion.', diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py index bccc6ea9a..229373400 100644 --- a/freqtrade/commands/data_commands.py +++ b/freqtrade/commands/data_commands.py @@ -85,7 +85,7 @@ def start_convert_data(args: Dict[str, Any], ohlcv: bool = True) -> None: erase=args['erase']) else: convert_trades_format(config, - convert_from=args['format_from'], convert_to=args['format_to'], + convert_from=args['format_from_trades'], convert_to=args['format_to'], erase=args['erase'])