Merge pull request #10 from Co-Evolve/develop

v1.0.4

moojoco/environment/dual.py

@@ -63,12 +63,12 @@ def observation_space(self) -> SpaceType:
     def step(
         self, state: BaseEnvState, action: chex.Array, *args, **kwargs
     ) -> BaseEnvState:
-        return self._env.step(state=state, action=action)
+        return self._env.step(state=state, action=action, *args, **kwargs)
 
     def reset(
         self, rng: np.random.RandomState | chex.PRNGKey, *args, **kwargs
     ) -> BaseEnvState:
-        return self._env.reset(rng=rng)
+        return self._env.reset(rng=rng, *args, **kwargs)
 
     def render(self, state: BaseEnvState) -> List[RenderFrame] | None:
         return self._env.render(state=state)

moojoco/environment/mjc_env.py

@@ -265,7 +265,7 @@ def step(
     ) -> VectorMJCEnvState:
         self._states = list(
             self._pool.map(
-                lambda env, ste, act: env.step(state=ste, action=act),
+                lambda env, ste, act: env.step(state=ste, action=act, *args, **kwargs),
                 self._envs,
                 self._states,
                 action,
@@ -277,7 +277,11 @@ def reset(
         self, rng: List[np.random.RandomState], *args, **kwargs
     ) -> VectorMJCEnvState:
         self._states = list(
-            self._pool.map(lambda env, sub_rng: env.reset(sub_rng), self._envs, rng)
+            self._pool.map(
+                lambda env, sub_rng: env.reset(sub_rng, *args, **kwargs),
+                self._envs,
+                rng,
+            )
         )
 
         return self._merged_states

moojoco/environment/wrapper.py

@@ -53,12 +53,12 @@ def observation_space(self) -> SpaceType:
     def step(
         self, state: BaseEnvState, action: chex.Array, *args, **kwargs
     ) -> BaseEnvState:
-        return self._env.step(state=state, action=action)
+        return self._env.step(state=state, action=action, *args, **kwargs)
 
     def reset(
         self, rng: np.random.RandomState | chex.PRNGKey, *args, **kwargs
     ) -> BaseEnvState:
-        return self._env.reset(rng=rng)
+        return self._env.reset(rng=rng, *args, **kwargs)
 
     def render(self, state: BaseEnvState) -> List[RenderFrame] | None:
         return self._env.render(state=state)
@@ -83,14 +83,14 @@ def _transform_observations(self, state: BaseEnvState) -> BaseEnvState:
     def step(
         self, state: BaseEnvState, action: chex.Array, *args, **kwargs
     ) -> BaseEnvState:
-        state = self._env.step(state=state, action=action)
+        state = self._env.step(state=state, action=action, *args, **kwargs)
         state = self._transform_observations(state=state)
         return state
 
     def reset(
         self, rng: np.random.RandomState | chex.PRNGKey, *args, **kwargs
     ) -> BaseEnvState:
-        state = self._env.reset(rng=rng)
+        state = self._env.reset(rng=rng, *args, **kwargs)
         state = self._transform_observations(state=state)
         return state
 
@@ -114,5 +114,5 @@ def step(
         self, state: BaseEnvState, action: chex.Array, *args, **kwargs
     ) -> BaseEnvState:
         action, state = self._transform_action(action=action, state=state)
-        state = self._env.step(state=state, action=action)
+        state = self._env.step(state=state, action=action, *args, **kwargs)
         return state

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moojoco"
-version = "1.0.3"
+version = "1.0.4"
 authors = [
     { name = "Dries Marzougui", email = "[email protected]" },
 ]

setup.py

@@ -11,7 +11,7 @@
 
 setup(
         name='moojoco',
-        version='1.0.3',
+        version='1.0.4',
         description='A unified framework for implementing and interfacing with MuJoCo and MuJoCo-XLA simulation '
                     'environments.',
         long_description=readme,