adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some more arguments to args_to_config

Browse Source
This commit is contained in:
Matthias
2019-04-24 21:02:05 +02:00
parent 17cf9d33cf
commit 39f60c4740
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
freqtrade/configuration.py
View File

@@ -216,12 +216,18 @@ class Configuration(object):
logger.info(f'Created data directory: {datadir}') logger.info(f'Created data directory: {datadir}')
return datadir return datadir
def _args_to_config(self, config, argname, configname, logstring) -> bool: def _args_to_config(self, config, argname, configname, logstring, logfun=None) -> bool:
"""
logfun is applied to the configuration entry before passing
that entry to the log string using .format().
sample: logfun=len (prints the length of the found configuration instead of the content)
"""
if argname in self.args and getattr(self.args, argname): if argname in self.args and getattr(self.args, argname):
config.update({configname: getattr(self.args, argname)}) config.update({configname: getattr(self.args, argname)})
if logfun:
logger.info(logstring.format(logfun(config[configname])))
else:
logger.info(logstring.format(config[configname])) logger.info(logstring.format(config[configname]))
def _load_backtesting_config(self, config: Dict[str, Any]) -> Dict[str, Any]: # noqa: C901 def _load_backtesting_config(self, config: Dict[str, Any]) -> Dict[str, Any]: # noqa: C901
@@ -236,12 +242,11 @@ class Configuration(object):
logger.info('Parameter -i/--ticker-interval detected ...') logger.info('Parameter -i/--ticker-interval detected ...')
logger.info('Using ticker_interval: %s ...', config.get('ticker_interval')) logger.info('Using ticker_interval: %s ...', config.get('ticker_interval'))
if 'live' in self.args and self.args.live: self._args_to_config(config, argname='live', configname='live',
config.update({'live': True}) logstring='Parameter -l/--live detected ...')
logger.info('Parameter -l/--live detected ...')
self._args_to_config(config, 'position_stacking', 'position_stacking', self._args_to_config(config, argname='position_stacking', configname='position_stacking',
'Parameter --enable-position-stacking detected ...') logstring='Parameter --enable-position-stacking detected ...')
if 'use_max_market_positions' in self.args and not self.args.use_max_market_positions: if 'use_max_market_positions' in self.args and not self.args.use_max_market_positions:
config.update({'use_max_market_positions': False}) config.update({'use_max_market_positions': False})
@@ -254,14 +259,12 @@ class Configuration(object):
else: else:
logger.info('Using max_open_trades: %s ...', config.get('max_open_trades')) logger.info('Using max_open_trades: %s ...', config.get('max_open_trades'))
if 'stake_amount' in self.args and self.args.stake_amount: self._args_to_config(config, argname='stake_amount', configname='stake_amount',
config.update({'stake_amount': self.args.stake_amount}) logstring='Parameter --stake_amount detected, '
logger.info('Parameter --stake_amount detected, overriding stake_amount to: %s ...', 'overriding stake_amount to: {} ...')
config.get('stake_amount'))
if 'timerange' in self.args and self.args.timerange: self._args_to_config(config, argname='timerange', configname='timerange',
config.update({'timerange': self.args.timerange}) logstring='Parameter --timerange detected: {} ...')
logger.info('Parameter --timerange detected: %s ...', self.args.timerange)
if 'datadir' in self.args and self.args.datadir: if 'datadir' in self.args and self.args.datadir:
config.update({'datadir': self._create_datadir(config, self.args.datadir)}) config.update({'datadir': self._create_datadir(config, self.args.datadir)})
@@ -269,25 +272,20 @@ class Configuration(object):
config.update({'datadir': self._create_datadir(config, None)}) config.update({'datadir': self._create_datadir(config, None)})
logger.info('Using data folder: %s ...', config.get('datadir')) logger.info('Using data folder: %s ...', config.get('datadir'))
if 'refresh_pairs' in self.args and self.args.refresh_pairs: self._args_to_config(config, argname='refresh_pairs', configname='refresh_pairs',
config.update({'refresh_pairs': True}) logstring='Parameter -r/--refresh-pairs-cached detected ...')
logger.info('Parameter -r/--refresh-pairs-cached detected ...')
if 'strategy_list' in self.args and self.args.strategy_list: self._args_to_config(config, argname='strategy_list', configname='strategy_list',
config.update({'strategy_list': self.args.strategy_list}) logstring='Using strategy list of {} Strategies', logfun=len)
logger.info('Using strategy list of %s Strategies', len(self.args.strategy_list))
if 'ticker_interval' in self.args and self.args.ticker_interval: self._args_to_config(config, argname='ticker_interval', configname='ticker_interval',
config.update({'ticker_interval': self.args.ticker_interval}) logstring='Overriding ticker interval with Command line argument')
logger.info('Overriding ticker interval with Command line argument')
if 'export' in self.args and self.args.export: self._args_to_config(config, argname='export', configname='export',
config.update({'export': self.args.export}) logstring='Parameter --export detected: {} ...')
logger.info('Parameter --export detected: %s ...', self.args.export)
if 'export' in config and 'exportfilename' in self.args and self.args.exportfilename: self._args_to_config(config, argname='exportfilename', configname='exportfilename',
config.update({'exportfilename': self.args.exportfilename}) logstring='Storing backtest results to {} ...')
logger.info('Storing backtest results to %s ...', self.args.exportfilename)
return config return config