Merge branch 'reginald-mclean-removeV1_refactor'

metaworld/__init__.py

@@ -10,8 +10,13 @@
 import numpy as np
 import numpy.typing as npt
 
-import metaworld.envs.mujoco.env_dict as _env_dict
+import metaworld.env_dict as _env_dict
 from metaworld.types import Task
+from .sawyer_xyz_env import SawyerXYZEnv
+from metaworld.env_dict import (
+    ALL_V2_ENVIRONMENTS_GOAL_HIDDEN,
+    ALL_V2_ENVIRONMENTS_GOAL_OBSERVABLE,
+)
 
 
 class MetaWorldEnv(abc.ABC):
@@ -285,4 +290,4 @@ def __init__(self, seed=None):
         )
 
 
-__all__ = ["ML1", "MT1", "ML10", "MT10", "ML45", "MT50"]
+__all__ = ["ML1", "MT1", "ML10", "MT10", "ML45", "MT50", "ALL_V2_ENVIRONMENTS_GOAL_HIDDEN", "ALL_V2_ENVIRONMENTS_GOAL_OBSERVABLE", "SawyerXYZEnv"]

metaworld/envs/asset_path_utils.py → metaworld/asset_path_utils.py

@@ -6,20 +6,7 @@
 
 _CURRENT_FILE_DIR = Path(__file__).parent.absolute()
 
-ENV_ASSET_DIR_V1 = _CURRENT_FILE_DIR / "assets_v1"
-ENV_ASSET_DIR_V2 = _CURRENT_FILE_DIR / "assets_v2"
-
-
-def full_v1_path_for(file_name: str) -> str:
-    """Retrieves the full, absolute path for a given V1 asset
-
-    Args:
-        file_name: Name of the asset file. Can include subdirectories.
-
-    Returns:
-        The full path to the asset file.
-    """
-    return str(ENV_ASSET_DIR_V1 / file_name)
+ENV_ASSET_DIR_V2 = _CURRENT_FILE_DIR / "assets"
 
 
 def full_v2_path_for(file_name: str) -> str: