Skip to content

fix: Stop node execution from deleting or moving pre-existing datasets in workspace #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
floo-dck wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: Stop node execution from deleting or moving pre-existing datasets in workspace #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions treesearch/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ async def exec_node(self, node: Node) -> Node:
# Always sync node.code with current_code so that what we execute
# matches what the agent sees later
node.code = current_code


# Snapshot workspace state before execution so pre-existing files are not moved
workspace_dir = Path(self._workspace)
files_before_exec = set(workspace_dir.rglob("*"))

exec_result = self._interpreter.run(current_code)
logger.debug(exec_result)

Expand All @@ -190,19 +194,22 @@ async def exec_node(self, node: Node) -> Node:
(node_dir / "out.log").write_text("".join(exec_result.term_out))
(node_dir / "exec_result.pkl").write_bytes(pickle.dumps(exec_result))

# Move all generated files from the workspace to checkpoint for this node
workspace_dir = Path(self._workspace)
# Move only files that were newly generated during execution
working_dir = workspace_dir / "working"
# Collect files from workspace (excluding runfile.py and working dir)

# Collect files from workspace (excluding runfile.py, working dir, and pre-existing files)
generated_files = [
item for item in workspace_dir.iterdir()
if item.name not in ("runfile.py", "working") and not item.name.startswith(".")
and item not in files_before_exec
]

# Also collect files from working subdirectory if it exists
# Also collect newly generated files from working subdirectory if it exists
if working_dir.exists():
generated_files.extend(list(working_dir.iterdir()))
generated_files.extend([
item for item in working_dir.iterdir()
if item not in files_before_exec
])

# Keep only relevant files via whitelist
if self._config.exec.keep_only_relevant_files:
Expand Down