diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d586fc2c4..9683ddf84 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ .github/workflows/ @Significant-Gravitas/devops -autogpts/autogpt/ @Significant-Gravitas/maintainers -autogpts/forge/ @Significant-Gravitas/forge-maintainers +autogpt/ @Significant-Gravitas/maintainers +forge/ @Significant-Gravitas/forge-maintainers benchmark/ @Significant-Gravitas/benchmark-maintainers frontend/ @Significant-Gravitas/frontend-maintainers diff --git a/.github/labeler.yml b/.github/labeler.yml index cef6db432..153c485d4 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,10 +1,10 @@ AutoGPT Agent: - changed-files: - - any-glob-to-any-file: autogpts/autogpt/** + - any-glob-to-any-file: autogpt/** Forge: - changed-files: - - any-glob-to-any-file: autogpts/forge/** + - any-glob-to-any-file: forge/** Benchmark: - changed-files: diff --git a/.github/workflows/autogpt-ci.yml b/.github/workflows/autogpt-ci.yml index bc3858e88..d1f9302ec 100644 --- a/.github/workflows/autogpt-ci.yml +++ b/.github/workflows/autogpt-ci.yml @@ -5,14 +5,14 @@ on: branches: [ master, development, ci-test* ] paths: - '.github/workflows/autogpt-ci.yml' - - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/vcr_cassettes' + - 'autogpt/**' + - '!autogpt/tests/vcr_cassettes' pull_request: branches: [ master, development, release-* ] paths: - '.github/workflows/autogpt-ci.yml' - - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/vcr_cassettes' + - 'autogpt/**' + - '!autogpt/tests/vcr_cassettes' concurrency: group: ${{ format('autogpt-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: autogpts/autogpt + working-directory: autogpt jobs: lint: @@ -48,7 +48,7 @@ jobs: uses: actions/cache@v4 with: path: ~/.cache/pypoetry - key: ${{ runner.os }}-poetry-${{ hashFiles('autogpts/autogpt/pyproject.toml') }}-${{ steps.get_date.outputs.date }} + key: ${{ runner.os }}-poetry-${{ hashFiles('autogpt/pyproject.toml') }}-${{ steps.get_date.outputs.date }} - name: Install Python dependencies run: | @@ -170,7 +170,7 @@ jobs: uses: actions/cache@v4 with: path: ${{ runner.os == 'macOS' && '~/Library/Caches/pypoetry' || '~/.cache/pypoetry' }} - key: poetry-${{ runner.os }}-${{ hashFiles('autogpts/autogpt/poetry.lock') }} + key: poetry-${{ runner.os }}-${{ hashFiles('autogpt/poetry.lock') }} - name: Install Poetry (Unix) if: runner.os != 'Windows' @@ -293,4 +293,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: test-logs - path: autogpts/autogpt/logs/ + path: autogpt/logs/ diff --git a/.github/workflows/autogpt-docker-cache-clean.yml b/.github/workflows/autogpt-docker-cache-clean.yml index 22c940128..57ead411d 100644 --- a/.github/workflows/autogpt-docker-cache-clean.yml +++ b/.github/workflows/autogpt-docker-cache-clean.yml @@ -25,7 +25,7 @@ jobs: name: Build image uses: docker/build-push-action@v5 with: - context: autogpts/autogpt + context: autogpt build-args: BUILD_TYPE=${{ matrix.build-type }} load: true # save to docker images # use GHA cache as read-only diff --git a/.github/workflows/autogpt-docker-ci.yml b/.github/workflows/autogpt-docker-ci.yml index 4ef63547e..e9948f354 100644 --- a/.github/workflows/autogpt-docker-ci.yml +++ b/.github/workflows/autogpt-docker-ci.yml @@ -5,14 +5,14 @@ on: branches: [ master, development ] paths: - '.github/workflows/autogpt-docker-ci.yml' - - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/vcr_cassettes' + - 'autogpt/**' + - '!autogpt/tests/vcr_cassettes' pull_request: branches: [ master, development, release-* ] paths: - '.github/workflows/autogpt-docker-ci.yml' - - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/vcr_cassettes' + - 'autogpt/**' + - '!autogpt/tests/vcr_cassettes' concurrency: group: ${{ format('autogpt-docker-ci-{0}', github.head_ref && format('pr-{0}', github.event.pull_request.number) || github.sha) }} @@ -20,7 +20,7 @@ concurrency: defaults: run: - working-directory: autogpts/autogpt + working-directory: autogpt env: IMAGE_NAME: auto-gpt @@ -49,7 +49,7 @@ jobs: name: Build image uses: docker/build-push-action@v5 with: - context: autogpts/autogpt + context: autogpt build-args: BUILD_TYPE=${{ matrix.build-type }} tags: ${{ env.IMAGE_NAME }} labels: GIT_REVISION=${{ github.sha }} @@ -119,7 +119,7 @@ jobs: name: Build image uses: docker/build-push-action@v5 with: - context: autogpts/autogpt + context: autogpt build-args: BUILD_TYPE=dev # include pytest tags: > ${{ env.IMAGE_NAME }}, diff --git a/.github/workflows/autogpt-docker-release.yml b/.github/workflows/autogpt-docker-release.yml index f45a63a2a..8610967eb 100644 --- a/.github/workflows/autogpt-docker-release.yml +++ b/.github/workflows/autogpt-docker-release.yml @@ -12,7 +12,7 @@ on: defaults: run: - working-directory: autogpts/autogpt + working-directory: autogpt env: IMAGE_NAME: auto-gpt @@ -48,7 +48,7 @@ jobs: name: Build image uses: docker/build-push-action@v5 with: - context: autogpts/autogpt + context: autogpt build-args: BUILD_TYPE=release load: true # save to docker images # push: true # TODO: uncomment when this issue is fixed: https://github.com/moby/buildkit/issues/1555 diff --git a/.github/workflows/autogpts-benchmark.yml b/.github/workflows/autogpts-benchmark.yml index fb1cb6f08..469893059 100644 --- a/.github/workflows/autogpts-benchmark.yml +++ b/.github/workflows/autogpts-benchmark.yml @@ -42,7 +42,7 @@ jobs: - name: Benchmark ${{ matrix.agent-name }} run: | ./run agent start ${{ matrix.agent-name }} - cd autogpts/${{ matrix.agent-name }} + cd ${{ matrix.agent-name }} set +e # Do not quit on non-zero exit codes poetry run agbenchmark run -N 3 \ diff --git a/.github/workflows/autogpts-ci.yml b/.github/workflows/autogpts-ci.yml index 19f8c5ab2..fc767b960 100644 --- a/.github/workflows/autogpts-ci.yml +++ b/.github/workflows/autogpts-ci.yml @@ -8,7 +8,8 @@ on: branches: [ master, development, ci-test* ] paths: - '.github/workflows/autogpts-ci.yml' - - 'autogpts/**' + - 'autogpt/**' + - 'forge/**' - 'benchmark/**' - 'run' - 'cli.py' @@ -18,7 +19,8 @@ on: branches: [ master, development, release-* ] paths: - '.github/workflows/autogpts-ci.yml' - - 'autogpts/**' + - 'autogpt/**' + - 'forge/**' - 'benchmark/**' - 'run' - 'cli.py' @@ -48,14 +50,14 @@ jobs: python-version: ${{ env.min-python-version }} - name: Install Poetry - working-directory: ./autogpts/${{ matrix.agent-name }}/ + working-directory: ./${{ matrix.agent-name }}/ run: | curl -sSL https://install.python-poetry.org | python - - name: Run regression tests run: | ./run agent start ${{ matrix.agent-name }} - cd autogpts/${{ matrix.agent-name }} + cd ${{ matrix.agent-name }} poetry run agbenchmark --mock --test=BasicRetrieval --test=Battleship --test=WebArenaTask_0 poetry run agbenchmark --test=WriteFile env: diff --git a/.github/workflows/benchmark-ci.yml b/.github/workflows/benchmark-ci.yml index 88c5750ac..361568d76 100644 --- a/.github/workflows/benchmark-ci.yml +++ b/.github/workflows/benchmark-ci.yml @@ -89,14 +89,14 @@ jobs: python-version: ${{ env.min-python-version }} - name: Install Poetry - working-directory: ./autogpts/${{ matrix.agent-name }}/ + working-directory: ./${{ matrix.agent-name }}/ run: | curl -sSL https://install.python-poetry.org | python - - name: Run regression tests run: | ./run agent start ${{ matrix.agent-name }} - cd autogpts/${{ matrix.agent-name }} + cd ${{ matrix.agent-name }} set +e # Ignore non-zero exit codes and continue execution echo "Running the following command: poetry run agbenchmark --maintain --mock" @@ -119,7 +119,7 @@ jobs: echo "Running the following command: poetry run agbenchmark --test=WriteFile" poetry run agbenchmark --test=WriteFile - cd ../../benchmark + cd ../benchmark poetry install echo "Adding the BUILD_SKILL_TREE environment variable. This will attempt to add new elements in the skill tree. If new elements are added, the CI fails because they should have been pushed" export BUILD_SKILL_TREE=true diff --git a/.github/workflows/hackathon.yml b/.github/workflows/hackathon.yml index 94b2c752f..d165d268f 100644 --- a/.github/workflows/hackathon.yml +++ b/.github/workflows/hackathon.yml @@ -117,7 +117,7 @@ jobs: branch=$(jq -r '.["branch_to_benchmark"]' arena/$AGENT_NAME.json) git clone "$link" -b "$branch" "$AGENT_NAME" cd $AGENT_NAME - cp ./autogpts/$AGENT_NAME/.env.example ./autogpts/$AGENT_NAME/.env || echo "file not found" + cp ./$AGENT_NAME/.env.example ./$AGENT_NAME/.env || echo "file not found" ./run agent start $AGENT_NAME cd ../benchmark poetry install diff --git a/.github/workflows/pr-label.yml b/.github/workflows/pr-label.yml index 415637702..15b4e73a9 100644 --- a/.github/workflows/pr-label.yml +++ b/.github/workflows/pr-label.yml @@ -5,7 +5,7 @@ on: push: branches: [ master, development, release-* ] paths-ignore: - - 'autogpts/autogpt/tests/vcr_cassettes' + - 'autogpt/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. diff --git a/.gitmodules b/.gitmodules index c7d571220..0258bcd36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "autogpts/autogpt/tests/vcr_cassettes"] - path = autogpts/autogpt/tests/vcr_cassettes +[submodule "autogpt/tests/vcr_cassettes"] + path = autogpt/tests/vcr_cassettes url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes diff --git a/CLI-USAGE.md b/CLI-USAGE.md index 82c3ecc8d..5cd8ea662 100755 --- a/CLI-USAGE.md +++ b/CLI-USAGE.md @@ -74,7 +74,7 @@ Lists all the available agents. **Output**: ``` -🎉 New agent 'my_agent' created and switched to the new directory in autogpts folder. +🎉 New agent 'my_agent' created and switched to the new directory in agents folder. ``` Creates a new agent named 'my_agent'. diff --git a/README.md b/README.md index b47934734..774a882b0 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ Be part of the revolution! **AutoGPT** is here to stay, at the forefront of AI i ### 🏗️ Forge -**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`](/autogpts/forge/forge/sdk) 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/autogpts/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/autogpts/forge) about Forge +📘 [Learn More](https://github.com/Significant-Gravitas/AutoGPT/tree/master/forge) about Forge ### 🎯 Benchmark diff --git a/autogpts/autogpt/.coveragerc b/autogpt/.coveragerc similarity index 100% rename from autogpts/autogpt/.coveragerc rename to autogpt/.coveragerc diff --git a/autogpts/autogpt/.devcontainer/Dockerfile b/autogpt/.devcontainer/Dockerfile similarity index 100% rename from autogpts/autogpt/.devcontainer/Dockerfile rename to autogpt/.devcontainer/Dockerfile diff --git a/autogpts/autogpt/.devcontainer/devcontainer.json b/autogpt/.devcontainer/devcontainer.json similarity index 100% rename from autogpts/autogpt/.devcontainer/devcontainer.json rename to autogpt/.devcontainer/devcontainer.json diff --git a/autogpts/autogpt/.devcontainer/docker-compose.yml b/autogpt/.devcontainer/docker-compose.yml similarity index 100% rename from autogpts/autogpt/.devcontainer/docker-compose.yml rename to autogpt/.devcontainer/docker-compose.yml diff --git a/autogpts/autogpt/.dockerignore b/autogpt/.dockerignore similarity index 100% rename from autogpts/autogpt/.dockerignore rename to autogpt/.dockerignore diff --git a/autogpts/autogpt/.env.template b/autogpt/.env.template similarity index 100% rename from autogpts/autogpt/.env.template rename to autogpt/.env.template diff --git a/autogpts/autogpt/.envrc b/autogpt/.envrc similarity index 100% rename from autogpts/autogpt/.envrc rename to autogpt/.envrc diff --git a/autogpts/autogpt/.flake8 b/autogpt/.flake8 similarity index 100% rename from autogpts/autogpt/.flake8 rename to autogpt/.flake8 diff --git a/autogpts/autogpt/.gitattributes b/autogpt/.gitattributes similarity index 100% rename from autogpts/autogpt/.gitattributes rename to autogpt/.gitattributes diff --git a/autogpts/autogpt/.gitignore b/autogpt/.gitignore similarity index 100% rename from autogpts/autogpt/.gitignore rename to autogpt/.gitignore diff --git a/autogpts/autogpt/.pre-commit-config.yaml b/autogpt/.pre-commit-config.yaml similarity index 92% rename from autogpts/autogpt/.pre-commit-config.yaml rename to autogpt/.pre-commit-config.yaml index 955d49fa3..d6131dc48 100644 --- a/autogpts/autogpt/.pre-commit-config.yaml +++ b/autogpt/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: # types: [ python ] - id: pytest-check name: pytest-check - entry: bash -c 'cd autogpts/autogpt && poetry run pytest --cov=autogpt tests/unit' + entry: bash -c 'cd autogpt && poetry run pytest --cov=autogpt tests/unit' language: system pass_filenames: false always_run: true diff --git a/autogpts/autogpt/.sourcery.yaml b/autogpt/.sourcery.yaml similarity index 100% rename from autogpts/autogpt/.sourcery.yaml rename to autogpt/.sourcery.yaml diff --git a/autogpts/autogpt/BULLETIN.md b/autogpt/BULLETIN.md similarity index 100% rename from autogpts/autogpt/BULLETIN.md rename to autogpt/BULLETIN.md diff --git a/autogpts/autogpt/Dockerfile b/autogpt/Dockerfile similarity index 100% rename from autogpts/autogpt/Dockerfile rename to autogpt/Dockerfile diff --git a/autogpts/autogpt/README.md b/autogpt/README.md similarity index 100% rename from autogpts/autogpt/README.md rename to autogpt/README.md diff --git a/autogpts/autogpt/agbenchmark_config/.gitignore b/autogpt/agbenchmark_config/.gitignore similarity index 100% rename from autogpts/autogpt/agbenchmark_config/.gitignore rename to autogpt/agbenchmark_config/.gitignore diff --git a/autogpts/forge/forge/llm/__init__.py b/autogpt/agbenchmark_config/__init__.py similarity index 100% rename from autogpts/forge/forge/llm/__init__.py rename to autogpt/agbenchmark_config/__init__.py diff --git a/autogpts/autogpt/agbenchmark_config/analyze_reports.py b/autogpt/agbenchmark_config/analyze_reports.py similarity index 100% rename from autogpts/autogpt/agbenchmark_config/analyze_reports.py rename to autogpt/agbenchmark_config/analyze_reports.py diff --git a/autogpts/autogpt/agbenchmark_config/benchmarks.py b/autogpt/agbenchmark_config/benchmarks.py similarity index 100% rename from autogpts/autogpt/agbenchmark_config/benchmarks.py rename to autogpt/agbenchmark_config/benchmarks.py diff --git a/autogpts/autogpt/agbenchmark_config/config.json b/autogpt/agbenchmark_config/config.json similarity index 100% rename from autogpts/autogpt/agbenchmark_config/config.json rename to autogpt/agbenchmark_config/config.json diff --git a/autogpts/autogpt/autogpt.bat b/autogpt/autogpt.bat similarity index 100% rename from autogpts/autogpt/autogpt.bat rename to autogpt/autogpt.bat diff --git a/autogpts/autogpt/autogpt.sh b/autogpt/autogpt.sh similarity index 100% rename from autogpts/autogpt/autogpt.sh rename to autogpt/autogpt.sh diff --git a/autogpts/autogpt/autogpt/__init__.py b/autogpt/autogpt/__init__.py similarity index 100% rename from autogpts/autogpt/autogpt/__init__.py rename to autogpt/autogpt/__init__.py diff --git a/autogpts/autogpt/autogpt/__main__.py b/autogpt/autogpt/__main__.py similarity index 100% rename from autogpts/autogpt/autogpt/__main__.py rename to autogpt/autogpt/__main__.py diff --git a/autogpts/autogpt/autogpt/agent_factory/configurators.py b/autogpt/autogpt/agent_factory/configurators.py similarity index 100% rename from autogpts/autogpt/autogpt/agent_factory/configurators.py rename to autogpt/autogpt/agent_factory/configurators.py diff --git a/autogpts/autogpt/autogpt/agent_factory/generators.py b/autogpt/autogpt/agent_factory/generators.py similarity index 100% rename from autogpts/autogpt/autogpt/agent_factory/generators.py rename to autogpt/autogpt/agent_factory/generators.py diff --git a/autogpts/autogpt/autogpt/agent_factory/profile_generator.py b/autogpt/autogpt/agent_factory/profile_generator.py similarity index 100% rename from autogpts/autogpt/autogpt/agent_factory/profile_generator.py rename to autogpt/autogpt/agent_factory/profile_generator.py diff --git a/autogpts/autogpt/autogpt/agents/README.md b/autogpt/autogpt/agents/README.md similarity index 94% rename from autogpts/autogpt/autogpt/agents/README.md rename to autogpt/autogpt/agents/README.md index 4ab573243..0a43440d2 100644 --- a/autogpts/autogpt/autogpt/agents/README.md +++ b/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/autogpts/autogpt/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. diff --git a/autogpts/autogpt/autogpt/agents/__init__.py b/autogpt/autogpt/agents/__init__.py similarity index 100% rename from autogpts/autogpt/autogpt/agents/__init__.py rename to autogpt/autogpt/agents/__init__.py diff --git a/autogpts/autogpt/autogpt/agents/agent.py b/autogpt/autogpt/agents/agent.py similarity index 100% rename from autogpts/autogpt/autogpt/agents/agent.py rename to autogpt/autogpt/agents/agent.py diff --git a/autogpts/autogpt/autogpt/agents/agent_manager.py b/autogpt/autogpt/agents/agent_manager.py similarity index 100% rename from autogpts/autogpt/autogpt/agents/agent_manager.py rename to autogpt/autogpt/agents/agent_manager.py diff --git a/autogpts/autogpt/autogpt/agents/prompt_strategies/one_shot.py b/autogpt/autogpt/agents/prompt_strategies/one_shot.py similarity index 100% rename from autogpts/autogpt/autogpt/agents/prompt_strategies/one_shot.py rename to autogpt/autogpt/agents/prompt_strategies/one_shot.py diff --git a/autogpts/autogpt/autogpt/app/__init__.py b/autogpt/autogpt/app/__init__.py similarity index 100% rename from autogpts/autogpt/autogpt/app/__init__.py rename to autogpt/autogpt/app/__init__.py diff --git a/autogpts/autogpt/autogpt/app/agent_protocol_server.py b/autogpt/autogpt/app/agent_protocol_server.py similarity index 99% rename from autogpts/autogpt/autogpt/app/agent_protocol_server.py rename to autogpt/autogpt/app/agent_protocol_server.py index 520ccbc11..54aaa32d6 100644 --- a/autogpts/autogpt/autogpt/app/agent_protocol_server.py +++ b/autogpt/autogpt/app/agent_protocol_server.py @@ -98,9 +98,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("../../../../frontend/build/web") - .resolve() + pathlib.Path(script_dir).joinpath("../../../frontend/build/web").resolve() ) if os.path.exists(frontend_path): diff --git a/autogpts/autogpt/autogpt/app/cli.py b/autogpt/autogpt/app/cli.py similarity index 100% rename from autogpts/autogpt/autogpt/app/cli.py rename to autogpt/autogpt/app/cli.py diff --git a/autogpts/autogpt/autogpt/app/configurator.py b/autogpt/autogpt/app/configurator.py similarity index 100% rename from autogpts/autogpt/autogpt/app/configurator.py rename to autogpt/autogpt/app/configurator.py diff --git a/autogpts/autogpt/autogpt/app/input.py b/autogpt/autogpt/app/input.py similarity index 100% rename from autogpts/autogpt/autogpt/app/input.py rename to autogpt/autogpt/app/input.py diff --git a/autogpts/autogpt/autogpt/app/log_cycle.py b/autogpt/autogpt/app/log_cycle.py similarity index 100% rename from autogpts/autogpt/autogpt/app/log_cycle.py rename to autogpt/autogpt/app/log_cycle.py diff --git a/autogpts/autogpt/autogpt/app/main.py b/autogpt/autogpt/app/main.py similarity index 100% rename from autogpts/autogpt/autogpt/app/main.py rename to autogpt/autogpt/app/main.py diff --git a/autogpts/autogpt/autogpt/app/setup.py b/autogpt/autogpt/app/setup.py similarity index 100% rename from autogpts/autogpt/autogpt/app/setup.py rename to autogpt/autogpt/app/setup.py diff --git a/autogpts/autogpt/autogpt/app/spinner.py b/autogpt/autogpt/app/spinner.py similarity index 100% rename from autogpts/autogpt/autogpt/app/spinner.py rename to autogpt/autogpt/app/spinner.py diff --git a/autogpts/autogpt/autogpt/app/telemetry.py b/autogpt/autogpt/app/telemetry.py similarity index 100% rename from autogpts/autogpt/autogpt/app/telemetry.py rename to autogpt/autogpt/app/telemetry.py diff --git a/autogpts/autogpt/autogpt/app/utils.py b/autogpt/autogpt/app/utils.py similarity index 98% rename from autogpts/autogpt/autogpt/app/utils.py rename to autogpt/autogpt/app/utils.py index 7c0452a7c..fd18a4ffe 100644 --- a/autogpts/autogpt/autogpt/app/utils.py +++ b/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/autogpts/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 = "autogpts/autogpt/autogpt/**/*.py" + paths_we_care_about = "autogpt/autogpt/**/*.py" try: repo = Repo(search_parent_directories=True) diff --git a/autogpts/autogpt/azure.yaml.template b/autogpt/azure.yaml.template similarity index 100% rename from autogpts/autogpt/azure.yaml.template rename to autogpt/azure.yaml.template diff --git a/autogpts/autogpt/codecov.yml b/autogpt/codecov.yml similarity index 100% rename from autogpts/autogpt/codecov.yml rename to autogpt/codecov.yml diff --git a/autogpts/autogpt/plugins/.keep b/autogpt/data/.keep similarity index 100% rename from autogpts/autogpt/plugins/.keep rename to autogpt/data/.keep diff --git a/autogpts/autogpt/docker-compose.yml b/autogpt/docker-compose.yml similarity index 100% rename from autogpts/autogpt/docker-compose.yml rename to autogpt/docker-compose.yml diff --git a/autogpts/autogpt/hooks/post-checkout b/autogpt/hooks/post-checkout similarity index 100% rename from autogpts/autogpt/hooks/post-checkout rename to autogpt/hooks/post-checkout diff --git a/autogpts/autogpt/hooks/post-rewrite b/autogpt/hooks/post-rewrite similarity index 100% rename from autogpts/autogpt/hooks/post-rewrite rename to autogpt/hooks/post-rewrite diff --git a/autogpts/autogpt/plugin.png b/autogpt/plugin.png similarity index 100% rename from autogpts/autogpt/plugin.png rename to autogpt/plugin.png diff --git a/autogpts/autogpt/data/.keep b/autogpt/plugins/.keep similarity index 100% rename from autogpts/autogpt/data/.keep rename to autogpt/plugins/.keep diff --git a/autogpts/autogpt/poetry.lock b/autogpt/poetry.lock similarity index 99% rename from autogpts/autogpt/poetry.lock rename to autogpt/poetry.lock index 895b8054c..a73d5e463 100644 --- a/autogpts/autogpt/poetry.lock +++ b/autogpt/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "agbenchmark" @@ -38,7 +38,7 @@ uvicorn = "^0.23.2" [package.source] type = "directory" -url = "../../benchmark" +url = "../benchmark" [[package]] name = "agent-protocol-client" @@ -355,7 +355,7 @@ uvicorn = "^0.23.2" webdriver-manager = "^4.0.1" [package.extras] -benchmark = ["agbenchmark @ file:///home/reinier/code/agpt/Auto-GPT/benchmark"] +benchmark = ["agbenchmark @ file:///Users/czerwinski/Projects/AutoGPT/benchmark"] [package.source] type = "directory" @@ -7184,4 +7184,4 @@ benchmark = ["agbenchmark"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "d79316409dd12b59677b9d5c31717f8147bac58ee96d42ce9fb0d01cdcf826b0" +content-hash = "6427a16e1d25b69fd8dcaf50f851b6e04b80677a0389a93c04dbd8cbed0cfef1" diff --git a/autogpts/autogpt/pyproject.toml b/autogpt/pyproject.toml similarity index 95% rename from autogpts/autogpt/pyproject.toml rename to autogpt/pyproject.toml index c176aedfe..64839cc2b 100644 --- a/autogpts/autogpt/pyproject.toml +++ b/autogpt/pyproject.toml @@ -6,7 +6,7 @@ authors = [ ] readme = "README.md" description = "An open-source attempt to make GPT-4 autonomous" -homepage = "https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt" +homepage = "https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt" classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", @@ -24,7 +24,7 @@ serve = "autogpt.app.cli:serve" python = "^3.10" anthropic = "^0.25.1" autogpt-forge = { path = "../forge", develop = true } -# autogpt-forge = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "autogpts/forge"} +# autogpt-forge = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "forge"} beautifulsoup4 = "^4.12.2" charset-normalizer = "^3.1.0" click = "*" @@ -57,7 +57,7 @@ tiktoken = "^0.5.0" openapi-python-client = "^0.14.0" # Benchmarking -agbenchmark = { path = "../../benchmark", optional = true } +agbenchmark = { path = "../benchmark", optional = true } # agbenchmark = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "benchmark", optional = true} google-cloud-logging = "^3.8.0" google-cloud-storage = "^2.13.0" diff --git a/autogpts/autogpt/run b/autogpt/run similarity index 100% rename from autogpts/autogpt/run rename to autogpt/run diff --git a/autogpts/autogpt/run_benchmark b/autogpt/run_benchmark similarity index 100% rename from autogpts/autogpt/run_benchmark rename to autogpt/run_benchmark diff --git a/autogpts/forge/forge/content_processing/__init__.py b/autogpt/scripts/__init__.py similarity index 100% rename from autogpts/forge/forge/content_processing/__init__.py rename to autogpt/scripts/__init__.py diff --git a/autogpts/autogpt/scripts/check_requirements.py b/autogpt/scripts/check_requirements.py similarity index 100% rename from autogpts/autogpt/scripts/check_requirements.py rename to autogpt/scripts/check_requirements.py diff --git a/autogpts/autogpt/scripts/git_log_to_release_notes.py b/autogpt/scripts/git_log_to_release_notes.py similarity index 94% rename from autogpts/autogpt/scripts/git_log_to_release_notes.py rename to autogpt/scripts/git_log_to_release_notes.py index bf69a6584..b4359672f 100755 --- a/autogpts/autogpt/scripts/git_log_to_release_notes.py +++ b/autogpt/scripts/git_log_to_release_notes.py @@ -55,7 +55,7 @@ async def generate_release_notes(repo_path: Optional[Path] = None): git_log = repo.git.log( f"{last_release_tag.name}...{new_release_ref}", - "autogpts/autogpt/", + "autogpt/", no_merges=True, follow=True, ) @@ -80,7 +80,7 @@ async def generate_release_notes(repo_path: Optional[Path] = None): 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 `autogpts/autogpt`. +* 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/autogpt/usage/#workspace) for more information. ## New features ✨ @@ -89,12 +89,12 @@ First some important notes w.r.t. using the application: Our agent now works with the [Agent Protocol](/#-agent-protocol), a REST API that allows creating tasks and executing the agent's step-by-step process. This allows integration with other applications, and we also use it to connect to the agent through the UI. * **UI 💻** With the aforementioned Agent Protocol integration comes the benefit of using our own open-source Agent UI. Easily create, use, and chat with multiple agents from one interface. - When starting the application through the project's new [CLI](/#-cli), it runs with the new frontend by default, with benchmarking capabilities. Running `autogpt.sh serve` in the subproject folder (`autogpts/autogpt`) will also serve the new frontend, but without benchmarking functionality. + When starting the application through the project's new [CLI](/#-cli), it runs with the new frontend by default, with benchmarking capabilities. Running `autogpt.sh serve` in the subproject folder (`autogpt`) will also serve the new frontend, but without benchmarking functionality. Running the application the "old-fashioned" way, with the terminal interface (let's call it TTY mode), is still possible with `autogpt.sh run`. * **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`](/autogpts/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 🔧** @@ -110,8 +110,8 @@ First some important notes w.r.t. using the application: This is mostly made possible by the `autogpt.core.configuration` module, which was also expanded with a few new features for it. Most notably, the new `from_env` attribute on the `UserConfigurable` field decorator and corresponding logic in `SystemConfiguration.from_env()` and related functions. * **Monorepo** As mentioned, the repo has been restructured to accommodate the AutoGPT Agent, Forge, AGBenchmark and the new Frontend. - * AutoGPT Agent has been moved to `autogpts/autogpt` - * Forge now lives in `autogpts/forge`, and the project's new CLI makes it easy to create new Forge-based agents. + * AutoGPT Agent has been moved to `autogpt` + * Forge now lives in `forge`, and the project's new CLI makes it easy to create new Forge-based agents. * AGBenchmark -> `benchmark` * Frontend -> `frontend` diff --git a/autogpts/autogpt/setup b/autogpt/setup similarity index 100% rename from autogpts/autogpt/setup rename to autogpt/setup diff --git a/autogpts/forge/forge/__init__.py b/autogpt/tests/__init__.py similarity index 100% rename from autogpts/forge/forge/__init__.py rename to autogpt/tests/__init__.py diff --git a/autogpts/autogpt/tests/conftest.py b/autogpt/tests/conftest.py similarity index 100% rename from autogpts/autogpt/tests/conftest.py rename to autogpt/tests/conftest.py diff --git a/autogpts/autogpt/tests/context.py b/autogpt/tests/context.py similarity index 100% rename from autogpts/autogpt/tests/context.py rename to autogpt/tests/context.py diff --git a/autogpts/forge/__init__.py b/autogpt/tests/integration/__init__.py similarity index 100% rename from autogpts/forge/__init__.py rename to autogpt/tests/integration/__init__.py diff --git a/autogpts/autogpt/tests/integration/agent_factory.py b/autogpt/tests/integration/agent_factory.py similarity index 100% rename from autogpts/autogpt/tests/integration/agent_factory.py rename to autogpt/tests/integration/agent_factory.py diff --git a/autogpts/autogpt/tests/integration/test_execute_code.py b/autogpt/tests/integration/test_execute_code.py similarity index 100% rename from autogpts/autogpt/tests/integration/test_execute_code.py rename to autogpt/tests/integration/test_execute_code.py diff --git a/autogpts/autogpt/tests/integration/test_image_gen.py b/autogpt/tests/integration/test_image_gen.py similarity index 100% rename from autogpts/autogpt/tests/integration/test_image_gen.py rename to autogpt/tests/integration/test_image_gen.py diff --git a/autogpts/autogpt/tests/integration/test_setup.py b/autogpt/tests/integration/test_setup.py similarity index 100% rename from autogpts/autogpt/tests/integration/test_setup.py rename to autogpt/tests/integration/test_setup.py diff --git a/autogpts/autogpt/tests/integration/test_web_selenium.py b/autogpt/tests/integration/test_web_selenium.py similarity index 100% rename from autogpts/autogpt/tests/integration/test_web_selenium.py rename to autogpt/tests/integration/test_web_selenium.py diff --git a/autogpts/autogpt/tests/unit/__init__.py b/autogpt/tests/mocks/__init__.py similarity index 100% rename from autogpts/autogpt/tests/unit/__init__.py rename to autogpt/tests/mocks/__init__.py diff --git a/autogpts/autogpt/tests/mocks/__init__.py b/autogpt/tests/unit/__init__.py similarity index 100% rename from autogpts/autogpt/tests/mocks/__init__.py rename to autogpt/tests/unit/__init__.py diff --git a/autogpts/autogpt/tests/unit/data/test_ai_config.yaml b/autogpt/tests/unit/data/test_ai_config.yaml similarity index 100% rename from autogpts/autogpt/tests/unit/data/test_ai_config.yaml rename to autogpt/tests/unit/data/test_ai_config.yaml diff --git a/autogpts/autogpt/tests/unit/test_config.py b/autogpt/tests/unit/test_config.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_config.py rename to autogpt/tests/unit/test_config.py diff --git a/autogpts/autogpt/tests/unit/test_file_operations.py b/autogpt/tests/unit/test_file_operations.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_file_operations.py rename to autogpt/tests/unit/test_file_operations.py diff --git a/autogpts/autogpt/tests/unit/test_gcs_file_storage.py b/autogpt/tests/unit/test_gcs_file_storage.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_gcs_file_storage.py rename to autogpt/tests/unit/test_gcs_file_storage.py diff --git a/autogpts/autogpt/tests/unit/test_git_commands.py b/autogpt/tests/unit/test_git_commands.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_git_commands.py rename to autogpt/tests/unit/test_git_commands.py diff --git a/autogpts/autogpt/tests/unit/test_json.py b/autogpt/tests/unit/test_json.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_json.py rename to autogpt/tests/unit/test_json.py diff --git a/autogpts/autogpt/tests/unit/test_local_file_storage.py b/autogpt/tests/unit/test_local_file_storage.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_local_file_storage.py rename to autogpt/tests/unit/test_local_file_storage.py diff --git a/autogpts/autogpt/tests/unit/test_logs.py b/autogpt/tests/unit/test_logs.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_logs.py rename to autogpt/tests/unit/test_logs.py diff --git a/autogpts/autogpt/tests/unit/test_s3_file_storage.py b/autogpt/tests/unit/test_s3_file_storage.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_s3_file_storage.py rename to autogpt/tests/unit/test_s3_file_storage.py diff --git a/autogpts/autogpt/tests/unit/test_spinner.py b/autogpt/tests/unit/test_spinner.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_spinner.py rename to autogpt/tests/unit/test_spinner.py diff --git a/autogpts/autogpt/tests/unit/test_text_file_parsers.py b/autogpt/tests/unit/test_text_file_parsers.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_text_file_parsers.py rename to autogpt/tests/unit/test_text_file_parsers.py diff --git a/autogpts/autogpt/tests/unit/test_url_validation.py b/autogpt/tests/unit/test_url_validation.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_url_validation.py rename to autogpt/tests/unit/test_url_validation.py diff --git a/autogpts/autogpt/tests/unit/test_utils.py b/autogpt/tests/unit/test_utils.py similarity index 99% rename from autogpts/autogpt/tests/unit/test_utils.py rename to autogpt/tests/unit/test_utils.py index de8e0737e..7b9b93c10 100644 --- a/autogpts/autogpt/tests/unit/test_utils.py +++ b/autogpt/tests/unit/test_utils.py @@ -67,7 +67,7 @@ def test_get_bulletin_from_web_success(mock_get): assert expected_content in bulletin mock_get.assert_called_with( - "https://raw.githubusercontent.com/Significant-Gravitas/AutoGPT/master/autogpts/autogpt/BULLETIN.md" # noqa: E501 + "https://raw.githubusercontent.com/Significant-Gravitas/AutoGPT/master/autogpt/BULLETIN.md" # noqa: E501 ) diff --git a/autogpts/autogpt/tests/unit/test_web_search.py b/autogpt/tests/unit/test_web_search.py similarity index 100% rename from autogpts/autogpt/tests/unit/test_web_search.py rename to autogpt/tests/unit/test_web_search.py diff --git a/autogpts/autogpt/tests/utils.py b/autogpt/tests/utils.py similarity index 100% rename from autogpts/autogpt/tests/utils.py rename to autogpt/tests/utils.py diff --git a/autogpts/autogpt/tests/vcr/__init__.py b/autogpt/tests/vcr/__init__.py similarity index 100% rename from autogpts/autogpt/tests/vcr/__init__.py rename to autogpt/tests/vcr/__init__.py diff --git a/autogpts/autogpt/tests/vcr/vcr_filter.py b/autogpt/tests/vcr/vcr_filter.py similarity index 100% rename from autogpts/autogpt/tests/vcr/vcr_filter.py rename to autogpt/tests/vcr/vcr_filter.py diff --git a/autogpts/autogpt/tests/vcr_cassettes b/autogpt/tests/vcr_cassettes similarity index 100% rename from autogpts/autogpt/tests/vcr_cassettes rename to autogpt/tests/vcr_cassettes diff --git a/autogpts/autogpt/challenges_already_beaten.json b/autogpts/autogpt/challenges_already_beaten.json deleted file mode 100644 index 7bdab6f24..000000000 --- a/autogpts/autogpt/challenges_already_beaten.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "TestWriteFile": true -} \ No newline at end of file diff --git a/cli.py b/cli.py index ecf603825..0a9f6ba85 100644 --- a/cli.py +++ b/cli.py @@ -94,14 +94,14 @@ def create(agent_name: str): ) return try: - new_agent_dir = f"./autogpts/{agent_name}" + new_agent_dir = f"./agents/{agent_name}" new_agent_name = f"{agent_name.lower()}.json" if not os.path.exists(new_agent_dir): - shutil.copytree("./autogpts/forge", new_agent_dir) + shutil.copytree("./forge", new_agent_dir) click.echo( click.style( - f"🎉 New agent '{agent_name}' created. The code for your new agent is in: autogpts/{agent_name}", + f"🎉 New agent '{agent_name}' created. The code for your new agent is in: agents/{agent_name}", fg="green", ) ) @@ -129,7 +129,7 @@ def start(agent_name: str, no_setup: bool): import subprocess script_dir = os.path.dirname(os.path.realpath(__file__)) - agent_dir = os.path.join(script_dir, f"autogpts/{agent_name}") + agent_dir = os.path.join(script_dir, f"agents/{agent_name}") run_command = os.path.join(agent_dir, "run") run_bench_command = os.path.join(agent_dir, "run_benchmark") if ( @@ -203,7 +203,7 @@ def list(): import os try: - agents_dir = "./autogpts" + agents_dir = "./agents" agents_list = [ d for d in os.listdir(agents_dir) @@ -216,7 +216,7 @@ def list(): else: click.echo(click.style("No agents found 😞", fg="red")) except FileNotFoundError: - click.echo(click.style("The autogpts directory does not exist 😢", fg="red")) + click.echo(click.style("The agents directory does not exist 😢", fg="red")) except Exception as e: click.echo(click.style(f"An error occurred: {e} 😢", fg="red")) @@ -240,7 +240,7 @@ def start(agent_name, subprocess_args): import subprocess script_dir = os.path.dirname(os.path.realpath(__file__)) - agent_dir = os.path.join(script_dir, f"autogpts/{agent_name}") + agent_dir = os.path.join(script_dir, f"agents/{agent_name}") benchmark_script = os.path.join(agent_dir, "run_benchmark") if os.path.exists(agent_dir) and os.path.isfile(benchmark_script): os.chdir(agent_dir) diff --git a/docs/content/AutoGPT/index.md b/docs/content/AutoGPT/index.md index c53589baa..de993b034 100644 --- a/docs/content/AutoGPT/index.md +++ b/docs/content/AutoGPT/index.md @@ -4,9 +4,9 @@  |  [💻 **User guide**](./usage.md)  |  -[🐙 **GitHub**](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt) +[🐙 **GitHub**](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt) -**Location:** `autogpts/autogpt/` in the GitHub repo +**Location:** `autogpt/` in the GitHub repo AutoGPT was conceived when OpenAI published their GPT-4 model accompanied by a paper outlining the advanced reasoning and task-solving abilities of the model. The concept diff --git a/docs/content/AutoGPT/setup/docker.md b/docs/content/AutoGPT/setup/docker.md index 2d279986d..60be726b7 100644 --- a/docs/content/AutoGPT/setup/docker.md +++ b/docs/content/AutoGPT/setup/docker.md @@ -87,7 +87,7 @@ AutoGPT uses a browser in headless mode by default: `HEADLESS_BROWSER=True`. Please do not change this setting in combination with Docker, or AutoGPT will crash. -[.env.template]: https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/.env.template +[.env.template]: https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/.env.template [Docker Hub]: https://hub.docker.com/r/significantgravitas/auto-gpt ## Configuration diff --git a/docs/content/AutoGPT/setup/index.md b/docs/content/AutoGPT/setup/index.md index 540c7f116..02657c972 100644 --- a/docs/content/AutoGPT/setup/index.md +++ b/docs/content/AutoGPT/setup/index.md @@ -71,7 +71,7 @@ Since we don't ship AutoGPT as a desktop application, you'll need to download th ### Completing the Setup Once you have cloned or downloaded the project, you can find the AutoGPT Agent in the -`autogpts/autogpt/` folder. In this folder: +`autogpt/` folder. In this folder: 1. Find the file named `.env.template`. This file may be hidden by default in some operating systems due to the dot prefix. To reveal diff --git a/docs/content/AutoGPT/usage.md b/docs/content/AutoGPT/usage.md index 501715197..2a3bdd0c1 100644 --- a/docs/content/AutoGPT/usage.md +++ b/docs/content/AutoGPT/usage.md @@ -1,7 +1,7 @@ # AutoGPT Agent User Guide !!! note - This guide assumes you are in the `autogpts/autogpt` folder, where the AutoGPT Agent + This guide assumes you are in the `autogpt` folder, where the AutoGPT Agent is located. ## Command Line Interface @@ -169,7 +169,7 @@ Here are some common arguments you can use when running AutoGPT: There are shorthands for some of these flags, for example `-P` for `--prompt-settings`. Use `./autogpt.sh --help` for more information. -[.env.template]: https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/.env.template +[.env.template]: https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/.env.template ## Agent State [agent state]: #agent-state diff --git a/docs/content/challenges/building_challenges.md b/docs/content/challenges/building_challenges.md index e1631c601..d63880868 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/autogpts/autogpt/tests/integration/agent_factory.py +Go to https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt/tests/integration/agent_factory.py Create your agent fixture. diff --git a/docs/content/forge/components/agents.md b/docs/content/forge/components/agents.md index 7d3808a14..fc32b1ad8 120000 --- a/docs/content/forge/components/agents.md +++ b/docs/content/forge/components/agents.md @@ -1 +1 @@ -../../../../autogpts/autogpt/autogpt/agents/README.md \ No newline at end of file +../../../../autogpt/autogpt/agents/README.md \ No newline at end of file diff --git a/docs/content/forge/components/components.md b/docs/content/forge/components/components.md index 6dcee2945..e21234227 120000 --- a/docs/content/forge/components/components.md +++ b/docs/content/forge/components/components.md @@ -1 +1 @@ -../../../../autogpts/forge/forge/components/README.md \ No newline at end of file +../../../../forge/forge/components/README.md \ No newline at end of file diff --git a/docs/content/forge/components/creating-components.md b/docs/content/forge/components/creating-components.md index 2eed5c683..03546bb1c 100644 --- a/docs/content/forge/components/creating-components.md +++ b/docs/content/forge/components/creating-components.md @@ -94,7 +94,7 @@ To learn more about commands see [🛠️ Commands](./commands.md). After components provided all necessary data, the agent needs to build the final prompt that will be send to a llm. Currently, `PromptStrategy` (*not* a protocol) is responsible for building the final prompt. If you want to change the way the prompt is built, you need to create a new `PromptStrategy` class, and then call relavant methods in your agent class. -You can have a look at the default strategy used by the AutoGPT Agent: [OneShotAgentPromptStrategy](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/autogpt/agents/prompt_strategies/one_shot.py), and how it's used in the [Agent](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/autogpt/agents/agent.py) (search for `self.prompt_strategy`). +You can have a look at the default strategy used by the AutoGPT Agent: [OneShotAgentPromptStrategy](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/autogpt/agents/prompt_strategies/one_shot.py), and how it's used in the [Agent](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/autogpt/agents/agent.py) (search for `self.prompt_strategy`). ## Example `UserInteractionComponent` @@ -233,7 +233,7 @@ class MyAgent(Agent): ## Learn more -The best place to see more examples is to look at the built-in components in the [autogpt/components](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/autogpt/components/) and [autogpt/commands](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpts/autogpt/autogpt/commands/) directories. +The best place to see more examples is to look at the built-in components in the [autogpt/components](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/autogpt/components/) and [autogpt/commands](https://github.com/Significant-Gravitas/AutoGPT/tree/master/autogpt/autogpt/commands/) directories. Guide on how to extend the built-in agent and build your own: [🤖 Agents](./agents.md) Order of some components matters, see [🧩 Components](./components.md) to learn more about components and how they can be customized. diff --git a/docs/content/index.md b/docs/content/index.md index d027ca4af..ad37ffef6 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -95,7 +95,7 @@ Commands: Common commands: * `./run agent start autogpt` – [runs](./AutoGPT/usage.md#serve-agent-protocol-mode-with-ui) the AutoGPT agent -* `./run agent create ` – creates a new Forge-based agent project at `autogpts/` +* `./run agent create ` – creates a new Forge-based agent project at `agents/` * `./run benchmark start ` – benchmarks the specified agent --- diff --git a/autogpts/forge/.env.example b/forge/.env.example similarity index 100% rename from autogpts/forge/.env.example rename to forge/.env.example diff --git a/autogpts/forge/.flake8 b/forge/.flake8 similarity index 100% rename from autogpts/forge/.flake8 rename to forge/.flake8 diff --git a/autogpts/forge/.gitignore b/forge/.gitignore similarity index 100% rename from autogpts/forge/.gitignore rename to forge/.gitignore diff --git a/autogpts/forge/.pre-commit-config.yaml b/forge/.pre-commit-config.yaml similarity index 100% rename from autogpts/forge/.pre-commit-config.yaml rename to forge/.pre-commit-config.yaml diff --git a/autogpts/forge/Dockerfile b/forge/Dockerfile similarity index 100% rename from autogpts/forge/Dockerfile rename to forge/Dockerfile diff --git a/autogpts/forge/README.md b/forge/README.md similarity index 100% rename from autogpts/forge/README.md rename to forge/README.md diff --git a/autogpts/autogpt/tests/integration/__init__.py b/forge/__init__.py similarity index 100% rename from autogpts/autogpt/tests/integration/__init__.py rename to forge/__init__.py diff --git a/autogpts/forge/agbenchmark_config/config.json b/forge/agbenchmark_config/config.json similarity index 100% rename from autogpts/forge/agbenchmark_config/config.json rename to forge/agbenchmark_config/config.json diff --git a/autogpts/autogpt/tests/__init__.py b/forge/forge/__init__.py similarity index 100% rename from autogpts/autogpt/tests/__init__.py rename to forge/forge/__init__.py diff --git a/autogpts/forge/forge/__main__.py b/forge/forge/__main__.py similarity index 100% rename from autogpts/forge/forge/__main__.py rename to forge/forge/__main__.py diff --git a/autogpts/forge/forge/agent/__init__.py b/forge/forge/agent/__init__.py similarity index 100% rename from autogpts/forge/forge/agent/__init__.py rename to forge/forge/agent/__init__.py diff --git a/autogpts/forge/forge/agent/agent.py b/forge/forge/agent/agent.py similarity index 98% rename from autogpts/forge/forge/agent/agent.py rename to forge/forge/agent/agent.py index 5c3e532f6..9ae607b6c 100644 --- a/autogpts/forge/forge/agent/agent.py +++ b/forge/forge/agent/agent.py @@ -67,7 +67,7 @@ class Agent: app.include_router(router, prefix="/ap/v1") script_dir = os.path.dirname(os.path.realpath(__file__)) frontend_path = pathlib.Path( - os.path.join(script_dir, "../../../../frontend/build/web") + os.path.join(script_dir, "../../../frontend/build/web") ).resolve() if os.path.exists(frontend_path): @@ -78,7 +78,7 @@ class Agent: return RedirectResponse(url="/app/index.html", status_code=307) else: - LOG.warning( + logger.warning( f"Frontend not found. {frontend_path} does not exist. The frontend will not be served" ) app.add_middleware(AgentMiddleware, agent=self) diff --git a/autogpts/forge/forge/agent/agent_test.py b/forge/forge/agent/agent_test.py similarity index 100% rename from autogpts/forge/forge/agent/agent_test.py rename to forge/forge/agent/agent_test.py diff --git a/autogpts/forge/forge/agent/base.py b/forge/forge/agent/base.py similarity index 100% rename from autogpts/forge/forge/agent/base.py rename to forge/forge/agent/base.py diff --git a/autogpts/forge/forge/agent/components.py b/forge/forge/agent/components.py similarity index 100% rename from autogpts/forge/forge/agent/components.py rename to forge/forge/agent/components.py diff --git a/autogpts/forge/forge/agent/protocols.py b/forge/forge/agent/protocols.py similarity index 100% rename from autogpts/forge/forge/agent/protocols.py rename to forge/forge/agent/protocols.py diff --git a/autogpts/forge/forge/agent_protocol/api_router.py b/forge/forge/agent_protocol/api_router.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/api_router.py rename to forge/forge/agent_protocol/api_router.py diff --git a/autogpts/forge/forge/agent_protocol/database/__init__.py b/forge/forge/agent_protocol/database/__init__.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/database/__init__.py rename to forge/forge/agent_protocol/database/__init__.py diff --git a/autogpts/forge/forge/agent_protocol/database/db.py b/forge/forge/agent_protocol/database/db.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/database/db.py rename to forge/forge/agent_protocol/database/db.py diff --git a/autogpts/forge/forge/agent_protocol/database/db_test.py b/forge/forge/agent_protocol/database/db_test.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/database/db_test.py rename to forge/forge/agent_protocol/database/db_test.py diff --git a/autogpts/forge/forge/agent_protocol/middlewares.py b/forge/forge/agent_protocol/middlewares.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/middlewares.py rename to forge/forge/agent_protocol/middlewares.py diff --git a/autogpts/forge/forge/agent_protocol/models/__init__.py b/forge/forge/agent_protocol/models/__init__.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/models/__init__.py rename to forge/forge/agent_protocol/models/__init__.py diff --git a/autogpts/forge/forge/agent_protocol/models/artifact.py b/forge/forge/agent_protocol/models/artifact.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/models/artifact.py rename to forge/forge/agent_protocol/models/artifact.py diff --git a/autogpts/forge/forge/agent_protocol/models/pagination.py b/forge/forge/agent_protocol/models/pagination.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/models/pagination.py rename to forge/forge/agent_protocol/models/pagination.py diff --git a/autogpts/forge/forge/agent_protocol/models/task.py b/forge/forge/agent_protocol/models/task.py similarity index 100% rename from autogpts/forge/forge/agent_protocol/models/task.py rename to forge/forge/agent_protocol/models/task.py diff --git a/autogpts/forge/forge/command/__init__.py b/forge/forge/command/__init__.py similarity index 100% rename from autogpts/forge/forge/command/__init__.py rename to forge/forge/command/__init__.py diff --git a/autogpts/forge/forge/command/command.py b/forge/forge/command/command.py similarity index 100% rename from autogpts/forge/forge/command/command.py rename to forge/forge/command/command.py diff --git a/autogpts/forge/forge/command/decorator.py b/forge/forge/command/decorator.py similarity index 100% rename from autogpts/forge/forge/command/decorator.py rename to forge/forge/command/decorator.py diff --git a/autogpts/forge/forge/command/parameter.py b/forge/forge/command/parameter.py similarity index 100% rename from autogpts/forge/forge/command/parameter.py rename to forge/forge/command/parameter.py diff --git a/autogpts/forge/forge/components/README.md b/forge/forge/components/README.md similarity index 100% rename from autogpts/forge/forge/components/README.md rename to forge/forge/components/README.md diff --git a/autogpts/forge/forge/components/action_history/__init__.py b/forge/forge/components/action_history/__init__.py similarity index 100% rename from autogpts/forge/forge/components/action_history/__init__.py rename to forge/forge/components/action_history/__init__.py diff --git a/autogpts/forge/forge/components/action_history/action_history.py b/forge/forge/components/action_history/action_history.py similarity index 100% rename from autogpts/forge/forge/components/action_history/action_history.py rename to forge/forge/components/action_history/action_history.py diff --git a/autogpts/forge/forge/components/action_history/model.py b/forge/forge/components/action_history/model.py similarity index 100% rename from autogpts/forge/forge/components/action_history/model.py rename to forge/forge/components/action_history/model.py diff --git a/autogpts/forge/forge/components/code_executor/__init__.py b/forge/forge/components/code_executor/__init__.py similarity index 100% rename from autogpts/forge/forge/components/code_executor/__init__.py rename to forge/forge/components/code_executor/__init__.py diff --git a/autogpts/forge/forge/components/code_executor/code_executor.py b/forge/forge/components/code_executor/code_executor.py similarity index 100% rename from autogpts/forge/forge/components/code_executor/code_executor.py rename to forge/forge/components/code_executor/code_executor.py diff --git a/autogpts/forge/forge/components/context/__init__.py b/forge/forge/components/context/__init__.py similarity index 100% rename from autogpts/forge/forge/components/context/__init__.py rename to forge/forge/components/context/__init__.py diff --git a/autogpts/forge/forge/components/context/context.py b/forge/forge/components/context/context.py similarity index 100% rename from autogpts/forge/forge/components/context/context.py rename to forge/forge/components/context/context.py diff --git a/autogpts/forge/forge/components/context/context_item.py b/forge/forge/components/context/context_item.py similarity index 100% rename from autogpts/forge/forge/components/context/context_item.py rename to forge/forge/components/context/context_item.py diff --git a/autogpts/forge/forge/components/file_manager/__init__.py b/forge/forge/components/file_manager/__init__.py similarity index 100% rename from autogpts/forge/forge/components/file_manager/__init__.py rename to forge/forge/components/file_manager/__init__.py diff --git a/autogpts/forge/forge/components/file_manager/file_manager.py b/forge/forge/components/file_manager/file_manager.py similarity index 100% rename from autogpts/forge/forge/components/file_manager/file_manager.py rename to forge/forge/components/file_manager/file_manager.py diff --git a/autogpts/forge/forge/components/git_operations/__init__.py b/forge/forge/components/git_operations/__init__.py similarity index 100% rename from autogpts/forge/forge/components/git_operations/__init__.py rename to forge/forge/components/git_operations/__init__.py diff --git a/autogpts/forge/forge/components/git_operations/git_operations.py b/forge/forge/components/git_operations/git_operations.py similarity index 100% rename from autogpts/forge/forge/components/git_operations/git_operations.py rename to forge/forge/components/git_operations/git_operations.py diff --git a/autogpts/forge/forge/components/image_gen/__init__.py b/forge/forge/components/image_gen/__init__.py similarity index 100% rename from autogpts/forge/forge/components/image_gen/__init__.py rename to forge/forge/components/image_gen/__init__.py diff --git a/autogpts/forge/forge/components/image_gen/image_gen.py b/forge/forge/components/image_gen/image_gen.py similarity index 100% rename from autogpts/forge/forge/components/image_gen/image_gen.py rename to forge/forge/components/image_gen/image_gen.py diff --git a/autogpts/forge/forge/components/system/__init__.py b/forge/forge/components/system/__init__.py similarity index 100% rename from autogpts/forge/forge/components/system/__init__.py rename to forge/forge/components/system/__init__.py diff --git a/autogpts/forge/forge/components/system/system.py b/forge/forge/components/system/system.py similarity index 100% rename from autogpts/forge/forge/components/system/system.py rename to forge/forge/components/system/system.py diff --git a/autogpts/forge/forge/components/user_interaction/__init__.py b/forge/forge/components/user_interaction/__init__.py similarity index 100% rename from autogpts/forge/forge/components/user_interaction/__init__.py rename to forge/forge/components/user_interaction/__init__.py diff --git a/autogpts/forge/forge/components/user_interaction/user_interaction.py b/forge/forge/components/user_interaction/user_interaction.py similarity index 100% rename from autogpts/forge/forge/components/user_interaction/user_interaction.py rename to forge/forge/components/user_interaction/user_interaction.py diff --git a/autogpts/forge/forge/components/watchdog/__init__.py b/forge/forge/components/watchdog/__init__.py similarity index 100% rename from autogpts/forge/forge/components/watchdog/__init__.py rename to forge/forge/components/watchdog/__init__.py diff --git a/autogpts/forge/forge/components/watchdog/watchdog.py b/forge/forge/components/watchdog/watchdog.py similarity index 100% rename from autogpts/forge/forge/components/watchdog/watchdog.py rename to forge/forge/components/watchdog/watchdog.py diff --git a/autogpts/forge/forge/components/web/__init__.py b/forge/forge/components/web/__init__.py similarity index 100% rename from autogpts/forge/forge/components/web/__init__.py rename to forge/forge/components/web/__init__.py diff --git a/autogpts/forge/forge/components/web/search.py b/forge/forge/components/web/search.py similarity index 100% rename from autogpts/forge/forge/components/web/search.py rename to forge/forge/components/web/search.py diff --git a/autogpts/forge/forge/components/web/selenium.py b/forge/forge/components/web/selenium.py similarity index 100% rename from autogpts/forge/forge/components/web/selenium.py rename to forge/forge/components/web/selenium.py diff --git a/autogpts/forge/forge/config/__init__.py b/forge/forge/config/__init__.py similarity index 100% rename from autogpts/forge/forge/config/__init__.py rename to forge/forge/config/__init__.py diff --git a/autogpts/forge/forge/config/ai_directives.py b/forge/forge/config/ai_directives.py similarity index 100% rename from autogpts/forge/forge/config/ai_directives.py rename to forge/forge/config/ai_directives.py diff --git a/autogpts/forge/forge/config/ai_profile.py b/forge/forge/config/ai_profile.py similarity index 100% rename from autogpts/forge/forge/config/ai_profile.py rename to forge/forge/config/ai_profile.py diff --git a/autogpts/forge/forge/config/config.py b/forge/forge/config/config.py similarity index 100% rename from autogpts/forge/forge/config/config.py rename to forge/forge/config/config.py diff --git a/autogpts/autogpt/scripts/__init__.py b/forge/forge/content_processing/__init__.py similarity index 100% rename from autogpts/autogpt/scripts/__init__.py rename to forge/forge/content_processing/__init__.py diff --git a/autogpts/forge/forge/content_processing/html.py b/forge/forge/content_processing/html.py similarity index 100% rename from autogpts/forge/forge/content_processing/html.py rename to forge/forge/content_processing/html.py diff --git a/autogpts/forge/forge/content_processing/text.py b/forge/forge/content_processing/text.py similarity index 100% rename from autogpts/forge/forge/content_processing/text.py rename to forge/forge/content_processing/text.py diff --git a/autogpts/forge/forge/file_storage/__init__.py b/forge/forge/file_storage/__init__.py similarity index 100% rename from autogpts/forge/forge/file_storage/__init__.py rename to forge/forge/file_storage/__init__.py diff --git a/autogpts/forge/forge/file_storage/base.py b/forge/forge/file_storage/base.py similarity index 100% rename from autogpts/forge/forge/file_storage/base.py rename to forge/forge/file_storage/base.py diff --git a/autogpts/forge/forge/file_storage/gcs.py b/forge/forge/file_storage/gcs.py similarity index 100% rename from autogpts/forge/forge/file_storage/gcs.py rename to forge/forge/file_storage/gcs.py diff --git a/autogpts/forge/forge/file_storage/local.py b/forge/forge/file_storage/local.py similarity index 100% rename from autogpts/forge/forge/file_storage/local.py rename to forge/forge/file_storage/local.py diff --git a/autogpts/forge/forge/file_storage/s3.py b/forge/forge/file_storage/s3.py similarity index 100% rename from autogpts/forge/forge/file_storage/s3.py rename to forge/forge/file_storage/s3.py diff --git a/autogpts/forge/forge/json/__init__.py b/forge/forge/json/__init__.py similarity index 100% rename from autogpts/forge/forge/json/__init__.py rename to forge/forge/json/__init__.py diff --git a/autogpts/forge/forge/json/parsing.py b/forge/forge/json/parsing.py similarity index 100% rename from autogpts/forge/forge/json/parsing.py rename to forge/forge/json/parsing.py diff --git a/autogpts/autogpt/agbenchmark_config/__init__.py b/forge/forge/llm/__init__.py similarity index 100% rename from autogpts/autogpt/agbenchmark_config/__init__.py rename to forge/forge/llm/__init__.py diff --git a/autogpts/forge/forge/llm/prompting/__init__.py b/forge/forge/llm/prompting/__init__.py similarity index 100% rename from autogpts/forge/forge/llm/prompting/__init__.py rename to forge/forge/llm/prompting/__init__.py diff --git a/autogpts/forge/forge/llm/prompting/base.py b/forge/forge/llm/prompting/base.py similarity index 100% rename from autogpts/forge/forge/llm/prompting/base.py rename to forge/forge/llm/prompting/base.py diff --git a/autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/role_selection.j2 b/forge/forge/llm/prompting/gpt-3.5-turbo/role_selection.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/role_selection.j2 rename to forge/forge/llm/prompting/gpt-3.5-turbo/role_selection.j2 diff --git a/autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/system-format.j2 b/forge/forge/llm/prompting/gpt-3.5-turbo/system-format.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/system-format.j2 rename to forge/forge/llm/prompting/gpt-3.5-turbo/system-format.j2 diff --git a/autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/task-step.j2 b/forge/forge/llm/prompting/gpt-3.5-turbo/task-step.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/gpt-3.5-turbo/task-step.j2 rename to forge/forge/llm/prompting/gpt-3.5-turbo/task-step.j2 diff --git a/autogpts/forge/forge/llm/prompting/schema.py b/forge/forge/llm/prompting/schema.py similarity index 100% rename from autogpts/forge/forge/llm/prompting/schema.py rename to forge/forge/llm/prompting/schema.py diff --git a/autogpts/forge/forge/llm/prompting/techniques/chain-of-thought.j2 b/forge/forge/llm/prompting/techniques/chain-of-thought.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/techniques/chain-of-thought.j2 rename to forge/forge/llm/prompting/techniques/chain-of-thought.j2 diff --git a/autogpts/forge/forge/llm/prompting/techniques/expert.j2 b/forge/forge/llm/prompting/techniques/expert.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/techniques/expert.j2 rename to forge/forge/llm/prompting/techniques/expert.j2 diff --git a/autogpts/forge/forge/llm/prompting/techniques/few-shot.j2 b/forge/forge/llm/prompting/techniques/few-shot.j2 similarity index 100% rename from autogpts/forge/forge/llm/prompting/techniques/few-shot.j2 rename to forge/forge/llm/prompting/techniques/few-shot.j2 diff --git a/autogpts/forge/forge/llm/prompting/utils.py b/forge/forge/llm/prompting/utils.py similarity index 100% rename from autogpts/forge/forge/llm/prompting/utils.py rename to forge/forge/llm/prompting/utils.py diff --git a/autogpts/forge/forge/llm/providers/__init__.py b/forge/forge/llm/providers/__init__.py similarity index 100% rename from autogpts/forge/forge/llm/providers/__init__.py rename to forge/forge/llm/providers/__init__.py diff --git a/autogpts/forge/forge/llm/providers/anthropic.py b/forge/forge/llm/providers/anthropic.py similarity index 100% rename from autogpts/forge/forge/llm/providers/anthropic.py rename to forge/forge/llm/providers/anthropic.py diff --git a/autogpts/forge/forge/llm/providers/multi.py b/forge/forge/llm/providers/multi.py similarity index 100% rename from autogpts/forge/forge/llm/providers/multi.py rename to forge/forge/llm/providers/multi.py diff --git a/autogpts/forge/forge/llm/providers/openai.py b/forge/forge/llm/providers/openai.py similarity index 100% rename from autogpts/forge/forge/llm/providers/openai.py rename to forge/forge/llm/providers/openai.py diff --git a/autogpts/forge/forge/llm/providers/schema.py b/forge/forge/llm/providers/schema.py similarity index 100% rename from autogpts/forge/forge/llm/providers/schema.py rename to forge/forge/llm/providers/schema.py diff --git a/autogpts/forge/forge/llm/providers/utils.py b/forge/forge/llm/providers/utils.py similarity index 100% rename from autogpts/forge/forge/llm/providers/utils.py rename to forge/forge/llm/providers/utils.py diff --git a/autogpts/forge/forge/logging/__init__.py b/forge/forge/logging/__init__.py similarity index 100% rename from autogpts/forge/forge/logging/__init__.py rename to forge/forge/logging/__init__.py diff --git a/autogpts/forge/forge/logging/config.py b/forge/forge/logging/config.py similarity index 100% rename from autogpts/forge/forge/logging/config.py rename to forge/forge/logging/config.py diff --git a/autogpts/forge/forge/logging/filters.py b/forge/forge/logging/filters.py similarity index 100% rename from autogpts/forge/forge/logging/filters.py rename to forge/forge/logging/filters.py diff --git a/autogpts/forge/forge/logging/formatters.py b/forge/forge/logging/formatters.py similarity index 100% rename from autogpts/forge/forge/logging/formatters.py rename to forge/forge/logging/formatters.py diff --git a/autogpts/forge/forge/logging/handlers.py b/forge/forge/logging/handlers.py similarity index 100% rename from autogpts/forge/forge/logging/handlers.py rename to forge/forge/logging/handlers.py diff --git a/autogpts/forge/forge/logging/utils.py b/forge/forge/logging/utils.py similarity index 100% rename from autogpts/forge/forge/logging/utils.py rename to forge/forge/logging/utils.py diff --git a/autogpts/forge/forge/models/action.py b/forge/forge/models/action.py similarity index 100% rename from autogpts/forge/forge/models/action.py rename to forge/forge/models/action.py diff --git a/autogpts/forge/forge/models/config.py b/forge/forge/models/config.py similarity index 100% rename from autogpts/forge/forge/models/config.py rename to forge/forge/models/config.py diff --git a/autogpts/forge/forge/models/json_schema.py b/forge/forge/models/json_schema.py similarity index 100% rename from autogpts/forge/forge/models/json_schema.py rename to forge/forge/models/json_schema.py diff --git a/autogpts/forge/forge/models/providers.py b/forge/forge/models/providers.py similarity index 100% rename from autogpts/forge/forge/models/providers.py rename to forge/forge/models/providers.py diff --git a/autogpts/forge/forge/models/utils.py b/forge/forge/models/utils.py similarity index 100% rename from autogpts/forge/forge/models/utils.py rename to forge/forge/models/utils.py diff --git a/autogpts/forge/forge/speech/__init__.py b/forge/forge/speech/__init__.py similarity index 100% rename from autogpts/forge/forge/speech/__init__.py rename to forge/forge/speech/__init__.py diff --git a/autogpts/forge/forge/speech/base.py b/forge/forge/speech/base.py similarity index 100% rename from autogpts/forge/forge/speech/base.py rename to forge/forge/speech/base.py diff --git a/autogpts/forge/forge/speech/eleven_labs.py b/forge/forge/speech/eleven_labs.py similarity index 100% rename from autogpts/forge/forge/speech/eleven_labs.py rename to forge/forge/speech/eleven_labs.py diff --git a/autogpts/forge/forge/speech/gtts.py b/forge/forge/speech/gtts.py similarity index 100% rename from autogpts/forge/forge/speech/gtts.py rename to forge/forge/speech/gtts.py diff --git a/autogpts/forge/forge/speech/macos_tts.py b/forge/forge/speech/macos_tts.py similarity index 100% rename from autogpts/forge/forge/speech/macos_tts.py rename to forge/forge/speech/macos_tts.py diff --git a/autogpts/forge/forge/speech/say.py b/forge/forge/speech/say.py similarity index 100% rename from autogpts/forge/forge/speech/say.py rename to forge/forge/speech/say.py diff --git a/autogpts/forge/forge/speech/stream_elements_speech.py b/forge/forge/speech/stream_elements_speech.py similarity index 100% rename from autogpts/forge/forge/speech/stream_elements_speech.py rename to forge/forge/speech/stream_elements_speech.py diff --git a/autogpts/forge/forge/utils/const.py b/forge/forge/utils/const.py similarity index 100% rename from autogpts/forge/forge/utils/const.py rename to forge/forge/utils/const.py diff --git a/autogpts/forge/forge/utils/exceptions.py b/forge/forge/utils/exceptions.py similarity index 100% rename from autogpts/forge/forge/utils/exceptions.py rename to forge/forge/utils/exceptions.py diff --git a/autogpts/forge/forge/utils/file_operations.py b/forge/forge/utils/file_operations.py similarity index 100% rename from autogpts/forge/forge/utils/file_operations.py rename to forge/forge/utils/file_operations.py diff --git a/autogpts/forge/forge/utils/url_validator.py b/forge/forge/utils/url_validator.py similarity index 100% rename from autogpts/forge/forge/utils/url_validator.py rename to forge/forge/utils/url_validator.py diff --git a/autogpts/forge/mypy.ini b/forge/mypy.ini similarity index 100% rename from autogpts/forge/mypy.ini rename to forge/mypy.ini diff --git a/autogpts/forge/poetry.lock b/forge/poetry.lock similarity index 99% rename from autogpts/forge/poetry.lock rename to forge/poetry.lock index fc6d69dad..e9f7feea4 100644 --- a/autogpts/forge/poetry.lock +++ b/forge/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "agbenchmark" @@ -38,7 +38,7 @@ uvicorn = "^0.23.2" [package.source] type = "directory" -url = "../../benchmark" +url = "../benchmark" [[package]] name = "agent-protocol-client" @@ -6117,4 +6117,4 @@ benchmark = ["agbenchmark"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "d88392928c5d8009bd9eafd9d2ccd8c810e63928c780cfa9d88e2ce3ff659c1f" +content-hash = "5e493a1132ffacec11607b5ca1c91147d5b43c47af6c1ac039a235b3a68fcb1e" diff --git a/autogpts/forge/pyproject.toml b/forge/pyproject.toml similarity index 97% rename from autogpts/forge/pyproject.toml rename to forge/pyproject.toml index 1c8796943..e60fa97f6 100644 --- a/autogpts/forge/pyproject.toml +++ b/forge/pyproject.toml @@ -9,7 +9,7 @@ packages = [{ include = "forge" }] [tool.poetry.dependencies] python = "^3.10" -agbenchmark = { path = "../../benchmark", optional = true } +agbenchmark = { path = "../benchmark", optional = true } # agbenchmark = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "benchmark", optional = true} aiohttp = "^3.8.5" anthropic = "^0.25.1" diff --git a/autogpts/forge/run b/forge/run similarity index 100% rename from autogpts/forge/run rename to forge/run diff --git a/autogpts/forge/run_benchmark b/forge/run_benchmark similarity index 100% rename from autogpts/forge/run_benchmark rename to forge/run_benchmark diff --git a/autogpts/forge/setup b/forge/setup similarity index 100% rename from autogpts/forge/setup rename to forge/setup diff --git a/autogpts/forge/tutorials/001_getting_started.md b/forge/tutorials/001_getting_started.md similarity index 100% rename from autogpts/forge/tutorials/001_getting_started.md rename to forge/tutorials/001_getting_started.md diff --git a/autogpts/forge/tutorials/002_blueprint_of_an_agent.md b/forge/tutorials/002_blueprint_of_an_agent.md similarity index 100% rename from autogpts/forge/tutorials/002_blueprint_of_an_agent.md rename to forge/tutorials/002_blueprint_of_an_agent.md diff --git a/autogpts/forge/tutorials/003_crafting_agent_logic.md b/forge/tutorials/003_crafting_agent_logic.md similarity index 100% rename from autogpts/forge/tutorials/003_crafting_agent_logic.md rename to forge/tutorials/003_crafting_agent_logic.md diff --git a/autogpts/forge/tutorials/004_memories.md b/forge/tutorials/004_memories.md similarity index 100% rename from autogpts/forge/tutorials/004_memories.md rename to forge/tutorials/004_memories.md