clean reset args (#67)

Author: xingdi-eric-yuan

froggy/envs/aider.py

@@ -30,13 +30,13 @@ def eval(self, **kwargs):
         self.last_eval_obs = utils.cleanup_pytest_output(output)
         return self.last_eval_obs
 
-    def reset(self, *, seed=None, options: dict = None):
+    def reset(self, *, options: dict = None):
         options = options or {}
         self.current_sample = self.dataset[options["task_name"]]
 
         directory = self.current_sample["base_directory"]
         self.setup_workspace(directory, entrypoint="python -m pytest -s .")
-        infos = super().reset()
+        infos = super().reset(options=options)
 
         # By default, open the only modifiable file.
         self.load_current_file(self.current_sample["filename"])

froggy/envs/env.py

@@ -264,9 +264,7 @@ def restore(self, *filepaths):
     def reset(
         self,
         *,
-        seed=None,
         options: dict = None,
-        restore_code=True,
     ):
         """Resets the environment to the initial state and returns the initial observation"""
         self.logger.info(f"Resetting environment")
@@ -279,10 +277,6 @@ def reset(
         self.done = False
         self.clear_all_observations()
         self.empty_event_queue()
-        self.seed(seed)
-
-        if restore_code:
-            self.restore()
 
         # Notify all tools that the environment is reset and get their observations
         self.queue_event(Event.ENV_RESET, source="env")

froggy/envs/mini_nightmare.py

@@ -39,7 +39,7 @@ def eval(self, **kwargs):
         self.last_eval_obs = utils.cleanup_pytest_output(output)
         return self.last_eval_obs
 
-    def reset(self, *, seed=None, options: dict = None):
+    def reset(self, *, options: dict = None):
         options = options or {}
         self.current_sample = self.dataset[options["task_name"]]
 
@@ -50,7 +50,7 @@ def reset(self, *, seed=None, options: dict = None):
             debug_entrypoint="python -m pdb -m pytest -s test.py",
         )
 
-        infos = super().reset()
+        infos = super().reset(options=options)
 
         # By default, open the only modifiable file.
         self.load_current_file(self.current_sample["filename"])

froggy/envs/swe_bench.py

@@ -194,7 +194,7 @@ def eval(self, **kwargs):
         self.last_eval_obs = output
         return self.last_eval_obs
 
-    def reset(self, *, seed=None, options: dict | None = None):
+    def reset(self, *, options: dict | None = None):
         # TODO: support reset current task, i.e. no options provided.
         options = options or {}
 
@@ -287,7 +287,7 @@ def reset(self, *, seed=None, options: dict | None = None):
         # Reset RepoEnv
         # TODO: Create a RepoEnv per task and set max_score at initialization.
         self.max_score = len(self.fail_to_pass)
-        infos = super().reset(options=options, restore_code=False)
+        infos = super().reset(options=options)
         assert not self.done, "Tests should be failing before debugging."
 
         return infos

froggy/envs/tests/test_env.py

@@ -295,22 +295,19 @@ def test_directory_tree(tmp_path):
     assert result == expected_result
 
 
-@patch.object(RepoEnv, "restore")
 @patch.object(Terminal, "run", return_value=(False, "1 failed, 0 passed"))
 @patch.object(RepoEnv, "get_tool")
 def test_reset(
     mock_get_tool,
     mock_eval,
-    mock_restore,
     env,
 ):
     mock_pdb_tool = MagicMock()
     mock_pdb_tool.start_pseudo_terminal.return_value = None
     mock_pdb_tool.pdb_obs = "PDB started"
     mock_get_tool.return_value = mock_pdb_tool
-    infos = env.reset(seed=42)
+    infos = env.reset()
 
-    mock_restore.assert_called_once()
     mock_eval.assert_called_once()
     assert env.current_file is None
     assert env.current_file_content is None