From 36a90bb1cbd18510d7a4b2f191f8f94db2703ad5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sat, 15 Feb 2025 23:47:39 +0100 Subject: [PATCH] fix(qav3): uniformize optuna storage namespace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../freqaimodels/LightGBMRegressorQuickAdapterV35.py | 4 ++-- .../user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py index 04152a8..11bdb94 100644 --- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py @@ -230,11 +230,11 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): storage_dir = str(dk.full_path) storage_backend = self.__optuna_config.get("storage", "file") if storage_backend == "sqlite": - storage = f"sqlite:///{storage_dir}/optuna-{sanitize_path(dk.pair)}.sqlite" + storage = f"sqlite:///{storage_dir}/optuna-{sanitize_path(dk.pair.split('/')[0])}.sqlite" elif storage_backend == "file": storage = optuna.storages.JournalStorage( optuna.storages.journal.JournalFileBackend( - f"{storage_dir}/optuna-{sanitize_path(dk.pair)}.log" + f"{storage_dir}/optuna-{sanitize_path(dk.pair.split('/')[0])}.log" ) ) return storage diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py index 0872136..fe44dd9 100644 --- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py @@ -231,11 +231,11 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): storage_dir = str(dk.full_path) storage_backend = self.__optuna_config.get("storage", "file") if storage_backend == "sqlite": - storage = f"sqlite:///{storage_dir}/optuna-{sanitize_path(dk.pair)}.sqlite" + storage = f"sqlite:///{storage_dir}/optuna-{sanitize_path(dk.pair.split('/')[0])}.sqlite" elif storage_backend == "file": storage = optuna.storages.JournalStorage( optuna.storages.journal.JournalFileBackend( - f"{storage_dir}/optuna-{sanitize_path(dk.pair)}.log" + f"{storage_dir}/optuna-{sanitize_path(dk.pair.split('/')[0])}.log" ) ) return storage -- 2.43.0