-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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.
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
Bug fixes #6460
Open
kripper
wants to merge
22
commits into
All-Hands-AI:main
Choose a base branch
from
kripper:bug-fixes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Bug fixes #6460
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
fcc2bee
Re-enabled devcontainer.json (usefull for windows developers)
kripper 46e5b81
Merge remote-tracking branch 'upstream/main'
kripper 02ca830
Merge remote-tracking branch 'upstream/main'
kripper 331d9a1
Global .gitignore for VS Code
kripper a8c80a4
Merge remote-tracking branch 'upstream/main'
kripper 65ded25
Fix https://github.com/All-Hands-AI/OpenHands/issues/5569#issuecommen…
kripper 3de310c
Dev Containers support
kripper 116d1e3
Fix https://github.com/All-Hands-AI/OpenHands/issues/6382
kripper c57c386
Merge remote-tracking branch 'upstream/main'
kripper 35beb18
Fix https://github.com/All-Hands-AI/OpenHands/issues/6440
kripper b373281
Merge branch 'main' into main
kripper 0afef18
Merge branch 'main' into main
kripper 97465c6
Create docker-snapshots.py
kripper 74acf2b
Add container snapshot/restore support
kripper cc959ee
Merge branch 'main' into main
kripper fcab126
Reverted "Add container snapshot/restore support"
607ee43
Revert "Create docker-snapshots.py"
57ece7e
Merge branch 'main' into bug-fixes
xingyaoww 9813d19
Merge branch 'main' into bug-fixes
kripper 5600e2b
Removed comments
kripper 4d119d0
Reverted host network fallback hack (not required anymore)
kripper 44cd778
Merge branch 'main' into bug-fixes
kripper File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
The files in this directory configure a development container that can be used for development on Windows using Microsoft's "Dev Containers" extension for VS Code. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"name": "OpenHands Codespaces", | ||
/* Doesn't work because Dockerfile uses HEREDOCS (currently not supported by Dev Containers) | ||
"build": { | ||
"dockerfile": "../containers/dev/Dockerfile" | ||
}, | ||
*/ | ||
"image": "mcr.microsoft.com/devcontainers/universal", | ||
"runArgs": [ | ||
"--name=openhands-dev-container", | ||
"--network=host" | ||
], | ||
"customizations":{ | ||
"vscode":{ | ||
"extensions": [ | ||
"ms-python.python" | ||
] | ||
} | ||
}, | ||
"onCreateCommand": "sh ./.devcontainer/on_create.sh", | ||
"postCreateCommand": "yes | make build", | ||
"postStartCommand": "bash ./.devcontainer/on_run.sh" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/usr/bin/env bash | ||
sudo apt update | ||
sudo apt install -y netcat | ||
sudo add-apt-repository -y ppa:deadsnakes/ppa | ||
curl -sSL https://install.python-poetry.org | python3.12 - | ||
|
||
# WAS working: | ||
#sudo add-apt-repository -y ppa:deadsnakes/ppa \ | ||
# && apt-get update \ | ||
# && apt-get install -y python3.12 python3.12-venv python3.12-dev python3-pip \ | ||
# && ln -s /usr/bin/python3.12 /usr/bin/python | ||
kripper marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
# See: https://github.com/SmartManoj/Kevin/issues/122#issuecomment-2540482254 | ||
git config --global --add safe.directory /workspaces/OpenHands | ||
|
||
# Global .gitignore for VS Code | ||
echo ".history/" > ~/.gitignore_global | ||
git config --global core.excludesfile ~/.gitignore_global |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#!/usr/bin/env bash | ||
#USE_HOST_NETWORK=True nohup bash -c '(litellm --config my-configs/litellm.yaml &) ; make run' &> output.log & | ||
export USE_HOST_NETWORK=True | ||
bash -c '(nohup bash -c "make run") &> output.log' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's remove devcontainer here |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't we already have something like this before but we removed it because it was yet another way to run OpenHands that is not fully supported?
By adding extra ways to run OH, we need them to be maintained and I'm not sure if the current maintainers will want to maintain another way. Unless you add a note that says "This is not officially supported and may not work".
I'll let people like @enyst comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's correct. The team decided not to support DevContainer.
I tried the official documentation, but it didn’t work on Windows probably because it requieres you too install a Linux WSL distro + tools on top of WSL. Probably not difficult, but I expected easy instructions to start out of the box, and DevContainers helped here.
DevContainer is simply a definition that specifies which Linux environment to create to make it easier to start developing and debugging OH, especially in Windows. You just open VS Code and it starts the container. When you close VS Code, the container is automatically stopped. You can also start the container manually outside VS Code. It's very simple and handy.
That said, I’m happy to give it support and make it an easier UX for new developers.
Please let me know if you want any further refinements!