diff --git a/freqtrade/arguments.py b/freqtrade/arguments.py index 1ec32d1f0..f020252f8 100644 --- a/freqtrade/arguments.py +++ b/freqtrade/arguments.py @@ -10,6 +10,358 @@ import arrow from freqtrade import __version__, constants +def check_int_positive(value: str) -> int: + try: + uint = int(value) + if uint <= 0: + raise ValueError + except ValueError: + raise argparse.ArgumentTypeError( + f"{value} is invalid for this parameter, should be a positive integer value" + ) + return uint + + +class Arg: + # Optional CLI arguments + def __init__(self, *args, **kwargs): + self.cli = args + self.kwargs = kwargs + + +# List of available command line arguments +AVAILABLE_CLI_OPTIONS = { + # Common arguments + "loglevel": Arg( + '-v', '--verbose', + help='Verbose mode (-vv for more, -vvv to get all messages).', + action='count', + dest='loglevel', + default=0, + ), + "logfile": Arg( + '--logfile', + help='Log to the file specified.', + dest='logfile', + metavar='FILE', + ), + + "version": Arg( + '--version', + action='version', + version=f'%(prog)s {__version__}' + ), + "config": Arg( + '-c', '--config', + help=f'Specify configuration file (default: `{constants.DEFAULT_CONFIG}`). ' + f'Multiple --config options may be used. ' + f'Can be set to `-` to read config from stdin.', + dest='config', + action='append', + metavar='PATH',), + "datadir": Arg( + '-d', '--datadir', + help='Path to backtest data.', + dest='datadir', + metavar='PATH',), + # Main options + "strategy": Arg( + '-s', '--strategy', + help='Specify strategy class name (default: `%(default)s`).', + dest='strategy', + default='DefaultStrategy', + metavar='NAME', + ), + "strategy_path": Arg( + '--strategy-path', + help='Specify additional strategy lookup path.', + dest='strategy_path', + metavar='PATH', + ), + "dynamic_whitelist": Arg( + '--dynamic-whitelist', + help='Dynamically generate and update whitelist ' + 'based on 24h BaseVolume (default: %(const)s). ' + 'DEPRECATED.', + dest='dynamic_whitelist', + const=constants.DYNAMIC_WHITELIST, + type=int, + metavar='INT', + nargs='?', + ), + "db_url": Arg( + '--db-url', + help=f'Override trades database URL, this is useful in custom deployments ' + f'(default: `{constants.DEFAULT_DB_PROD_URL}` for Live Run mode, ' + f'`{constants.DEFAULT_DB_DRYRUN_URL}` for Dry Run).', + dest='db_url', + metavar='PATH', + ), + "sd_notify": Arg( + '--sd-notify', + help='Notify systemd service manager.', + action='store_true', + dest='sd_notify', + ), + # Optimize common + "ticker_interval": Arg( + '-i', '--ticker-interval', + help='Specify ticker interval (`1m`, `5m`, `30m`, `1h`, `1d`).', + dest='ticker_interval', + ), + "timerange": Arg( + '--timerange', + help='Specify what timerange of data to use.', + dest='timerange', + ), + "max_open_trades": Arg( + '--max_open_trades', + help='Specify max_open_trades to use.', + type=int, + dest='max_open_trades', + ), + "stake_amount": Arg( + '--stake_amount', + help='Specify stake_amount.', + type=float, + dest='stake_amount', + ), + "refresh_pairs": Arg( + '-r', '--refresh-pairs-cached', + help='Refresh the pairs files in tests/testdata with the latest data from the ' + 'exchange. Use it if you want to run your optimization commands with ' + 'up-to-date data.', + action='store_true', + dest='refresh_pairs', + ), + # backtesting + "position_stacking": Arg( + '--eps', '--enable-position-stacking', + help='Allow buying the same pair multiple times (position stacking).', + action='store_true', + dest='position_stacking', + default=False + ), + "use_max_market_positions": Arg( + '--dmmp', '--disable-max-market-positions', + help='Disable applying `max_open_trades` during backtest ' + '(same as setting `max_open_trades` to a very high number).', + action='store_false', + dest='use_max_market_positions', + default=True + ), + "live": Arg( + '-l', '--live', + help='Use live data.', + action='store_true', + dest='live', + ), + "strategy_list": Arg( + '--strategy-list', + help='Provide a comma-separated list of strategies to backtest. ' + 'Please note that ticker-interval needs to be set either in config ' + 'or via command line. When using this together with `--export trades`, ' + 'the strategy-name is injected into the filename ' + '(so `backtest-data.json` becomes `backtest-data-DefaultStrategy.json`', + nargs='+', + dest='strategy_list', + ), + "export": Arg( + '--export', + help='Export backtest results, argument are: trades. ' + 'Example: `--export=trades`', + dest='export', + ), + "exportfilename": Arg( + '--export-filename', + help='Save backtest results to the file with this filename (default: `%(default)s`). ' + 'Requires `--export` to be set as well. ' + 'Example: `--export-filename=user_data/backtest_data/backtest_today.json`', + default=os.path.join('user_data', 'backtest_data', + 'backtest-result.json'), + dest='exportfilename', + metavar='PATH', + ), + # Edge + "stoploss_range": Arg( + '--stoplosses', + help='Defines a range of stoploss values against which edge will assess the strategy. ' + 'The format is "min,max,step" (without any space). ' + 'Example: `--stoplosses=-0.01,-0.1,-0.001`', + dest='stoploss_range', + ), + # hyperopt + "hyperopt": Arg( + '--customhyperopt', + help='Specify hyperopt class name (default: `%(default)s`).', + dest='hyperopt', + default=constants.DEFAULT_HYPEROPT, + metavar='NAME', + ), + "epochs": Arg( + '-e', '--epochs', + help='Specify number of epochs (default: %(default)d).', + dest='epochs', + default=constants.HYPEROPT_EPOCH, + type=int, + metavar='INT', + ), + "spaces": Arg( + '-s', '--spaces', + help='Specify which parameters to hyperopt. Space-separated list. ' + 'Default: `%(default)s`.', + choices=['all', 'buy', 'sell', 'roi', 'stoploss'], + default='all', + nargs='+', + dest='spaces', + ), + "print_all": Arg( + '--print-all', + help='Print all results, not only the best ones.', + action='store_true', + dest='print_all', + default=False + ), + "hyperopt_jobs": Arg( + '-j', '--job-workers', + help='The number of concurrently running jobs for hyperoptimization ' + '(hyperopt worker processes). ' + 'If -1 (default), all CPUs are used, for -2, all CPUs but one are used, etc. ' + 'If 1 is given, no parallel computing code is used at all.', + dest='hyperopt_jobs', + default=-1, + type=int, + metavar='JOBS', + ), + "hyperopt_random_state": Arg( + '--random-state', + help='Set random state to some positive integer for reproducible hyperopt results.', + dest='hyperopt_random_state', + type=check_int_positive, + metavar='INT', + ), + "hyperopt_min_trades": Arg( + '--min-trades', + help="Set minimal desired number of trades for evaluations in the hyperopt " + "optimization path (default: 1).", + dest='hyperopt_min_trades', + default=1, + type=check_int_positive, + metavar='INT', + ), + # List_exchange + "print_one_column": Arg( + '-1', '--one-column', + help='Print exchanges in one column.', + action='store_true', + dest='print_one_column', + ), + # script_options + "pairs": Arg( + '-p', '--pairs', + help='Show profits for only these pairs. Pairs are comma-separated.', + dest='pairs', + ), + # Download data + + "pairs_file": Arg( + '--pairs-file', + help='File containing a list of pairs to download.', + dest='pairs_file', + metavar='FILE', + ), + "days": Arg( + '--days', + help='Download data for given number of days.', + dest='days', + type=check_int_positive, + metavar='INT', + ), + "exchange": Arg( + '--exchange', + help=f'Exchange name (default: `{constants.DEFAULT_EXCHANGE}`). ' + f'Only valid if no config is provided.', + dest='exchange', + ), + "timeframes": Arg( + '-t', '--timeframes', + help=f'Specify which tickers to download. Space-separated list. ' + f'Default: `{constants.DEFAULT_DOWNLOAD_TICKER_INTERVALS}`.', + choices=['1m', '3m', '5m', '15m', '30m', '1h', '2h', '4h', + '6h', '8h', '12h', '1d', '3d', '1w'], + nargs='+', + dest='timeframes', + ), + "erase": Arg( + '--erase', + help='Clean all existing data for the selected exchange/pairs/timeframes.', + dest='erase', + action='store_true', + ), + # Plot_df_options + "indicators1": Arg( + '--indicators1', + help='Set indicators from your strategy you want in the first row of the graph. ' + 'Comma-separated list. Example: `ema3,ema5`. Default: `%(default)s`.', + default='sma,ema3,ema5', + dest='indicators1', + ), + "indicators2": Arg( + '--indicators2', + help='Set indicators from your strategy you want in the third row of the graph. ' + 'Comma-separated list. Example: `fastd,fastk`. Default: `%(default)s`.', + default='macd,macdsignal', + dest='indicators2', + ), + "plot_limit": Arg( + '--plot-limit', + help='Specify tick limit for plotting. Notice: too high values cause huge files. ' + 'Default: %(default)s.', + dest='plot_limit', + default=750, + type=int, + ), + "trade_source": Arg( + '--trade-source', + help='Specify the source for trades (Can be DB or file (backtest file)) ' + 'Default: %(default)s', + dest='trade_source', + default="file", + choices=["DB", "file"] + ) +} + +ARGS_COMMON = ["loglevel", "logfile", "version", "config", "datadir"] +ARGS_STRATEGY = ["strategy", "strategy_path"] + +ARGS_MAIN = ARGS_COMMON + ARGS_STRATEGY + ["dynamic_whitelist", "db_url", "sd_notify"] + +ARGS_COMMON_OPTIMIZE = ["loglevel", "ticker_interval", "timerange", + "max_open_trades", "stake_amount", "refresh_pairs"] + +ARGS_BACKTEST = ARGS_COMMON_OPTIMIZE + ["position_stacking", "use_max_market_positions", + "live", "strategy_list", "export", "exportfilename"] + +ARGS_HYPEROPT = ARGS_COMMON_OPTIMIZE + ["hyperopt", "position_stacking", "epochs", "spaces", + "use_max_market_positions", "print_all", "hyperopt_jobs", + "hyperopt_random_state", "hyperopt_min_trades"] + +ARGS_EDGE = ARGS_COMMON_OPTIMIZE + ["stoploss_range"] + + +ARGS_LIST_EXCHANGE = ["print_one_column"] + +ARGS_DOWNLOADER = ARGS_COMMON + ["pairs", "pairs_file", "days", "exchange", "timeframes", "erase"] + +ARGS_PLOT_DATAFRAME = (ARGS_COMMON + ARGS_STRATEGY + + ["pairs", "indicators1", "indicators2", "plot_limit", "db_url", + "trade_source", "export", "exportfilename", "timerange", + "refresh_pairs", "live"]) + +ARGS_PLOT_PROFIT = (ARGS_COMMON + ARGS_STRATEGY + + ["pairs", "timerange", "export", "exportfilename"]) + + class TimeRange(NamedTuple): """ NamedTuple Defining timerange inputs. @@ -33,8 +385,8 @@ class Arguments(object): self.parser = argparse.ArgumentParser(description=description) def _load_args(self) -> None: - self.common_options() - self.main_options() + self.build_args(optionlist=ARGS_MAIN) + self._build_subcommands() def get_parsed_arg(self) -> argparse.Namespace: @@ -61,288 +413,12 @@ class Arguments(object): return parsed_arg - def common_options(self) -> None: - """ - Parses arguments that are common for the main Freqtrade, all subcommands and scripts. - """ - parser = self.parser + def build_args(self, optionlist, parser=None): + parser = parser or self.parser - parser.add_argument( - '-v', '--verbose', - help='Verbose mode (-vv for more, -vvv to get all messages).', - action='count', - dest='loglevel', - default=0, - ) - parser.add_argument( - '--logfile', - help='Log to the file specified.', - dest='logfile', - metavar='FILE', - ) - parser.add_argument( - '--version', - action='version', - version=f'%(prog)s {__version__}' - ) - parser.add_argument( - '-c', '--config', - help=f'Specify configuration file (default: `{constants.DEFAULT_CONFIG}`). ' - f'Multiple --config options may be used. ' - f'Can be set to `-` to read config from stdin.', - dest='config', - action='append', - metavar='PATH', - ) - parser.add_argument( - '-d', '--datadir', - help='Path to backtest data.', - dest='datadir', - metavar='PATH', - ) - - def main_options(self) -> None: - """ - Parses arguments for the main Freqtrade. - """ - parser = self.parser - - parser.add_argument( - '-s', '--strategy', - help='Specify strategy class name (default: `%(default)s`).', - dest='strategy', - default='DefaultStrategy', - metavar='NAME', - ) - parser.add_argument( - '--strategy-path', - help='Specify additional strategy lookup path.', - dest='strategy_path', - metavar='PATH', - ) - parser.add_argument( - '--dynamic-whitelist', - help='Dynamically generate and update whitelist ' - 'based on 24h BaseVolume (default: %(const)s). ' - 'DEPRECATED.', - dest='dynamic_whitelist', - const=constants.DYNAMIC_WHITELIST, - type=int, - metavar='INT', - nargs='?', - ) - parser.add_argument( - '--db-url', - help=f'Override trades database URL, this is useful in custom deployments ' - f'(default: `{constants.DEFAULT_DB_PROD_URL}` for Live Run mode, ' - f'`{constants.DEFAULT_DB_DRYRUN_URL}` for Dry Run).', - dest='db_url', - metavar='PATH', - ) - parser.add_argument( - '--sd-notify', - help='Notify systemd service manager.', - action='store_true', - dest='sd_notify', - ) - - def common_optimize_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses arguments common for Backtesting, Edge and Hyperopt modules. - :param parser: - """ - parser = subparser or self.parser - - parser.add_argument( - '-i', '--ticker-interval', - help='Specify ticker interval (`1m`, `5m`, `30m`, `1h`, `1d`).', - dest='ticker_interval', - ) - parser.add_argument( - '--timerange', - help='Specify what timerange of data to use.', - dest='timerange', - ) - parser.add_argument( - '--max_open_trades', - help='Specify max_open_trades to use.', - type=int, - dest='max_open_trades', - ) - parser.add_argument( - '--stake_amount', - help='Specify stake_amount.', - type=float, - dest='stake_amount', - ) - parser.add_argument( - '-r', '--refresh-pairs-cached', - help='Refresh the pairs files in tests/testdata with the latest data from the ' - 'exchange. Use it if you want to run your optimization commands with ' - 'up-to-date data.', - action='store_true', - dest='refresh_pairs', - ) - - def backtesting_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses given arguments for Backtesting module. - """ - parser = subparser or self.parser - - parser.add_argument( - '--eps', '--enable-position-stacking', - help='Allow buying the same pair multiple times (position stacking).', - action='store_true', - dest='position_stacking', - default=False - ) - parser.add_argument( - '--dmmp', '--disable-max-market-positions', - help='Disable applying `max_open_trades` during backtest ' - '(same as setting `max_open_trades` to a very high number).', - action='store_false', - dest='use_max_market_positions', - default=True - ) - parser.add_argument( - '-l', '--live', - help='Use live data.', - action='store_true', - dest='live', - ) - parser.add_argument( - '--strategy-list', - help='Provide a comma-separated list of strategies to backtest. ' - 'Please note that ticker-interval needs to be set either in config ' - 'or via command line. When using this together with `--export trades`, ' - 'the strategy-name is injected into the filename ' - '(so `backtest-data.json` becomes `backtest-data-DefaultStrategy.json`', - nargs='+', - dest='strategy_list', - ) - parser.add_argument( - '--export', - help='Export backtest results, argument are: trades. ' - 'Example: `--export=trades`', - dest='export', - ) - parser.add_argument( - '--export-filename', - help='Save backtest results to the file with this filename (default: `%(default)s`). ' - 'Requires `--export` to be set as well. ' - 'Example: `--export-filename=user_data/backtest_data/backtest_today.json`', - default=os.path.join('user_data', 'backtest_data', 'backtest-result.json'), - dest='exportfilename', - metavar='PATH', - ) - - def edge_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses given arguments for Edge module. - """ - parser = subparser or self.parser - - parser.add_argument( - '--stoplosses', - help='Defines a range of stoploss values against which edge will assess the strategy. ' - 'The format is "min,max,step" (without any space). ' - 'Example: `--stoplosses=-0.01,-0.1,-0.001`', - dest='stoploss_range', - ) - - def hyperopt_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses given arguments for Hyperopt module. - """ - parser = subparser or self.parser - - parser.add_argument( - '--customhyperopt', - help='Specify hyperopt class name (default: `%(default)s`).', - dest='hyperopt', - default=constants.DEFAULT_HYPEROPT, - metavar='NAME', - ) - parser.add_argument( - '--eps', '--enable-position-stacking', - help='Allow buying the same pair multiple times (position stacking).', - action='store_true', - dest='position_stacking', - default=False - ) - parser.add_argument( - '--dmmp', '--disable-max-market-positions', - help='Disable applying `max_open_trades` during backtest ' - '(same as setting `max_open_trades` to a very high number).', - action='store_false', - dest='use_max_market_positions', - default=True - ) - parser.add_argument( - '-e', '--epochs', - help='Specify number of epochs (default: %(default)d).', - dest='epochs', - default=constants.HYPEROPT_EPOCH, - type=int, - metavar='INT', - ) - parser.add_argument( - '-s', '--spaces', - help='Specify which parameters to hyperopt. Space-separated list. ' - 'Default: `%(default)s`.', - choices=['all', 'buy', 'sell', 'roi', 'stoploss'], - default='all', - nargs='+', - dest='spaces', - ) - parser.add_argument( - '--print-all', - help='Print all results, not only the best ones.', - action='store_true', - dest='print_all', - default=False - ) - parser.add_argument( - '-j', '--job-workers', - help='The number of concurrently running jobs for hyperoptimization ' - '(hyperopt worker processes). ' - 'If -1 (default), all CPUs are used, for -2, all CPUs but one are used, etc. ' - 'If 1 is given, no parallel computing code is used at all.', - dest='hyperopt_jobs', - default=-1, - type=int, - metavar='JOBS', - ) - parser.add_argument( - '--random-state', - help='Set random state to some positive integer for reproducible hyperopt results.', - dest='hyperopt_random_state', - type=Arguments.check_int_positive, - metavar='INT', - ) - parser.add_argument( - '--min-trades', - help="Set minimal desired number of trades for evaluations in the hyperopt " - "optimization path (default: 1).", - dest='hyperopt_min_trades', - default=1, - type=Arguments.check_int_positive, - metavar='INT', - ) - - def list_exchanges_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses given arguments for the list-exchanges command. - """ - parser = subparser or self.parser - - parser.add_argument( - '-1', '--one-column', - help='Print exchanges in one column.', - action='store_true', - dest='print_one_column', - ) + for val in optionlist: + opt = AVAILABLE_CLI_OPTIONS[val] + parser.add_argument(*opt.cli, **opt.kwargs) def _build_subcommands(self) -> None: """ @@ -357,20 +433,17 @@ class Arguments(object): # Add backtesting subcommand backtesting_cmd = subparsers.add_parser('backtesting', help='Backtesting module.') backtesting_cmd.set_defaults(func=start_backtesting) - self.common_optimize_options(backtesting_cmd) - self.backtesting_options(backtesting_cmd) + self.build_args(optionlist=ARGS_BACKTEST, parser=backtesting_cmd) # Add edge subcommand edge_cmd = subparsers.add_parser('edge', help='Edge module.') edge_cmd.set_defaults(func=start_edge) - self.common_optimize_options(edge_cmd) - self.edge_options(edge_cmd) + self.build_args(optionlist=ARGS_EDGE, parser=edge_cmd) # Add hyperopt subcommand hyperopt_cmd = subparsers.add_parser('hyperopt', help='Hyperopt module.') hyperopt_cmd.set_defaults(func=start_hyperopt) - self.common_optimize_options(hyperopt_cmd) - self.hyperopt_options(hyperopt_cmd) + self.build_args(optionlist=ARGS_HYPEROPT, parser=hyperopt_cmd) # Add list-exchanges subcommand list_exchanges_cmd = subparsers.add_parser( @@ -378,7 +451,7 @@ class Arguments(object): help='Print available exchanges.' ) list_exchanges_cmd.set_defaults(func=start_list_exchanges) - self.list_exchanges_options(list_exchanges_cmd) + self.build_args(optionlist=ARGS_LIST_EXCHANGE, parser=list_exchanges_cmd) @staticmethod def parse_timerange(text: Optional[str]) -> TimeRange: @@ -421,106 +494,3 @@ class Arguments(object): stop = int(stops) return TimeRange(stype[0], stype[1], start, stop) raise Exception('Incorrect syntax for timerange "%s"' % text) - - @staticmethod - def check_int_positive(value: str) -> int: - try: - uint = int(value) - if uint <= 0: - raise ValueError - except ValueError: - raise argparse.ArgumentTypeError( - f"{value} is invalid for this parameter, should be a positive integer value" - ) - return uint - - def common_scripts_options(self, subparser: argparse.ArgumentParser = None) -> None: - """ - Parses arguments common for scripts. - """ - parser = subparser or self.parser - - parser.add_argument( - '-p', '--pairs', - help='Show profits for only these pairs. Pairs are comma-separated.', - dest='pairs', - ) - - def download_data_options(self) -> None: - """ - Parses given arguments for testdata download script - """ - parser = self.parser - - parser.add_argument( - '--pairs-file', - help='File containing a list of pairs to download.', - dest='pairs_file', - metavar='FILE', - ) - parser.add_argument( - '--days', - help='Download data for given number of days.', - dest='days', - type=Arguments.check_int_positive, - metavar='INT', - ) - parser.add_argument( - '--exchange', - help=f'Exchange name (default: `{constants.DEFAULT_EXCHANGE}`). ' - f'Only valid if no config is provided.', - dest='exchange', - ) - parser.add_argument( - '-t', '--timeframes', - help=f'Specify which tickers to download. Space-separated list. ' - f'Default: `{constants.DEFAULT_DOWNLOAD_TICKER_INTERVALS}`.', - choices=['1m', '3m', '5m', '15m', '30m', '1h', '2h', '4h', - '6h', '8h', '12h', '1d', '3d', '1w'], - nargs='+', - dest='timeframes', - ) - parser.add_argument( - '--erase', - help='Clean all existing data for the selected exchange/pairs/timeframes.', - dest='erase', - action='store_true' - ) - - def plot_dataframe_options(self) -> None: - """ - Parses given arguments for plot dataframe script - """ - parser = self.parser - - parser.add_argument( - '--indicators1', - help='Set indicators from your strategy you want in the first row of the graph. ' - 'Comma-separated list. Example: `ema3,ema5`. Default: `%(default)s`.', - default='sma,ema3,ema5', - dest='indicators1', - ) - - parser.add_argument( - '--indicators2', - help='Set indicators from your strategy you want in the third row of the graph. ' - 'Comma-separated list. Example: `fastd,fastk`. Default: `%(default)s`.', - default='macd,macdsignal', - dest='indicators2', - ) - parser.add_argument( - '--plot-limit', - help='Specify tick limit for plotting. Notice: too high values cause huge files. ' - 'Default: %(default)s.', - dest='plot_limit', - default=750, - type=int, - ) - parser.add_argument( - '--trade-source', - help='Specify the source for trades (Can be DB or file (backtest file)) ' - 'Default: %(default)s', - dest='trade_source', - default="file", - choices=["DB", "file"] - ) diff --git a/freqtrade/tests/test_arguments.py b/freqtrade/tests/test_arguments.py index d9292bdb5..c9d2a2261 100644 --- a/freqtrade/tests/test_arguments.py +++ b/freqtrade/tests/test_arguments.py @@ -3,7 +3,8 @@ import argparse import pytest -from freqtrade.arguments import Arguments, TimeRange +from freqtrade.arguments import (ARGS_DOWNLOADER, ARGS_PLOT_DATAFRAME, + Arguments, TimeRange, check_int_positive) # Parse common command-line-arguments. Used for all tools @@ -49,8 +50,8 @@ def test_parse_args_verbose() -> None: def test_common_scripts_options() -> None: arguments = Arguments(['-p', 'ETH/BTC'], '') - arguments.common_scripts_options() - args = arguments.get_parsed_arg() + arguments.build_args(ARGS_DOWNLOADER) + args = arguments.parse_args() assert args.pairs == 'ETH/BTC' @@ -178,8 +179,8 @@ def test_download_data_options() -> None: '--exchange', 'binance' ] arguments = Arguments(args, '') - arguments.common_options() - arguments.download_data_options() + arguments.build_args(ARGS_DOWNLOADER) + args = arguments.parse_args() assert args.pairs_file == 'file_with_pairs' assert args.datadir == 'datadir/folder' @@ -195,8 +196,7 @@ def test_plot_dataframe_options() -> None: '-p', 'UNITTEST/BTC', ] arguments = Arguments(args, '') - arguments.common_scripts_options() - arguments.plot_dataframe_options() + arguments.build_args(ARGS_PLOT_DATAFRAME) pargs = arguments.parse_args(True) assert pargs.indicators1 == "sma10,sma100" assert pargs.indicators2 == "macd,fastd,fastk" @@ -206,18 +206,18 @@ def test_plot_dataframe_options() -> None: def test_check_int_positive() -> None: - assert Arguments.check_int_positive("3") == 3 - assert Arguments.check_int_positive("1") == 1 - assert Arguments.check_int_positive("100") == 100 + assert check_int_positive("3") == 3 + assert check_int_positive("1") == 1 + assert check_int_positive("100") == 100 with pytest.raises(argparse.ArgumentTypeError): - Arguments.check_int_positive("-2") + check_int_positive("-2") with pytest.raises(argparse.ArgumentTypeError): - Arguments.check_int_positive("0") + check_int_positive("0") with pytest.raises(argparse.ArgumentTypeError): - Arguments.check_int_positive("3.5") + check_int_positive("3.5") with pytest.raises(argparse.ArgumentTypeError): - Arguments.check_int_positive("DeadBeef") + check_int_positive("DeadBeef") diff --git a/scripts/download_backtest_data.py b/scripts/download_backtest_data.py index dd4627c14..472b3ef4e 100755 --- a/scripts/download_backtest_data.py +++ b/scripts/download_backtest_data.py @@ -8,7 +8,7 @@ import sys from pathlib import Path from typing import Any, Dict, List -from freqtrade.arguments import Arguments, TimeRange +from freqtrade.arguments import Arguments, TimeRange, ARGS_DOWNLOADER from freqtrade.configuration import Configuration from freqtrade.data.history import download_pair_history from freqtrade.exchange import Exchange @@ -21,8 +21,7 @@ logger = logging.getLogger('download_backtest_data') DEFAULT_DL_PATH = 'user_data/data' arguments = Arguments(sys.argv[1:], 'Download backtest data') -arguments.common_options() -arguments.download_data_options() +arguments.build_args(ARGS_DOWNLOADER) # Do not read the default config if config is not specified # in the command line options explicitely diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py index 7eaf0b337..7e81af925 100755 --- a/scripts/plot_dataframe.py +++ b/scripts/plot_dataframe.py @@ -31,7 +31,7 @@ from typing import Any, Dict, List import pandas as pd -from freqtrade.arguments import Arguments +from freqtrade.arguments import ARGS_PLOT_DATAFRAME, Arguments from freqtrade.data import history from freqtrade.data.btanalysis import (extract_trades_of_period, load_backtest_data, load_trades_from_db) @@ -125,12 +125,8 @@ def plot_parse_args(args: List[str]) -> Dict[str, Any]: :return: args: Array with all arguments """ arguments = Arguments(args, 'Graph dataframe') - arguments.common_options() - arguments.main_options() - arguments.common_optimize_options() - arguments.backtesting_options() - arguments.common_scripts_options() - arguments.plot_dataframe_options() + arguments.build_args(optionlist=ARGS_PLOT_DATAFRAME) + parsed_args = arguments.parse_args() # Load the configuration diff --git a/scripts/plot_profit.py b/scripts/plot_profit.py index fd98c120c..32bfae9cc 100755 --- a/scripts/plot_profit.py +++ b/scripts/plot_profit.py @@ -24,7 +24,7 @@ import plotly.graph_objs as go from plotly import tools from plotly.offline import plot -from freqtrade.arguments import Arguments +from freqtrade.arguments import Arguments, ARGS_PLOT_PROFIT from freqtrade.configuration import Configuration from freqtrade.data import history from freqtrade.exchange import timeframe_to_seconds @@ -206,11 +206,7 @@ def plot_parse_args(args: List[str]) -> Namespace: :return: args: Array with all arguments """ arguments = Arguments(args, 'Graph profits') - arguments.common_options() - arguments.main_options() - arguments.common_optimize_options() - arguments.backtesting_options() - arguments.common_scripts_options() + arguments.build_args(optionlist=ARGS_PLOT_PROFIT) return arguments.parse_args()