Skip to content
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

refactor: Replace pexpect with libtmux in BashSession #4881

Draft
wants to merge 112 commits into
base: main
Choose a base branch
from
Draft

refactor: Replace pexpect with libtmux in BashSession #4881

wants to merge 112 commits into from
+1,762 −976

Conversation

xingyaoww
Copy link
Collaborator

@xingyaoww xingyaoww commented Nov 10, 2024 •
edited by github-actions bot
Loading

  • Simplified implementation using libtmux instead of pexpect
  • Added proper handling of command errors, interactive commands, and timeouts
  • Added test suite to verify behavior
  • Improved output handling and error detection

End-user friendly description of the problem this fixes or functionality that this introduces

  • Include this change in the Release Notes. If checked, you must provide an end-user friendly description for your change below

Give a summary of what the PR does, explaining any non-trivial design decisions

Collaborated with OpenHands:

Link of any specific issues this addresses

To run this PR locally, use the following command:

docker run -it --rm   -p 3000:3000   -v /var/run/docker.sock:/var/run/docker.sock   --add-host host.docker.internal:host-gateway   -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:60daaa3-nikolaik   --name openhands-app-60daaa3   docker.all-hands.dev/all-hands-ai/openhands:60daaa3

openhands-agent and others added 30 commits November 10, 2024 18:12
@openhands-agent
refactor: Replace pexpect with libtmux in BashSession
7b86e33 
- Simplified implementation using libtmux instead of pexpect
- Added proper handling of command errors, interactive commands, and timeouts
- Added test suite to verify behavior
- Improved output handling and error detection
@xingyaoww
update poetry and implement pwd
9e5653c
@xingyaoww
add CmdOutputMetadata to get a lot of info from ps1
522eb53
@xingyaoww
handle and test on multiple PS1 block
d60065b
@xingyaoww
greatly simplify command to not accepting blocking/keep_prompt, we sh…
e304973 
…ould do it in the CmdOutputObservation end for keep_prompt
@xingyaoww
fix PS1 so PS1JSON works
c743833
@xingyaoww
support pid
49eae72
@xingyaoww
preliminary impl of bash
363b379
@xingyaoww
slight refactor of cmd
ffa0676
@xingyaoww
add blocking back
554e03a
@xingyaoww
add blocking back
2b252e0
@openhands-agent
Improve test coverage for CmdOutputMetadata
e994620 
- Add tests for missing fields in PS1 metadata
- Add tests for malformed values in numeric fields
- Add tests for boolean values in numeric fields
- Fix JSON parsing in test_ps1_metadata_json_structure
- Fix handling of malformed values in from_ps1_match
@openhands-agent
Refactor error handling in CmdOutputMetadata
1935483 
- Move error handling from from_ps1_match to from_ps1
- Let from_ps1_match raise exceptions for invalid data
- Update tests to match new error handling behavior
@openhands-agent
Improve CmdOutputMetadata handling of malformed values and line endings
23ddbe4 
- Add support for float values in numeric fields
- Fix regex pattern to handle different line endings
- Add more test cases for edge cases
- Keep valid string fields when numeric fields fail to parse
@openhands-agent
Refactor PS1 metadata regex pattern
744938c 
- Use re.escape() to properly escape special characters in markers
- Use constants to avoid duplication
- Update tests to use constants and handle newlines consistently
@xingyaoww
update test bash session to be compatible with latest interface
f5518bf
@xingyaoww
make sure ps1 end begin with newline
aaed596
@xingyaoww
add newline suffix for test
71e4ec5
@xingyaoww
add test
3a2443f
@xingyaoww
add testcase & tweak for ps1
ceb0d32
@xingyaoww
remove re escape
145f141
@xingyaoww
tweak ps1
56e4df5
@xingyaoww
fix bash session arg
9e43ee5
@xingyaoww
make action execution server compatible
ed382c6
@xingyaoww
remove command id from agent obs & make other places compatible with …
8e4180f 
…the new change
@xingyaoww
fix typo
3c68c7d
@xingyaoww
fix typo
d82c420
@xingyaoww
do not wrap lines in tmux captured output
010e453
@xingyaoww
use pwd to get working_dir
4aeb681
@xingyaoww
use PROMPT_COMMAND to make sure PS1 changes
28615cd
@xingyaoww
fix test
7ef9e37
@xingyaoww
remove keep_prompt from everywhere
20721e3
@xingyaoww
fix resolver tests
725eeb1
@xingyaoww
improve error message
1dfee78
@xingyaoww
fix resolver test
9fe792f
@xingyaoww
fix test bash ps1
c335b1e
@xingyaoww
remove the complex local tmux test
a15708a
@xingyaoww
try fix conflict of tmux session
ff3d971
@xingyaoww
Merge commit 'a531413d8649640842d2e639e15b4e7ecadf35c5' into feature/…
22a2572 
…tmux-shell
@xingyaoww
remove command id
904bc29
@xingyaoww
fix test
f016fbc
@xingyaoww
fix PS1 parsing
0f40b4c
@xingyaoww
fix ipython pwd
313a901
@xingyaoww
remove specified sid
1f9168a
@xingyaoww
only raise RuntimeError when error code >= 500
1a40358
@xingyaoww
relax tests
95add43
@xingyaoww
resize tmux window
6da2636
@xingyaoww
temporarily bump ver for runtime
bc995ef
@xingyaoww
fix resize arg
153a501
@xingyaoww
simplify test bash session in favor of runtime test
796a100
@xingyaoww
tweak test
483f4b1
@xingyaoww
tweak test
3d7b44c
@xingyaoww
fix serialization for CmdOutputMetadata
bd12b99
@xingyaoww
Merge commit '302e41d7bb3d5b2b319f1ce2d15e5925dda069a2' into feature/…
f2d57f9 
…tmux-shell
@xingyaoww
hopefully fixes the bash
cf7897b
@xingyaoww
fix empty cmd handling
b430cb4
@xingyaoww
fix test
bae44a7
@xingyaoww
fix request
60daaa3
@xingyaoww
fix VERY long cmd output
04397fe
@xingyaoww
update runtime test for looooong output
206eb19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xingyaoww @diwu-sf @openhands-agent