Refactor session management #1810

rbren · 2024-05-15T20:48:18Z

Big goals in this PR:

Support multiple concurrent sessions (from different browsers, for now)
Full support for different runtimes (e.g. the E2B runtime)
Ability to restore sessions even after a server restart

A few things in here:

Pass file operations to the runtime
- Previously we were listing files on the local machine
Change the auth handshake
- Previously we weren't great about authenticating all API calls
- Now the websocket sends a JWT token back (with the sid) as the first message, and that gets sent in all subsequent calls
Change up server-side session management
- Mostly deleted code here
- Removed the extra session/message serialization (EventStream will handle this now)

Testing

I'd love for folks to play with this locally to make sure it's running smoothly. I've found a few edge cases (like clearing local storage and starting fresh).

docker run \
  --pull=always \
  -it  \
  -e SANDBOX_USER_ID=$(id -u) \
  -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
  -v $WORKSPACE_BASE:/opt/workspace_base \
  -v /var/run/docker.sock:/var/run/docker.sock \
  -p 3000:3000 \
  --add-host host.docker.internal:host-gateway \
  ghcr.io/opendevin/opendevin:1810-merge

rbren · 2024-05-21T20:07:35Z

Yup! I've been chatting with @johnnyaug to get that done here: #1448

We're mostly waiting on this PR.

I'd also like to see multi-session in the same browser, which we have some designs for.

neubig

I looked through! It's a lot of code, but nothing jumped out at me as being wrong, so LGTM.

I also downloaded and tested, and everything worked as expected. Thanks for all the work on this @rbren !

assertion · 2024-05-22T03:09:59Z

Awesome work, this is a very big improvement on session management!

li-boxuan

I really love the fact that this PR contributes net negative lines of code!

LGTM in general, and most of my comments are small/local issues/nitpicks, not design/framework related:

frontend/src/services/api.ts

frontend/src/services/session.ts

frontend/src/services/fileService.ts

opendevin/server/session/agent.py

opendevin/server/session/session.py

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

…n into rb/api-sessions

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

…n into rb/api-sessions

opendevin/server/session/session.py

Co-authored-by: Engel Nyst <enyst@users.noreply.github.com>

* refactor session mgmt * defer file handling to runtime * add todo * refactor sessions a bit more * remove messages logic from FE * fix up socket handshake * refactor frontend auth a bit * first pass at redoing file explorer * implement directory suffix * fix up file tree * close agent on websocket close * remove session saving * move file refresh * remove getWorkspace * plumb path/code differently * fix build issues * fix the tests * fix npm build * add session rehydration * fix event serialization * logspam * fix user message rehydration * add get_event fn * agent state restoration * change history tracking for codeact * fix responsiveness of init * fix lint * lint * delint * fix prop * update tests * logspam * lint * fix test * revert codeact * change fileService to use API * fix up session loading * delint * delint * fix integration tests * revert test * fix up access to options endpoints * fix initial files load * delint * fix file initialization * fix mock server * fixl int * fix auth for html * Update frontend/src/i18n/translation.json Co-authored-by: Xingyao Wang <xingyao6@illinois.edu> * refactor sessions and sockets * avoid reinitializing the same session * fix reconnect issue * change up intro message * more guards on reinit * rename agent_session * delint * fix a bunch of tests * delint * fix last test * remove code editor context * fix build * fix any * fix dot notation * Update frontend/src/services/api.ts Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk> * fix up error handling * Update opendevin/server/session/agent.py Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk> * Update opendevin/server/session/agent.py Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk> * Update frontend/src/services/session.ts Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk> * fix build errs * fix else * add closed state * delint * Update opendevin/server/session/session.py Co-authored-by: Engel Nyst <enyst@users.noreply.github.com> --------- Co-authored-by: Xingyao Wang <xingyao6@illinois.edu> Co-authored-by: Graham Neubig <neubig@gmail.com> Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk> Co-authored-by: Engel Nyst <enyst@users.noreply.github.com>

rbren added 30 commits May 14, 2024 21:34

refactor session mgmt

8a13c22

defer file handling to runtime

2cf184c

add todo

4758599

Merge branch 'main' into rb/api-sessions

e854fe5

refactor sessions a bit more

b8a7714

remove messages logic from FE

68efd09

fix up socket handshake

833e94b

refactor frontend auth a bit

ebe9fe4

first pass at redoing file explorer

8160402

implement directory suffix

34640d2

fix up file tree

1956844

close agent on websocket close

dae8568

remove session saving

e973237

move file refresh

c130a06

remove getWorkspace

500dff9

plumb path/code differently

9eb29ec

fix build issues

9b80827

fix the tests

87c4288

Merge branch 'main' into rb/api-sessions

ca285f1

fix npm build

19db96f

add session rehydration

b19d4bb

fix event serialization

863d5d0

logspam

4206db8

fix user message rehydration

a3732d9

add get_event fn

6d6c645

agent state restoration

d3d7efd

change history tracking for codeact

fe4e41f

fix responsiveness of init

20aeffe

Merge branch 'main' into rb/api-sessions

2579245

fix lint

76c07a4

fix dot notation

1412763

isavita approved these changes May 21, 2024

View reviewed changes

Merge branch 'main' into rb/api-sessions

6792acb

neubig approved these changes May 21, 2024

View reviewed changes

enyst approved these changes May 21, 2024

View reviewed changes

assertion approved these changes May 22, 2024

View reviewed changes

li-boxuan reviewed May 22, 2024

View reviewed changes

neubig mentioned this pull request May 22, 2024

Refactor monologue and SWE agent to use the messages in state history #1863

Merged

enyst mentioned this pull request May 22, 2024

[Bug]: User Messages Not Displayed After Resuming Session #1965

Closed

2 tasks

rbren and others added 12 commits May 22, 2024 11:43

Merge branch 'main' into rb/api-sessions

591dd16

Update frontend/src/services/api.ts

1030bd8

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

Merge branch 'rb/api-sessions' of ssh://github.com/opendevin/opendevi…

ad97f41

…n into rb/api-sessions

fix up error handling

0c4dff7

Update opendevin/server/session/agent.py

a2af497

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

Update opendevin/server/session/agent.py

105340e

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

Update frontend/src/services/session.ts

5d8abb3

Co-authored-by: Boxuan Li <liboxuan@connect.hku.hk>

fix build errs

10ccb6a

Merge branch 'rb/api-sessions' of ssh://github.com/opendevin/opendevi…

c908a67

…n into rb/api-sessions

fix else

b1b6e8f

add closed state

1358f40

delint

5637aab

enyst reviewed May 22, 2024

View reviewed changes

opendevin/server/session/session.py Outdated Show resolved Hide resolved

rbren and others added 2 commits May 22, 2024 14:23

Update opendevin/server/session/session.py

faf4ac4

Co-authored-by: Engel Nyst <enyst@users.noreply.github.com>

Merge branch 'main' into rb/api-sessions

4715765

rbren enabled auto-merge (squash) May 22, 2024 18:23

rbren merged commit 5bdacf7 into main May 22, 2024
25 checks passed

rbren deleted the rb/api-sessions branch May 22, 2024 18:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor session management #1810

Refactor session management #1810

rbren commented May 15, 2024 •

edited

rbren commented May 21, 2024

neubig left a comment

assertion commented May 22, 2024

li-boxuan left a comment •

edited

Refactor session management #1810

Refactor session management #1810

Conversation

rbren commented May 15, 2024 • edited

Testing

rbren commented May 21, 2024

neubig left a comment

Choose a reason for hiding this comment

assertion commented May 22, 2024

li-boxuan left a comment • edited

Choose a reason for hiding this comment

rbren commented May 15, 2024 •

edited

li-boxuan left a comment •

edited