Terminal refac #13

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

Jump to bottom

Merged

MarcCote merged 29 commits into main from terminal-refac

Nov 26, 2024

Collaborator

matheper commented Nov 19, 2024 •

edited

Loading

This WIP PR contains:

Decouple the terminal operations from environments and tools.
New Terminal class handles terminal operations, including running commands and managing pseudo terminals (interactive sessions).
New DockerTerminal to handle operations within Docker containers. Terminal and DockerTerminal should work interchangeably.
Refactoring of pdb.py to use Terminal class
Adding tests for Terminal, DockerTerminal, and PDBTool classes

TODO:

Run docker with non-root user
Provide the option to initialize the terminal using docker or the regular terminal (done through config)
Clean up docker containers (implemented using atexit, will revisit that in the future)
Update remaining tools and envs that use a terminal (I'll do that in a separate pr)

matheper added 8 commits

November 15, 2024 14:12


          Add Terminal and DockerTerminal classes

ac26c6d


          docker requirement

513dffd


          terminal fixes

3a4beff


          cleaner output from terminal

41cb54b


          integrate terminal into PDBTool and RepoEnv

41fb649


          merge main into terminal-refac

a6fb19e


          fix circular import

3cc12f5


          merged main into terminal-refac

eba3ddc

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/tools/eval.py Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/tools/pdb.py Show resolved Hide resolved

matheper added 3 commits

November 22, 2024 06:52


          running docker with uid and gid that matches host

2cbe38b


          Timeout read_terminal if no changes to output

4c5b97c


          pr comments

71c9075

MarcCote reviewed

View reviewed changes

froggy/terminal.py Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/terminal.py Outdated Show resolved Hide resolved


          remove working_dir from terminal run. use tempfile.TemporaryDirectory

93621de

matheper added 8 commits

November 25, 2024 09:35


          updating volumes while setting working_dir

070bd03


          remove previous working dir from volumes

2f14336


          removed mutable default arguments

511d327


          aider use docker terminal

f8102e4


          merge main into terminal-refac

01f2e80


          run_interactive always string

2f51523


          fix tests and entrypoint list

fd2f0be


          fix test_env tests

e01936e

matheper changed the title ~~WIP - Terminal refac~~ Terminal refac

matheper added 3 commits

November 25, 2024 16:10


          check output using list

63c1b46


          Fix docker UID and GID patch logic

ac46608


          let docker name container, then rename it

92a6a06

matheper marked this pull request as ready for review

November 26, 2024 01:00

Collaborator Author

matheper commented Nov 26, 2024

I suggest we review the PR as is. I'll update the remaining tools and envs in a separate one.

MarcCote reviewed

View reviewed changes

froggy/envs/aider.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/env.py Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/swe_bench.py Outdated Show resolved Hide resolved

matheper commented

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

matheper commented

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

MarcCote reviewed

View reviewed changes

froggy/envs/terminal_simulator.py Outdated Show resolved Hide resolved

matheper commented

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

matheper commented

View reviewed changes

froggy/envs/env.py Outdated Show resolved Hide resolved

MarcCote approved these changes

View reviewed changes

matheper and others added 2 commits

November 26, 2024 11:44


          Apply suggestions from code review

f664aba

Co-authored-by: Marc-Alexandre Côté <marc.cote.19@gmail.com>


          Apply suggestions from code review

cc00f43

Co-authored-by: Marc-Alexandre Côté <marc.cote.19@gmail.com>

MarcCote merged commit 8a50d1d into main

2 checks passed

MarcCote deleted the terminal-refac branch

November 26, 2024 16:49

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet