Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .github/workflows/check_code.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: check_code
on: pull_request
jobs:
lint_python:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- run: pip install --upgrade pip wheel
- run: pip install black isort
- run: black --check --diff --line-length 79 .
- run: isort --check-only --line-length 79 --profile black .
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ Overcooked-Demo can dynamically load pre-trained agents provided by the user. In

If a more complex or custom loading routing is necessary, one can subclass the `OvercookedGame` class and override the `get_policy` method, as done in [DummyOvercookedGame](server/game.py#L420). Make sure the subclass is properly imported [here](server/app.py#L5)

## Use the human vs. human game mode.

With the Overcooked demo you can test the interaction between two human players. To do this, select the human keyboard input for both players and click on "Create Game", it will display "Waiting for game to start". Open another tab and navigate to http://localhost/psyturk to start the game.
The first user can be controlled from the same page, the other user from another tab (http://localhost/psiturk).

Comment on lines +55 to +59
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should merge #35 before merging these changes, so we can merge master into this branch with the correctly updated human-human instructions before merging this PR.

## Updating Overcooked_ai
This repo was designed to be as flexible to changes in overcooked_ai as possible. To change the branch used, use the `OVERCOOKED_BRANCH` environment variable shown above.

Expand All @@ -70,4 +75,4 @@ Basic game settings can be configured by changing the values in [config.json](se

## Legacy Code

For legacy code compatible with the Neurips2019 submission please see [this](https://github.com/HumanCompatibleAI/overcooked-demo/tree/legacy) branch of this repo.
For legacy code compatible with the Neurips2019 submission please see [this](https://github.com/HumanCompatibleAI/overcooked-demo/tree/legacy) branch of this repo.
13 changes: 7 additions & 6 deletions server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
certifi==2020.6.20
click==7.1.2
click==8.0
dnspython==1.16.0
dill==0.3.2
Flask==1.1.2
Flask==2.1.0
Flask-SocketIO==4.3.0
greenlet==0.4.16
itsdangerous==1.1.0
Jinja2==2.11.2
MarkupSafe==1.1.1
itsdangerous==2.0
Jinja2==3.1.0
MarkupSafe==2.0
monotonic==1.5
python-engineio==3.13.0
python-socketio==4.6.0
six==1.15.0
Werkzeug==1.0.1
Werkzeug==2.0.3
tensorflow==2.0.3
requests==2.23.0
protobuf==3.19