Merge branch 'repo-restructure' into fix-path

.github/labeler.yml

@@ -1,27 +1,27 @@
-Classic AutoGPT Agent:
+AutoGPT Agent:
 - changed-files:
   - any-glob-to-any-file: classic/original_autogpt/**
 
-Classic Benchmark:
-- changed-files:
-  - any-glob-to-any-file: classic/benchmark/**
-
-Classic Frontend:
-- changed-files:
-  - any-glob-to-any-file: classic/frontend/**
-
 Forge:
 - changed-files:
   - any-glob-to-any-file: classic/forge/**
 
+Benchmark:
+- changed-files:
+  - any-glob-to-any-file: classic/benchmark/**
+
+Frontend:
+- changed-files:
+  - any-glob-to-any-file: classic/frontend/**
+
 documentation:
 - changed-files:
   - any-glob-to-any-file: docs/**
 
-platform/frontend:
+Builder:
 - changed-files:
-  - any-glob-to-any-file: autogpt_platform/frontend/**
+  - any-glob-to-any-file: autogpt_platform/autogpt_builder/**
 
-platform/backend:
+Server:
 - changed-files:
-  - any-glob-to-any-file: autogpt_platform/backend/**
+  - any-glob-to-any-file: autogpt_platform/autogpt_server/**

.github/workflows/classic-frontend-ci.yml

@@ -8,11 +8,11 @@ on:
       - 'ci-test*' # This will match any branch that starts with "ci-test"
     paths:
       - 'classic/frontend/**'
-      - '.github/workflows/classic-frontend-ci.yml'
+      - '.github/workflows/frontend-ci.yml'
   pull_request:
     paths:
       - 'classic/frontend/**'
-      - '.github/workflows/classic-frontend-ci.yml'
+      - '.github/workflows/frontend-ci.yml'
 
 jobs:
   build:
@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     env:
-      BUILD_BRANCH: ${{ format('classic-frontend-build/{0}', github.ref_name) }}
+      BUILD_BRANCH: ${{ format('frontend-build/{0}', github.ref_name) }}
 
     steps:
     - name: Checkout Repo

.github/workflows/classic-python-checks.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master, development, ci-test* ]
     paths:
-      - '.github/workflows/classic-python-checks-ci.yml'
+      - '.github/workflows/lint-ci.yml'
       - 'classic/original_autogpt/**'
       - 'classic/forge/**'
       - 'classic/benchmark/**'
@@ -13,7 +13,7 @@ on:
   pull_request:
     branches: [ master, development, release-* ]
     paths:
-      - '.github/workflows/classic-python-checks-ci.yml'
+      - '.github/workflows/lint-ci.yml'
       - 'classic/original_autogpt/**'
       - 'classic/forge/**'
       - 'classic/benchmark/**'
@@ -21,7 +21,7 @@ on:
       - '!classic/forge/tests/vcr_cassettes'
 
 concurrency:
-  group: ${{ format('classic-python-checks-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
+  group: ${{ format('lint-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:

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

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

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

@@ -1,40 +0,0 @@
-name: AutoGPT Server Docker Build & Push
-
-on:
-  push:
-    branches: [ update-docker-ci ]
-    paths:
-      - '**'
-
-defaults:
-  run:
-    shell: bash
-
-env:
-  PROJECT_ID: agpt-dev
-  IMAGE_NAME: agpt-server-dev
-  REGION: us-central1
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v0.2.1
-        with:
-          project_id: ${{ env.PROJECT_ID }}
-          service_account_key: ${{ secrets.GCP_SA_KEY }}
-          export_default_credentials: true
-
-      - name: Configure Docker
-        run: gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
-
-      - name: Build Docker image
-        run: docker build -t ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }} -f autogpt_platform/backend/Dockerfile .
-
-      - name: Push Docker image
-        run: docker push ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }}

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

@@ -1,14 +1,14 @@
-name: AutoGPT Platform - Infra
+name: Platform - AutoGPT Builder Infra
 
 on:
   push:
     branches: [ master ]
     paths:
-      - '.github/workflows/platform-autogpt-infra-ci.yml'
+      - '.github/workflows/autogpt-infra-ci.yml'
       - 'autogpt_platform/infra/**'
   pull_request:
     paths:
-      - '.github/workflows/platform-autogpt-infra-ci.yml'
+      - '.github/workflows/autogpt-infra-ci.yml'
       - 'autogpt_platform/infra/**'
 
 defaults:
@@ -53,4 +53,4 @@ jobs:
 
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }}

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

@@ -1,25 +1,25 @@
-name: AutoGPT Platform - Backend CI
+name: Platform - AutoGPT Server CI
 
 on:
   push:
     branches: [master, development, ci-test*]
     paths:
-      - ".github/workflows/platform-backend-ci.yml"
-      - "autogpt_platform/backend/**"
+      - ".github/workflows/autogpt-server-ci.yml"
+      - "autogpt_platform/autogpt_server/**"
   pull_request:
     branches: [master, development, release-*]
     paths:
-      - ".github/workflows/platform-backend-ci.yml"
-      - "autogpt_platform/backend/**"
+      - ".github/workflows/autogpt-server-ci.yml"
+      - "autogpt_platform/autogpt_server/**"
 
 concurrency:
-  group: ${{ format('backend-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
+  group: ${{ format('autogpt-server-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: autogpt_platform/backend
+    working-directory: autogpt_platform/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/backend/poetry.lock') }}
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/autogpt_server/poetry.lock') }}
 
       - name: Install Poetry (Unix)
         if: runner.os != 'Windows'
@@ -152,4 +152,4 @@ jobs:
       #   uses: codecov/codecov-action@v4
       #   with:
       #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     flags: backend,${{ runner.os }}
+      #     flags: autogpt-server,${{ runner.os }}

.gitignore

@@ -170,4 +170,4 @@ pri*
 ig*
 .github_access_token
 LICENSE.rtf
-autogpt_platform/backend/settings.py
+autogpt_platform/autogpt_server/settings.py

autogpt_platform/README.md

@@ -19,7 +19,7 @@ To run the AutoGPT Platform, follow these steps:
    ```
       git submodule update --init --recursive
    ```
-4. Navigate back to autogpt_platform (cd ..)
+4. Navigate back to rnd (cd ..)
 5. Run the following command:
    ```
       cp supabase/docker/.env.example .env
@@ -32,7 +32,7 @@ To run the AutoGPT Platform, follow these steps:
    ```
 
    This command will start all the necessary backend services defined in the `docker-compose.combined.yml` file in detached mode.
-7. Navigate to autogpt_platform/frontend.
+7. Navigate to autogpt_platform/autogpt_builder.
 8. Run the following command: 
    ```
       cp .env.example .env.local

autogpt_platform/autogpt_builder/Dockerfile

@@ -1,19 +1,19 @@
 # Base stage for both dev and prod
 FROM node:21-alpine AS base
 WORKDIR /app
-COPY autogpt_platform/frontend/package.json autogpt_platform/frontend/yarn.lock ./
+COPY autogpt_platform/autogpt_builder/package.json autogpt_platform/autogpt_builder/yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 # Dev stage
 FROM base AS dev
 ENV NODE_ENV=development
-COPY autogpt_platform/frontend/ .
+COPY autogpt_platform/autogpt_builder/ .
 EXPOSE 3000
 CMD ["yarn", "run", "dev"]
 
 # Build stage for prod
 FROM base AS build
-COPY autogpt_platform/frontend/ .
+COPY autogpt_platform/autogpt_builder/ .
 RUN npm run build
 
 # Prod stage

autogpt_platform/autogpt_builder/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "frontend",
+  "name": "autogpt_builder",
   "version": "0.1.0",
   "private": true,
   "scripts": {

autogpt_platform/autogpt_builder/src/components/ProfileDropdown.tsx

@@ -42,11 +42,7 @@ const ProfileDropdown = () => {
             Admin Dashboard
           </DropdownMenuItem>
         )}
-        <DropdownMenuItem
-          onClick={() =>
-            supabase?.auth.signOut().then(() => router.replace("/login"))
-          }
-        >
+        <DropdownMenuItem onClick={() => supabase?.auth.signOut()}>
           Log out
         </DropdownMenuItem>
       </DropdownMenuContent>