Updated docker setup

.dockerignore

@@ -2,11 +2,11 @@
 *
 
 # AutoGPT
-!original_autogpt/autogpt/
-!original_autogpt/pyproject.toml
-!original_autogpt/poetry.lock
-!original_autogpt/README.md
-!original_autogpt/tests/
+!autogpt/autogpt/
+!autogpt/pyproject.toml
+!autogpt/poetry.lock
+!autogpt/README.md
+!autogpt/tests/
 
 # Benchmark
 !benchmark/agbenchmark/
@@ -15,7 +15,7 @@
 !benchmark/README.md
 
 # Forge
-!forge/
+!forge/forge/
 !forge/pyproject.toml
 !forge/poetry.lock
 !forge/README.md
@@ -23,6 +23,16 @@
 # Frontend
 !frontend/build/web/
 
+# rnd
+!rnd/
+
 # Explicitly re-ignore some folders
 .*
 **/__pycache__
+# rnd
+rnd/autogpt_builder/.next/
+rnd/autogpt_builder/node_modules
+rnd/autogpt_builder/.env.example
+rnd/autogpt_builder/.env.local
+rnd/autogpt_server/.env
+rnd/autogpt_server/.venv/

.gitattributes

@@ -1,10 +1,10 @@
-classic/frontend/build/** linguist-generated
+frontend/build/** linguist-generated
 
 **/poetry.lock linguist-generated
 
 docs/_javascript/** linguist-vendored
 
 # Exclude VCR cassettes from stats
-classic/forge/tests/vcr_cassettes/**/**.y*ml linguist-generated
+forge/tests/vcr_cassettes/**/**.y*ml linguist-generated
 
 * text=auto

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 * @Significant-Gravitas/maintainers
 .github/workflows/ @Significant-Gravitas/devops
-classic/forge/ @Significant-Gravitas/forge-maintainers
-classic/benchmark/ @Significant-Gravitas/benchmark-maintainers
-classic/frontend/ @Significant-Gravitas/frontend-maintainers
-autogpt_platform/infra @Significant-Gravitas/devops
+forge/ @Significant-Gravitas/forge-maintainers
+benchmark/ @Significant-Gravitas/benchmark-maintainers
+frontend/ @Significant-Gravitas/frontend-maintainers
+rnd/infra @Significant-Gravitas/devops
 .github/CODEOWNERS @Significant-Gravitas/admins

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,18 +6,26 @@
 
 <!-- Concisely describe all of the changes made in this pull request: -->
 
-
-### Testing 🔍
-> [!NOTE] 
-Only for the new autogpt platform, currently in autogpt_platform/
+### PR Quality Scorecard ✨
 
 <!--
-Please make sure your changes have been tested and are in good working condition. 
-Here is a list of our critical paths, if you need some inspiration on what and how to test:
+Check out our contribution guide:
+https://github.com/Significant-Gravitas/AutoGPT/wiki/Contributing
+
+1. Avoid duplicate work, issues, PRs etc.
+2. Also consider contributing something other than code; see the [contribution guide]
+   for options.
+3. Clearly explain your changes.
+4. Avoid making unnecessary changes, especially if they're purely based on personal
+   preferences. Doing so is the maintainers' job. ;-)
 -->
 
-- Create from scratch and execute an agent with at least 3 blocks
-- Import an agent from file upload, and confirm it executes correctly
-- Upload agent to marketplace
-- Import an agent from marketplace and confirm it executes correctly
-- Edit an agent from monitor, and confirm it executes correctly
+- [x] Have you used the PR description template? &ensp; `+2 pts`
+- [ ] Is your pull request atomic, focusing on a single change? &ensp; `+5 pts`
+- [ ] Have you linked the GitHub issue(s) that this PR addresses? &ensp; `+5 pts`
+- [ ] Have you documented your changes clearly and comprehensively? &ensp; `+5 pts`
+- [ ] Have you changed or added a feature? &ensp; `-4 pts`
+  - [ ] Have you added/updated corresponding documentation? &ensp; `+4 pts`
+  - [ ] Have you added/updated corresponding integration tests? &ensp; `+5 pts`
+- [ ] Have you changed the behavior of AutoGPT? &ensp; `-5 pts`
+  - [ ] Have you also run `agbenchmark` to verify that these changes do not regress performance? &ensp; `+10 pts`

.github/labeler.yml

@@ -1,18 +1,18 @@
 AutoGPT Agent:
 - changed-files:
-  - any-glob-to-any-file: classic/original_autogpt/**
+  - any-glob-to-any-file: autogpt/**
 
 Forge:
 - changed-files:
-  - any-glob-to-any-file: classic/forge/**
+  - any-glob-to-any-file: forge/**
 
 Benchmark:
 - changed-files:
-  - any-glob-to-any-file: classic/benchmark/**
+  - any-glob-to-any-file: benchmark/**
 
 Frontend:
 - changed-files:
-  - any-glob-to-any-file: classic/frontend/**
+  - any-glob-to-any-file: frontend/**
 
 documentation:
 - changed-files:
@@ -20,8 +20,8 @@ documentation:
 
 Builder:
 - changed-files:
-  - any-glob-to-any-file: autogpt_platform/autogpt_builder/**
+  - any-glob-to-any-file: rnd/autogpt_builder/**
 
 Server:
 - changed-files:
-  - any-glob-to-any-file: autogpt_platform/autogpt_server/**
+  - any-glob-to-any-file: rnd/autogpt_server/**

.github/workflows/autogpt-builder-ci.yml

@@ -1,20 +1,20 @@
-name: Platform - AutoGPT Builder CI
+name: AutoGPT Builder CI
 
 on:
   push:
     branches: [ master ]
     paths:
       - '.github/workflows/autogpt-builder-ci.yml'
-      - 'autogpt_platform/autogpt_builder/**'
+      - 'rnd/autogpt_builder/**'
   pull_request:
     paths:
       - '.github/workflows/autogpt-builder-ci.yml'
-      - 'autogpt_platform/autogpt_builder/**'
+      - 'rnd/autogpt_builder/**'
 
 defaults:
   run:
     shell: bash
-    working-directory: autogpt_platform/autogpt_builder
+    working-directory: rnd/autogpt_builder
 
 jobs:
 

.github/workflows/autogpt-ci.yml

@@ -1,25 +1,25 @@
-name: Classic - AutoGPT CI
+name: AutoGPT CI
 
 on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
-      - '.github/workflows/classic-autogpt-ci.yml'
-      - 'classic/original_autogpt/**'
+      - '.github/workflows/autogpt-ci.yml'
+      - 'autogpt/**'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - '.github/workflows/classic-autogpt-ci.yml'
-      - 'classic/original_autogpt/**'
+      - '.github/workflows/autogpt-ci.yml'
+      - 'autogpt/**'
 
 concurrency:
-  group: ${{ format('classic-autogpt-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
+  group: ${{ format('autogpt-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull_request') }}
 
 defaults:
   run:
     shell: bash
-    working-directory: classic/original_autogpt
+    working-directory: autogpt
 
 jobs:
   test:
@@ -86,7 +86,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }}
-          key: poetry-${{ runner.os }}-${{ hashFiles('classic/original_autogpt/poetry.lock') }}
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt/poetry.lock') }}
 
       - name: Install Poetry (Unix)
         if: runner.os != 'Windows'
@@ -135,4 +135,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: test-logs
-          path: classic/original_autogpt/logs/
+          path: autogpt/logs/

.github/workflows/autogpt-docker-cache-clean.yml

@@ -1,4 +1,4 @@
-name: Classic - Purge Auto-GPT Docker CI cache
+name: Purge Auto-GPT Docker CI cache
 
 on:
   schedule:
@@ -25,8 +25,7 @@ jobs:
       name: Build image
       uses: docker/build-push-action@v5
       with:
-        context: classic/
-        file: classic/Dockerfile.autogpt
+        file: Dockerfile.autogpt
         build-args: BUILD_TYPE=${{ matrix.build-type }}
         load: true    # save to docker images
         # use GHA cache as read-only

.github/workflows/autogpt-docker-ci.yml

@@ -1,26 +1,24 @@
-name: Classic - AutoGPT Docker CI
+name: AutoGPT Docker CI
 
 on:
   push:
     branches: [ master, development ]
     paths:
-      - '.github/workflows/classic-autogpt-docker-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
+      - '.github/workflows/autogpt-docker-ci.yml'
+      - 'autogpt/**'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - '.github/workflows/classic-autogpt-docker-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
+      - '.github/workflows/autogpt-docker-ci.yml'
+      - 'autogpt/**'
 
 concurrency:
-  group: ${{ format('classic-autogpt-docker-ci-{0}', github.head_ref && format('pr-{0}', github.event.pull_request.number) || github.sha) }}
+  group: ${{ format('autogpt-docker-ci-{0}', github.head_ref && format('pr-{0}', github.event.pull_request.number) || github.sha) }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 defaults:
   run:
-    working-directory: classic/original_autogpt
+    working-directory: autogpt
 
 env:
   IMAGE_NAME: auto-gpt
@@ -49,8 +47,7 @@ jobs:
       name: Build image
       uses: docker/build-push-action@v5
       with:
-        context: classic/
-        file: classic/Dockerfile.autogpt
+        file: Dockerfile.autogpt
         build-args: BUILD_TYPE=${{ matrix.build-type }}
         tags: ${{ env.IMAGE_NAME }}
         labels: GIT_REVISION=${{ github.sha }}
@@ -119,8 +116,7 @@ jobs:
         name: Build image
         uses: docker/build-push-action@v5
         with:
-          context: classic/
-          file: classic/Dockerfile.autogpt
+          file: Dockerfile.autogpt
           build-args: BUILD_TYPE=dev  # include pytest
           tags: >
             ${{ env.IMAGE_NAME }},

.github/workflows/autogpt-docker-release.yml

@@ -1,4 +1,4 @@
-name: Classic - AutoGPT Docker Release
+name: AutoGPT Docker Release
 
 on:
   release:
@@ -44,7 +44,6 @@ jobs:
       name: Build image
       uses: docker/build-push-action@v5
       with:
-        context: classic/
         file: Dockerfile.autogpt
         build-args: BUILD_TYPE=release
         load: true    # save to docker images

.github/workflows/autogpt-infra-ci.yml

@@ -1,20 +1,20 @@
-name: Platform - AutoGPT Builder Infra
+name: AutoGPT Builder Infra
 
 on:
   push:
     branches: [ master ]
     paths:
       - '.github/workflows/autogpt-infra-ci.yml'
-      - 'autogpt_platform/infra/**'
+      - 'rnd/infra/**'
   pull_request:
     paths:
       - '.github/workflows/autogpt-infra-ci.yml'
-      - 'autogpt_platform/infra/**'
+      - 'rnd/infra/**'
 
 defaults:
   run:
     shell: bash
-    working-directory: autogpt_platform/infra
+    working-directory: rnd/infra
 
 jobs:
   lint:

.github/workflows/autogpt-server-ci.yml

@@ -1,16 +1,16 @@
-name: Platform - AutoGPT Server CI
+name: AutoGPT Server CI
 
 on:
   push:
     branches: [master, development, ci-test*]
     paths:
       - ".github/workflows/autogpt-server-ci.yml"
-      - "autogpt_platform/autogpt_server/**"
+      - "rnd/autogpt_server/**"
   pull_request:
     branches: [master, development, release-*]
     paths:
       - ".github/workflows/autogpt-server-ci.yml"
-      - "autogpt_platform/autogpt_server/**"
+      - "rnd/autogpt_server/**"
 
 concurrency:
   group: ${{ format('autogpt-server-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -19,7 +19,7 @@ concurrency:
 defaults:
   run:
     shell: bash
-    working-directory: autogpt_platform/autogpt_server
+    working-directory: rnd/autogpt_server
 
 jobs:
   test:
@@ -90,7 +90,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }}
-          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/autogpt_server/poetry.lock') }}
+          key: poetry-${{ runner.os }}-${{ hashFiles('rnd/autogpt_server/poetry.lock') }}
 
       - name: Install Poetry (Unix)
         if: runner.os != 'Windows'

.github/workflows/autogpts-benchmark.yml

@@ -0,0 +1,97 @@
+name: AutoGPTs Nightly Benchmark
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  benchmark:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        agent-name: [ autogpt ]
+      fail-fast: false
+    timeout-minutes: 120
+    env:
+      min-python-version: '3.10'
+      REPORTS_BRANCH: data/benchmark-reports
+      REPORTS_FOLDER: ${{ format('benchmark/reports/{0}', matrix.agent-name) }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Set up Python ${{ env.min-python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.min-python-version }}
+
+      - name: Install Poetry
+        run: curl -sSL https://install.python-poetry.org | python -
+
+      - name: Prepare reports folder
+        run: mkdir -p ${{ env.REPORTS_FOLDER }}
+
+      - run: poetry -C benchmark install
+
+      - name: Benchmark ${{ matrix.agent-name }}
+        run: |
+          ./run agent start ${{ matrix.agent-name }}
+          cd ${{ matrix.agent-name }}
+
+          set +e  # Do not quit on non-zero exit codes
+          poetry run agbenchmark run -N 3 \
+            --test=ReadFile \
+            --test=BasicRetrieval --test=RevenueRetrieval2 \
+            --test=CombineCsv --test=LabelCsv --test=AnswerQuestionCombineCsv \
+            --test=UrlShortener --test=TicTacToe --test=Battleship \
+            --test=WebArenaTask_0 --test=WebArenaTask_21 --test=WebArenaTask_124 \
+            --test=WebArenaTask_134 --test=WebArenaTask_163
+
+            # Convert exit code 1 (some challenges failed) to exit code 0
+            if [ $? -eq 0 ] || [ $? -eq 1 ]; then
+              exit 0
+            else
+              exit $?
+            fi
+        env:
+          AGENT_NAME: ${{ matrix.agent-name }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
+          REPORTS_FOLDER: ${{ format('../../{0}', env.REPORTS_FOLDER) }}  # account for changed workdir
+
+          TELEMETRY_ENVIRONMENT: autogpt-benchmark-ci
+          TELEMETRY_OPT_IN: ${{ github.ref_name == 'master' }}
+
+      - name: Push reports to data branch
+        run: |
+          # BODGE: Remove success_rate.json and regression_tests.json to avoid conflicts on checkout
+          rm ${{ env.REPORTS_FOLDER }}/*.json
+
+          # Find folder with newest (untracked) report in it
+          report_subfolder=$(find ${{ env.REPORTS_FOLDER }} -type f -name 'report.json' \
+            | xargs -I {} dirname {} \
+            | xargs -I {} git ls-files --others --exclude-standard {} \
+            | xargs -I {} dirname {} \
+            | sort -u)
+          json_report_file="$report_subfolder/report.json"
+
+          # Convert JSON report to Markdown
+          markdown_report_file="$report_subfolder/report.md"
+          poetry -C benchmark run benchmark/reports/format.py "$json_report_file" > "$markdown_report_file"
+          cat "$markdown_report_file" >> $GITHUB_STEP_SUMMARY
+
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email 'github-actions@agpt.co'
+          git fetch origin ${{ env.REPORTS_BRANCH }}:${{ env.REPORTS_BRANCH }} \
+            && git checkout ${{ env.REPORTS_BRANCH }} \
+            || git checkout --orphan ${{ env.REPORTS_BRANCH }}
+          git reset --hard
+          git add ${{ env.REPORTS_FOLDER }}
+          git commit -m "Benchmark report for ${{ matrix.agent-name }} @ $(date +'%Y-%m-%d')" \
+            && git push origin ${{ env.REPORTS_BRANCH }}

.github/workflows/autogpts-ci.yml

@@ -1,4 +1,4 @@
-name: Classic - Agent smoke tests
+name: Agent smoke tests
 
 on:
   workflow_dispatch:
@@ -7,37 +7,32 @@ on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
-      - '.github/workflows/classic-autogpts-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
-      - 'classic/benchmark/**'
-      - 'classic/run'
-      - 'classic/cli.py'
-      - 'classic/setup.py'
+      - '.github/workflows/autogpts-ci.yml'
+      - 'autogpt/**'
+      - 'forge/**'
+      - 'benchmark/**'
+      - 'run'
+      - 'cli.py'
+      - 'setup.py'
       - '!**/*.md'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - '.github/workflows/classic-autogpts-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
-      - 'classic/benchmark/**'
-      - 'classic/run'
-      - 'classic/cli.py'
-      - 'classic/setup.py'
+      - '.github/workflows/autogpts-ci.yml'
+      - 'autogpt/**'
+      - 'forge/**'
+      - 'benchmark/**'
+      - 'run'
+      - 'cli.py'
+      - 'setup.py'
       - '!**/*.md'
 
-defaults:
-  run:
-    shell: bash
-    working-directory: classic
-
 jobs:
   serve-agent-protocol:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        agent-name: [ original_autogpt ]
+        agent-name: [ autogpt ]
       fail-fast: false
     timeout-minutes: 20
     env:
@@ -55,7 +50,7 @@ jobs:
           python-version: ${{ env.min-python-version }}
 
       - name: Install Poetry
-        working-directory: ./classic/${{ matrix.agent-name }}/
+        working-directory: ./${{ matrix.agent-name }}/
         run: |
           curl -sSL https://install.python-poetry.org | python -
 

.github/workflows/benchmark-ci.yml

@@ -1,18 +1,18 @@
-name: Classic - AGBenchmark CI
+name: AGBenchmark CI
 
 on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
-      - 'classic/benchmark/**'
-      - '!classic/benchmark/reports/**'
-      - .github/workflows/classic-benchmark-ci.yml
+      - 'benchmark/**'
+      - .github/workflows/benchmark-ci.yml
+      - '!benchmark/reports/**'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - 'classic/benchmark/**'
-      - '!classic/benchmark/reports/**'
-      - .github/workflows/classic-benchmark-ci.yml
+      - 'benchmark/**'
+      - '!benchmark/reports/**'
+      - .github/workflows/benchmark-ci.yml
 
 concurrency:
   group: ${{ format('benchmark-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -39,7 +39,7 @@ jobs:
     defaults:
       run:
         shell: bash
-        working-directory: classic/benchmark
+        working-directory: benchmark
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }}
-          key: poetry-${{ runner.os }}-${{ hashFiles('classic/benchmark/poetry.lock') }}
+          key: poetry-${{ runner.os }}-${{ hashFiles('benchmark/poetry.lock') }}
 
       - name: Install Poetry (Unix)
         if: runner.os != 'Windows'
@@ -122,7 +122,7 @@ jobs:
           curl -sSL https://install.python-poetry.org | python -
 
       - name: Run regression tests
-        working-directory: classic
+        working-directory: .
         run: |
           ./run agent start ${{ matrix.agent-name }}
           cd ${{ matrix.agent-name }}
@@ -155,7 +155,7 @@ jobs:
 
           poetry run agbenchmark --mock
 
-          CHANGED=$(git diff --name-only | grep -E '(agbenchmark/challenges)|(../classic/frontend/assets)') || echo "No diffs"
+          CHANGED=$(git diff --name-only | grep -E '(agbenchmark/challenges)|(../frontend/assets)') || echo "No diffs"
           if [ ! -z "$CHANGED" ]; then
             echo "There are unstaged changes please run agbenchmark and commit those changes since they are needed."
             echo "$CHANGED"

.github/workflows/benchmark_publish_package.yml

@@ -1,4 +1,4 @@
-name: Classic - Publish to PyPI
+name: Publish to PyPI
 
 on:
   workflow_dispatch:
@@ -21,21 +21,21 @@ jobs:
         python-version: 3.8
 
     - name: Install Poetry
-      working-directory: ./classic/benchmark/
+      working-directory: ./benchmark/
       run: |
         curl -sSL https://install.python-poetry.org | python3 -
         echo "$HOME/.poetry/bin" >> $GITHUB_PATH
 
     - name: Build project for distribution
-      working-directory: ./classic/benchmark/
+      working-directory: ./benchmark/
       run: poetry build
 
     - name: Install dependencies
-      working-directory: ./classic/benchmark/
+      working-directory: ./benchmark/
       run: poetry install
 
     - name: Check Version
-      working-directory: ./classic/benchmark/
+      working-directory: ./benchmark/
       id: check-version
       run: |
         echo version=$(poetry version --short) >> $GITHUB_OUTPUT
@@ -43,7 +43,7 @@ jobs:
     - name: Create Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: "classic/benchmark/dist/*"
+        artifacts: "benchmark/dist/*"
         token: ${{ secrets.GITHUB_TOKEN }}
         draft: false
         generateReleaseNotes: false
@@ -51,5 +51,5 @@ jobs:
         commit: master
 
     - name: Build and publish
-      working-directory: ./classic/benchmark/
+      working-directory: ./benchmark/
       run: poetry publish -u __token__ -p ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/close-stale-issues.yml

@@ -1,4 +1,4 @@
-name: Repo - Close stale issues
+name: 'Close stale issues'
 on:
   schedule:
     - cron: '30 1 * * *'

.github/workflows/forge-ci.yml

@@ -1,18 +1,18 @@
-name: Classic - Forge CI
+name: Forge CI
 
 on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
-      - '.github/workflows/classic-forge-ci.yml'
-      - 'classic/forge/**'
-      - '!classic/forge/tests/vcr_cassettes'
+      - '.github/workflows/forge-ci.yml'
+      - 'forge/**'
+      - '!forge/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - '.github/workflows/classic-forge-ci.yml'
-      - 'classic/forge/**'
-      - '!classic/forge/tests/vcr_cassettes'
+      - '.github/workflows/forge-ci.yml'
+      - 'forge/**'
+      - '!forge/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('forge-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -21,7 +21,7 @@ concurrency:
 defaults:
   run:
     shell: bash
-    working-directory: classic/forge
+    working-directory: forge
 
 jobs:
   test:
@@ -110,7 +110,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }}
-          key: poetry-${{ runner.os }}-${{ hashFiles('classic/forge/poetry.lock') }}
+          key: poetry-${{ runner.os }}-${{ hashFiles('forge/poetry.lock') }}
 
       - name: Install Poetry (Unix)
         if: runner.os != 'Windows'
@@ -233,4 +233,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: test-logs
-          path: classic/forge/logs/
+          path: forge/logs/

.github/workflows/frontend-ci.yml

@@ -1,4 +1,4 @@
-name: Classic - Frontend CI/CD
+name: Frontend CI/CD
 
 on:
   push:
@@ -7,11 +7,11 @@ on:
       - development
       - 'ci-test*' # This will match any branch that starts with "ci-test"
     paths:
-      - 'classic/frontend/**'
+      - 'frontend/**'
       - '.github/workflows/frontend-ci.yml'
   pull_request:
     paths:
-      - 'classic/frontend/**'
+      - 'frontend/**'
       - '.github/workflows/frontend-ci.yml'
 
 jobs:
@@ -34,7 +34,7 @@ jobs:
 
     - name: Build Flutter to Web
       run: |
-        cd classic/frontend
+        cd frontend
         flutter build web --base-href /app/
 
     # - name: Commit and Push to ${{ env.BUILD_BRANCH }}
@@ -42,7 +42,7 @@ jobs:
     #   run: |
     #     git config --local user.email "action@github.com"
     #     git config --local user.name "GitHub Action"
-    #     git add classic/frontend/build/web
+    #     git add frontend/build/web
     #     git checkout -B ${{ env.BUILD_BRANCH }}
     #     git commit -m "Update frontend build to ${GITHUB_SHA:0:7}" -a
     #     git push -f origin ${{ env.BUILD_BRANCH }}
@@ -51,7 +51,7 @@ jobs:
       if: github.event_name == 'push'
       uses: peter-evans/create-pull-request@v6
       with:
-        add-paths: classic/frontend/build/web
+        add-paths: frontend/build/web
         base: ${{ github.ref_name }}
         branch: ${{ env.BUILD_BRANCH }}
         delete-branch: true

.github/workflows/hackathon.yml

@@ -0,0 +1,133 @@
+name: Hackathon
+
+on:
+  workflow_dispatch:
+    inputs:
+      agents:
+        description: "Agents to run (comma-separated)"
+        required: false
+        default: "autogpt" # Default agents if none are specified
+
+jobs:
+  matrix-setup:
+    runs-on: ubuntu-latest
+    # Service containers to run with `matrix-setup`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      env-name: ${{ steps.set-matrix.outputs.env-name }}
+    steps:
+      - id: set-matrix
+        run: |
+          if [ "${{ github.event_name }}" == "schedule" ]; then
+            echo "::set-output name=env-name::production"
+            echo "::set-output name=matrix::[ 'irrelevant']"
+          elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            IFS=',' read -ra matrix_array <<< "${{ github.event.inputs.agents }}"
+            matrix_string="[ \"$(echo "${matrix_array[@]}" | sed 's/ /", "/g')\" ]"
+            echo "::set-output name=env-name::production"
+            echo "::set-output name=matrix::$matrix_string"
+          else
+            echo "::set-output name=env-name::testing"
+            echo "::set-output name=matrix::[ 'irrelevant' ]"
+          fi
+
+  tests:
+    environment:
+      name: "${{ needs.matrix-setup.outputs.env-name }}"
+    needs: matrix-setup
+    env:
+      min-python-version: "3.10"
+    name: "${{ matrix.agent-name }}"
+    runs-on: ubuntu-latest
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    timeout-minutes: 50
+    strategy:
+      fail-fast: false
+      matrix:
+        agent-name: ${{fromJson(needs.matrix-setup.outputs.matrix)}}
+    steps:
+      - name: Print Environment Name
+        run: |
+          echo "Matrix Setup Environment Name: ${{ needs.matrix-setup.outputs.env-name }}"
+
+      - name: Check Docker Container
+        id: check
+        run: docker ps
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Set up Python ${{ env.min-python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.min-python-version }}
+
+      - id: get_date
+        name: Get date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python -
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: v18.15
+
+      - name: Run benchmark
+        run: |
+          link=$(jq -r '.["github_repo_url"]' arena/$AGENT_NAME.json)
+          branch=$(jq -r '.["branch_to_benchmark"]' arena/$AGENT_NAME.json)
+          git clone "$link" -b "$branch" "$AGENT_NAME"
+          cd $AGENT_NAME
+          cp ./$AGENT_NAME/.env.example ./$AGENT_NAME/.env || echo "file not found"
+          ./run agent start $AGENT_NAME
+          cd ../benchmark
+          poetry install
+          poetry run agbenchmark --no-dep
+        env:
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          SERP_API_KEY: ${{ secrets.SERP_API_KEY }}
+          SERPAPI_API_KEY: ${{ secrets.SERP_API_KEY }}
+          WEAVIATE_API_KEY: ${{ secrets.WEAVIATE_API_KEY }}
+          WEAVIATE_URL: ${{ secrets.WEAVIATE_URL }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          GOOGLE_CUSTOM_SEARCH_ENGINE_ID: ${{ secrets.GOOGLE_CUSTOM_SEARCH_ENGINE_ID }}
+          AGENT_NAME: ${{ matrix.agent-name }}

.github/workflows/pr-label.yml

@@ -1,12 +1,12 @@
-name: Repo - Pull Request auto-label
+name: "Pull Request auto-label"
 
 on:
   # So that PRs touching the same files as the push are updated
   push:
     branches: [ master, development, release-* ]
     paths-ignore:
-      - 'classic/forge/tests/vcr_cassettes'
-      - 'classic/benchmark/reports/**'
+      - 'forge/tests/vcr_cassettes'
+      - 'benchmark/reports/**'
   # So that the `dirtyLabel` is removed if conflicts are resolve
   # We recommend `pull_request_target` so that github secrets are available.
   # In `pull_request` we wouldn't be able to change labels of fork PRs

.github/workflows/python-checks.yml

@@ -1,24 +1,24 @@
-name: Classic - Python checks
+name: Python checks
 
 on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
       - '.github/workflows/lint-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
-      - 'classic/benchmark/**'
+      - 'autogpt/**'
+      - 'forge/**'
+      - 'benchmark/**'
       - '**.py'
-      - '!classic/forge/tests/vcr_cassettes'
+      - '!forge/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
       - '.github/workflows/lint-ci.yml'
-      - 'classic/original_autogpt/**'
-      - 'classic/forge/**'
-      - 'classic/benchmark/**'
+      - 'autogpt/**'
+      - 'forge/**'
+      - 'benchmark/**'
       - '**.py'
-      - '!classic/forge/tests/vcr_cassettes'
+      - '!forge/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('lint-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -40,18 +40,18 @@ jobs:
         uses: dorny/paths-filter@v3
         with:
           filters: |
-            original_autogpt:
-              - classic/original_autogpt/autogpt/**
-              - classic/original_autogpt/tests/**
-              - classic/original_autogpt/poetry.lock
+            autogpt:
+              - autogpt/autogpt/**
+              - autogpt/tests/**
+              - autogpt/poetry.lock
             forge:
-              - classic/forge/forge/**
-              - classic/forge/tests/**
-              - classic/forge/poetry.lock
+              - forge/forge/**
+              - forge/tests/**
+              - forge/poetry.lock
             benchmark:
-              - classic/benchmark/agbenchmark/**
-              - classic/benchmark/tests/**
-              - classic/benchmark/poetry.lock
+              - benchmark/agbenchmark/**
+              - benchmark/tests/**
+              - benchmark/poetry.lock
     outputs:
       changed-parts: ${{ steps.changes-in.outputs.changes }}
 
@@ -89,23 +89,23 @@ jobs:
       # Install dependencies
 
       - name: Install Python dependencies
-        run: poetry -C classic/${{ matrix.sub-package }} install
+        run: poetry -C ${{ matrix.sub-package }} install
 
       # Lint
 
       - name: Lint (isort)
         run: poetry run isort --check .
-        working-directory: classic/${{ matrix.sub-package }}
+        working-directory: ${{ matrix.sub-package }}
 
       - name: Lint (Black)
         if: success() || failure()
         run: poetry run black --check .
-        working-directory: classic/${{ matrix.sub-package }}
+        working-directory: ${{ matrix.sub-package }}
 
       - name: Lint (Flake8)
         if: success() || failure()
         run: poetry run flake8 .
-        working-directory: classic/${{ matrix.sub-package }}
+        working-directory: ${{ matrix.sub-package }}
 
   types:
     needs: get-changed-parts
@@ -141,11 +141,11 @@ jobs:
       # Install dependencies
 
       - name: Install Python dependencies
-        run: poetry -C classic/${{ matrix.sub-package }} install
+        run: poetry -C ${{ matrix.sub-package }} install
 
       # Typecheck
 
       - name: Typecheck
         if: success() || failure()
         run: poetry run pyright
-        working-directory: classic/${{ matrix.sub-package }}
+        working-directory: ${{ matrix.sub-package }}

.github/workflows/repo-stats.yml

@@ -1,4 +1,4 @@
-name: Repo - Github Stats
+name: github-repo-stats
 
 on:
   schedule:

.github/workflows/workflow-checker.yml

@@ -1,4 +1,4 @@
-name: Repo - PR Status Checker
+name: PR Status Checker
 on:
   pull_request:
     types: [opened, synchronize, reopened]
@@ -26,6 +26,6 @@ jobs:
           echo "Current directory before running Python script:"
           pwd
           echo "Attempting to run Python script:"
-          python .github/workflows/scripts/check_actions_status.py
+          python check_actions_status.py
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,7 +1,7 @@
 ## Original ignores
 .github_access_token
-classic/original_autogpt/keys.py
-classic/original_autogpt/*.json
+autogpt/keys.py
+autogpt/*.json
 auto_gpt_workspace/*
 *.mpeg
 .env
@@ -157,7 +157,7 @@ openai/
 CURRENT_BULLETIN.md
 
 # AgBenchmark
-classic/benchmark/agbenchmark/reports/
+agbenchmark/reports/
 
 # Nodejs
 package-lock.json
@@ -170,4 +170,4 @@ pri*
 ig*
 .github_access_token
 LICENSE.rtf
-autogpt_platform/autogpt_server/settings.py
+rnd/autogpt_server/settings.py

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "classic/forge/tests/vcr_cassettes"]
-	path = classic/forge/tests/vcr_cassettes
+[submodule "forge/tests/vcr_cassettes"]
+	path = forge/tests/vcr_cassettes
 	url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes
-[submodule "autogpt_platform/supabase"]
-	path = autogpt_platform/supabase
-	url = https://github.com/supabase/supabase.git

.pre-commit-config.yaml

@@ -16,22 +16,22 @@ repos:
     hooks:
       - id: isort-autogpt
         name: Lint (isort) - AutoGPT
-        entry: poetry -C classic/original_autogpt run isort
-        files: ^classic/original_autogpt/
+        entry: poetry -C autogpt run isort
+        files: ^autogpt/
         types: [file, python]
         language: system
 
       - id: isort-forge
         name: Lint (isort) - Forge
-        entry: poetry -C classic/forge run isort
-        files: ^classic/forge/
+        entry: poetry -C forge run isort
+        files: ^forge/
         types: [file, python]
         language: system
 
       - id: isort-benchmark
         name: Lint (isort) - Benchmark
-        entry: poetry -C classic/benchmark run isort
-        files: ^classic/benchmark/
+        entry: poetry -C benchmark run isort
+        files: ^benchmark/
         types: [file, python]
         language: system
 
@@ -52,20 +52,20 @@ repos:
       - id: flake8
         name: Lint (Flake8) - AutoGPT
         alias: flake8-autogpt
-        files: ^classic/original_autogpt/(autogpt|scripts|tests)/
-        args: [--config=classic/original_autogpt/.flake8]
+        files: ^autogpt/(autogpt|scripts|tests)/
+        args: [--config=autogpt/.flake8]
 
       - id: flake8
         name: Lint (Flake8) - Forge
         alias: flake8-forge
-        files: ^classic/forge/(forge|tests)/
-        args: [--config=classic/forge/.flake8]
+        files: ^forge/(forge|tests)/
+        args: [--config=forge/.flake8]
 
       - id: flake8
         name: Lint (Flake8) - Benchmark
         alias: flake8-benchmark
-        files: ^classic/benchmark/(agbenchmark|tests)/((?!reports).)*[/.]
-        args: [--config=classic/benchmark/.flake8]
+        files: ^benchmark/(agbenchmark|tests)/((?!reports).)*[/.]
+        args: [--config=benchmark/.flake8]
 
   - repo: local
     # To have watertight type checking, we check *all* the files in an affected
@@ -74,10 +74,10 @@ repos:
       - id: pyright
         name: Typecheck - AutoGPT
         alias: pyright-autogpt
-        entry: poetry -C classic/original_autogpt run pyright
+        entry: poetry -C autogpt run pyright
         args: [-p, autogpt, autogpt]
         # include forge source (since it's a path dependency) but exclude *_test.py files:
-        files: ^(classic/original_autogpt/((autogpt|scripts|tests)/|poetry\.lock$)|classic/forge/(classic/forge/.*(?<!_test)\.py|poetry\.lock)$)
+        files: ^(autogpt/((autogpt|scripts|tests)/|poetry\.lock$)|forge/(forge/.*(?<!_test)\.py|poetry\.lock)$)
         types: [file]
         language: system
         pass_filenames: false
@@ -85,9 +85,9 @@ repos:
       - id: pyright
         name: Typecheck - Forge
         alias: pyright-forge
-        entry: poetry -C classic/forge run pyright
+        entry: poetry -C forge run pyright
         args: [-p, forge, forge]
-        files: ^classic/forge/(classic/forge/|poetry\.lock$)
+        files: ^forge/(forge/|poetry\.lock$)
         types: [file]
         language: system
         pass_filenames: false
@@ -95,9 +95,9 @@ repos:
       - id: pyright
         name: Typecheck - Benchmark
         alias: pyright-benchmark
-        entry: poetry -C classic/benchmark run pyright
+        entry: poetry -C benchmark run pyright
         args: [-p, benchmark, benchmark]
-        files: ^classic/benchmark/(agbenchmark/|tests/|poetry\.lock$)
+        files: ^benchmark/(agbenchmark/|tests/|poetry\.lock$)
         types: [file]
         language: system
         pass_filenames: false
@@ -106,22 +106,22 @@ repos:
     hooks:
       - id: pytest-autogpt
         name: Run tests - AutoGPT (excl. slow tests)
-        entry: bash -c 'cd classic/original_autogpt && poetry run pytest --cov=autogpt -m "not slow" tests/unit tests/integration'
+        entry: bash -c 'cd autogpt && poetry run pytest --cov=autogpt -m "not slow" tests/unit tests/integration'
         # include forge source (since it's a path dependency) but exclude *_test.py files:
-        files: ^(classic/original_autogpt/((autogpt|tests)/|poetry\.lock$)|classic/forge/(classic/forge/.*(?<!_test)\.py|poetry\.lock)$)
+        files: ^(autogpt/((autogpt|tests)/|poetry\.lock$)|forge/(forge/.*(?<!_test)\.py|poetry\.lock)$)
         language: system
         pass_filenames: false
 
       - id: pytest-forge
         name: Run tests - Forge (excl. slow tests)
-        entry: bash -c 'cd classic/forge && poetry run pytest --cov=forge -m "not slow"'
-        files: ^classic/forge/(classic/forge/|tests/|poetry\.lock$)
+        entry: bash -c 'cd forge && poetry run pytest --cov=forge -m "not slow"'
+        files: ^forge/(forge/|tests/|poetry\.lock$)
         language: system
         pass_filenames: false
 
       - id: pytest-benchmark
         name: Run tests - Benchmark
-        entry: bash -c 'cd classic/benchmark && poetry run pytest --cov=benchmark'
-        files: ^classic/benchmark/(agbenchmark/|tests/|poetry\.lock$)
+        entry: bash -c 'cd benchmark && poetry run pytest --cov=benchmark'
+        files: ^benchmark/(agbenchmark/|tests/|poetry\.lock$)
         language: system
         pass_filenames: false

.vscode/all-projects.code-workspace

@@ -1,49 +1,49 @@
 {
   "folders": [
     {
-      "name": "autogpt_server",
-      "path": "../autogpt_platform/autogpt_server"
+      "name": "autogpt",
+      "path": "../autogpt"
     },
     {
-      "name": "autogpt_builder",
-      "path": "../autogpt_platform/autogpt_builder"
-    },
-    {
-      "name": "market",
-      "path": "../autogpt_platform/market"
-    },
-    {
-      "name": "lib",
-      "path": "../autogpt_platform/autogpt_libs"
-    },
-    {
-      "name": "infra",
-      "path": "../autogpt_platform/infra"
+      "name": "benchmark",
+      "path": "../benchmark"
     },
     {
       "name": "docs",
       "path": "../docs"
     },
+    {
+      "name": "forge",
+      "path": "../forge"
+    },
+    {
+      "name": "frontend",
+      "path": "../frontend"
+    },
+    {
+      "name": "autogpt_server",
+      "path": "../rnd/autogpt_server"
+    },
+    {
+      "name": "autogpt_builder",
+      "path": "../rnd/autogpt_builder"
+    },
+    {
+      "name": "market",
+      "path": "../rnd/market"
+    },
+    {
+      "name": "lib",
+      "path": "../rnd/autogpt_libs"
+    },
+    {
+      "name": "infra",
+      "path": "../rnd/infra"
+    },
     {
       "name": "[root]",
       "path": ".."
-    },
-    {
-      "name": "classic - autogpt",
-      "path": "../classic/original_autogpt"
-    },
-    {
-      "name": "classic - benchmark",
-      "path": "../classic/benchmark"
-    },
-    {
-      "name": "classic - forge",
-      "path": "../classic/forge"
-    },
-    {
-      "name": "classic - frontend",
-      "path": "../classic/frontend"
-    },
+    }
   ],
   "settings": {
     "python.analysis.typeCheckingMode": "basic"

Dockerfile.autogpt

@@ -29,7 +29,7 @@ ENV PATH="$POETRY_HOME/bin:$PATH"
 RUN poetry config installer.max-workers 10
 
 WORKDIR /app/autogpt
-COPY original_autogpt/pyproject.toml original_autogpt/poetry.lock ./
+COPY autogpt/pyproject.toml autogpt/poetry.lock ./
 
 # Include forge so it can be used as a path dependency
 COPY forge/ ../forge
@@ -42,17 +42,19 @@ ENTRYPOINT ["poetry", "run", "autogpt"]
 CMD []
 
 # dev build -> include everything
-FROM autogpt-base AS autogpt-dev
+FROM autogpt-base as autogpt-dev
 RUN poetry install --no-cache --no-root \
     && rm -rf $(poetry env info --path)/src
-ONBUILD COPY original_autogpt/ ./
+ONBUILD COPY autogpt/ ./
 
 # release build -> include bare minimum
-FROM autogpt-base AS autogpt-release
+FROM autogpt-base as autogpt-release
 RUN poetry install --no-cache --no-root --without dev \
     && rm -rf $(poetry env info --path)/src
-ONBUILD COPY original_autogpt/ ./autogpt
-ONBUILD COPY original_autogpt/README.md ./README.md
+ONBUILD COPY autogpt/autogpt/ ./autogpt
+ONBUILD COPY autogpt/scripts/ ./scripts
+ONBUILD COPY autogpt/plugins/ ./plugins
+ONBUILD COPY autogpt/README.md ./README.md
 ONBUILD RUN mkdir ./data
 
 FROM autogpt-${BUILD_TYPE} AS autogpt

README.md

@@ -55,16 +55,15 @@ Be part of the revolution! **AutoGPT** is here to stay, at the forefront of AI i
 ## 🤖 AutoGPT Classic
 > Below is information about the classic version of AutoGPT.
 
-**🛠️ [Build your own Agent - Quickstart](classic/FORGE-QUICKSTART.md)**
-
+**🛠️ [Build your own Agent - Quickstart](FORGE-QUICKSTART.md)**
 ### 🏗️ Forge
 
-**Forge your own agent!** – Forge is a ready-to-go toolkit to build your own agent application. It handles most of the boilerplate code, letting you channel all your creativity into the things that set *your* agent apart. All tutorials are located [here](https://medium.com/@aiedge/autogpt-forge-e3de53cc58ec). Components from [`forge`](/classic/forge/) can also be used individually to speed up development and reduce boilerplate in your agent project.
+**Forge your own agent!** – Forge is a ready-to-go template for your agent application. All the boilerplate code is already handled, letting you channel all your creativity into the things that set *your* agent apart. All tutorials are located [here](https://medium.com/@aiedge/autogpt-forge-e3de53cc58ec). Components from the [`forge.sdk`](/forge/forge/sdk) can also be used individually to speed up development and reduce boilerplate in your agent project.
 
-🚀 [**Getting Started with Forge**](https://github.com/Significant-Gravitas/AutoGPT/blob/master/classic/forge/tutorials/001_getting_started.md) –
+🚀 [**Getting Started with Forge**](https://github.com/Significant-Gravitas/AutoGPT/blob/master/forge/tutorials/001_getting_started.md) –
 This guide will walk you through the process of creating your own agent and using the benchmark and user interface.
 
-📘 [Learn More](https://github.com/Significant-Gravitas/AutoGPT/tree/master/classic/forge) about Forge
+📘 [Learn More](https://github.com/Significant-Gravitas/AutoGPT/tree/master/forge) about Forge
 
 ### 🎯 Benchmark
 
@@ -84,7 +83,7 @@ This guide will walk you through the process of creating your own agent and usin
 
 The frontend works out-of-the-box with all agents in the repo. Just use the [CLI] to run your agent of choice!
 
-📘 [Learn More](https://github.com/Significant-Gravitas/AutoGPT/tree/master/classic/frontend) about the Frontend
+📘 [Learn More](https://github.com/Significant-Gravitas/AutoGPT/tree/master/frontend) about the Frontend
 
 ### ⌨️ CLI
 

autogpt/.coveragerc

@@ -1,2 +1,2 @@
-[run]
+[run]
 relative_files = true

autogpt/.gitignore

@@ -1,6 +1,6 @@
 ## Original ignores
-classic/original_autogpt/keys.py
-classic/original_autogpt/*.json
+autogpt/keys.py
+autogpt/*.json
 *.mpeg
 .env
 azure.yaml

autogpt/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.analysis.typeCheckingMode": "basic",
+}

autogpt/README.md

@@ -120,9 +120,9 @@ by default on `http://localhost:8000`.
 For more comprehensive instructions, see the [user guide][docs/usage].
 
 [docs]: https://docs.agpt.co/autogpt
-[docs/setup]: https://docs.agpt.co/classic/original_autogpt/setup
-[docs/usage]: https://docs.agpt.co/classic/original_autogpt/usage
-[docs/plugins]: https://docs.agpt.co/classic/original_autogpt/plugins
+[docs/setup]: https://docs.agpt.co/autogpt/setup
+[docs/usage]: https://docs.agpt.co/autogpt/usage
+[docs/plugins]: https://docs.agpt.co/autogpt/plugins
 
 ## 📚 Resources
 * 📔 AutoGPT [project wiki](https://github.com/Significant-Gravitas/AutoGPT/wiki)

autogpt/autogpt/agents/README.md

@@ -34,4 +34,4 @@ class MyAgent(Agent):
         self.my_component = MyComponent()
 ```
 
-For more customization, you can override the `propose_action` and `execute` or even subclass `BaseAgent` directly. This way you can have full control over the agent's components and behavior. Have a look at the [implementation of Agent](https://github.com/Significant-Gravitas/AutoGPT/tree/master/classic/original_autogpt/agents/agent.py) for more details.
+For more customization, you can override the `propose_action` and `execute` or even subclass `BaseAgent` directly. This way you can have full control over the agent's components and behavior. Have a look at the [implementation of Agent](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/autogpt/agents/agent.py) for more details.

autogpt/autogpt/app/agent_protocol_server.py

@@ -97,9 +97,7 @@ class AgentProtocolServer:
         app.include_router(router, prefix="/ap/v1")
         script_dir = os.path.dirname(os.path.realpath(__file__))
         frontend_path = (
-            pathlib.Path(script_dir)
-            .joinpath("../../../classic/frontend/build/web")
-            .resolve()
+            pathlib.Path(script_dir).joinpath("../../../frontend/build/web").resolve()
         )
 
         if os.path.exists(frontend_path):

autogpt/autogpt/app/config.py

@@ -148,7 +148,7 @@ async def assert_config_has_required_llm_api_keys(config: AppConfig) -> None:
                 )
                 logger.info(
                     "For further instructions: "
-                    "https://docs.agpt.co/classic/original_autogpt/setup/#anthropic"
+                    "https://docs.agpt.co/autogpt/setup/#anthropic"
                 )
 
             raise ValueError("Anthropic is unavailable: can't load credentials") from e
@@ -176,15 +176,14 @@ async def assert_config_has_required_llm_api_keys(config: AppConfig) -> None:
 
             logger.error("Set your Groq API key in .env or as an environment variable")
             logger.info(
-                "For further instructions: "
-                + "https://docs.agpt.co/classic/original_autogpt/setup/#groq"
+                "For further instructions: https://docs.agpt.co/autogpt/setup/#groq"
             )
             raise ValueError("Groq is unavailable: can't load credentials")
         except AuthenticationError as e:
             logger.error("The Groq API key is invalid!")
             logger.info(
                 "For instructions to get and set a new API key: "
-                "https://docs.agpt.co/classic/original_autogpt/setup/#groq"
+                "https://docs.agpt.co/autogpt/setup/#groq"
             )
             raise ValueError("Groq is unavailable: invalid API key") from e
 
@@ -203,15 +202,14 @@ async def assert_config_has_required_llm_api_keys(config: AppConfig) -> None:
                 "Set your OpenAI API key in .env or as an environment variable"
             )
             logger.info(
-                "For further instructions: "
-                + "https://docs.agpt.co/classic/original_autogpt/setup/#openai"
+                "For further instructions: https://docs.agpt.co/autogpt/setup/#openai"
             )
             raise ValueError("OpenAI is unavailable: can't load credentials")
         except AuthenticationError as e:
             logger.error("The OpenAI API key is invalid!")
             logger.info(
                 "For instructions to get and set a new API key: "
-                "https://docs.agpt.co/classic/original_autogpt/setup/#openai"
+                "https://docs.agpt.co/autogpt/setup/#openai"
             )
             raise ValueError("OpenAI is unavailable: invalid API key") from e
 

autogpt/autogpt/app/utils.py

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 def get_bulletin_from_web():
     try:
         response = requests.get(
-            "https://raw.githubusercontent.com/Significant-Gravitas/AutoGPT/master/classic/original_autogpt/BULLETIN.md"  # noqa: E501
+            "https://raw.githubusercontent.com/Significant-Gravitas/AutoGPT/master/autogpt/BULLETIN.md"  # noqa: E501
         )
         if response.status_code == 200:
             return response.text
@@ -45,7 +45,7 @@ def vcs_state_diverges_from_master() -> bool:
     """
     Returns whether a git repo is present and contains changes that are not in `master`.
     """
-    paths_we_care_about = "classic/original_autogpt/classic/original_autogpt/**/*.py"
+    paths_we_care_about = "autogpt/autogpt/**/*.py"
     try:
         repo = Repo(search_parent_directories=True)
 

autogpt/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - ./:/app/classic/original_autogpt/
+      - ./:/app/autogpt/
       - ./docker-compose.yml:/app/docker-compose.yml:ro
       # - ./Dockerfile:/app/Dockerfile:ro
     profiles: ["exclude-from-up"]
@@ -33,8 +33,8 @@ services:
     entrypoint: ["poetry", "run"]
     command: ["pytest", "-v"]
     volumes:
-      - ./autogpt:/app/classic/original_autogpt/autogpt
-      - ./tests:/app/classic/original_autogpt/tests
+      - ./autogpt:/app/autogpt/autogpt
+      - ./tests:/app/autogpt/tests
     depends_on:
       - minio
     profiles: ["exclude-from-up"]

autogpt/poetry.lock

@@ -348,10 +348,10 @@ tiktoken = ">=0.7.0,<1.0.0"
 toml = "^0.10.2"
 uvicorn = {version = ">=0.23.2,<1", extras = ["standard"]}
 watchdog = "4.0.0"
-webdriver-manager = "^4.0.2"
+webdriver-manager = "^4.0.1"
 
 [package.extras]
-benchmark = ["agbenchmark @ file:///home/reinier/code/agpt/AutoGPT/classic/benchmark"]
+benchmark = ["agbenchmark @ file:///Users/czerwinski/Projects/AutoGPT/benchmark"]
 
 [package.source]
 type = "directory"
@@ -6416,13 +6416,13 @@ wasabi = ">=0.9.1,<1.2.0"
 
 [[package]]
 name = "webdriver-manager"
-version = "4.0.2"
+version = "4.0.1"
 description = "Library provides the way to automatically manage drivers for different browsers"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "webdriver_manager-4.0.2-py2.py3-none-any.whl", hash = "sha256:75908d92ecc45ff2b9953614459c633db8f9aa1ff30181cefe8696e312908129"},
-    {file = "webdriver_manager-4.0.2.tar.gz", hash = "sha256:efedf428f92fd6d5c924a0d054e6d1322dd77aab790e834ee767af392b35590f"},
+    {file = "webdriver_manager-4.0.1-py2.py3-none-any.whl", hash = "sha256:d7970052295bb9cda2c1a24cf0b872dd2c41ababcc78f7b6b8dc37a41e979a7e"},
+    {file = "webdriver_manager-4.0.1.tar.gz", hash = "sha256:25ec177c6a2ce9c02fb8046f1b2732701a9418d6a977967bb065d840a3175d87"},
 ]
 
 [package.dependencies]

autogpt/pyproject.toml

@@ -88,4 +88,4 @@ skip_glob = ["data"]
 [tool.pyright]
 pythonVersion = "3.10"
 exclude = ["data/**", "**/node_modules", "**/__pycache__", "**/.*"]
-ignore = ["../classic/forge/**"]
+ignore = ["../forge/**"]

autogpt/scripts/git_log_to_release_notes.py

@@ -55,7 +55,7 @@ async def generate_release_notes(repo_path: Optional[str | Path] = None):
 
     git_log = repo.git.log(
         f"{last_release_tag.name}...{new_release_ref}",
-        "classic/original_autogpt/",
+        "autogpt/",
         no_merges=True,
         follow=True,
     )
@@ -81,7 +81,7 @@ EXAMPLE_RELEASE_NOTES = """
 First some important notes w.r.t. using the application:
 * `run.sh` has been renamed to `autogpt.sh`
 * The project has been restructured. The AutoGPT Agent is now located in `autogpt`.
-* The application no longer uses a single workspace for all tasks. Instead, every task that you run the agent on creates a new workspace folder. See the [usage guide](https://docs.agpt.co/classic/original_autogpt/usage/#workspace) for more information.
+* The application no longer uses a single workspace for all tasks. Instead, every task that you run the agent on creates a new workspace folder. See the [usage guide](https://docs.agpt.co/autogpt/usage/#workspace) for more information.
 
 ## New features ✨
 
@@ -94,7 +94,7 @@ First some important notes w.r.t. using the application:
 * **Resuming agents 🔄️**
   In TTY mode, the application will now save the agent's state when quitting, and allows resuming where you left off at a later time!
 * **GCS and S3 workspace backends 📦**
-  To further support running the application as part of a larger system, Google Cloud Storage and S3 workspace backends were added. Configuration options for this can be found in [`.env.template`](/classic/original_autogpt/.env.template).
+  To further support running the application as part of a larger system, Google Cloud Storage and S3 workspace backends were added. Configuration options for this can be found in [`.env.template`](/autogpt/.env.template).
 * **Documentation Rewrite 📖**
   The [documentation](https://docs.agpt.co) has been restructured and mostly rewritten to clarify and simplify the instructions, and also to accommodate the other subprojects that are now in the repo.
 * **New Project CLI 🔧**

autogpt/scripts/llamafile/serve.py

@@ -80,7 +80,7 @@ def main(
         ):
             return
 
-    # Go to classic/original_autogpt/scripts/llamafile/
+    # Go to autogpt/scripts/llamafile/
     os.chdir(Path(__file__).resolve().parent)
 
     on_windows = platform.system() == "Windows"

autogpt/setup.py

@@ -59,10 +59,7 @@ txt_to_rtf("../LICENSE", license_file)
 setup(
     executables=[
         Executable(
-            "classic/original_autogpt/__main__.py",
-            target_name="autogpt",
-            base="console",
-            icon=icon,
+            "autogpt/__main__.py", target_name="autogpt", base="console", icon=icon
         ),
     ],
     options={