From 4b4097e855de67f97b81af246e028caa6c68af0a Mon Sep 17 00:00:00 2001 From: Merwane Hamadi Date: Mon, 5 Jun 2023 16:32:49 -0700 Subject: [PATCH 1/4] CI test --- .github/workflows/ci.yml | 71 +++++-------------- .gitmodules | 2 +- .../basic_abilities/test_write_file.py | 3 +- .../test_information_retrieval_challenge_a.py | 3 +- .../test_information_retrieval_challenge_b.py | 3 +- .../test_kubernetes_template_challenge_a.py | 2 + .../memory/test_memory_challenge_a.py | 3 +- .../memory/test_memory_challenge_b.py | 3 +- .../memory/test_memory_challenge_c.py | 3 +- 9 files changed, 34 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df9148c4b95b..93e06b22a1b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,8 +98,12 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} submodules: true - - id: checkout_cassettes - name: Check out cassettes + - name: Setup git username and email + run: | + git config --global user.name "Auto-GPT-Bot" + git config --global user.email "github-bot@agpt.co" + + - name: Check out cassettes if: ${{ startsWith(github.event_name, 'pull_request') }} run: | cassette_branch="${{ github.event.pull_request.user.login }}-${{ github.event.pull_request.head.ref }}" @@ -111,21 +115,12 @@ jobs: git checkout $cassette_branch - if git merge --no-commit --no-ff ${{ github.event.pull_request.base.ref }}; then - echo "Using cassettes from mirror branch, synced to upstream branch '${{ github.event.pull_request.base.ref }}'" - else - echo "Could not merge upstream changes to cassettes. Using cassettes from ${{ github.event.pull_request.base.ref }}." - git merge --abort - git checkout ${{ github.event.pull_request.base.ref }} - - # Delete branch to prevent conflict when re-creating it - git branch -D $cassette_branch - fi - echo "cassette_branch=$(git branch --show-current)" >> $GITHUB_OUTPUT + git merge --no-commit --strategy-option ours origin/${{ github.event.pull_request.base.ref }} + echo "Using cassettes from mirror branch, synced to upstream branch '${{ github.event.pull_request.base.ref }}' if no conflicts." else + git checkout -b $cassette_branch echo "Branch '$cassette_branch' does not exist in cassette submodule."\ "Using cassettes from ${{ github.event.pull_request.base.ref }}." - echo "cassette_branch=${{ github.event.pull_request.base.ref }}" >> $GITHUB_OUTPUT fi - name: Set up Python ${{ matrix.python-version }} @@ -162,10 +157,8 @@ jobs: - id: setup_git_auth name: Set up git token authentication + if: always() && (startsWith(github.event_name, 'pull_request') || success()) run: | - git config --global user.name "Auto-GPT-Bot" - git config --global user.email "github-bot@agpt.co" - config_key="http.${{ github.server_url }}/.extraheader" base64_pat=$(echo -n "pat:${{ secrets.PAT_REVIEW }}" | base64 -w0) @@ -193,51 +186,31 @@ jobs: - id: push_cassettes name: Push updated cassettes + if: always() && (startsWith(github.event_name, 'pull_request') || success()) run: | if [ "${{ startsWith(github.event_name, 'pull_request') }}" = "true" ]; then is_pull_request=true cassette_branch="${{ github.event.pull_request.user.login }}-${{ github.event.pull_request.head.ref }}" - cassette_source_branch="${{ steps.checkout_cassettes.outputs.cassette_branch }}" - base_branch="${{ github.event.pull_request.base.ref }}" else - current_branch=$(echo ${{ github.ref }} | sed -e "s/refs\/heads\///g") - cassette_branch=$current_branch + cassette_branch=$(echo ${{ github.ref }} | sed -e "s/refs\/heads\///g") fi cd tests/Auto-GPT-test-cassettes - git fetch origin $cassette_source_branch:$cassette_source_branch - # Commit & push changes to cassettes if any - if ! git diff --quiet $cassette_source_branch --; then - if [ "$cassette_branch" != "$cassette_source_branch" ]; then - git checkout -b $cassette_branch - fi + if ! git diff --quiet; then git add . git commit -m "Auto-update cassettes" - - if [ $is_pull_request ]; then - git push --force origin HEAD:$cassette_branch - else - git push origin HEAD:$cassette_branch - fi - - cd ../.. - if [ $is_pull_request ]; then - git fetch origin $base_branch - cassette_diff=$(git diff origin/$base_branch) - else + git push origin HEAD:$cassette_branch + if [ ! $is_pull_request ]; then + cd ../.. git add tests/Auto-GPT-test-cassettes git commit -m "Update cassette submodule" - git push origin HEAD:$current_branch + git push origin HEAD:$cassette_branch fi - else - echo "No cassette changes to commit" - fi - - if [ -n "$cassette_diff" ]; then echo "updated=true" >> $GITHUB_OUTPUT else echo "updated=false" >> $GITHUB_OUTPUT + echo "No cassette changes to commit" fi - name: Post Set up git token auth @@ -246,7 +219,7 @@ jobs: git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}' git submodule foreach git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}' - - name: Apply or remove behaviour change label and comment on PR + - name: Apply "behaviour change" label and comment on PR if: ${{ startsWith(github.event_name, 'pull_request') }} run: | PR_NUMBER=${{ github.event.pull_request.number }} @@ -263,10 +236,4 @@ jobs: echo $TOKEN | gh auth login --with-token gh api repos/$REPO/issues/$PR_NUMBER/comments -X POST -F body="You changed AutoGPT's behaviour. The cassettes have been updated and will be merged to the submodule when this Pull Request gets merged." - else - echo "Removing label..." - curl -X DELETE \ - -H "Authorization: Bearer $TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/$REPO/issues/$PR_NUMBER/labels/behaviour%20change fi diff --git a/.gitmodules b/.gitmodules index 55d09f842c8f..eb14002855be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "tests/Auto-GPT-test-cassettes"] path = tests/Auto-GPT-test-cassettes url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes - branch = master \ No newline at end of file + branch = ci-test-2 diff --git a/tests/integration/challenges/basic_abilities/test_write_file.py b/tests/integration/challenges/basic_abilities/test_write_file.py index cbbad514b6b6..393dbfd05d85 100644 --- a/tests/integration/challenges/basic_abilities/test_write_file.py +++ b/tests/integration/challenges/basic_abilities/test_write_file.py @@ -1,4 +1,5 @@ import pytest +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file @@ -17,7 +18,7 @@ @challenge def test_write_file( writer_agent: Agent, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, monkeypatch: pytest.MonkeyPatch, config: Config, level_to_run: int, diff --git a/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_a.py b/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_a.py index 6b970e8b227d..2f61fef3902a 100644 --- a/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_a.py +++ b/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_a.py @@ -1,4 +1,5 @@ import pytest +from pytest_mock import MockerFixture from autogpt.commands.file_operations import read_file from autogpt.config import Config @@ -19,7 +20,7 @@ def test_information_retrieval_challenge_a( information_retrieval_agents: Agent, monkeypatch: pytest.MonkeyPatch, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, config: Config, level_to_run: int, ) -> None: diff --git a/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_b.py b/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_b.py index feac95a0f646..6461e13fbf4c 100644 --- a/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_b.py +++ b/tests/integration/challenges/information_retrieval/test_information_retrieval_challenge_b.py @@ -1,6 +1,7 @@ import contextlib import pytest +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file @@ -20,7 +21,7 @@ def test_information_retrieval_challenge_b( get_nobel_prize_agent: Agent, monkeypatch: pytest.MonkeyPatch, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, level_to_run: int, config: Config, ) -> None: diff --git a/tests/integration/challenges/kubernetes/test_kubernetes_template_challenge_a.py b/tests/integration/challenges/kubernetes/test_kubernetes_template_challenge_a.py index 5fd280ac4bbb..aa46ac4d4f33 100644 --- a/tests/integration/challenges/kubernetes/test_kubernetes_template_challenge_a.py +++ b/tests/integration/challenges/kubernetes/test_kubernetes_template_challenge_a.py @@ -1,5 +1,6 @@ import pytest import yaml +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file @@ -19,6 +20,7 @@ def test_kubernetes_template_challenge_a( kubernetes_agent: Agent, monkeypatch: pytest.MonkeyPatch, + patched_api_requestor: MockerFixture, config: Config, level_to_run: int, ) -> None: diff --git a/tests/integration/challenges/memory/test_memory_challenge_a.py b/tests/integration/challenges/memory/test_memory_challenge_a.py index 8919bf58c0eb..08f461bdd86d 100644 --- a/tests/integration/challenges/memory/test_memory_challenge_a.py +++ b/tests/integration/challenges/memory/test_memory_challenge_a.py @@ -1,4 +1,5 @@ import pytest +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file, write_to_file @@ -15,7 +16,7 @@ @challenge def test_memory_challenge_a( memory_management_agent: Agent, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, monkeypatch: pytest.MonkeyPatch, config: Config, level_to_run: int, diff --git a/tests/integration/challenges/memory/test_memory_challenge_b.py b/tests/integration/challenges/memory/test_memory_challenge_b.py index 5c28b330a3b4..c82763129aca 100644 --- a/tests/integration/challenges/memory/test_memory_challenge_b.py +++ b/tests/integration/challenges/memory/test_memory_challenge_b.py @@ -1,4 +1,5 @@ import pytest +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file, write_to_file @@ -17,7 +18,7 @@ @challenge def test_memory_challenge_b( memory_management_agent: Agent, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, monkeypatch: pytest.MonkeyPatch, config: Config, level_to_run: int, diff --git a/tests/integration/challenges/memory/test_memory_challenge_c.py b/tests/integration/challenges/memory/test_memory_challenge_c.py index 23c0217d6135..ab8ece105262 100644 --- a/tests/integration/challenges/memory/test_memory_challenge_c.py +++ b/tests/integration/challenges/memory/test_memory_challenge_c.py @@ -1,4 +1,5 @@ import pytest +from pytest_mock import MockerFixture from autogpt.agent import Agent from autogpt.commands.file_operations import read_file, write_to_file @@ -18,7 +19,7 @@ @challenge def test_memory_challenge_c( memory_management_agent: Agent, - patched_api_requestor: None, + patched_api_requestor: MockerFixture, monkeypatch: pytest.MonkeyPatch, config: Config, level_to_run: int, From 0954503c0de0a160edb4258be7422b294b967e7e Mon Sep 17 00:00:00 2001 From: Merwane Hamadi Date: Mon, 5 Jun 2023 16:33:49 -0700 Subject: [PATCH 2/4] CI From 6abdc0fe68af00e5a3de9fa0928bb7b97654278a Mon Sep 17 00:00:00 2001 From: Merwane Hamadi Date: Mon, 5 Jun 2023 16:34:07 -0700 Subject: [PATCH 3/4] CI test From 6f0762f140f83f501cf8242d98cb9e3910384625 Mon Sep 17 00:00:00 2001 From: Merwane Hamadi Date: Mon, 5 Jun 2023 16:40:53 -0700 Subject: [PATCH 4/4] CI test --- tests/Auto-GPT-test-cassettes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Auto-GPT-test-cassettes b/tests/Auto-GPT-test-cassettes index 28497a8b4ef0..03f63572c412 160000 --- a/tests/Auto-GPT-test-cassettes +++ b/tests/Auto-GPT-test-cassettes @@ -1 +1 @@ -Subproject commit 28497a8b4ef0e62375dd5024794426cb401a3779 +Subproject commit 03f63572c4122af9c2dc2c3dd278d96e9c980b2f