From 0bf55490f8ddfb474b374dd1068f4a7b26003c1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 9 Apr 2025 21:32:43 +0200 Subject: [PATCH] refactor: cleanup optuna best trial check 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 | 8 ++++---- .../user_data/freqaimodels/QuickAdapterRegressorV3.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ReforceXY/user_data/freqaimodels/ReforceXY.py b/ReforceXY/user_data/freqaimodels/ReforceXY.py index b4c06dd..64c4be1 100644 --- a/ReforceXY/user_data/freqaimodels/ReforceXY.py +++ b/ReforceXY/user_data/freqaimodels/ReforceXY.py @@ -506,11 +506,11 @@ class ReforceXY(BaseReinforcementLearningModel): return storage @staticmethod - def study_has_best_trial_params(study: Optional[Study]) -> bool: + def study_has_best_trial(study: Optional[Study]) -> bool: if study is None: return False try: - _ = study.best_trial.params + _ = study.best_trial return True # file backend storage raises KeyError except KeyError: @@ -576,9 +576,9 @@ class ReforceXY(BaseReinforcementLearningModel): ) hyperopt_failed = True time_spent = time.time() - start - if ReforceXY.study_has_best_trial_params(study) is False: + if ReforceXY.study_has_best_trial(study) is False: logger.error( - f"Hyperopt {study_name} failed ({time_spent:.2f} secs): no study best trial params found" + f"Hyperopt {study_name} failed ({time_spent:.2f} secs): no study best trial found" ) hyperopt_failed = True diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index e611516..7a07a55 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -44,7 +44,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel): https://github.com/sponsors/robcaulk """ - version = "3.7.4" + version = "3.7.5" @cached_property def _optuna_config(self) -> dict: @@ -470,9 +470,9 @@ class QuickAdapterRegressorV3(BaseRegressionModel): time_spent = time.time() - start_time if is_study_multi_objective is False: - if not QuickAdapterRegressorV3.optuna_study_has_best_params(study): + if not QuickAdapterRegressorV3.optuna_study_has_best_trial(study): logger.error( - f"Optuna {pair} {namespace} {objective_type} hyperopt failed ({time_spent:.2f} secs): no study best params found" + f"Optuna {pair} {namespace} {objective_type} hyperopt failed ({time_spent:.2f} secs): no study best trial found" ) return self.set_optuna_rmse(pair, namespace, study.best_value) @@ -614,11 +614,11 @@ class QuickAdapterRegressorV3(BaseRegressionModel): return study @staticmethod - def optuna_study_has_best_params(study: Optional[optuna.study.Study]) -> bool: + def optuna_study_has_best_trial(study: Optional[optuna.study.Study]) -> bool: if study is None: return False try: - _ = study.best_params + _ = study.best_trial return True # file backend storage raises KeyError except KeyError: -- 2.43.0