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

Add "freqai.enabled" flag to disable freqAI via config flag

Browse Source 
aligns with how other optional modules work in freqtrade.
This commit is contained in:
Matthias 2022-08-13 09:24:04 +02:00
parent 49989012ab
commit 3b827ee60a
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_examples/config_freqai.example.json
View File

@ -52,6 +52,7 @@
} }
], ],
"freqai": { "freqai": {
"enabled": true,
"startup_candles": 10000, "startup_candles": 10000,
"purge_old_models": true, "purge_old_models": true,
"train_period_days": 15, "train_period_days": 15,

8
freqtrade/constants.py
View File

@ -486,6 +486,7 @@ CONF_SCHEMA = {
"freqai": { "freqai": {
"type": "object", "type": "object",
"properties": { "properties": {
"enabled": {"type": "boolean", "default": False},
"keras": {"type": "boolean", "default": False}, "keras": {"type": "boolean", "default": False},
"conv_width": {"type": "integer", "default": 2}, "conv_width": {"type": "integer", "default": 2},
"train_period_days": {"type": "integer", "default": 0}, "train_period_days": {"type": "integer", "default": 0},
@ -525,12 +526,15 @@ CONF_SCHEMA = {
}, },
}, },
}, },
"required": ["train_period_days", "required": [
"enabled",
"train_period_days",
"backtest_period_days", "backtest_period_days",
"identifier", "identifier",
"feature_parameters", "feature_parameters",
"data_split_parameters", "data_split_parameters",
"model_training_parameters"] "model_training_parameters"
]
}, },
}, },
} }

4
freqtrade/optimize/backtesting.py
View File

@ -89,7 +89,7 @@ class Backtesting:
self.dataprovider = DataProvider(self.config, self.exchange) self.dataprovider = DataProvider(self.config, self.exchange)
if self.config.get('strategy_list'): if self.config.get('strategy_list'):
if self.config.get('freqai'): if self.config.get('freqai', {}).get('enabled', False):
raise OperationalException( raise OperationalException(
"You can't use strategy_list and freqai at the same time.") "You can't use strategy_list and freqai at the same time.")
for strat in list(self.config['strategy_list']): for strat in list(self.config['strategy_list']):
@ -210,7 +210,7 @@ class Backtesting:
""" """
self.progress.init_step(BacktestState.DATALOAD, 1) self.progress.init_step(BacktestState.DATALOAD, 1)
if self.config.get('freqai') is not None: if self.config.get('freqai', {}).get('enabled', False):
startup_candles = int(self.config.get('freqai', {}).get('startup_candles', 0)) startup_candles = int(self.config.get('freqai', {}).get('startup_candles', 0))
if not startup_candles: if not startup_candles:
raise OperationalException('FreqAI backtesting module requires user set ' raise OperationalException('FreqAI backtesting module requires user set '

2
freqtrade/plugins/pairlist/pairlist_helpers.py
View File

@ -44,7 +44,7 @@ def expand_pairlist(wildcardpl: List[str], available_pairs: List[str],
def dynamic_expand_pairlist(config: dict, markets: list) -> List[str]: def dynamic_expand_pairlist(config: dict, markets: list) -> List[str]:
expanded_pairs = expand_pairlist(config['pairs'], markets) expanded_pairs = expand_pairlist(config['pairs'], markets)
if config.get('freqai', {}): if config.get('freqai', {}).get('enabled', False):
corr_pairlist = config['freqai']['feature_parameters']['include_corr_pairlist'] corr_pairlist = config['freqai']['feature_parameters']['include_corr_pairlist']
expanded_pairs += [pair for pair in corr_pairlist expanded_pairs += [pair for pair in corr_pairlist
if pair not in config['pairs']] if pair not in config['pairs']]

2
freqtrade/strategy/interface.py
View File

@ -146,7 +146,7 @@ class IStrategy(ABC, HyperStrategyMixin):
self._ft_informative.append((informative_data, cls_method)) self._ft_informative.append((informative_data, cls_method))
def load_freqAI_model(self) -> None: def load_freqAI_model(self) -> None:
if self.config.get('freqai', None): if self.config.get('freqai', {}).get('enabled', False):
# Import here to avoid importing this if freqAI is disabled # Import here to avoid importing this if freqAI is disabled
from freqtrade.resolvers.freqaimodel_resolver import FreqaiModelResolver from freqtrade.resolvers.freqaimodel_resolver import FreqaiModelResolver

1
tests/freqai/conftest.py
View File

@ -17,6 +17,7 @@ def freqai_conf(default_conf, tmpdir):
freqaiconf = deepcopy(default_conf) freqaiconf = deepcopy(default_conf)
freqaiconf.update( freqaiconf.update(
{ {
"enabled": True,
"datadir": Path(default_conf["datadir"]), "datadir": Path(default_conf["datadir"]),
"strategy": "freqai_test_strat", "strategy": "freqai_test_strat",
"user_data_dir": Path(tmpdir), "user_data_dir": Path(tmpdir),