From 719895bc8ca5b26e0d7f84a21d3ef959ccf413ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 2 Mar 2025 13:04:55 +0100 Subject: [PATCH] refactor(qav3): simplify model identifier fetching MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- ReforceXY/user_data/freqaimodels/ReforceXY.py | 2 +- .../freqaimodels/LightGBMRegressorQuickAdapterV35.py | 4 ++-- .../user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReforceXY/user_data/freqaimodels/ReforceXY.py b/ReforceXY/user_data/freqaimodels/ReforceXY.py index d5a66ad..f4a33b0 100644 --- a/ReforceXY/user_data/freqaimodels/ReforceXY.py +++ b/ReforceXY/user_data/freqaimodels/ReforceXY.py @@ -483,7 +483,7 @@ class ReforceXY(BaseReinforcementLearningModel): Runs hyperparameter optimization using Optuna and returns the best hyperparameters found merged with the user defined parameters """ - _, identifier = str(self.full_path).rsplit("/", 1) + identifier = self.freqai_info.get("identifier") if self.rl_config_optuna.get("per_pair", False): study_name = f"{identifier}-{dk.pair}" storage = self.get_storage(dk.pair) diff --git a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py index 1c4a156..bfbcd5b 100644 --- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py @@ -310,7 +310,7 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): y_test, test_weights, ) -> tuple[Dict, float] | tuple[None, None]: - _, identifier = str(self.full_path).rsplit("/", 1) + identifier = self.freqai_info.get("identifier") study_namespace = "hp" study_name = f"{identifier}-{study_namespace}-{pair}" storage = self.optuna_storage(pair) @@ -386,7 +386,7 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): test_weights, model_training_parameters, ) -> tuple[Dict, float] | tuple[None, None]: - _, identifier = str(self.full_path).rsplit("/", 1) + identifier = self.freqai_info.get("identifier") study_namespace = "period" study_name = f"{identifier}-{study_namespace}-{pair}" storage = self.optuna_storage(pair) diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py index ad7c646..9312bdf 100644 --- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py @@ -311,7 +311,7 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): y_test, test_weights, ) -> tuple[Dict, float] | tuple[None, None]: - _, identifier = str(self.full_path).rsplit("/", 1) + identifier = self.freqai_info.get("identifier") study_namespace = "hp" study_name = f"{identifier}-{study_namespace}-{pair}" storage = self.optuna_storage(pair) @@ -387,7 +387,7 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): test_weights, model_training_parameters, ) -> tuple[Dict, float] | tuple[None, None]: - _, identifier = str(self.full_path).rsplit("/", 1) + identifier = self.freqai_info.get("identifier") study_namespace = "period" study_name = f"{identifier}-{study_namespace}-{pair}" storage = self.optuna_storage(pair) -- 2.43.0