Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Restructuring Repo #8113

Merged
merged 54 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0d73428
Restructureing Repo
Swiftyos Sep 20, 2024
8397b78
update frontend ci
Swiftyos Sep 20, 2024
bda9384
fix frontend paths
Swiftyos Sep 20, 2024
d593f76
updating CI's
Swiftyos Sep 20, 2024
d10167c
renamed all CI's to make it clear which subproject they are for
Swiftyos Sep 20, 2024
be16fd9
fixing repo workflow checker CI
Swiftyos Sep 20, 2024
ba206e3
docs update
Swiftyos Sep 20, 2024
efeba44
update symbolic links
Swiftyos Sep 20, 2024
ba30aa2
Merge branch 'master' into repo-restructure
Swiftyos Sep 20, 2024
d7aba4f
updaate python checks ci
Swiftyos Sep 20, 2024
7f514c1
Merge branch 'repo-restructure' of github.com:Significant-Gravitas/Au…
Swiftyos Sep 20, 2024
4e569f4
add flake8 path to python checks ci
Swiftyos Sep 20, 2024
2cad209
updaing python checks ci
Swiftyos Sep 20, 2024
f583a15
formatting changes
Swiftyos Sep 20, 2024
d62fe00
move back `.pre-commit-config.yaml`
Pwuts Sep 20, 2024
10cefc1
linitng fixes
Swiftyos Sep 20, 2024
2582eb1
Merge branch 'repo-restructure' of github.com:Significant-Gravitas/Au…
Swiftyos Sep 20, 2024
43bf6f2
unbreak classic/.dockerignore
Pwuts Sep 20, 2024
46cc8ae
more linting fixes
Swiftyos Sep 20, 2024
f1bf7f2
Merge branch 'repo-restructure' of github.com:Significant-Gravitas/Au…
Swiftyos Sep 20, 2024
9d7dfb0
fix type errors
Swiftyos Sep 20, 2024
ff11d00
isort fixes
Swiftyos Sep 20, 2024
13b82c8
unbreak Classic AutoGPT CI workflows
Pwuts Sep 20, 2024
31cd6dc
move back .pre-commit-config.yaml
Pwuts Sep 20, 2024
aeab5aa
unbreak Classic AutoGPT Docker Release workflow
Pwuts Sep 20, 2024
d35b91c
delete Classic AutoGPTs Nightly Benchmark
Pwuts Sep 20, 2024
5e1a3d5
fix classic-autogpts-ci.yml
Pwuts Sep 20, 2024
6ced85d
fix classic docker CI workflows
Pwuts Sep 20, 2024
f5040fa
fix classic-benchmark-ci.yml
Pwuts Sep 20, 2024
430835e
fix classic-forge-ci.yml
Pwuts Sep 20, 2024
7551782
fix classic-autogpts-ci.yml
Pwuts Sep 20, 2024
241f21a
fix classic-autogpts-ci.yml
Pwuts Sep 20, 2024
369b1d9
fix code workspace file
Pwuts Sep 20, 2024
4e33399
fix code workspace file (vol. 2)
Pwuts Sep 20, 2024
dfcfd00
fix original_autogpt path in classic/cli.py
Pwuts Sep 20, 2024
df2126c
fix `Dockerfile.autogpt`
Pwuts Sep 20, 2024
c8f55bc
fix .pre-commit-config.yml
Pwuts Sep 20, 2024
6ae6c71
fix `Dockerfile.autogpt`
Pwuts Sep 20, 2024
3abe821
Update docker file formatting
Swiftyos Sep 20, 2024
815cf8b
fix issue with `webdriver-manager`
Pwuts Sep 20, 2024
0c6b08d
fix agbenchmark replace-all
Pwuts Sep 20, 2024
f711c05
unbreak links in README
Pwuts Sep 20, 2024
6bdea7e
Repo restructure frontend (#8118)
Swiftyos Sep 20, 2024
05b1fa8
rename workflows
Swiftyos Sep 20, 2024
a00b2f9
updated the naming of platform workflows
Swiftyos Sep 20, 2024
4ecf887
fix `Dockerfile.autogpt` data folder in dev mode
Pwuts Sep 20, 2024
c2884e3
supabase and readme update
aarushik93 Sep 20, 2024
0083fbd
fix paths in workflows
Pwuts Sep 20, 2024
18c24a9
Rename `autogpt_server` to `backend` (#8119)
Pwuts Sep 20, 2024
74ae529
add schamea to marketplace
aarushik93 Sep 20, 2024
d243c5f
fix pyproject file for backend
Pwuts Sep 20, 2024
39d54ad
format backend
Pwuts Sep 20, 2024
9d7f843
update autolabeler config
Pwuts Sep 20, 2024
7bb1323
update docs
aarushik93 Sep 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
frontend/build/** linguist-generated
classic/frontend/build/** linguist-generated

**/poetry.lock linguist-generated

docs/_javascript/** linguist-vendored

# Exclude VCR cassettes from stats
forge/tests/vcr_cassettes/**/**.y*ml linguist-generated
classic/forge/tests/vcr_cassettes/**/**.y*ml linguist-generated

* text=auto
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
* @Significant-Gravitas/maintainers
.github/workflows/ @Significant-Gravitas/devops
forge/ @Significant-Gravitas/forge-maintainers
benchmark/ @Significant-Gravitas/benchmark-maintainers
frontend/ @Significant-Gravitas/frontend-maintainers
rnd/infra @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
.github/CODEOWNERS @Significant-Gravitas/admins
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Testing 🔍
> [!NOTE]
Only for the new autogpt platform, currently in rnd/
Only for the new autogpt platform, currently in autogpt_platform/

<!--
Please make sure your changes have been tested and are in good working condition.
Expand Down
24 changes: 12 additions & 12 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
AutoGPT Agent:
Classic AutoGPT Agent:
- changed-files:
- any-glob-to-any-file: autogpt/**
- any-glob-to-any-file: classic/original_autogpt/**

Forge:
Classic Benchmark:
- changed-files:
- any-glob-to-any-file: forge/**
- any-glob-to-any-file: classic/benchmark/**

Benchmark:
Classic Frontend:
- changed-files:
- any-glob-to-any-file: benchmark/**
- any-glob-to-any-file: classic/frontend/**

Frontend:
Forge:
- changed-files:
- any-glob-to-any-file: frontend/**
- any-glob-to-any-file: classic/forge/**

documentation:
- changed-files:
- any-glob-to-any-file: docs/**

Builder:
platform/frontend:
- changed-files:
- any-glob-to-any-file: rnd/autogpt_builder/**
- any-glob-to-any-file: autogpt_platform/frontend/**

Server:
platform/backend:
- changed-files:
- any-glob-to-any-file: rnd/autogpt_server/**
- any-glob-to-any-file: autogpt_platform/backend/**
97 changes: 0 additions & 97 deletions .github/workflows/autogpts-benchmark.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: AutoGPT CI
name: Classic - AutoGPT CI

on:
push:
branches: [ master, development, ci-test* ]
paths:
- '.github/workflows/autogpt-ci.yml'
- 'autogpt/**'
- '.github/workflows/classic-autogpt-ci.yml'
- 'classic/original_autogpt/**'
pull_request:
branches: [ master, development, release-* ]
paths:
- '.github/workflows/autogpt-ci.yml'
- 'autogpt/**'
- '.github/workflows/classic-autogpt-ci.yml'
- 'classic/original_autogpt/**'

concurrency:
group: ${{ format('autogpt-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
group: ${{ format('classic-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: autogpt
working-directory: classic/original_autogpt

jobs:
test:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }}
key: poetry-${{ runner.os }}-${{ hashFiles('autogpt/poetry.lock') }}
key: poetry-${{ runner.os }}-${{ hashFiles('classic/original_autogpt/poetry.lock') }}

- name: Install Poetry (Unix)
if: runner.os != 'Windows'
Expand Down Expand Up @@ -135,4 +135,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: test-logs
path: autogpt/logs/
path: classic/original_autogpt/logs/
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Purge Auto-GPT Docker CI cache
name: Classic - Purge Auto-GPT Docker CI cache

on:
schedule:
Expand All @@ -25,7 +25,8 @@ jobs:
name: Build image
uses: docker/build-push-action@v5
with:
file: Dockerfile.autogpt
context: classic/
file: classic/Dockerfile.autogpt
build-args: BUILD_TYPE=${{ matrix.build-type }}
load: true # save to docker images
# use GHA cache as read-only
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
name: AutoGPT Docker CI
name: Classic - AutoGPT Docker CI

on:
push:
branches: [ master, development ]
paths:
- '.github/workflows/autogpt-docker-ci.yml'
- 'autogpt/**'
- '.github/workflows/classic-autogpt-docker-ci.yml'
- 'classic/original_autogpt/**'
- 'classic/forge/**'
pull_request:
branches: [ master, development, release-* ]
paths:
- '.github/workflows/autogpt-docker-ci.yml'
- 'autogpt/**'
- '.github/workflows/classic-autogpt-docker-ci.yml'
- 'classic/original_autogpt/**'
- 'classic/forge/**'

concurrency:
group: ${{ format('autogpt-docker-ci-{0}', github.head_ref && format('pr-{0}', github.event.pull_request.number) || github.sha) }}
group: ${{ format('classic-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: autogpt
working-directory: classic/original_autogpt

env:
IMAGE_NAME: auto-gpt
Expand Down Expand Up @@ -47,7 +49,8 @@ jobs:
name: Build image
uses: docker/build-push-action@v5
with:
file: Dockerfile.autogpt
context: classic/
file: classic/Dockerfile.autogpt
build-args: BUILD_TYPE=${{ matrix.build-type }}
tags: ${{ env.IMAGE_NAME }}
labels: GIT_REVISION=${{ github.sha }}
Expand Down Expand Up @@ -116,7 +119,8 @@ jobs:
name: Build image
uses: docker/build-push-action@v5
with:
file: Dockerfile.autogpt
context: classic/
file: classic/Dockerfile.autogpt
build-args: BUILD_TYPE=dev # include pytest
tags: >
${{ env.IMAGE_NAME }},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: AutoGPT Docker Release
name: Classic - AutoGPT Docker Release

on:
release:
Expand Down Expand Up @@ -44,6 +44,7 @@ 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Agent smoke tests
name: Classic - Agent smoke tests

on:
workflow_dispatch:
Expand All @@ -7,32 +7,37 @@ on:
push:
branches: [ master, development, ci-test* ]
paths:
- '.github/workflows/autogpts-ci.yml'
- 'autogpt/**'
- 'forge/**'
- 'benchmark/**'
- 'run'
- 'cli.py'
- 'setup.py'
- '.github/workflows/classic-autogpts-ci.yml'
- 'classic/original_autogpt/**'
- 'classic/forge/**'
- 'classic/benchmark/**'
- 'classic/run'
- 'classic/cli.py'
- 'classic/setup.py'
- '!**/*.md'
pull_request:
branches: [ master, development, release-* ]
paths:
- '.github/workflows/autogpts-ci.yml'
- 'autogpt/**'
- 'forge/**'
- 'benchmark/**'
- 'run'
- 'cli.py'
- 'setup.py'
- '.github/workflows/classic-autogpts-ci.yml'
- 'classic/original_autogpt/**'
- 'classic/forge/**'
- 'classic/benchmark/**'
- 'classic/run'
- 'classic/cli.py'
- 'classic/setup.py'
- '!**/*.md'

defaults:
run:
shell: bash
working-directory: classic

jobs:
serve-agent-protocol:
runs-on: ubuntu-latest
strategy:
matrix:
agent-name: [ autogpt ]
agent-name: [ original_autogpt ]
fail-fast: false
timeout-minutes: 20
env:
Expand All @@ -50,7 +55,7 @@ jobs:
python-version: ${{ env.min-python-version }}

- name: Install Poetry
working-directory: ./${{ matrix.agent-name }}/
working-directory: ./classic/${{ matrix.agent-name }}/
run: |
curl -sSL https://install.python-poetry.org | python -
Expand Down
Loading
Loading