refactor(qav3): refine optuna enablement condition

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 f6736011b694eb47dd382c804de236c043b554cd..07e7d759e9700893299e45c83094690cc5241105 100644 (file)
--- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py
+++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py
@@ -40,7 +40,8 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel):
         super().__init__(**kwargs)
         self.__optuna_config = self.freqai_info.get("optuna_hyperopt", {})
         self.__optuna_hyperopt: bool = (
-            self.__optuna_config.get("enabled", False)
+            self.freqai_info.get("enabled", False)
+            and self.__optuna_config.get("enabled", False)
             and self.data_split_parameters.get("test_size", TEST_SIZE) > 0
         )
         self.__optuna_hp = {}

diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
index 15abca3c4ed10007b83c8837735659194a10eeae..fcffac6f0f4b81399effde42cacd5b3aa1bed920 100644 (file)
--- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
+++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py
@@ -40,7 +40,8 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel):
         super().__init__(**kwargs)
         self.__optuna_config = self.freqai_info.get("optuna_hyperopt", {})
         self.__optuna_hyperopt: bool = (
-            self.__optuna_config.get("enabled", False)
+            self.freqai_info.get("enabled", False)
+            and self.__optuna_config.get("enabled", False)
             and self.data_split_parameters.get("test_size", TEST_SIZE) > 0
         )
         self.__optuna_hp = {}