Refactoring: API cleanup - Export lists __all__

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, Mochammad Rizky Diprasetya et al'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.2'
+release = '1.0.3'
 
 
 # -- General configuration ---------------------------------------------------
@@ -85,4 +85,4 @@ def setup(app):
   'github_user': 'fhswf',
   'github_repo': 'MLPro-Int-MuJoCo',
   'github_version': 'main/doc/docs/',
-}
+}

doc/rtd/requirements.txt

@@ -1,4 +1,4 @@
-mlpro[full]>=1.4.4
+mlpro[full]>=2.1.0
 mujoco>=3.1.2
 lxml>=4.9.2
 

requirements.txt

@@ -1,3 +1,3 @@
-mlpro[full]>=1.4.4
+mlpro[full]>=2.1.0
 mujoco>=3.1.2
-lxml>=4.9.2
+lxml>=4.9.2

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mlpro-int-mujoco
-version = 1.0.2
+version = 1.0.3
 author = MLPro Team
 author_email = mlpro@listen.fh-swf.de
 description = MLPro: Integration MuJoCo
@@ -18,14 +18,14 @@ classifiers =
 package_dir =
     = src
 packages = find:
-python_requires = >=3.10
+python_requires = >=3.11
 include_package_data = True
 
 [options.packages.find]
 where = src
 
 [options.extras_require]
 full =
-    mlpro[full]>=1.4.4
+    mlpro[full]>=2.1.0
     mujoco>=3.1.2
     lxml>=4.9.2

src/mlpro_int_mujoco/__init__.py

@@ -1 +1,3 @@
-from mlpro_int_mujoco.wrappers import *
+from .wrappers import *
+from .envs import *
+from .systems import *

src/mlpro_int_mujoco/envs/__init__.py

@@ -0,0 +1 @@
+from .cartpole import *

src/mlpro_int_mujoco/envs/cartpole.py

@@ -9,22 +9,28 @@
 ## -- 2023-02-23  1.0.0     MRD       Released first version
 ## -- 2024-05-08  1.1.0     SY        Migration from MLPro to MLPro-Int-MuJoCo
 ## -- 2024-08-13  1.1.1     SY        Refactoring
+## -- 2025-08-03  1.1.2     SY        Refactoring
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.1.1 (2024-08-13)
+Ver. 1.1.2 (2025-08-03)
 
 This module provides a CartPole environment with MuJoCo Simulation. 
 """
 
 
 import os
 import mlpro_int_mujoco
-from mlpro.rl.models_env import Environment
-from mlpro.rl.models_agents import Reward, State
-from mlpro.bf.ops import Mode
-from mlpro.bf.various import Log
-from mlpro.bf.math import Dimension
+from mlpro.rl import *
+from mlpro.bf import *
+from mlpro.bf.math import *
+from mlpro.bf.plot import *
+from mlpro.bf.systems import *
+
+# Export list for public API
+__all__ = [
+    'CartpoleMujoco'
+    ]
 
 
 
@@ -134,4 +140,5 @@ def _action_to_mujoco(self, p_mlpro_action):
 ## -------------------------------------------------------------------------------------------------
 class CartpoleMujocoContinuous(CartpoleMujoco):
 
-    C_NAME = "CartpoleMujocoContinuous"
+
+    C_NAME = "CartpoleMujocoContinuous"

src/mlpro_int_mujoco/wrappers/__init__.py

@@ -1 +1 @@
-from mlpro_int_mujoco.wrappers.basics import *
+from .basics import *

src/mlpro_int_mujoco/wrappers/basics.py

@@ -32,11 +32,11 @@
 ## -- 2023-04-14  1.2.7     MRD       Add depth data to the state, simplify _get_camera_data
 ## -- 2024-04-10  1.2.8     DA        Refactoring
 ## -- 2024-05-08  1.3.0     SY        Migration from MLPro to MLPro-Int-MuJoCo
+## -- 2025-08-03  1.3.1     SY       Refactoring
 ## -------------------------------------------------------------------------------------------------
 
-
 """
-Ver. 1.3.0  (2024-05-08)
+Ver. 1.3.1 (2025-08-03)
 
 This module wraps bf.Systems with MuJoCo Simulation functionality.
 
@@ -50,9 +50,23 @@
 from threading import Lock
 from lxml import etree
 
-from mlpro.rl.models import *
+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 *
 from mlpro.wrappers import Wrapper
 
+# Export list for public API
+__all__ = [
+    'CallbacksViewer',
+    'BaseViewer',
+    'OffRenderViewer',
+    'RenderViewer',
+    'MujocoHandler'
+    ]
+
 
 
 
@@ -960,3 +974,4 @@ def _close(self):
         if self._viewer is not None:
             self._viewer.close()
             self._viewer = None
+

src/setup.py

@@ -2,7 +2,7 @@
 
 
 setup(name='mlpro-int-mujoco',
-version='1.0.2',
+version='1.0.3',
 description='MLPro: Integration MuJoCo',
 author='MLPro Team',
 author_mail='mlpro@listen.fh-swf.de',
@@ -12,10 +12,10 @@
 # Package dependencies for full installation
 extras_require={
     "full": [
-        "mlpro[full]>=1.4.4",
+        "mlpro[full]>=2.1.0",
         "mujoco>=3.1.2",
         "lxml>=4.9.2"
     ],
 },
 
-zip_safe=False)
+zip_safe=False)

test/howtos/bf/howto_bf_systems_001_doublependulum_systems_wrapped_with_mujoco.py

@@ -31,8 +31,10 @@
 
 
 import mlpro_int_mujoco
-from mlpro.bf.various import Log
+from mlpro.bf import *
 from mlpro.bf.systems import *
+import os
+import numpy as np
 
 
 

test/howtos/bf/howto_bf_systems_002_cartpole_continuous_systems_wrapped_with_mujoco.py

@@ -28,8 +28,10 @@
 
 
 import mlpro_int_mujoco
-from mlpro.bf.various import Log
+from mlpro.bf import *
 from mlpro.bf.systems import *
+import numpy as np
+import os
 
 
 

test/howtos/bf/howto_bf_systems_003_box_on_table_mujoco_simulation.py.off

@@ -32,8 +32,9 @@ You will learn:
 
 import random
 import mlpro_int_mujoco
-from mlpro.bf.various import Log
+from mlpro.bf import *
 from mlpro.bf.systems import *
+import os
 
 
 

test/howtos/rl/howto_rl_env_001_run_agent_with_random_policy_on_double_pendulum_mujoco_environment.py

@@ -40,16 +40,12 @@
 import os
 
 import mlpro_int_mujoco
-from mlpro.bf.ml import Model
-from mlpro.bf.ops import Mode
-from mlpro.bf.various import Log
-from mlpro.rl.models_agents import Policy, Agent
-from mlpro.rl.models_train import RLScenario
-from mlpro.bf.systems import State, Action
-from mlpro.rl.models_env_ada import SARSElement
-from mlpro.rl.models_env import Environment
-from mlpro.rl.models_agents import Reward
+from mlpro.rl import *
+from mlpro.bf import *
+from mlpro.bf.ml import *
 from mlpro.bf.systems import *
+from mlpro.bf.math import *
+from mlpro.bf.plot import *
 
 
 # 1 Implement the Environment
@@ -168,4 +164,4 @@ def _setup(self, p_mode, p_ada: bool, p_visualize:bool, p_logging) -> Model:
 
 myscenario.reset(p_seed=3)
 
-myscenario.run()
+myscenario.run()

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