From 11ff32e073388889704a8f5cafd8567aa9aee1ef Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:16:57 +0200 Subject: [PATCH 01/17] Update __init__.py --- src/mlpro_int_optuna/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mlpro_int_optuna/__init__.py b/src/mlpro_int_optuna/__init__.py index 63b6a44..fff7b7d 100644 --- a/src/mlpro_int_optuna/__init__.py +++ b/src/mlpro_int_optuna/__init__.py @@ -1 +1 @@ -from mlpro_int_optuna.wrappers import WrHPTOptuna \ No newline at end of file +from .wrappers import * From c1dfa22c5c5e2d105ef2c167a3057a4764201eac Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:17:19 +0200 Subject: [PATCH 02/17] Update __init__.py --- src/mlpro_int_optuna/wrappers/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mlpro_int_optuna/wrappers/__init__.py b/src/mlpro_int_optuna/wrappers/__init__.py index bcc847d..cc48add 100644 --- a/src/mlpro_int_optuna/wrappers/__init__.py +++ b/src/mlpro_int_optuna/wrappers/__init__.py @@ -1 +1 @@ -from mlpro_int_optuna.wrappers.optuna import WrHPTOptuna \ No newline at end of file +from .optuna import * From 2f0dbeb32a3e95236307a4eda5024ba302575c0a Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:18:29 +0200 Subject: [PATCH 03/17] Update optuna.py --- src/mlpro_int_optuna/wrappers/optuna.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mlpro_int_optuna/wrappers/optuna.py b/src/mlpro_int_optuna/wrappers/optuna.py index f4128a2..8b8c92c 100644 --- a/src/mlpro_int_optuna/wrappers/optuna.py +++ b/src/mlpro_int_optuna/wrappers/optuna.py @@ -13,10 +13,11 @@ ## -- 2022-10-17 1.1.1 SY Refactoring due to unit test ## -- 2024-01-31 2.0.0 LSB Migrated Optuna to new repo MLPro-Int-Optuna ## -- 2024-04-18 2.1.0 DA Alignment with MLPro 1.4.0 +## -- 2025-08-03 2.1.1 SY Refactoring ## ------------------------------------------------------------------------------------------------- """ -Ver. 2.1.0. (2024-04-18) +Ver. 2.1.1 (2025-08-03) This module provides a wrapper class for hyperparameter tuning by reusing Optuna framework. @@ -26,13 +27,17 @@ import optuna from mlpro.wrappers import Wrapper +from mlpro.bf import * from mlpro.bf.ml import * from mlpro.bf.math import * from mlpro.bf.various import * -from mlpro.rl.models import * +from mlpro.rl import * from mlpro.gt import * import os +# Export list for public API +__all__ = ['WrHPTOptuna'] + ## ------------------------------------------------------------------------------------------------- ## ------------------------------------------------------------------------------------------------- From 267cb9df7455bfd8b81447c3ee83309171409a20 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:18:58 +0200 Subject: [PATCH 04/17] Update setup.cfg --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4f9f519..3730fed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = mlpro_int_optuna -version = 1.0.0 +version = 1.0.1 author = MLPro Team author_email = mlpro@listen.fh-swf.de description = MLPro: Integration Optuna @@ -26,5 +26,5 @@ where = src [options.extras_require] full = - mlpro[full] >= 1.4.0 + mlpro[full] >= 2.1.0 optuna >= 3.4.0 From 81880855eaaab0924979d35259c65ef931d9be4b Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:19:11 +0200 Subject: [PATCH 05/17] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b257799..0d0d594 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mlpro[full] >= 1.4.0 -optuna >= 3.4.0 \ No newline at end of file +mlpro[full] >= 2.1.0 +optuna >= 3.4.0 From 0ccd8c9129ea5a81c1e4fca192bf07af0eec77c7 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:19:30 +0200 Subject: [PATCH 06/17] Update setup.py --- src/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/setup.py b/src/setup.py index 38ba375..aa35f6a 100644 --- a/src/setup.py +++ b/src/setup.py @@ -2,7 +2,7 @@ setup(name='mlpro_int_optuna', -version='1.0.0', +version='1.0.1', description='MLPro: Integration Optuna', author='MLPro Team', author_mail='mlpro@listen.fh-swf.de', @@ -12,9 +12,9 @@ # Package dependencies for full installation extras_require={ "full": [ - "mlpro>=1.4.0", + "mlpro>=2.1.0", "optuna>=3.4.0" ], }, -zip_safe=False) \ No newline at end of file +zip_safe=False) From a485353772000938f2c474a762e59f0a2b58a551 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:19:45 +0200 Subject: [PATCH 07/17] Update requirements.txt --- doc/rtd/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rtd/requirements.txt b/doc/rtd/requirements.txt index 23cfce9..c58eec1 100644 --- a/doc/rtd/requirements.txt +++ b/doc/rtd/requirements.txt @@ -1,4 +1,4 @@ -mlpro[full]>=1.4.0 +mlpro[full]>=2.1.0 optuna>=3.4.0 sphinxcontrib-napoleon From a4617ef6575af4920215f2370d042ae1307c7b4e Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:20:12 +0200 Subject: [PATCH 08/17] Update conf.py --- doc/rtd/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py index 3d9464e..75ee9cf 100644 --- a/doc/rtd/conf.py +++ b/doc/rtd/conf.py @@ -18,11 +18,11 @@ # -- Project information ----------------------------------------------------- project = 'MLPro Documentations' -copyright = '2024 South Westphalia University of Applied Sciences, Germany' +copyright = '2025 South Westphalia University of Applied Sciences, Germany' author = 'Detlef Arend, Steve Yuwono, Laxmikant Shrikant Baheti et al' # The full version, including alpha/beta/rc tags -release = '1.0.0' +release = '1.0.1' # -- General configuration --------------------------------------------------- @@ -85,4 +85,4 @@ def setup(app): 'github_user': 'fhswf', 'github_repo': 'MLPro-Int-Optuna', 'github_version': 'main/doc/docs/', -} \ No newline at end of file +} From 40441572f377d3f2dfaac37d1f52613a7c1c5ab6 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:22:59 +0200 Subject: [PATCH 09/17] Update test_examples.py --- test/test_examples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_examples.py b/test/test_examples.py index af502cd..09a1f79 100644 --- a/test/test_examples.py +++ b/test/test_examples.py @@ -59,7 +59,7 @@ import sys import os -from mlpro.bf.various import Log +from mlpro.bf import * import runpy import pytest From 5a3bafcaf18871b81576ac0468625142a6b7f6e9 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:23:42 +0200 Subject: [PATCH 10/17] Update howto_rl_ht_001_optuna.py --- test/howtos/rl/howto_rl_ht_001_optuna.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py index 7a2fa8c..42c0c90 100644 --- a/test/howtos/rl/howto_rl_ht_001_optuna.py +++ b/test/howtos/rl/howto_rl_ht_001_optuna.py @@ -36,6 +36,11 @@ from mlpro_int_optuna import WrHPTOptuna from mlpro.rl.pool.envs.bglp import BGLP from mlpro.rl import * +from mlpro.bf import * +from mlpro.bf.math import * +from mlpro.bf.systems import * +from mlpro.bf.plot import * +from mlpro.bf.ml import * import random from pathlib import Path From 8b3897ba95825e719ef4c942afb14173e1ad06fe Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:26:14 +0200 Subject: [PATCH 11/17] Update howto_rl_ht_001_optuna.py --- test/howtos/rl/howto_rl_ht_001_optuna.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py index 42c0c90..8bba564 100644 --- a/test/howtos/rl/howto_rl_ht_001_optuna.py +++ b/test/howtos/rl/howto_rl_ht_001_optuna.py @@ -41,6 +41,7 @@ from mlpro.bf.systems import * from mlpro.bf.plot import * from mlpro.bf.ml import * +from mlpro.bf.data import * import random from pathlib import Path From eed6e5ae364672f7913fb2aaee326005cd012059 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:31:33 +0200 Subject: [PATCH 12/17] Update howto_rl_ht_001_optuna.py --- test/howtos/rl/howto_rl_ht_001_optuna.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py index 8bba564..23a7d73 100644 --- a/test/howtos/rl/howto_rl_ht_001_optuna.py +++ b/test/howtos/rl/howto_rl_ht_001_optuna.py @@ -41,7 +41,7 @@ from mlpro.bf.systems import * from mlpro.bf.plot import * from mlpro.bf.ml import * -from mlpro.bf.data import * +from mlpro.bf.data import DataStoring import random from pathlib import Path From 29aa2abb8839f79ddb3b7a03c9ccaabaf7b5cfbc Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:33:53 +0200 Subject: [PATCH 13/17] Update howto_rl_ht_001_optuna.py --- test/howtos/rl/howto_rl_ht_001_optuna.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py index 23a7d73..42c0c90 100644 --- a/test/howtos/rl/howto_rl_ht_001_optuna.py +++ b/test/howtos/rl/howto_rl_ht_001_optuna.py @@ -41,7 +41,6 @@ from mlpro.bf.systems import * from mlpro.bf.plot import * from mlpro.bf.ml import * -from mlpro.bf.data import DataStoring import random from pathlib import Path From 523b4cff37e5789550adf9842de0e13f652ac16b Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:34:21 +0200 Subject: [PATCH 14/17] Update optuna.py --- src/mlpro_int_optuna/wrappers/optuna.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mlpro_int_optuna/wrappers/optuna.py b/src/mlpro_int_optuna/wrappers/optuna.py index 8b8c92c..5d16c74 100644 --- a/src/mlpro_int_optuna/wrappers/optuna.py +++ b/src/mlpro_int_optuna/wrappers/optuna.py @@ -30,7 +30,7 @@ from mlpro.bf import * from mlpro.bf.ml import * from mlpro.bf.math import * -from mlpro.bf.various import * +from mlpro.bf.data import * from mlpro.rl import * from mlpro.gt import * import os From 5203a891fcd494bae018634e9b161980ef074ae4 Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:36:41 +0200 Subject: [PATCH 15/17] Update optuna.py --- src/mlpro_int_optuna/wrappers/optuna.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mlpro_int_optuna/wrappers/optuna.py b/src/mlpro_int_optuna/wrappers/optuna.py index 5d16c74..a52d9f5 100644 --- a/src/mlpro_int_optuna/wrappers/optuna.py +++ b/src/mlpro_int_optuna/wrappers/optuna.py @@ -31,6 +31,7 @@ from mlpro.bf.ml import * from mlpro.bf.math import * from mlpro.bf.data import * +from mlpro.bf.various import * from mlpro.rl import * from mlpro.gt import * import os From dd07bd7781c77c43fa954bd872336c28eba519bb Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Sun, 3 Aug 2025 20:38:18 +0200 Subject: [PATCH 16/17] Update howto_rl_ht_001_optuna.py --- test/howtos/rl/howto_rl_ht_001_optuna.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py index 42c0c90..f4efe62 100644 --- a/test/howtos/rl/howto_rl_ht_001_optuna.py +++ b/test/howtos/rl/howto_rl_ht_001_optuna.py @@ -43,6 +43,7 @@ from mlpro.bf.ml import * import random from pathlib import Path +import numpy as np ## ------------------------------------------------------------------------------------------------- From 58744a09981a85a5bf533075d5992a596d282c9b Mon Sep 17 00:00:00 2001 From: Steve Yuwono <88610818+steveyuwono@users.noreply.github.com> Date: Wed, 6 Aug 2025 15:59:38 +0200 Subject: [PATCH 17/17] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3730fed..375c396 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ classifiers = package_dir = = src packages = find: -python_requires = >=3.10 +python_requires = >=3.11 include_package_data = True [options.packages.find]