Remove timestep enforcement from monitor, adjust TimeLimit semantics …

…to match existing monitor, fix test for env reuse

gym/monitoring/monitor_manager.py

@@ -235,11 +235,6 @@ def _before_step(self, action):
     def _after_step(self, observation, reward, done, info):
         if not self.enabled: return done
 
-        # Add 1 since about to take another step
-        if self.env.spec and self.stats_recorder.steps+1 >= self.env.spec.timestep_limit:
-            logger.debug('Ending episode %i because it reached the timestep limit of %i.', self.episode_id, self.env.spec.timestep_limit)
-            done = True
-
         if done and self.env_semantics_autoreset:
             # For envs with BlockingReset wrapping VNCEnv, this observation will be the first one of the new episode
             self._reset_video_recorder()

gym/monitoring/tests/test_monitor.py

@@ -99,7 +99,9 @@ def _step(self, action):
 gym.envs.register(
     id='Autoreset-v0',
     entry_point='gym.monitoring.tests.test_monitor:AutoresetEnv',
-    timestep_limit=2,
+    tags={
+        'wrapper_config.TimeLimit.max_episode_steps': 2,
+        },
 )
 def test_env_reuse():
     with helpers.tempdir() as temp:
@@ -108,11 +110,13 @@ def test_env_reuse():
 
         env.reset()
 
-        env.step(None)
+        _, _, done, _ = env.step(None)
+        assert not done
         _, _, done, _ = env.step(None)
         assert done
 
-        env.step(None)
+        _, _, done, _ = env.step(None)
+        assert not done
         _, _, done, _ = env.step(None)
         assert done
 
@@ -182,7 +186,7 @@ def test_only_complete_episodes_written():
     id='test.StepsLimitCartpole-v0',
     entry_point='gym.envs.classic_control:CartPoleEnv',
     tags={
-        'wrapper_config.TimeLimit.max_episode_steps': 1
+        'wrapper_config.TimeLimit.max_episode_steps': 2
         }
     )
 

gym/wrappers/time_limit.py

@@ -26,11 +26,11 @@ def _elapsed_seconds(self):
 
     def _past_limit(self):
         """Return true if we are past our limit"""
-        if self._max_episode_steps is not None and self._max_episode_steps < self._elapsed_steps:
+        if self._max_episode_steps is not None and self._max_episode_steps <= self._elapsed_steps:
             logger.debug("Env has passed the step limit defined by TimeLimit.")
             return True
 
-        if self._max_episode_seconds is not None and self._max_episode_seconds < self._elapsed_seconds:
+        if self._max_episode_seconds is not None and self._max_episode_seconds <= self._elapsed_seconds:
             logger.debug("Env has passed the seconds limit defined by TimeLimit.")
             return True