From 5c02a9bc7d17493920e7f629e6c48162d39d61af Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 2 Jun 2025 13:06:05 +0200 Subject: [PATCH] fix(qav3): ensure timeframe is aligned everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../user_data/freqaimodels/QuickAdapterRegressorV3.py | 6 ++++-- quickadapter/user_data/strategies/QuickAdapterV3.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index ce13833..cb73f74 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -45,7 +45,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel): https://github.com/sponsors/robcaulk """ - version = "3.7.74" + version = "3.7.75" @cached_property def _optuna_config(self) -> dict: @@ -200,7 +200,9 @@ class QuickAdapterRegressorV3(BaseRegressionModel): namespace="label", objective=lambda trial: label_objective( trial, - self.data_provider.get_pair_dataframe(dk.pair), + self.data_provider.get_pair_dataframe( + pair=dk.pair, timeframe=self.config.get("timeframe") + ), self.freqai_info.get("fit_live_predictions_candles", 100), self._optuna_config.get("candles_step"), ), diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py index fb42c92..2feec21 100644 --- a/quickadapter/user_data/strategies/QuickAdapterV3.py +++ b/quickadapter/user_data/strategies/QuickAdapterV3.py @@ -159,9 +159,9 @@ class QuickAdapterV3(IStrategy): "FreqAI strategy requires 'identifier' defined in the freqai section configuration" ) self.models_full_path = Path( - self.config.get("user_data_dir") + str(self.config.get("user_data_dir")) / "models" - / f"{self.freqai_info.get('identifier')}" + / str(self.freqai_info.get("identifier")) ) self._label_params: dict[str, dict] = {} for pair in self.pairs: -- 2.43.0