diff --git a/.github/workflows/autogpt-ci.yml b/.github/workflows/autogpt-ci.yml index 7ceb4785..375a433a 100644 --- a/.github/workflows/autogpt-ci.yml +++ b/.github/workflows/autogpt-ci.yml @@ -2,17 +2,17 @@ name: AutoGPT Python CI on: push: - branches: [ master, ci-test* ] + branches: [ master, development, ci-test* ] paths: - 'autogpts/autogpt/**' - '!autogpts/autogpt/tests/vcr_cassettes' pull_request: - branches: [ stable, master, release-* ] + branches: [ master, development, release-* ] paths: - 'autogpts/autogpt/**' - '!autogpts/autogpt/tests/vcr_cassettes' pull_request_target: - branches: [ master, release-*, ci-test* ] + branches: [ master, development, release-*, ci-test* ] paths: - 'autogpts/autogpt/**' - '!autogpts/autogpt/tests/vcr_cassettes' diff --git a/.github/workflows/autogpt-docker-cache-clean.yml b/.github/workflows/autogpt-docker-cache-clean.yml index e23e88ec..780caf44 100644 --- a/.github/workflows/autogpt-docker-cache-clean.yml +++ b/.github/workflows/autogpt-docker-cache-clean.yml @@ -5,7 +5,7 @@ on: - cron: 20 4 * * 1,4 env: - BASE_BRANCH: master + BASE_BRANCH: development IMAGE_NAME: auto-gpt jobs: @@ -38,10 +38,10 @@ jobs: build_type: ${{ matrix.build-type }} - prod_branch: stable - dev_branch: master + prod_branch: master + dev_branch: development repository: ${{ github.repository }} - base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }} + base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }} current_ref: ${{ github.ref_name }} commit_hash: ${{ github.sha }} diff --git a/.github/workflows/autogpt-docker-ci.yml b/.github/workflows/autogpt-docker-ci.yml index 282e05c0..a6f336a7 100644 --- a/.github/workflows/autogpt-docker-ci.yml +++ b/.github/workflows/autogpt-docker-ci.yml @@ -2,12 +2,12 @@ name: AutoGPT Docker CI on: push: - branches: [ master ] + branches: [ master, development ] paths: - 'autogpts/autogpt/**' - '!autogpts/autogpt/tests/vcr_cassettes' pull_request: - branches: [ master, release-*, stable ] + branches: [ master, development, release-* ] paths: - 'autogpts/autogpt/**' - '!autogpts/autogpt/tests/vcr_cassettes' @@ -61,10 +61,10 @@ jobs: build_type: ${{ matrix.build-type }} - prod_branch: stable - dev_branch: master + prod_branch: master + dev_branch: development repository: ${{ github.repository }} - base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }} + base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }} current_ref: ${{ github.ref_name }} commit_hash: ${{ github.event.after }} diff --git a/.github/workflows/autogpt-docker-release.yml b/.github/workflows/autogpt-docker-release.yml index c56cdc56..df2f0e9f 100644 --- a/.github/workflows/autogpt-docker-release.yml +++ b/.github/workflows/autogpt-docker-release.yml @@ -68,10 +68,10 @@ jobs: event_ref_type: ${{ github.event.ref}} inputs_no_cache: ${{ inputs.no_cache }} - prod_branch: stable - dev_branch: master + prod_branch: master + dev_branch: development repository: ${{ github.repository }} - base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'stable' && 'master' || 'stable' }} + base_branch: ${{ github.ref_name != 'master' && github.ref_name != 'development' && 'development' || 'master' }} ref_type: ${{ github.ref_type }} current_ref: ${{ github.ref_name }} diff --git a/.github/workflows/autogpts-ci.yml b/.github/workflows/autogpts-ci.yml index a3758a2c..4f89fb7c 100644 --- a/.github/workflows/autogpts-ci.yml +++ b/.github/workflows/autogpts-ci.yml @@ -2,13 +2,12 @@ name: Valid AutoGPTs on: workflow_dispatch: - branches: [master] schedule: - cron: '0 8 * * *' push: - branches: [master, ci-test*] + branches: [ master, development, ci-test* ] pull_request: - branches: [stable, master, release-*] + branches: [ master, development, release-* ] jobs: run-tests: diff --git a/.github/workflows/benchmark-ci.yml b/.github/workflows/benchmark-ci.yml index 14e8b8c1..fd8020d2 100644 --- a/.github/workflows/benchmark-ci.yml +++ b/.github/workflows/benchmark-ci.yml @@ -2,13 +2,13 @@ name: Benchmark CI on: push: - branches: [master, ci-test*] + branches: [ master, development, ci-test* ] paths: - 'benchmark/**' - .github/workflows/benchmark-ci.yml - '!benchmark/reports/**' pull_request: - branches: [stable, master, release-*] + branches: [ master, development, release-* ] paths: - 'benchmark/**' - '!benchmark/reports/**' diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index b29407e5..dedf67f3 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - development - 'ci-test*' # This will match any branch that starts with "ci-test" paths: - 'frontend/**' diff --git a/.github/workflows/pr-label.yml b/.github/workflows/pr-label.yml index 077211f4..512daf11 100644 --- a/.github/workflows/pr-label.yml +++ b/.github/workflows/pr-label.yml @@ -3,7 +3,7 @@ name: "Pull Request auto-label" on: # So that PRs touching the same files as the push are updated push: - branches: [ master, release-* ] + branches: [ master, development, release-* ] paths-ignore: - 'autogpts/autogpt/tests/vcr_cassettes' - 'benchmark/reports/**' diff --git a/autogpts/autogpt/autogpt/app/utils.py b/autogpts/autogpt/autogpt/app/utils.py index 30ee7f27..e5fbaa60 100644 --- a/autogpts/autogpt/autogpt/app/utils.py +++ b/autogpts/autogpt/autogpt/app/utils.py @@ -173,7 +173,7 @@ def print_motd(config: Config, logger: logging.Logger): def print_git_branch_info(logger: logging.Logger): git_branch = get_current_git_branch() - if git_branch and git_branch != "stable": + if git_branch and git_branch != "master": logger.warn( f"You are running on `{git_branch}` branch" " - this is not a supported branch." diff --git a/autogpts/autogpt/autogpt/core/README.md b/autogpts/autogpt/autogpt/core/README.md index d19660da..ff97e2c5 100644 --- a/autogpts/autogpt/autogpt/core/README.md +++ b/autogpts/autogpt/autogpt/core/README.md @@ -32,8 +32,8 @@ There are two client applications for AutoGPT included. The first app is a straight CLI application. I have not done anything yet to port all the friendly display stuff from the ~~`logger.typewriter_log`~~`user_friendly_output` logic. -- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_app/cli.py) -- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_app/main.py) +- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_app/cli.py) +- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_app/main.py) You'll then need a settings file. Run @@ -71,9 +71,9 @@ The second app is still a CLI, but it sets up a local webserver that the client rather than invoking calls to the Agent library code directly. This application is essentially a sketch at this point as the folks who were driving it have had less time (and likely not enough clarity) to proceed. -- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/cli.py) -- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/client/client.py) -- [Server API](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/core/runner/cli_web_app/server/api.py) +- [Entry Point](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/cli.py) +- [Client Application](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/client/client.py) +- [Server API](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/autogpt/core/runner/cli_web_app/server/api.py) To run, you still need to generate a default configuration. You can do diff --git a/docs/content/challenges/building_challenges.md b/docs/content/challenges/building_challenges.md index d6fd7bf4..74b11323 100644 --- a/docs/content/challenges/building_challenges.md +++ b/docs/content/challenges/building_challenges.md @@ -27,7 +27,7 @@ Output => Artifact (files, image, code, etc, etc...) ## Defining your Agent -Go to https://github.com/Significant-Gravitas/AutoGPT/blob/master/tests/integration/agent_factory.py +Go to https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/tests/integration/agent_factory.py Create your agent fixture. diff --git a/docs/content/setup.md b/docs/content/setup.md index 77c7af32..19fb7b9b 100644 --- a/docs/content/setup.md +++ b/docs/content/setup.md @@ -96,7 +96,7 @@ Get your OpenAI API key from: [https://platform.openai.com/account/api-keys](htt 1. Clone the repository ```shell - git clone -b stable https://github.com/Significant-Gravitas/AutoGPT.git + git clone https://github.com/Significant-Gravitas/AutoGPT.git ``` 2. Navigate to the directory where you downloaded the repository @@ -110,7 +110,7 @@ Get your OpenAI API key from: [https://platform.openai.com/account/api-keys](htt !!! warning We recommend to use Git or Docker, to make updating easier. Also note that some features such as Python execution will only work inside docker for security reasons. -1. Download `Source code (zip)` from the [latest stable release](https://github.com/Significant-Gravitas/AutoGPT/releases/latest) +1. Download `Source code (zip)` from the [latest release](https://github.com/Significant-Gravitas/AutoGPT/releases/latest) 2. Extract the zip-file into a folder @@ -211,7 +211,7 @@ docker run -it --env-file=.env -v $PWD:/app auto-gpt docker run -it --env-file=.env -v $PWD:/app --rm auto-gpt --gpt3only --continuous ``` -[Docker Compose file]: https://github.com/Significant-Gravitas/AutoGPT/blob/stable/docker-compose.yml +[Docker Compose file]: https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpts/autogpt/docker-compose.yml ### Run with Dev Container