diff --git a/quickstart/all_test_config.yaml b/_quickstart/all_test_config.yaml similarity index 100% rename from quickstart/all_test_config.yaml rename to _quickstart/all_test_config.yaml diff --git a/quickstart/combine_and_monitor_rerun.py b/_quickstart/combine_and_monitor_rerun.py similarity index 100% rename from quickstart/combine_and_monitor_rerun.py rename to _quickstart/combine_and_monitor_rerun.py diff --git a/quickstart/single_agent_train_battery_target_env.py b/_quickstart/single_agent_train_battery_target_env.py similarity index 100% rename from quickstart/single_agent_train_battery_target_env.py rename to _quickstart/single_agent_train_battery_target_env.py diff --git a/quickstart/single_agent_train_dest_env.py b/_quickstart/single_agent_train_dest_env.py similarity index 100% rename from quickstart/single_agent_train_dest_env.py rename to _quickstart/single_agent_train_dest_env.py diff --git a/quickstart/single_agent_train_dirt_env.py b/_quickstart/single_agent_train_dirt_env.py similarity index 100% rename from quickstart/single_agent_train_dirt_env.py rename to _quickstart/single_agent_train_dirt_env.py diff --git a/quickstart/single_agent_train_item_env.py b/_quickstart/single_agent_train_item_env.py similarity index 100% rename from quickstart/single_agent_train_item_env.py rename to _quickstart/single_agent_train_item_env.py diff --git a/marl_factory_grid/__init__.py b/marl_factory_grid/__init__.py index e69de29..5b8bacc 100644 --- a/marl_factory_grid/__init__.py +++ b/marl_factory_grid/__init__.py @@ -0,0 +1,6 @@ +from environment.factory import BaseFactory +from environment.factory import OBSBuilder + +from utils.tools import ConfigExplainer + +from quickstart import init diff --git a/marl_factory_grid/quickstart/default_config.yaml b/marl_factory_grid/default_config.yaml similarity index 100% rename from marl_factory_grid/quickstart/default_config.yaml rename to marl_factory_grid/default_config.yaml diff --git a/marl_factory_grid/quickstart/init.py b/marl_factory_grid/quickstart.py similarity index 58% rename from marl_factory_grid/quickstart/init.py rename to marl_factory_grid/quickstart.py index 150a776..3b96e2a 100644 --- a/marl_factory_grid/quickstart/init.py +++ b/marl_factory_grid/quickstart.py @@ -4,11 +4,16 @@ from pathlib import Path from marl_factory_grid.utils.tools import ConfigExplainer -if __name__ == '__main__': + +def init(): print('Retrieving available options...') ce = ConfigExplainer() cwd = Path(os.getcwd()) ce.save_all(cwd / 'full_config.yaml') template_path = Path(__file__) / 'marl_factory_grid' / 'modules' / '_template' + print(f'Available config options saved to: {(cwd / "full_config.yaml").resolve()}') + print('-----------------------------') + print(f'Copying Templates....') shutil.copytree(template_path, cwd) - print() + print(f'Templates copied to {template_path.resolve()}') + print(':wave:') diff --git a/marl_factory_grid/quickstart/__init__.py b/marl_factory_grid/quickstart/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/setup.py b/setup.py index 8262bdb..eb82069 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ long_description = (this_directory / "README.md").read_text() setup(name='Marl-Factory-Grid', - version='0.0.8', + version='0.0.9', description='A framework to research MARL agents in various setings.', author='Steffen Illium', author_email='steffen.illium@ifi.lmu.de',