diff --git a/README.md b/README.md index 9fb37bc..945f45f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Minecraft Virtual Intelligence +# MineAgent Welcome! This is a package intended for research into virtual intelligence in Minecraft. @@ -37,8 +37,8 @@ pixi install If you want to a conda environment you can install like so: ```bash -conda create -n mvi python=3.11 -conda activate mvi +conda create -n mineagent python=3.11 +conda activate mineagent pip install . # Install custom MineDojo fork @@ -52,23 +52,23 @@ cd .. ## Running the project -To run the project, you can use the `mvi` command. +To run the project, you can use the `mineagent` command. Either using Pixi: ```bash -pixi run mvi +pixi run mineagent ``` Or if you installed with conda or venv: ```bash -mvi +mineagent ``` -This will start the project and you can use the `mvi` command to run the project starting from the `engine.run` function. +This will start the project and you can use the `mineagent` command to run the project starting from the `engine.run` function. -To view a list of all the commands you can use, run `mvi --help`. +To view a list of all the commands you can use, run `mineagent --help`. ## Technologies diff --git a/forge/gradle.properties b/forge/gradle.properties index fb654c6..f7dcc79 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -42,9 +42,9 @@ mapping_version=1.21.5 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. -mod_id=mvi +mod_id=mineagent # The human-readable display name for the mod. -mod_name=Minecraft Virtual Intelligence Mod +mod_name=MineAgent Mod # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ @@ -52,7 +52,7 @@ mod_version=0.0.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=com.mvi.mvimod +mod_group_id=com.mineagent # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. mod_authors=Thomas Hopkins # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. diff --git a/forge/src/main/java/com/mvi/mvimod/ClientEventHandler.java b/forge/src/main/java/com/mineagent/ClientEventHandler.java similarity index 93% rename from forge/src/main/java/com/mvi/mvimod/ClientEventHandler.java rename to forge/src/main/java/com/mineagent/ClientEventHandler.java index c58ff21..1c738cc 100644 --- a/forge/src/main/java/com/mvi/mvimod/ClientEventHandler.java +++ b/forge/src/main/java/com/mineagent/ClientEventHandler.java @@ -1,4 +1,4 @@ -package com.mvi.mvimod; +package com.mineagent; import com.mojang.blaze3d.platform.Window; import com.mojang.logging.LogUtils; @@ -20,12 +20,12 @@ public class ClientEventHandler { @SubscribeEvent public static void onServerStarting(ServerStartingEvent event) { - LOGGER.info("MVI Mod Server Starting - Network handler is managed on client side"); + LOGGER.info("MineAgent Mod Server Starting - Network handler is managed on client side"); } @SubscribeEvent public static void onServerStopping(ServerStoppingEvent event) { - LOGGER.info("MVI Mod Server Stopping"); + LOGGER.info("MineAgent Mod Server Stopping"); } @SubscribeEvent diff --git a/forge/src/main/java/com/mvi/mvimod/Config.java b/forge/src/main/java/com/mineagent/Config.java similarity index 91% rename from forge/src/main/java/com/mvi/mvimod/Config.java rename to forge/src/main/java/com/mineagent/Config.java index 956180b..362dfa5 100644 --- a/forge/src/main/java/com/mvi/mvimod/Config.java +++ b/forge/src/main/java/com/mineagent/Config.java @@ -1,9 +1,9 @@ -package com.mvi.mvimod; +package com.mineagent; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = MviMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = MineAgentMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class Config { // Configuration Builder @@ -29,11 +29,11 @@ public class Config { READ_PORT = BUILDER - .comment("Port for reading data from MVI client") + .comment("Port for reading data from MineAgent client") .defineInRange("read_port", 12345, 1024, 65535); WRITE_PORT = BUILDER - .comment("Port for sending data to MVI client") + .comment("Port for sending data to MineAgent client") .defineInRange("write_port", 12346, 1024, 65535); BUILDER.pop(); diff --git a/forge/src/main/java/com/mvi/mvimod/DataBridge.java b/forge/src/main/java/com/mineagent/DataBridge.java similarity index 97% rename from forge/src/main/java/com/mvi/mvimod/DataBridge.java rename to forge/src/main/java/com/mineagent/DataBridge.java index 42718b1..72d6424 100644 --- a/forge/src/main/java/com/mvi/mvimod/DataBridge.java +++ b/forge/src/main/java/com/mineagent/DataBridge.java @@ -1,4 +1,4 @@ -package com.mvi.mvimod; +package com.mineagent; import com.mojang.logging.LogUtils; import org.slf4j.Logger; diff --git a/forge/src/main/java/com/mvi/mvimod/MviMod.java b/forge/src/main/java/com/mineagent/MineAgentMod.java similarity index 94% rename from forge/src/main/java/com/mvi/mvimod/MviMod.java rename to forge/src/main/java/com/mineagent/MineAgentMod.java index 39a8764..0e6c116 100644 --- a/forge/src/main/java/com/mvi/mvimod/MviMod.java +++ b/forge/src/main/java/com/mineagent/MineAgentMod.java @@ -1,4 +1,4 @@ -package com.mvi.mvimod; +package com.mineagent; import com.mojang.blaze3d.platform.Window; import com.mojang.logging.LogUtils; @@ -14,16 +14,16 @@ import org.slf4j.Logger; // The value here should match an entry in the META-INF/mods.toml file -@Mod(MviMod.MODID) -public class MviMod { +@Mod(MineAgentMod.MODID) +public class MineAgentMod { // Define mod id in a common place for everything to reference - public static final String MODID = "mvi"; + public static final String MODID = "mineagent"; // Directly reference a slf4j logger private static final Logger LOGGER = LogUtils.getLogger(); private static Thread networkThread; - public MviMod(FMLJavaModLoadingContext context) { + public MineAgentMod(FMLJavaModLoadingContext context) { // Register client event handler MinecraftForge.EVENT_BUS.register(ClientEventHandler.class); diff --git a/forge/src/main/java/com/mvi/mvimod/NetworkHandler.java b/forge/src/main/java/com/mineagent/NetworkHandler.java similarity index 98% rename from forge/src/main/java/com/mvi/mvimod/NetworkHandler.java rename to forge/src/main/java/com/mineagent/NetworkHandler.java index 9903d7b..360a263 100644 --- a/forge/src/main/java/com/mvi/mvimod/NetworkHandler.java +++ b/forge/src/main/java/com/mineagent/NetworkHandler.java @@ -1,4 +1,4 @@ -package com.mvi.mvimod; +package com.mineagent; import com.mojang.logging.LogUtils; import java.io.BufferedReader; @@ -23,8 +23,8 @@ public class NetworkHandler implements Runnable { private static final Logger LOGGER = LogUtils.getLogger(); - private static final String SEND_SOCKET_PATH = "/tmp/mvi_send.sock"; - private static final String RECEIVE_SOCKET_PATH = "/tmp/mvi_receive.sock"; + private static final String SEND_SOCKET_PATH = "/tmp/mineagent_send.sock"; + private static final String RECEIVE_SOCKET_PATH = "/tmp/mineagent_receive.sock"; private static final ExecutorService senderExecutor = Executors.newCachedThreadPool(); private static final ExecutorService receiverExecutor = Executors.newCachedThreadPool(); private Thread sendThread; diff --git a/mvi/__init__.py b/mineagent/__init__.py similarity index 100% rename from mvi/__init__.py rename to mineagent/__init__.py diff --git a/mvi/affector/__init__.py b/mineagent/affector/__init__.py similarity index 100% rename from mvi/affector/__init__.py rename to mineagent/affector/__init__.py diff --git a/mvi/affector/affector.py b/mineagent/affector/affector.py similarity index 100% rename from mvi/affector/affector.py rename to mineagent/affector/affector.py diff --git a/mvi/agent/__init__.py b/mineagent/agent/__init__.py similarity index 100% rename from mvi/agent/__init__.py rename to mineagent/agent/__init__.py diff --git a/mvi/agent/agent.py b/mineagent/agent/agent.py similarity index 100% rename from mvi/agent/agent.py rename to mineagent/agent/agent.py diff --git a/mvi/config.py b/mineagent/config.py similarity index 99% rename from mvi/config.py rename to mineagent/config.py index ac4fcef..85c5c03 100644 --- a/mvi/config.py +++ b/mineagent/config.py @@ -199,7 +199,7 @@ def get_config() -> Config: def parse_arguments() -> argparse.Namespace: """Parse command-line arguments""" parser = argparse.ArgumentParser( - description="Specify arguments for running Minecraft Virtual Intelligence" + description="Specify arguments for running MineAgent" ) parser.add_argument( "-f", diff --git a/mvi/engine.py b/mineagent/engine.py similarity index 100% rename from mvi/engine.py rename to mineagent/engine.py diff --git a/mvi/env.py b/mineagent/env.py similarity index 98% rename from mvi/env.py rename to mineagent/env.py index 6c9de64..cc78e89 100644 --- a/mvi/env.py +++ b/mineagent/env.py @@ -27,8 +27,8 @@ class ConnectionConfig: """Configuration for Minecraft Forge mod connection""" - command_port: str = "/tmp/mvi_receive.sock" - data_port: str = "/tmp/mvi_send.sock" + command_port: str = "/tmp/mineagent_receive.sock" + data_port: str = "/tmp/mineagent_send.sock" width: int = 320 height: int = 240 timeout: float = 30.0 @@ -403,7 +403,7 @@ def create_minecraft_env( Parameters ---------- config : Config | None - MVI configuration object + MineAgent configuration object connection_config : ConnectionConfig | None Connection configuration for the Minecraft mod diff --git a/mvi/learning/__init__.py b/mineagent/learning/__init__.py similarity index 100% rename from mvi/learning/__init__.py rename to mineagent/learning/__init__.py diff --git a/mvi/learning/icm.py b/mineagent/learning/icm.py similarity index 98% rename from mvi/learning/icm.py rename to mineagent/learning/icm.py index 102d6d2..3bd01ef 100644 --- a/mvi/learning/icm.py +++ b/mineagent/learning/icm.py @@ -7,8 +7,8 @@ import torch.nn.functional as F import torch.optim as optim -from mvi.memory.trajectory import TrajectoryBuffer -from mvi.config import ICMConfig +from mineagent.memory.trajectory import TrajectoryBuffer +from mineagent.config import ICMConfig @dataclass diff --git a/mvi/learning/ppo.py b/mineagent/learning/ppo.py similarity index 97% rename from mvi/learning/ppo.py rename to mineagent/learning/ppo.py index d139651..c123197 100644 --- a/mvi/learning/ppo.py +++ b/mineagent/learning/ppo.py @@ -7,9 +7,9 @@ import torch.nn.functional as F import torch.optim as optim -from mvi.utils import joint_logp_action, discount_cumsum -from mvi.config import PPOConfig -from mvi.memory.trajectory import TrajectoryBuffer +from mineagent.utils import joint_logp_action, discount_cumsum +from mineagent.config import PPOConfig +from mineagent.memory.trajectory import TrajectoryBuffer @dataclass diff --git a/mvi/learning/td.py b/mineagent/learning/td.py similarity index 98% rename from mvi/learning/td.py rename to mineagent/learning/td.py index 170c631..0d54d86 100644 --- a/mvi/learning/td.py +++ b/mineagent/learning/td.py @@ -1,7 +1,7 @@ import torch import torch.nn as nn -from mvi.config import TDConfig +from mineagent.config import TDConfig class TemporalDifferenceActorCritic: diff --git a/mvi/memory/__init__.py b/mineagent/memory/__init__.py similarity index 100% rename from mvi/memory/__init__.py rename to mineagent/memory/__init__.py diff --git a/mvi/memory/trajectory.py b/mineagent/memory/trajectory.py similarity index 100% rename from mvi/memory/trajectory.py rename to mineagent/memory/trajectory.py diff --git a/mvi/monitoring/callbacks/tensorboard.py b/mineagent/monitoring/callbacks/tensorboard.py similarity index 100% rename from mvi/monitoring/callbacks/tensorboard.py rename to mineagent/monitoring/callbacks/tensorboard.py diff --git a/mvi/monitoring/event.py b/mineagent/monitoring/event.py similarity index 100% rename from mvi/monitoring/event.py rename to mineagent/monitoring/event.py diff --git a/mvi/monitoring/event_bus.py b/mineagent/monitoring/event_bus.py similarity index 100% rename from mvi/monitoring/event_bus.py rename to mineagent/monitoring/event_bus.py diff --git a/mvi/perception/__init__.py b/mineagent/perception/__init__.py similarity index 100% rename from mvi/perception/__init__.py rename to mineagent/perception/__init__.py diff --git a/mvi/perception/visual.py b/mineagent/perception/visual.py similarity index 100% rename from mvi/perception/visual.py rename to mineagent/perception/visual.py diff --git a/mvi/reasoning/__init__.py b/mineagent/reasoning/__init__.py similarity index 100% rename from mvi/reasoning/__init__.py rename to mineagent/reasoning/__init__.py diff --git a/mvi/reasoning/critic.py b/mineagent/reasoning/critic.py similarity index 100% rename from mvi/reasoning/critic.py rename to mineagent/reasoning/critic.py diff --git a/mvi/reasoning/dynamics.py b/mineagent/reasoning/dynamics.py similarity index 100% rename from mvi/reasoning/dynamics.py rename to mineagent/reasoning/dynamics.py diff --git a/mvi/utils.py b/mineagent/utils.py similarity index 100% rename from mvi/utils.py rename to mineagent/utils.py diff --git a/pixi.lock b/pixi.lock index d0959a4..c41ae1a 100644 --- a/pixi.lock +++ b/pixi.lock @@ -178,7 +178,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/47/6a/62e288da7bcda82b935ff0c6cfe542970f04e29c756b0e147251b2fb251f/wget-3.2.zip - pypi: https://files.pythonhosted.org/packages/d6/45/fc303eb433e8a2a271739c98e953728422fa61a3c1f36077a49e395c972e/xmltodict-0.14.2-py2.py3-none-any.whl - - pypi: . + - pypi: ./ dev: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -375,7 +375,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/47/6a/62e288da7bcda82b935ff0c6cfe542970f04e29c756b0e147251b2fb251f/wget-3.2.zip - pypi: https://files.pythonhosted.org/packages/d6/45/fc303eb433e8a2a271739c98e953728422fa61a3c1f36077a49e395c972e/xmltodict-0.14.2-py2.py3-none-any.whl - - pypi: . + - pypi: ./ py310: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -555,7 +555,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/47/6a/62e288da7bcda82b935ff0c6cfe542970f04e29c756b0e147251b2fb251f/wget-3.2.zip - pypi: https://files.pythonhosted.org/packages/d6/45/fc303eb433e8a2a271739c98e953728422fa61a3c1f36077a49e395c972e/xmltodict-0.14.2-py2.py3-none-any.whl - - pypi: . + - pypi: ./ py311: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -734,7 +734,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/47/6a/62e288da7bcda82b935ff0c6cfe542970f04e29c756b0e147251b2fb251f/wget-3.2.zip - pypi: https://files.pythonhosted.org/packages/d6/45/fc303eb433e8a2a271739c98e953728422fa61a3c1f36077a49e395c972e/xmltodict-0.14.2-py2.py3-none-any.whl - - pypi: . + - pypi: ./ py312: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -913,7 +913,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/47/6a/62e288da7bcda82b935ff0c6cfe542970f04e29c756b0e147251b2fb251f/wget-3.2.zip - pypi: https://files.pythonhosted.org/packages/d6/45/fc303eb433e8a2a271739c98e953728422fa61a3c1f36077a49e395c972e/xmltodict-0.14.2-py2.py3-none-any.whl - - pypi: . + - pypi: ./ packages: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-3_kmp_llvm.conda build_number: 3 @@ -1566,28 +1566,28 @@ packages: - lz4>=3.1.0 ; extra == 'other' - opencv-python>=3.0 ; extra == 'other' - pygame==2.1.0 ; extra == 'nomujoco' - - scipy>=1.4.1 ; extra == 'nomujoco' - lz4>=3.1.0 ; extra == 'nomujoco' - opencv-python>=3.0 ; extra == 'nomujoco' - - box2d-py==2.3.5 ; extra == 'nomujoco' - pygame==2.1.0 ; extra == 'nomujoco' + - scipy>=1.4.1 ; extra == 'nomujoco' + - box2d-py==2.3.5 ; extra == 'nomujoco' - pygame==2.1.0 ; extra == 'nomujoco' - pygame==2.1.0 ; extra == 'all' - - scipy>=1.4.1 ; extra == 'all' + - pygame==2.1.0 ; extra == 'all' - lz4>=3.1.0 ; extra == 'all' - opencv-python>=3.0 ; extra == 'all' - - mujoco-py>=1.50,<2.0 ; extra == 'all' + - pygame==2.1.0 ; extra == 'all' + - scipy>=1.4.1 ; extra == 'all' - box2d-py==2.3.5 ; extra == 'all' - pygame==2.1.0 ; extra == 'all' - pygame==2.1.0 ; extra == 'all' - scipy>=1.4.1 ; extra == 'all' - lz4>=3.1.0 ; extra == 'all' - opencv-python>=3.0 ; extra == 'all' + - ale-py~=0.7.4 ; extra == 'all' - box2d-py==2.3.5 ; extra == 'all' - pygame==2.1.0 ; extra == 'all' - - pygame==2.1.0 ; extra == 'all' - - pygame==2.1.0 ; extra == 'all' - - ale-py~=0.7.4 ; extra == 'all' + - mujoco-py>=1.50,<2.0 ; extra == 'all' requires_python: '>=3.7' - pypi: https://files.pythonhosted.org/packages/25/26/d786c6bec30fe6110fd3d22c9a273a2a0e56c0b73b93e25ea1af5a53243b/gym_notices-0.0.8-py3-none-any.whl name: gym-notices @@ -2509,6 +2509,29 @@ packages: - setuptools-scm>=7 ; extra == 'dev' - setuptools>=64 ; extra == 'dev' requires_python: '>=3.10' +- pypi: ./ + name: mineagent + version: 0.0.1 + sha256: c5e40579dfa2050008785212eb7c2bc64d79ce6571e35e8010209fb0ee39cfc0 + requires_dist: + - pyyaml + - dacite + - gymnasium + - numpy==1.26.4 + - scipy + - torch + - torchvision + - tqdm + - tensorboard + - pre-commit ; extra == 'dev' + - pyright ; extra == 'dev' + - pytest ; extra == 'dev' + - pytest-mock ; extra == 'dev' + - ruff ; extra == 'dev' + - types-pyyaml ; extra == 'dev' + - matplotlib ; extra == 'dev' + requires_python: '>=3.10' + editable: true - pypi: git+https://github.com/thomashopkins32/MineDojo.git?rev=main#03ed9b47aeb1e681d9650982f3a06794530781db name: minedojo version: '0.1' @@ -2606,29 +2629,6 @@ packages: requires_dist: - dill>=0.3.9 requires_python: '>=3.8' -- pypi: . - name: mvi - version: 0.0.1 - sha256: 2b2ae536b613ce5896d5338070739bca453222dfdc43aeee8d302cc1adc220ce - requires_dist: - - pyyaml - - dacite - - gymnasium - - numpy==1.26.4 - - scipy - - torch - - torchvision - - tqdm - - tensorboard - - pre-commit ; extra == 'dev' - - pyright ; extra == 'dev' - - pytest ; extra == 'dev' - - pytest-mock ; extra == 'dev' - - ruff ; extra == 'dev' - - types-pyyaml ; extra == 'dev' - - matplotlib ; extra == 'dev' - requires_python: '>=3.10' - editable: true - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl name: mypy-extensions version: 1.0.0 diff --git a/pyproject.toml b/pyproject.toml index 88d61b6..cf474ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "mvi" +name = "mineagent" version = "0.0.1" authors = [ { name="Thomas Hopkins", email="thomas.hopkins.research@gmail.com" } @@ -30,7 +30,7 @@ dependencies = [ ] [tool.hatch.build.targets.wheel] -packages = ["mvi"] +packages = ["mineagent"] [project.license] file = "LICENSE" @@ -40,7 +40,7 @@ Homepage = "https://github.com/thomashopkins32/Minecraft-Virtual-Intelligence" Issues = "https://github.com/thomashopkins32/Minecraft-Virtual-Intelligence/issues" [project.scripts] -mvi = "mvi.engine:run" +mineagent = "mineagent.engine:run" [project.optional-dependencies] dev = [ @@ -76,7 +76,7 @@ openjdk = "21.*" [tool.pixi.pypi-dependencies] -mvi = { path = ".", editable = true } +mineagent = { path = ".", editable = true } MineDojo = { git = "https://github.com/thomashopkins32/MineDojo.git", rev = "main" } [tool.pixi.environments] @@ -96,6 +96,6 @@ python = "3.11.*" python = "3.12.*" [tool.pixi.tasks] -mvi = "mvi" +mineagent = "mineagent" minecraft-client = "cd forge && gradle runClient" minecraft-build = "cd forge && gradle build" diff --git a/tests/affector/test_affector.py b/tests/affector/test_affector.py index 6f737d6..38b5e55 100644 --- a/tests/affector/test_affector.py +++ b/tests/affector/test_affector.py @@ -1,7 +1,7 @@ import pytest import torch -from mvi.affector.affector import LinearAffector +from mineagent.affector.affector import LinearAffector from tests.helper import ACTION_SPACE diff --git a/tests/agent/test_agent.py b/tests/agent/test_agent.py index c84183d..47adfba 100644 --- a/tests/agent/test_agent.py +++ b/tests/agent/test_agent.py @@ -1,8 +1,8 @@ import pytest import torch -from mvi.agent.agent import AgentV1 -from mvi.config import AgentConfig, PPOConfig, ICMConfig, TDConfig +from mineagent.agent.agent import AgentV1 +from mineagent.config import AgentConfig, PPOConfig, ICMConfig, TDConfig from tests.perception.test_visual import VISUAL_EXPECTED_PARAMS from tests.affector.test_affector import LINEAR_AFFECTOR_EXPECTED_PARAMS from tests.reasoning.test_critic import LINEAR_CRITIC_EXPECTED_PARAMS diff --git a/tests/learning/test_icm.py b/tests/learning/test_icm.py index 22be856..a59d71c 100644 --- a/tests/learning/test_icm.py +++ b/tests/learning/test_icm.py @@ -1,9 +1,9 @@ import pytest -from mvi.agent.agent import AgentV1 +from mineagent.agent.agent import AgentV1 import torch -from mvi.learning.icm import ICM -from mvi.config import AgentConfig, PPOConfig, ICMConfig, TDConfig -from mvi.memory.trajectory import TrajectoryBuffer +from mineagent.learning.icm import ICM +from mineagent.config import AgentConfig, PPOConfig, ICMConfig, TDConfig +from mineagent.memory.trajectory import TrajectoryBuffer from tests.helper import ACTION_SPACE diff --git a/tests/learning/test_ppo.py b/tests/learning/test_ppo.py index 1c31a57..63ed348 100644 --- a/tests/learning/test_ppo.py +++ b/tests/learning/test_ppo.py @@ -1,9 +1,9 @@ import pytest -from mvi.agent.agent import AgentV1 +from mineagent.agent.agent import AgentV1 import torch -from mvi.learning.ppo import PPO -from mvi.config import AgentConfig, PPOConfig, ICMConfig, TDConfig -from mvi.memory.trajectory import TrajectoryBuffer +from mineagent.learning.ppo import PPO +from mineagent.config import AgentConfig, PPOConfig, ICMConfig, TDConfig +from mineagent.memory.trajectory import TrajectoryBuffer from tests.helper import ACTION_SPACE diff --git a/tests/learning/test_td.py b/tests/learning/test_td.py index 0662310..69a256a 100644 --- a/tests/learning/test_td.py +++ b/tests/learning/test_td.py @@ -1,9 +1,9 @@ import pytest import torch -from mvi.reasoning.critic import LinearCritic -from mvi.learning.td import TemporalDifferenceActorCritic -from mvi.config import TDConfig +from mineagent.reasoning.critic import LinearCritic +from mineagent.learning.td import TemporalDifferenceActorCritic +from mineagent.config import TDConfig @pytest.fixture diff --git a/tests/memory/test_trajectory.py b/tests/memory/test_trajectory.py index 369e6f0..64c3f53 100644 --- a/tests/memory/test_trajectory.py +++ b/tests/memory/test_trajectory.py @@ -1,7 +1,7 @@ import pytest import torch -from mvi.memory.trajectory import TrajectoryBuffer +from mineagent.memory.trajectory import TrajectoryBuffer MAX_BUFFER_SIZE = 10 diff --git a/tests/monitoring/callbacks/test_tensorboard.py b/tests/monitoring/callbacks/test_tensorboard.py index 5dc7462..101a7a3 100644 --- a/tests/monitoring/callbacks/test_tensorboard.py +++ b/tests/monitoring/callbacks/test_tensorboard.py @@ -4,8 +4,8 @@ import shutil from datetime import datetime -from mvi.monitoring.callbacks.tensorboard import TensorboardWriter -from mvi.monitoring.event import ( +from mineagent.monitoring.callbacks.tensorboard import TensorboardWriter +from mineagent.monitoring.event import ( Action, Start, Stop, @@ -14,7 +14,7 @@ ModuleForwardStart, ModuleForwardEnd, ) -from mvi.config import TensorboardConfig +from mineagent.config import TensorboardConfig def _verify_tensor_call( diff --git a/tests/monitoring/test_event.py b/tests/monitoring/test_event.py index 8659b45..5d55d50 100644 --- a/tests/monitoring/test_event.py +++ b/tests/monitoring/test_event.py @@ -1,7 +1,7 @@ import torch from datetime import datetime -from mvi.monitoring.event import ( +from mineagent.monitoring.event import ( Event, Start, Stop, diff --git a/tests/monitoring/test_event_bus.py b/tests/monitoring/test_event_bus.py index cc96147..c0bb769 100644 --- a/tests/monitoring/test_event_bus.py +++ b/tests/monitoring/test_event_bus.py @@ -1,6 +1,6 @@ -from mvi.monitoring.event_bus import EventBus, get_event_bus, setup_event_bus -from mvi.monitoring.event import Event -from mvi.config import MonitoringConfig +from mineagent.monitoring.event_bus import EventBus, get_event_bus, setup_event_bus +from mineagent.monitoring.event import Event +from mineagent.config import MonitoringConfig class MockEvent(Event): @@ -129,9 +129,9 @@ def test_subscribe_return_value(mocker): def test_global_event_bus(): """Test the global event bus singleton pattern.""" # Reset the global event bus - import mvi.monitoring.event_bus + import mineagent.monitoring.event_bus - mvi.monitoring.event_bus._global_event_bus = None + mineagent.monitoring.event_bus._global_event_bus = None # Get the global event bus event_bus1 = get_event_bus() diff --git a/tests/perception/test_visual.py b/tests/perception/test_visual.py index 4bc6efa..f9f2334 100644 --- a/tests/perception/test_visual.py +++ b/tests/perception/test_visual.py @@ -2,7 +2,7 @@ import torch from torchvision.transforms.functional import center_crop # type: ignore -from mvi.perception.visual import ( +from mineagent.perception.visual import ( VisualPerception, FoveatedPerception, PeripheralPerception, diff --git a/tests/reasoning/test_critic.py b/tests/reasoning/test_critic.py index 5228860..2791b9b 100644 --- a/tests/reasoning/test_critic.py +++ b/tests/reasoning/test_critic.py @@ -1,7 +1,7 @@ import pytest import torch -from mvi.reasoning.critic import LinearCritic +from mineagent.reasoning.critic import LinearCritic EMBED_DIM = 64 diff --git a/tests/reasoning/test_dynamics.py b/tests/reasoning/test_dynamics.py index 506569a..53f004d 100644 --- a/tests/reasoning/test_dynamics.py +++ b/tests/reasoning/test_dynamics.py @@ -1,7 +1,7 @@ import pytest import torch -from mvi.reasoning.dynamics import ForwardDynamics, InverseDynamics +from mineagent.reasoning.dynamics import ForwardDynamics, InverseDynamics from tests.helper import ACTION_SPACE diff --git a/tests/test_config.py b/tests/test_config.py index 6d6457a..fa48c46 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -4,8 +4,8 @@ import pytest import yaml -from mvi.agent.agent import AgentV1 -from mvi.config import ( +from mineagent.agent.agent import AgentV1 +from mineagent.config import ( parse_config, update_config, PPOConfig, diff --git a/tests/test_utils.py b/tests/test_utils.py index 626a090..ce03f31 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,7 +1,7 @@ import numpy as np import torch -from mvi.utils import discount_cumsum +from mineagent.utils import discount_cumsum def test_discount_cumsum():