From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Sun, 2 Mar 2025 16:01:16 +0000 (+0100)
Subject: fix(qav3): ensure always the latest computed optuna HPs are used
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=93c880cece23e960b8741e2af18a9b8173d0f9d9;p=freqai-strategies.git

fix(qav3): ensure always the latest computed optuna HPs are used

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py
index bfbcd5b..cced5a2 100644
--- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py
+++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py
@@ -101,12 +101,14 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel):
             )
             if optuna_hp_params:
                 self.__optuna_hp_params[dk.pair] = optuna_hp_params
+            if optuna_hp_rmse:
+                self.__optuna_hp_rmse[dk.pair] = optuna_hp_rmse
+
+            if self.__optuna_hp_params.get(dk.pair):
                 model_training_parameters = {
                     **model_training_parameters,
                     **self.__optuna_hp_params[dk.pair],
                 }
-            if optuna_hp_rmse:
-                self.__optuna_hp_rmse[dk.pair] = optuna_hp_rmse
 
             optuna_period_params, optuna_period_rmse = self.optuna_period_optimize(
                 dk.pair,
diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
index 9312bdf..be7ad10 100644
--- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
+++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
@@ -101,12 +101,14 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel):
             )
             if optuna_hp_params:
                 self.__optuna_hp_params[dk.pair] = optuna_hp_params
+            if optuna_hp_rmse:
+                self.__optuna_hp_rmse[dk.pair] = optuna_hp_rmse
+
+            if self.__optuna_hp_params.get(dk.pair):
                 model_training_parameters = {
                     **model_training_parameters,
                     **self.__optuna_hp_params[dk.pair],
                 }
-            if optuna_hp_rmse:
-                self.__optuna_hp_rmse[dk.pair] = optuna_hp_rmse
 
             optuna_period_params, optuna_period_rmse = self.optuna_period_optimize(
                 dk.pair,