From 78de4f694d179a2c94daf389c7bd8f4e045431b3 Mon Sep 17 00:00:00 2001 From: Alexander Lichtenstein Date: Wed, 25 May 2022 19:33:18 +0200 Subject: [PATCH 1/6] corrections to the requirements file (issue #32) --- server/requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/requirements.txt b/server/requirements.txt index dfcae0f..f1d6902 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,17 +1,17 @@ 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 From 76f27746d23473b345e1e6a1d1c5cc18869aaa2a Mon Sep 17 00:00:00 2001 From: Alexander Lichtenstein Date: Wed, 25 May 2022 19:51:19 +0200 Subject: [PATCH 2/6] black, isort github action workflow --- .github/workflows/check_code.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .github/workflows/check_code.yml diff --git a/.github/workflows/check_code.yml b/.github/workflows/check_code.yml new file mode 100644 index 0000000..e69de29 From 8bbf968194a07d8c45ef83f62f3f66dc677d9caf Mon Sep 17 00:00:00 2001 From: alexlichtenstein <49325191+alexlichtenstein@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:42:35 +0200 Subject: [PATCH 3/6] Update README human-human interaction --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bfe013..d7ecacc 100644 --- a/README.md +++ b/README.md @@ -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/psyturk). + ## 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. @@ -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. \ No newline at end of file +For legacy code compatible with the Neurips2019 submission please see [this](https://github.com/HumanCompatibleAI/overcooked-demo/tree/legacy) branch of this repo. From 2385891bd7889dfd4c6be66fddf227ed0f4c4c54 Mon Sep 17 00:00:00 2001 From: micah Date: Wed, 1 Jun 2022 23:27:54 -0700 Subject: [PATCH 4/6] Fixed additional requirement issue, fixed typo in readme --- README.md | 2 +- server/requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d7ecacc..450fae6 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ If a more complex or custom loading routing is necessary, one can subclass the ` ## 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/psyturk). +The first user can be controlled from the same page, the other user from another tab (http://localhost/psiturk). ## 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. diff --git a/server/requirements.txt b/server/requirements.txt index f1d6902..a9810c7 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -15,3 +15,4 @@ six==1.15.0 Werkzeug==2.0.3 tensorflow==2.0.3 requests==2.23.0 +protobuf==3.19 From 2301c8ee2763173e72535a087be7926699bc3bb1 Mon Sep 17 00:00:00 2001 From: alexlichtenstein Date: Thu, 2 Jun 2022 18:53:30 +0200 Subject: [PATCH 5/6] isort, black Github action --- .github/workflows/check_code.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/check_code.yml b/.github/workflows/check_code.yml index e69de29..fed2d48 100644 --- a/.github/workflows/check_code.yml +++ b/.github/workflows/check_code.yml @@ -0,0 +1,12 @@ +name: check_code +on: [pull_request, push] +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 . From 07cef683ff4b4594775f8d2a77dc1e9a88ead687 Mon Sep 17 00:00:00 2001 From: Micah Carroll Date: Thu, 2 Jun 2022 21:12:37 +0100 Subject: [PATCH 6/6] Update .github/workflows/check_code.yml --- .github/workflows/check_code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_code.yml b/.github/workflows/check_code.yml index fed2d48..f7c002a 100644 --- a/.github/workflows/check_code.yml +++ b/.github/workflows/check_code.yml @@ -1,5 +1,5 @@ name: check_code -on: [pull_request, push] +on: pull_request jobs: lint_python: runs-on: ubuntu-latest