From 2e934dfff3d1e252972f76899c600613e6b5d7fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:08:08 +0000 Subject: [PATCH 01/14] build(deps-dev): bump the development-dependencies group in /autogpt_platform/market with 2 updates (#8706) build(deps-dev): bump the development-dependencies group Bumps the development-dependencies group in /autogpt_platform/market with 2 updates: [ruff](https://github.com/astral-sh/ruff) and [pyright](https://github.com/RobertCraigie/pyright-python). Updates `ruff` from 0.7.3 to 0.7.4 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.7.3...0.7.4) Updates `pyright` from 1.1.388 to 1.1.389 - [Release notes](https://github.com/RobertCraigie/pyright-python/releases) - [Commits](https://github.com/RobertCraigie/pyright-python/compare/v1.1.388...v1.1.389) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: pyright dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- autogpt_platform/market/poetry.lock | 46 +++++++++++++------------- autogpt_platform/market/pyproject.toml | 4 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/autogpt_platform/market/poetry.lock b/autogpt_platform/market/poetry.lock index 141a53936f67..07615a821cd6 100644 --- a/autogpt_platform/market/poetry.lock +++ b/autogpt_platform/market/poetry.lock @@ -829,13 +829,13 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"] [[package]] name = "pyright" -version = "1.1.388" +version = "1.1.389" description = "Command line wrapper for pyright" optional = false python-versions = ">=3.7" files = [ - {file = "pyright-1.1.388-py3-none-any.whl", hash = "sha256:c7068e9f2c23539c6ac35fc9efac6c6c1b9aa5a0ce97a9a8a6cf0090d7cbf84c"}, - {file = "pyright-1.1.388.tar.gz", hash = "sha256:0166d19b716b77fd2d9055de29f71d844874dbc6b9d3472ccd22df91db3dfa34"}, + {file = "pyright-1.1.389-py3-none-any.whl", hash = "sha256:41e9620bba9254406dc1f621a88ceab5a88af4c826feb4f614d95691ed243a60"}, + {file = "pyright-1.1.389.tar.gz", hash = "sha256:716bf8cc174ab8b4dcf6828c3298cac05c5ed775dda9910106a5dcfe4c7fe220"}, ] [package.dependencies] @@ -1058,29 +1058,29 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "ruff" -version = "0.7.3" +version = "0.7.4" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.7.3-py3-none-linux_armv6l.whl", hash = "sha256:34f2339dc22687ec7e7002792d1f50712bf84a13d5152e75712ac08be565d344"}, - {file = "ruff-0.7.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:fb397332a1879b9764a3455a0bb1087bda876c2db8aca3a3cbb67b3dbce8cda0"}, - {file = "ruff-0.7.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:37d0b619546103274e7f62643d14e1adcbccb242efda4e4bdb9544d7764782e9"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d59f0c3ee4d1a6787614e7135b72e21024875266101142a09a61439cb6e38a5"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:44eb93c2499a169d49fafd07bc62ac89b1bc800b197e50ff4633aed212569299"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6d0242ce53f3a576c35ee32d907475a8d569944c0407f91d207c8af5be5dae4e"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:6b6224af8b5e09772c2ecb8dc9f3f344c1aa48201c7f07e7315367f6dd90ac29"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c50f95a82b94421c964fae4c27c0242890a20fe67d203d127e84fbb8013855f5"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7f3eff9961b5d2644bcf1616c606e93baa2d6b349e8aa8b035f654df252c8c67"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8963cab06d130c4df2fd52c84e9f10d297826d2e8169ae0c798b6221be1d1d2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:61b46049d6edc0e4317fb14b33bd693245281a3007288b68a3f5b74a22a0746d"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:10ebce7696afe4644e8c1a23b3cf8c0f2193a310c18387c06e583ae9ef284de2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3f36d56326b3aef8eeee150b700e519880d1aab92f471eefdef656fd57492aa2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5d024301109a0007b78d57ab0ba190087b43dce852e552734ebf0b0b85e4fb16"}, - {file = "ruff-0.7.3-py3-none-win32.whl", hash = "sha256:4ba81a5f0c5478aa61674c5a2194de8b02652f17addf8dfc40c8937e6e7d79fc"}, - {file = "ruff-0.7.3-py3-none-win_amd64.whl", hash = "sha256:588a9ff2fecf01025ed065fe28809cd5a53b43505f48b69a1ac7707b1b7e4088"}, - {file = "ruff-0.7.3-py3-none-win_arm64.whl", hash = "sha256:1713e2c5545863cdbfe2cbce21f69ffaf37b813bfd1fb3b90dc9a6f1963f5a8c"}, - {file = "ruff-0.7.3.tar.gz", hash = "sha256:e1d1ba2e40b6e71a61b063354d04be669ab0d39c352461f3d789cac68b54a313"}, + {file = "ruff-0.7.4-py3-none-linux_armv6l.whl", hash = "sha256:a4919925e7684a3f18e18243cd6bea7cfb8e968a6eaa8437971f681b7ec51478"}, + {file = "ruff-0.7.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfb365c135b830778dda8c04fb7d4280ed0b984e1aec27f574445231e20d6c63"}, + {file = "ruff-0.7.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:63a569b36bc66fbadec5beaa539dd81e0527cb258b94e29e0531ce41bacc1f20"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d06218747d361d06fd2fdac734e7fa92df36df93035db3dc2ad7aa9852cb109"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e0cea28d0944f74ebc33e9f934238f15c758841f9f5edd180b5315c203293452"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80094ecd4793c68b2571b128f91754d60f692d64bc0d7272ec9197fdd09bf9ea"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:997512325c6620d1c4c2b15db49ef59543ef9cd0f4aa8065ec2ae5103cedc7e7"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00b4cf3a6b5fad6d1a66e7574d78956bbd09abfd6c8a997798f01f5da3d46a05"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7dbdc7d8274e1422722933d1edddfdc65b4336abf0b16dfcb9dedd6e6a517d06"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e92dfb5f00eaedb1501b2f906ccabfd67b2355bdf117fea9719fc99ac2145bc"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3bd726099f277d735dc38900b6a8d6cf070f80828877941983a57bca1cd92172"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2e32829c429dd081ee5ba39aef436603e5b22335c3d3fff013cd585806a6486a"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:662a63b4971807623f6f90c1fb664613f67cc182dc4d991471c23c541fee62dd"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:876f5e09eaae3eb76814c1d3b68879891d6fde4824c015d48e7a7da4cf066a3a"}, + {file = "ruff-0.7.4-py3-none-win32.whl", hash = "sha256:75c53f54904be42dd52a548728a5b572344b50d9b2873d13a3f8c5e3b91f5cac"}, + {file = "ruff-0.7.4-py3-none-win_amd64.whl", hash = "sha256:745775c7b39f914238ed1f1b0bebed0b9155a17cd8bc0b08d3c87e4703b990d6"}, + {file = "ruff-0.7.4-py3-none-win_arm64.whl", hash = "sha256:11bff065102c3ae9d3ea4dc9ecdfe5a5171349cdd0787c1fc64761212fc9cf1f"}, + {file = "ruff-0.7.4.tar.gz", hash = "sha256:cd12e35031f5af6b9b93715d8c4f40360070b2041f81273d0527683d5708fce2"}, ] [[package]] @@ -1298,4 +1298,4 @@ watchmedo = ["PyYAML (>=3.10)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "cc73969e4aca097fb0832e02387d823095f06c7cd8516e56e8bc9026671ac9aa" +content-hash = "4f7e4bbed535e40688e953dd0bfab80f704ba6017fc01360941f5cf858ef5f4c" diff --git a/autogpt_platform/market/pyproject.toml b/autogpt_platform/market/pyproject.toml index 1337f7909720..7b0269416031 100644 --- a/autogpt_platform/market/pyproject.toml +++ b/autogpt_platform/market/pyproject.toml @@ -28,8 +28,8 @@ pytest-asyncio = "^0.24.0" pytest-watcher = "^0.4.3" requests = "^2.32.3" -ruff = "^0.7.3" -pyright = "^1.1.388" +ruff = "^0.7.4" +pyright = "^1.1.389" isort = "^5.13.2" black = "^24.10.0" From 84076ebee1f349c4aeb83f5920884ff3414b6530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:28:34 +0000 Subject: [PATCH 02/14] build(deps-dev): bump the development-dependencies group in /autogpt_platform/backend with 2 updates (#8699) build(deps-dev): bump the development-dependencies group Bumps the development-dependencies group in /autogpt_platform/backend with 2 updates: [ruff](https://github.com/astral-sh/ruff) and [pyright](https://github.com/RobertCraigie/pyright-python). Updates `ruff` from 0.7.3 to 0.7.4 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.7.3...0.7.4) Updates `pyright` from 1.1.388 to 1.1.389 - [Release notes](https://github.com/RobertCraigie/pyright-python/releases) - [Commits](https://github.com/RobertCraigie/pyright-python/compare/v1.1.388...v1.1.389) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: pyright dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- autogpt_platform/backend/poetry.lock | 52 ++++++++++++------------- autogpt_platform/backend/pyproject.toml | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/autogpt_platform/backend/poetry.lock b/autogpt_platform/backend/poetry.lock index 0843271e987d..d568eeae3ad9 100644 --- a/autogpt_platform/backend/poetry.lock +++ b/autogpt_platform/backend/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 = "aio-pika" @@ -1986,8 +1986,8 @@ python-dateutil = ">=2.5.3" tqdm = ">=4.64.1" typing-extensions = ">=3.7.4" urllib3 = [ - {version = ">=1.26.0", markers = "python_version >= \"3.8\" and python_version < \"3.12\""}, {version = ">=1.26.5", markers = "python_version >= \"3.12\" and python_version < \"4.0\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.8\" and python_version < \"3.12\""}, ] [package.extras] @@ -2359,8 +2359,8 @@ files = [ annotated-types = ">=0.6.0" pydantic-core = "2.23.4" typing-extensions = [ - {version = ">=4.6.1", markers = "python_version < \"3.13\""}, {version = ">=4.12.2", markers = "python_version >= \"3.13\""}, + {version = ">=4.6.1", markers = "python_version < \"3.13\""}, ] [package.extras] @@ -2532,13 +2532,13 @@ diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pyright" -version = "1.1.388" +version = "1.1.389" description = "Command line wrapper for pyright" optional = false python-versions = ">=3.7" files = [ - {file = "pyright-1.1.388-py3-none-any.whl", hash = "sha256:c7068e9f2c23539c6ac35fc9efac6c6c1b9aa5a0ce97a9a8a6cf0090d7cbf84c"}, - {file = "pyright-1.1.388.tar.gz", hash = "sha256:0166d19b716b77fd2d9055de29f71d844874dbc6b9d3472ccd22df91db3dfa34"}, + {file = "pyright-1.1.389-py3-none-any.whl", hash = "sha256:41e9620bba9254406dc1f621a88ceab5a88af4c826feb4f614d95691ed243a60"}, + {file = "pyright-1.1.389.tar.gz", hash = "sha256:716bf8cc174ab8b4dcf6828c3298cac05c5ed775dda9910106a5dcfe4c7fe220"}, ] [package.dependencies] @@ -2954,29 +2954,29 @@ pyasn1 = ">=0.1.3" [[package]] name = "ruff" -version = "0.7.3" +version = "0.7.4" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.7.3-py3-none-linux_armv6l.whl", hash = "sha256:34f2339dc22687ec7e7002792d1f50712bf84a13d5152e75712ac08be565d344"}, - {file = "ruff-0.7.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:fb397332a1879b9764a3455a0bb1087bda876c2db8aca3a3cbb67b3dbce8cda0"}, - {file = "ruff-0.7.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:37d0b619546103274e7f62643d14e1adcbccb242efda4e4bdb9544d7764782e9"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d59f0c3ee4d1a6787614e7135b72e21024875266101142a09a61439cb6e38a5"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:44eb93c2499a169d49fafd07bc62ac89b1bc800b197e50ff4633aed212569299"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6d0242ce53f3a576c35ee32d907475a8d569944c0407f91d207c8af5be5dae4e"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:6b6224af8b5e09772c2ecb8dc9f3f344c1aa48201c7f07e7315367f6dd90ac29"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c50f95a82b94421c964fae4c27c0242890a20fe67d203d127e84fbb8013855f5"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7f3eff9961b5d2644bcf1616c606e93baa2d6b349e8aa8b035f654df252c8c67"}, - {file = "ruff-0.7.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8963cab06d130c4df2fd52c84e9f10d297826d2e8169ae0c798b6221be1d1d2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:61b46049d6edc0e4317fb14b33bd693245281a3007288b68a3f5b74a22a0746d"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:10ebce7696afe4644e8c1a23b3cf8c0f2193a310c18387c06e583ae9ef284de2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3f36d56326b3aef8eeee150b700e519880d1aab92f471eefdef656fd57492aa2"}, - {file = "ruff-0.7.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5d024301109a0007b78d57ab0ba190087b43dce852e552734ebf0b0b85e4fb16"}, - {file = "ruff-0.7.3-py3-none-win32.whl", hash = "sha256:4ba81a5f0c5478aa61674c5a2194de8b02652f17addf8dfc40c8937e6e7d79fc"}, - {file = "ruff-0.7.3-py3-none-win_amd64.whl", hash = "sha256:588a9ff2fecf01025ed065fe28809cd5a53b43505f48b69a1ac7707b1b7e4088"}, - {file = "ruff-0.7.3-py3-none-win_arm64.whl", hash = "sha256:1713e2c5545863cdbfe2cbce21f69ffaf37b813bfd1fb3b90dc9a6f1963f5a8c"}, - {file = "ruff-0.7.3.tar.gz", hash = "sha256:e1d1ba2e40b6e71a61b063354d04be669ab0d39c352461f3d789cac68b54a313"}, + {file = "ruff-0.7.4-py3-none-linux_armv6l.whl", hash = "sha256:a4919925e7684a3f18e18243cd6bea7cfb8e968a6eaa8437971f681b7ec51478"}, + {file = "ruff-0.7.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfb365c135b830778dda8c04fb7d4280ed0b984e1aec27f574445231e20d6c63"}, + {file = "ruff-0.7.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:63a569b36bc66fbadec5beaa539dd81e0527cb258b94e29e0531ce41bacc1f20"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d06218747d361d06fd2fdac734e7fa92df36df93035db3dc2ad7aa9852cb109"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e0cea28d0944f74ebc33e9f934238f15c758841f9f5edd180b5315c203293452"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80094ecd4793c68b2571b128f91754d60f692d64bc0d7272ec9197fdd09bf9ea"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:997512325c6620d1c4c2b15db49ef59543ef9cd0f4aa8065ec2ae5103cedc7e7"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00b4cf3a6b5fad6d1a66e7574d78956bbd09abfd6c8a997798f01f5da3d46a05"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7dbdc7d8274e1422722933d1edddfdc65b4336abf0b16dfcb9dedd6e6a517d06"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e92dfb5f00eaedb1501b2f906ccabfd67b2355bdf117fea9719fc99ac2145bc"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3bd726099f277d735dc38900b6a8d6cf070f80828877941983a57bca1cd92172"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2e32829c429dd081ee5ba39aef436603e5b22335c3d3fff013cd585806a6486a"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:662a63b4971807623f6f90c1fb664613f67cc182dc4d991471c23c541fee62dd"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:876f5e09eaae3eb76814c1d3b68879891d6fde4824c015d48e7a7da4cf066a3a"}, + {file = "ruff-0.7.4-py3-none-win32.whl", hash = "sha256:75c53f54904be42dd52a548728a5b572344b50d9b2873d13a3f8c5e3b91f5cac"}, + {file = "ruff-0.7.4-py3-none-win_amd64.whl", hash = "sha256:745775c7b39f914238ed1f1b0bebed0b9155a17cd8bc0b08d3c87e4703b990d6"}, + {file = "ruff-0.7.4-py3-none-win_arm64.whl", hash = "sha256:11bff065102c3ae9d3ea4dc9ecdfe5a5171349cdd0787c1fc64761212fc9cf1f"}, + {file = "ruff-0.7.4.tar.gz", hash = "sha256:cd12e35031f5af6b9b93715d8c4f40360070b2041f81273d0527683d5708fce2"}, ] [[package]] @@ -3933,4 +3933,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "450f33a04327436b02c363c6f6d3846677b909768f21ebdf47982f30a2c972e9" +content-hash = "e33b0da31247495e8704fee5224f7b0cf53859cd0ce8bafb39889548a649f5fb" diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.toml index f1d4784f1c9d..da179b8ab3f1 100644 --- a/autogpt_platform/backend/pyproject.toml +++ b/autogpt_platform/backend/pyproject.toml @@ -54,8 +54,8 @@ poethepoet = "^0.30.0" httpx = "^0.27.0" pytest-watcher = "^0.4.2" requests = "^2.32.3" -ruff = "^0.7.3" -pyright = "^1.1.388" +ruff = "^0.7.4" +pyright = "^1.1.389" isort = "^5.13.2" black = "^24.10.0" aiohappyeyeballs = "^2.4.3" From 520d0ca0e44fd0738c650a30e4ff8af82f500755 Mon Sep 17 00:00:00 2001 From: Aarushi <50577581+aarushik93@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:21:57 +0000 Subject: [PATCH 03/14] delete infra folder (#8555) * delete infra folder * remove ci --- .../workflows/platform-autogpt-infra-ci.yml | 56 ------- .../infra/helm/autogpt-builder/.helmignore | 23 --- .../infra/helm/autogpt-builder/Chart.yaml | 24 --- .../helm/autogpt-builder/templates/NOTES.txt | 22 --- .../autogpt-builder/templates/_helpers.tpl | 62 -------- .../autogpt-builder/templates/configmap.yaml | 11 -- .../autogpt-builder/templates/deployment.yaml | 71 --------- .../templates/frontendconfig.yaml | 8 - .../helm/autogpt-builder/templates/hpa.yaml | 32 ---- .../autogpt-builder/templates/ingress.yaml | 61 -------- .../templates/managedcert.yaml | 8 - .../templates/sealed-secrets.yaml | 16 -- .../autogpt-builder/templates/service.yaml | 19 --- .../templates/serviceaccount.yaml | 13 -- .../templates/tests/test-connection.yaml | 15 -- .../helm/autogpt-builder/values.dev.yaml | 64 -------- .../helm/autogpt-builder/values.prod.yaml | 83 ---------- .../infra/helm/autogpt-builder/values.yaml | 76 --------- .../infra/helm/autogpt-market/.helmignore | 23 --- .../infra/helm/autogpt-market/Chart.yaml | 9 -- .../helm/autogpt-market/templates/NOTES.txt | 22 --- .../autogpt-market/templates/_helpers.tpl | 62 -------- .../templates/backendconfig.yaml | 26 --- .../autogpt-market/templates/configmap.yaml | 10 -- .../autogpt-market/templates/deployment.yaml | 73 --------- .../templates/frontendconfig.yaml | 8 - .../helm/autogpt-market/templates/hpa.yaml | 32 ---- .../autogpt-market/templates/ingress.yaml | 61 -------- .../autogpt-market/templates/managedcert.yaml | 7 - .../templates/sealed-secrets.yaml | 17 -- .../autogpt-market/templates/service.yaml | 19 --- .../templates/serviceaccount.yaml | 13 -- .../templates/tests/test-connection.yaml | 15 -- .../infra/helm/autogpt-market/values.dev.yaml | 100 ------------ .../helm/autogpt-market/values.prod.yaml | 99 ------------ .../infra/helm/autogpt-market/values.yaml | 98 ------------ .../infra/helm/autogpt-server/.helmignore | 23 --- .../infra/helm/autogpt-server/Chart.yaml | 10 -- .../helm/autogpt-server/templates/NOTES.txt | 22 --- .../autogpt-server/templates/_helpers.tpl | 62 -------- .../templates/backendconfig.yaml | 26 --- .../autogpt-server/templates/configmap.yaml | 10 -- .../templates/deployment-executor.yaml | 73 --------- .../autogpt-server/templates/deployment.yaml | 77 --------- .../templates/frontendconfig.yaml | 8 - .../helm/autogpt-server/templates/hpa.yaml | 32 ---- .../autogpt-server/templates/ingress.yaml | 61 -------- .../autogpt-server/templates/managedcert.yaml | 7 - .../templates/sealed-secrets.yaml | 16 -- .../templates/service-executor.yaml | 23 --- .../autogpt-server/templates/service.yaml | 25 --- .../templates/serviceaccount.yaml | 13 -- .../templates/tests/test-connection.yaml | 15 -- .../infra/helm/autogpt-server/values.dev.yaml | 126 --------------- .../helm/autogpt-server/values.prod.yaml | 129 --------------- .../infra/helm/autogpt-server/values.yaml | 84 ---------- .../helm/autogpt-websocket-server/.helmignore | 23 --- .../helm/autogpt-websocket-server/Chart.yaml | 10 -- .../templates/NOTES.txt | 22 --- .../templates/_helpers.tpl | 62 -------- .../templates/backendconfig.yaml | 26 --- .../templates/configmap.yaml | 10 -- .../templates/deployment.yaml | 78 --------- .../templates/frontendconfig.yaml | 6 - .../templates/hpa.yaml | 32 ---- .../templates/ingress.yaml | 61 -------- .../templates/managedcert.yaml | 7 - .../templates/sealed-secrets.yaml | 16 -- .../templates/service.yaml | 19 --- .../templates/serviceaccount.yaml | 13 -- .../templates/tests/test-connection.yaml | 15 -- .../autogpt-websocket-server/values.dev.yaml | 82 ---------- .../autogpt-websocket-server/values.prod.yaml | 84 ---------- .../helm/autogpt-websocket-server/values.yaml | 98 ------------ .../infra/helm/redis-values.dev.yaml | 15 -- .../infra/helm/redis-values.prod.yaml | 15 -- autogpt_platform/infra/terraform/.gitignore | 4 - .../infra/terraform/.terraform.lock.hcl | 22 --- .../infra/terraform/environments/dev.tfvars | 146 ----------------- .../infra/terraform/environments/prod.tfvars | 141 ----------------- autogpt_platform/infra/terraform/main.tf | 75 --------- .../terraform/modules/gke_cluster/main.tf | 35 ----- .../terraform/modules/gke_cluster/outputs.tf | 14 -- .../modules/gke_cluster/variables.tf | 41 ----- .../infra/terraform/modules/iam/main.tf | 53 ------- .../infra/terraform/modules/iam/outputs.tf | 14 -- .../infra/terraform/modules/iam/variables.tf | 42 ----- .../terraform/modules/networking/main.tf | 22 --- .../terraform/modules/networking/ouputs.tf | 19 --- .../terraform/modules/networking/variables.tf | 29 ---- .../infra/terraform/modules/static_ip/main.tf | 5 - .../terraform/modules/static_ip/outputs.tf | 9 -- .../terraform/modules/static_ip/variables.tf | 14 -- .../infra/terraform/modules/storage/main.tf | 64 -------- .../terraform/modules/storage/outputs.tf | 19 --- .../terraform/modules/storage/variables.tf | 27 ---- autogpt_platform/infra/terraform/variables.tf | 148 ------------------ 97 files changed, 3837 deletions(-) delete mode 100644 .github/workflows/platform-autogpt-infra-ci.yml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/.helmignore delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/Chart.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/NOTES.txt delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/_helpers.tpl delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/configmap.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/deployment.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/frontendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/hpa.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/ingress.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/managedcert.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/sealed-secrets.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/service.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/serviceaccount.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/templates/tests/test-connection.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-builder/values.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/.helmignore delete mode 100644 autogpt_platform/infra/helm/autogpt-market/Chart.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/NOTES.txt delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/_helpers.tpl delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/backendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/configmap.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/deployment.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/frontendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/hpa.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/ingress.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/managedcert.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/service.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/serviceaccount.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/templates/tests/test-connection.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/values.dev.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/values.prod.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-market/values.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/.helmignore delete mode 100644 autogpt_platform/infra/helm/autogpt-server/Chart.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/NOTES.txt delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/_helpers.tpl delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/backendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/configmap.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/deployment.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/frontendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/hpa.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/ingress.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/managedcert.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/sealed-secrets.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/service.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/serviceaccount.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/templates/tests/test-connection.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/values.dev.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/values.prod.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-server/values.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/.helmignore delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/Chart.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/NOTES.txt delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/_helpers.tpl delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/backendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/configmap.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/deployment.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/frontendconfig.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/hpa.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/ingress.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/managedcert.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/sealed-secrets.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/service.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/serviceaccount.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/templates/tests/test-connection.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/values.prod.yaml delete mode 100644 autogpt_platform/infra/helm/autogpt-websocket-server/values.yaml delete mode 100644 autogpt_platform/infra/helm/redis-values.dev.yaml delete mode 100644 autogpt_platform/infra/helm/redis-values.prod.yaml delete mode 100644 autogpt_platform/infra/terraform/.gitignore delete mode 100644 autogpt_platform/infra/terraform/.terraform.lock.hcl delete mode 100644 autogpt_platform/infra/terraform/environments/dev.tfvars delete mode 100644 autogpt_platform/infra/terraform/environments/prod.tfvars delete mode 100644 autogpt_platform/infra/terraform/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/gke_cluster/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/gke_cluster/outputs.tf delete mode 100644 autogpt_platform/infra/terraform/modules/gke_cluster/variables.tf delete mode 100644 autogpt_platform/infra/terraform/modules/iam/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/iam/outputs.tf delete mode 100644 autogpt_platform/infra/terraform/modules/iam/variables.tf delete mode 100644 autogpt_platform/infra/terraform/modules/networking/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/networking/ouputs.tf delete mode 100644 autogpt_platform/infra/terraform/modules/networking/variables.tf delete mode 100644 autogpt_platform/infra/terraform/modules/static_ip/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/static_ip/outputs.tf delete mode 100644 autogpt_platform/infra/terraform/modules/static_ip/variables.tf delete mode 100644 autogpt_platform/infra/terraform/modules/storage/main.tf delete mode 100644 autogpt_platform/infra/terraform/modules/storage/outputs.tf delete mode 100644 autogpt_platform/infra/terraform/modules/storage/variables.tf delete mode 100644 autogpt_platform/infra/terraform/variables.tf diff --git a/.github/workflows/platform-autogpt-infra-ci.yml b/.github/workflows/platform-autogpt-infra-ci.yml deleted file mode 100644 index 1dc5aec80fec..000000000000 --- a/.github/workflows/platform-autogpt-infra-ci.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: AutoGPT Platform - Infra - -on: - push: - branches: [ master, dev ] - paths: - - '.github/workflows/platform-autogpt-infra-ci.yml' - - 'autogpt_platform/infra/**' - pull_request: - paths: - - '.github/workflows/platform-autogpt-infra-ci.yml' - - 'autogpt_platform/infra/**' - -defaults: - run: - shell: bash - working-directory: autogpt_platform/infra - -jobs: - lint: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: TFLint - uses: pauloconnor/tflint-action@v0.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tflint_path: terraform/ - tflint_recurse: true - tflint_changed_only: false - - - name: Set up Helm - uses: azure/setup-helm@v4 - with: - version: v3.14.4 - - - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.1 - - - name: Run chart-testing (list-changed) - id: list-changed - run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) - if [[ -n "$changed" ]]; then - echo "changed=true" >> "$GITHUB_OUTPUT" - fi - - - name: Run chart-testing (lint) - if: steps.list-changed.outputs.changed == 'true' - run: ct lint --target-branch ${{ github.event.repository.default_branch }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/.helmignore b/autogpt_platform/infra/helm/autogpt-builder/.helmignore deleted file mode 100644 index 0e8a0eb36f4c..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/autogpt_platform/infra/helm/autogpt-builder/Chart.yaml b/autogpt_platform/infra/helm/autogpt-builder/Chart.yaml deleted file mode 100644 index 639e7cbd05b7..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: autogpt-builder -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.0.0" diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/NOTES.txt b/autogpt_platform/infra/helm/autogpt-builder/templates/NOTES.txt deleted file mode 100644 index 5bf2c1287a1e..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "autogpt-builder.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "autogpt-builder.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "autogpt-builder.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "autogpt-builder.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/_helpers.tpl b/autogpt_platform/infra/helm/autogpt-builder/templates/_helpers.tpl deleted file mode 100644 index c0624bd0a509..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "autogpt-builder.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "autogpt-builder.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "autogpt-builder.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "autogpt-builder.labels" -}} -helm.sh/chart: {{ include "autogpt-builder.chart" . }} -{{ include "autogpt-builder.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "autogpt-builder.selectorLabels" -}} -app.kubernetes.io/name: {{ include "autogpt-builder.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "autogpt-builder.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "autogpt-builder.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/configmap.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/configmap.yaml deleted file mode 100644 index 0841631cfb0a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "autogpt-builder.fullname" . }}-config - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} -data: - .env.local: |- - {{- range $key, $value := .Values.env }} - {{ $key }}={{ $value }} - {{- end }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/deployment.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/deployment.yaml deleted file mode 100644 index cd8ecabda1e0..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/deployment.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "autogpt-builder.fullname" . }} - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "autogpt-builder.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "autogpt-builder.labels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "autogpt-builder.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - envFrom: - - configMapRef: - name: {{ include "autogpt-builder.fullname" . }}-config - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/frontendconfig.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/frontendconfig.yaml deleted file mode 100644 index 853bc15de372..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/frontendconfig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: networking.gke.io/v1beta1 -kind: FrontendConfig -metadata: - name: {{ include "autogpt-builder.fullname" . }}-frontend-config -spec: - redirectToHttps: - enabled: true - responseCodeName: MOVED_PERMANENTLY_DEFAULT \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/hpa.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/hpa.yaml deleted file mode 100644 index 92b0732ccc41..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "autogpt-builder.fullname" . }} - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "autogpt-builder.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/ingress.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/ingress.yaml deleted file mode 100644 index 0c7ed238fb8e..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "autogpt-builder.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/managedcert.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/managedcert.yaml deleted file mode 100644 index 1f32c4d7edfb..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/managedcert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: networking.gke.io/v1 -kind: ManagedCertificate -metadata: - name: {{ include "autogpt-builder.fullname" . }}-cert -spec: - domains: - - {{ .Values.domain }} - - {{ .Values.wwwDomain }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/sealed-secrets.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/sealed-secrets.yaml deleted file mode 100644 index 1449ec950688..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/sealed-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: {{ include "autogpt-builder.fullname" . }}-secrets - namespace: {{ .Release.Namespace }} - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" -spec: - encryptedData: - {{- range $key, $value := .Values.secrets }} - {{ $key }}: {{ $value }} - {{- end }} - template: - metadata: - name: {{ .Release.Name }}-secrets - namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/service.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/service.yaml deleted file mode 100644 index 1303a557cfe1..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "autogpt-builder.fullname" . }} - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP - name: http - selector: - {{- include "autogpt-builder.selectorLabels" . | nindent 4 }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/serviceaccount.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/serviceaccount.yaml deleted file mode 100644 index 829940e1630d..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "autogpt-builder.serviceAccountName" . }} - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-builder/templates/tests/test-connection.yaml b/autogpt_platform/infra/helm/autogpt-builder/templates/tests/test-connection.yaml deleted file mode 100644 index ab20c848e80a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "autogpt-builder.fullname" . }}-test-connection" - labels: - {{- include "autogpt-builder.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "autogpt-builder.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml deleted file mode 100644 index 6fce97518dd6..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml +++ /dev/null @@ -1,64 +0,0 @@ -# dev values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-frontend-dev/agpt-frontend-dev - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com" - name: "dev-agpt-builder-sa" - -service: - type: ClusterIP - port: 8000 - targetPort: 3000 - annotations: - cloud.google.com/neg: '{"ingress": true}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-dev-agpt-builder-ip" - networking.gke.io/managed-certificates: "autogpt-builder-cert" - kubernetes.io/ingress.allow-http: "true" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-builder-frontend-config" - hosts: - - host: dev-builder.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-builder - port: 8000 - defaultBackend: - service: - name: autogpt-builder - port: - number: 8000 - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 500m - memory: 512Mi - -livenessProbe: null -readinessProbe: null - -domain: "dev-builder.agpt.co" -wwwDomain: "www.dev-builder.agpt.co" - - -env: - APP_ENV: "dev" - -secrets: - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" diff --git a/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml deleted file mode 100644 index c97be6477b0a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# prod values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-prod/agpt-frontend-prod/agpt-frontend-prod - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "prod-agpt-builder-sa@agpt-prod.iam.gserviceaccount.com" - name: "prod-agpt-builder-sa" - -service: - type: ClusterIP - port: 8000 - targetPort: 3000 - annotations: - cloud.google.com/neg: '{"ingress": true}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-prod-agpt-frontend-ip" - networking.gke.io/managed-certificates: "autogpt-builder-cert" - kubernetes.io/ingress.allow-http: "true" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-builder-frontend-config" - hosts: - - host: platform.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-builder - port: 8000 - - host: www.platform.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-builder - port: 8000 - defaultBackend: - service: - name: autogpt-builder - port: - number: 8000 - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 500m - memory: 512Mi - -livenessProbe: null -readinessProbe: null - -domain: "platform.agpt.co" -wwwDomain: "www.platform.agpt.co" - -volumes: - - name: env-config - configMap: - name: 'autogpt-builder-config' - -volumeMounts: - - name: env-config - mountPath: /app/.env.local - subPath: .env.local - readonly: true - - -env: - APP_ENV: "prod" - -secrets: - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-builder/values.yaml b/autogpt_platform/infra/helm/autogpt-builder/values.yaml deleted file mode 100644 index 3b4b64e6e600..000000000000 --- a/autogpt_platform/infra/helm/autogpt-builder/values.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# base values, environment specific variables should be specified/overwritten in environment values - -replicaCount: 1 - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-builder-dev/agpt-builder-dev - pullPolicy: IfNotPresent - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - create: true - automount: true - annotations: {} - name: "" - -podAnnotations: {} -podLabels: {} - -podSecurityContext: {} - -securityContext: {} - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 500m - memory: 512Mi - -livenessProbe: - httpGet: - path: / - port: http -readinessProbe: - httpGet: - path: / - port: http - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetMemoryUtilizationPercentage: 80 - -volumes: [] - -volumeMounts: [] - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -domain: "" diff --git a/autogpt_platform/infra/helm/autogpt-market/.helmignore b/autogpt_platform/infra/helm/autogpt-market/.helmignore deleted file mode 100644 index 0e8a0eb36f4c..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/autogpt_platform/infra/helm/autogpt-market/Chart.yaml b/autogpt_platform/infra/helm/autogpt-market/Chart.yaml deleted file mode 100644 index 72544a095e5d..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: autogpt-market -description: A Helm chart for Market - -type: application - -version: 0.1.0 - -appVersion: "1.0.0" diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/NOTES.txt b/autogpt_platform/infra/helm/autogpt-market/templates/NOTES.txt deleted file mode 100644 index 585e8704aba8..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "autogpt-market.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "autogpt-market.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "autogpt-market.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "autogpt-market.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/_helpers.tpl b/autogpt_platform/infra/helm/autogpt-market/templates/_helpers.tpl deleted file mode 100644 index 344a7d8a985f..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "autogpt-market.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "autogpt-market.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "autogpt-market.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "autogpt-market.labels" -}} -helm.sh/chart: {{ include "autogpt-market.chart" . }} -{{ include "autogpt-market.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "autogpt-market.selectorLabels" -}} -app.kubernetes.io/name: {{ include "autogpt-market.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "autogpt-market.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "autogpt-market.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/backendconfig.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/backendconfig.yaml deleted file mode 100644 index 0e7c138d3727..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/backendconfig.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: cloud.google.com/v1 -kind: BackendConfig -metadata: - name: {{ include "autogpt-market.fullname" . }}-backend-config -spec: - customRequestHeaders: - headers: - - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - customResponseHeaders: - headers: - - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - timeoutSec: 1800 - connectionDraining: - drainingTimeoutSec: 1800 \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/configmap.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/configmap.yaml deleted file mode 100644 index 23e1619173e6..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "autogpt-market.fullname" . }}-config - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} -data: - {{- range $key, $value := .Values.env }} - {{ $key }}: {{ $value | quote }} - {{- end }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/deployment.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/deployment.yaml deleted file mode 100644 index 230c204a6a0b..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/deployment.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "autogpt-market.fullname" . }} - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "autogpt-market.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "autogpt-market.labels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "autogpt-market.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - envFrom: - - configMapRef: - name: {{ include "autogpt-market.fullname" . }}-config - - secretRef: - name: {{ include "autogpt-market.fullname" . }}-secrets - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.service.targetPort }} - protocol: TCP - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/frontendconfig.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/frontendconfig.yaml deleted file mode 100644 index a66df4acd698..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/frontendconfig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: networking.gke.io/v1beta1 -kind: FrontendConfig -metadata: - name: {{ include "autogpt-market.fullname" . }}-frontend-config -spec: - redirectToHttps: - enabled: true - responseCodeName: MOVED_PERMANENTLY_DEFAULT diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/hpa.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/hpa.yaml deleted file mode 100644 index 08844f8e1ea4..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "autogpt-market.fullname" . }} - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "autogpt-market.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/ingress.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/ingress.yaml deleted file mode 100644 index 933a42f99f81..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "autogpt-market.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/managedcert.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/managedcert.yaml deleted file mode 100644 index 2a0f5a048310..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/managedcert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: networking.gke.io/v1 -kind: ManagedCertificate -metadata: - name: {{ include "autogpt-market.fullname" . }}-cert -spec: - domains: - - {{ .Values.domain }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml deleted file mode 100644 index 41ab87d94396..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: {{ include "autogpt-market.fullname" . }}-secrets - namespace: {{ .Release.Namespace }} - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" - force-update: "true" -spec: - encryptedData: - {{- range $key, $value := .Values.secrets }} - {{ $key }}: {{ $value }} - {{- end }} - template: - metadata: - name: {{ .Release.Name }}-secrets - namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/service.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/service.yaml deleted file mode 100644 index 3895c760f808..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "autogpt-market.fullname" . }} - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP - name: http - selector: - {{- include "autogpt-market.selectorLabels" . | nindent 4 }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/serviceaccount.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/serviceaccount.yaml deleted file mode 100644 index dae3bc325b05..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "autogpt-market.serviceAccountName" . }} - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/tests/test-connection.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/tests/test-connection.yaml deleted file mode 100644 index 2aa417fff867..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "autogpt-market.fullname" . }}-test-connection" - labels: - {{- include "autogpt-market.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "autogpt-market.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml deleted file mode 100644 index eefd03c1698f..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml +++ /dev/null @@ -1,100 +0,0 @@ -# dev values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-market-dev/agpt-market-dev - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - name: "dev-agpt-market-sa" - -service: - type: ClusterIP - port: 8015 - targetPort: 8015 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-market-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-dev-agpt-market-ip" - networking.gke.io/managed-certificates: "autogpt-market-cert" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-market-frontend-config" - hosts: - - host: dev-market.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-market - port: 8015 - defaultBackend: - service: - name: autogpt-market - port: - number: 8015 - -resources: - requests: - cpu: 200m - memory: 1Gi - limits: - cpu: 2 - memory: 2Gi - -livenessProbe: - httpGet: - path: /health - port: 8015 - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 12 -readinessProbe: - httpGet: - path: /health - port: 8015 - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 12 - -domain: "dev-market.agpt.co" - -cors: - allowOrigin: "https://dev-builder.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -env: - APP_ENV: "dev" - PYRO_HOST: "0.0.0.0" - ENABLE_AUTH: "true" - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - FRONTEND_BASE_URL: "https://dev-builder.agpt.co/" - SUPABASE_URL: "https://adfjtextkuilwuhzdjpf.supabase.co" - BACKEND_CORS_ALLOW_ORIGINS: "https://dev-builder.agpt.co" - - -secrets: - SUPABASE_JWT_SECRET: "AgCXWGuGOPbdUZsn1G+amfHxm1CZAmuiULAml7sDJ+SUXUBlBWOf/wb0Gf9vnjPrpS5QqeYUQDzVPIXRqs1BkL7m51zAYt4U5K1XGgF4VmUv5Jqm/99iLB/biuVBuGj32wuYzGNEfuPPz6sfg51AfPfuOCDE/bX9xD+M5E++wVQChulm0Lqab5GdBgZC2M90Cb57EjNbwkCnNhO1HY2etwMKJ5q4J6N8gW1nxdWemUFEtQuHRBwEhCA+XRVf4MHQPwixb0Kn7cA+D6OthxWaxsXgg0li/kY7tF4xed2XXkfhARFbATryExcnAXLOucWS1+NKjLSUCZdqeqR/+C6uKyAYQNj60WU9ikDG5LJrLgnB2dXVBDNFHWbVtWtHABdyIVENZlXCBYtIJUpDBVFVIZp/GOyR9mhwPil0qZOiLE6HXiRENyMcZxNk1E9BHQZHS6WKExsi7RP3kJVFcWknBvH8IydkoINRfGO+LNy+H8EK51ml60iq6pvNVRwcxfZBuNcdJQrWflsLbi2dT6u9tWM27COnV2UCWqJuslVhdEAdpeB/nErgnBcSWXl4vtApasxYw7l5QWTU2597TvMidqm9ardvFOiuj9SxRdLZ/H3x3rsn8yn3C22E8Ism4ciEA9wxjwL3pgWiSsRsIsTpI0++lHSSY7hZvsarwFWcgwzjZhufqjVTbRJiHGOeXijiAqj+b5haCkdYmJCFeJuph11GABtORqnVh2xkPfzB3iWpfshX+udtjr7vdJCcpQyRbq972I8sTqFJXQc5hXQYu8/JWApKnpYMFq7MtrCKGurYxLPx7pYaf1sA" - DATABASE_URL: "AgB2qSmnSLX5mVx+kIhbD2Mb8mKFHSyTD/DlhaNLo00tl+O4ix155S8Ec9voSFwuDhsjuQC9vND9cNSDIMUakjKIu4SmKfyi1zq2dHkToq0N5jxOO04N9XbZtXRIUaw6/ME8NGodw0hF4kPMaKBcC3Vt4dvnZw4YOnk2l39W5Cf3GR2Jm5V2s4g90HLy+JexQjxf5YiPQdDUQPu2bRxJ+ELuaEH113QrbLJVQZtd18+0p+89pBP9Rw98YqO+Lbf8u2MPGXOYQpjpT+bIIQE3c42Wd7lpHd+S8YBfHOjJKipLK2L1JsN30nte+xHEC3Vk1re9T3Qa7Nmb4fuwnJXcXBxwyaOucsPS9o/beNGYZtvpR3e9TedcjxCe4DQpJiMmkhK3Z8eVYmxNUviccN21mf2yMsZ/9KNuULnlz+EFVW1vwmnuGRD4yHUK4HKmGyrKEdmnEOMv1W2yoRbyy9kjj3lTSO4jKDxAgs+9zkVUD1cIL/bFjJZVqOnXZs5I6gJWM5dGtLTqZe8IyxbKj9fORHLzl0kZqjfjiIVvJkLpV/okjaITVueuGljROt89ZDSVKCcHDiMMXF4qZwLNGIPoRT4O8b3BIBiRm2fnJu5ui3xbTfQWH1/OagWhgiBkvcKJ4IoZuxdlQnBjCOSig4BMUopjAQ49YaPX78qDBFTDSkk5ofogs1nKHRo41EmdR8Kl7JI=" - SENTRY_DSN: "AgB9i02k9BgaIXF0p9Qyyeo0PRa9bd3UiPBWQ3V4Jn19Vy5XAzKfYvqP8t+vafN2ffY+wCk1FlhYzdIuFjh3oRvdKvtwGEBZk6nLFiUrw/GSum0ueR2OzEy+AwGFXA9FstD0KCMJvyehSv9xRm9kqLOC4Xb/5lOWwTNF3AKqkEMEeKrOWx4OLXG6MLdR7OicY45BCE5WvcV2PizDaN5w3J72eUxFP0HjXit/aW/gK32IJME0RxeuQZ5TnPKTNrooYPR0eWXd2PgYshFjQ2ARy/OsvOrD10y8tQ3M5qx/HNWLC/r0lEu2np+9iUIAE1ufSwjmNSyi4V8usdZWq7xnf3vuKlSgmveqKkLbwQUWj1BpLNIjUvyY+1Rk1rxup/WCgaw+xOZd6sR/qTIjILv5GuzpU0AiwEm7sgl2pmpFXq6n6QjNOfZoPBTL73f4bpXNJ3EyMYDbPxOtGDz91B+bDtOsMr1DNWQslKkk3EIilm/l0+NuLKxf/e2HwM3sB15mkQqVZBdbiVOr7B27cR9xAnr296KE/BU6E9dp/fl+IgcaonMpTsE61pCLHWxQXNBO5X078/zhmaXBQyEBNQ5SPDr9u3pHWrrLkBtXwldZvgmLMMVFMAzrVVkJB4lC9sZj0pXPhda0/BsA4xcGRELj/PizwSr+kb3lDumNMqzEap5ZjEGCBpeeIVSo19v+RoEDw0AFmyxfYx2+91HsgiEqjEUg+J6yDmjAoRpOD1wRZOnnpR8ufMiqdBteCG8B5SXkhgto1WtDyOMVlX2wbmBFVetv2nAbMIA/l4E/Yv8HXiJsTqAkeYc5Qak6/SMGnZTw7Q==" - SUPABASE_SERVICE_ROLE_KEY: "AgBKJDPEiTQUYLY0B/NKaAkxH7whrGuxQVtRdz9mEr/Bx06n1Yu1Zm4/oEQp3OvYerRvQWuv1k3//jf3eiya4ZW9+ZntfPdQWL9/tzq+/spevFtiEvuQ8uuUhtNOU4IGt27KTTlhCfeHKte8jtLQ/lwcrSrfPZ1T8Gy8PXdsAgakGUauEs2oHuX2XUaPE9UFF4HRAhmjPZ9e7u7Zfgcj8D+otjrwNVC5ZXFM7/ha0roeZHdpTvOcemKjxhiZA0FmdkXgOCPihNxlz0sKcupCEte6ocnSkpL3pBflBsa9+NLz7kLCUQPeOCExkMTndyqWk1kFci6j35cBP6PQlHfWPdo8OFCdG+3EfvEt5+4PQ08d7nXRZqowBiQdE2/e8qA/dZc8cJ7ecpza+9Qf/pNIl+9Ix0EFvmB6rpbO9w5Ptw2yMOAebVl7qV+A65GelvcPWROK5Vfftwx8KT2sn9ldVOYy+C7OafgOm8qaL7mEMePSwJy68MKpnMm/TceE7xxZ2sMSWEl9FMn4QXEawD4LQrJHKpum6XyUG2FlMkogHMikOEbJzz1ICAcHB6OWJXo3wU+fK8jkI4/UYioFSfF9MQXaC8bUGc4NT6T62KvjnrdkmOHG7HcN4UNQ7yBa/fP1pM7peYQdwAKr4Oxl4v3i96uKRdCuIimYiWpcxklkQhmSsMLKFMZGDDvv1BNtL6oxK4ZaEyWoorEyjkd2UrSpbP6cvyVMVWbTl1/BD350NRn6OYTpGIXwmAhqVWuuyt8kfLLU6Ot2MYcq/i16qvc3dA5XizLKHY95X8R+DlUCEzawF75Sx++eMPKU/o5rxhZNRjvffIcXtw1Hy/uqVCqilmSt33RqUsehOxQUqHBIW7L7sAik/L+hgTiE3MwN8XSfGncDB/bNweJh3ZSXsdwZD2bleEY1nWpsXVhcJDNcdW3YscJbsyTCGQcOb0zEQaxSmfLAd3rIa+SAZpFEOsD8A5kZjI4QpmqPkhNHeF8=" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-market/values.prod.yaml deleted file mode 100644 index 94db4a6e76f7..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/values.prod.yaml +++ /dev/null @@ -1,99 +0,0 @@ -# prod values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-prod/agpt-market-prod/agpt-market-prod - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - name: "prod-agpt-market-sa" - -service: - type: ClusterIP - port: 8015 - targetPort: 8015 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-market-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-prod-agpt-market-ip" - networking.gke.io/managed-certificates: "autogpt-market-cert" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-market-frontend-config" - hosts: - - host: market.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-market - port: 8015 - defaultBackend: - service: - name: autogpt-market - port: - number: 8015 - -resources: - requests: - cpu: 200m - memory: 1Gi - limits: - cpu: 2 - memory: 2Gi - -livenessProbe: - httpGet: - path: /health - port: 8015 - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 12 -readinessProbe: - httpGet: - path: /health - port: 8015 - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 12 - -domain: "market.agpt.co" - -cors: - allowOrigin: "https://platform.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -env: - APP_ENV: "prod" - PYRO_HOST: "0.0.0.0" - ENABLE_AUTH: "true" - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - FRONTEND_BASE_URL: "https://platform.agpt.co/" - SUPABASE_URL: "https://bgwpwdsxblryihinutbx.supabase.co" - BACKEND_CORS_ALLOW_ORIGINS: "https://platform.agpt.co" - -secrets: - DATABASE_URL: "AgCUKDIUv1z6KWRBX+sSfokUYFPZPMurFMcvVG4GKHPtV9ckIZ7tV2S+FxdQcXNnUQeuqQ7lSpaxOp6fnzC2ou9A+mHHstiEl0u9QrrL1gyOF3AsEnEd+TpXTZ3gOq4v6vmEqErNShrm1AiZy5qKQi50JoUUZNh9brM2MmtlSZU58BWxLTjMaEHttPsdQWz3mlumJchRxJzr9xnzVZWwp3Llq2hTGOdwa2UNljd9h11m547/fT2d7o3vqP/Sju+h6SEUB83EHP2Ncjxf9rhVn5KXboxvOSbKXxa8eu5eE87D1tlrCCvnoDV5hh8h+W4EboFwUffJZDD9+VPK5nIJuCZ5k9y/+9peQfOCvQ8LJaNxKxzBfGXxsb9PmYJrdN3KAbE5ZmhjuABvuMcPMdJRxGdwUCNCyw5XpiEQRD0vSSEXuZKOv3Oy0a6mOzcNf2a5QhAqAM98WazaCjg4gmVQ4ZKDUYzjsURpGavb/piBo5pDZHrwWjCilsjJqTFlPTFi39ppVtXitfncYCUPYVts/kNrWa9//4sj9ZKIKUsLzCB8X1B6pA7cG/9u0n61Kllmp7naWM2W9Jq0b7DB8FvihcyMsOPxfyeX66OzTFypat3+cY4JcLr4rx6DPk4hZyHfFnJZdfeSl/MePPkjLTS1aBLZ+sCNaPGWKaEJ97zZSEvm54V2AH5EuLJqSx3EUotpLok=" - SUPABASE_JWT_SECRET: "AgAYMdZyP+UhxIdTx6qyRzq9xf1dT7S+DFEC8KSPEFydX9+hAdJVTpprOlgLnqSbfSDmbqcFnCH+aK/6rdRx3HI3v41FogyCNFFxTrfxq1Esk8VuaVh8XrO2xKPd4iGBPZaTrenKlgt89aGdjPJzgl+NlZ5+/BXd95P2uX39DDGr9GJdO14zBt69O+L+Yt7kdd3ZMBjWYibZAzf+YaNIx/M7jjzGLYvxtywMVTrR+6e6GkGQSt5CzBpgk1b6ugPVtFs7PqmMtUqXMQjlrW2u7WVZRWeXO93ukc/TtjO2XUY9JfrgibMf0H81NDDTAAQBNqaDk0LdXsPUo9QGnyeQZTsfAOaeM6lTxX9qCYjneN6pxe60U1BKLURpordRdBs3peAedNJ95GC75qcdSkZE2agjwJvXKs8yy2Ig5eiU/80W27IWPMSLWhMSSf4ixyfkNWM4EfWL45bXlVGvtYaeyqByb0QU1g+II3AukIyO1qOS572y0sGseEv/UlfU2NDBLFejeBZaz4s/20lSyLhP3v1Y9aTs8qWIGl67syFKZoCwPRxwip2v7wIDnlDYXtlxMpQUWDnSUX16zQiVALD3izeDYkd1RViBgdYT/G0tp6lBeV1vnF8tBEGWIl3GJFV0okUflAQ9NIrdC5+BlcQDD08Jn0oGjyje7KE/BfvB1lHT7K+h9rr8B/U8zBSaAe+KFjA8pcjHqXgi4Zx3ayTXdAddyFZd0YqONohEAvXB+BLLdYJVNNXjBFwY62XQ6ojD2ZYWz4m/Wo+/zG0Zm5s/v2VS8UT5qe2Wjs3oGHKIJc6Eo3hVwLefcb7V" - SENTRY_DSN: "AgA+X2HkF9b3+p13JS4vG7VY+8p7su6qJ7smoPKqYh44Vpb7J5Eu9ksPNQkcFTDDPT8jAylqsHWUdI0A8u20+a4lqqGkmPN5tCgyBgAL1pIyvPUQjYUbL7A5lTQKlRLJJ+05h5XbkRU7cWR+G4yDUCDj2HcThne0CNDUbDao9D67ekSLUtp6/d0KO45Efao4MLuqISnypPUBGHmAdWGr2z/w7ItXjvUKt3RpH6pSCrGzjlKPKhenKdTsk/NX4Z+ew/JBbHiDQjKCdj0UlXFWH7Q4axaFy0T8tsqf/UN7n/QTalYE+v28isxrHvoR6h7kZETQV/gl0y7DdmTCi8/A1j1+e/9zUx6HvK+C/qGMsKMdNgaaVNSdfFp/yfMgXTUn4HGAls4gjVKSSRaIAbBq32NdKkIvRfocuAGsxInwbrDXLR0nzbHG/U/QhlvfL2gfqKRIVRJtEh99VW/KMMeXZUWR9dNt9gfTMtyzL7eta4oEV+g7sdO/9VjDn5wtic2/7eAxgA7wTEoDA8m0whpHH4VcPLHUfKLTHnRXVu6bykAfBgfEKhJBS8DghvPyu73qL5MREuYkGya4n0RQ73h5ja7mYwI0lsefQszP9Fz1lR+757dhJ6+/E7nNnOE/ShD/8xE0V54pd2IvrRoJmcOsIOZ5w+xWfmN8OyLn7wuEpqEuMHEoisLF9RSp2V5iKbB+fFB4o5P1/VqkNPEFBe0jA4K8DAGX+VdChMpjAI47wF22aj+jmTRf+EY+5l+aEvjyU0G7oUPVzzG8rYa6p+v56zeVsmU4SHIDO75J1cH7tnYDeOxk9fAYZgNplS4gKHVT0w==" - SUPABASE_SERVICE_ROLE_KEY: "AgCADpjXfdpTDruyK2F4GRNT/Kl+yaI87mQdXDHQo3jOC3gWoOiRlXg70JG3jIi2cWjAXwU8ySjpT87aJdRwsMToeMD78zr0FbOSB2abx7OPTij8zWFSzhIo4cLoEkvLxZO9HXwQc959Cxh5oBcn6WBhJ5XMUxNWALIem9+Lb5Eu1CwxSF0EDrl3znx3Iqw/zUqnAgS+Ob4AAiJwXNO641ja7dAKYkb2NJ/KCBgmSXAaPfxQByuNkGP4iwmQuxhhJQ/N+LRVCu03J6NLPVw22feKKtZxAAroMDn5wPhRdmzBawqbRsejiCb0JNL2yd574CDN5xzsDur/RYkCpTrMWzgnN3F1VcYMuB9FwYazKU3XqviOYtP8Ca4sUQChHQEOFP8n3Nt0Z17zo1NtgRt8IBpXpDeZFgDZU6Zy8EtpHHn05KT8YqyLDms2LfJhduiuyndbZgeIfr7IcxbU4aBafh+J/tfN7Tlj5NFYxFImKQ0NFg5z6W9zKKkfFMo9WUcOOXgwg8+g6xeZUX9g3rNpMBNf2bt0UfNqSIBeAmUZVKHuEqneFONbgtqOP2NKsKsSfvCsnpKgAndv+eL627qWAuDzywWuoAcxsF/Kvo/fQnv1a+7abCr1Qhf61u3DBriGp6TAVhQ9z7iGqvkuviELt97NKekeevCgdjwWpk78iKBCmxJobBTErdX2Xhrqfc5AHteoUBYv3TS7N8ZcOmfVmZc2ulgLLQZZ5hK30w9FFu28bu01ArfKcSp3U21keaC/cGHBNdUWgAbg3wIH+3y3vU2MRHI6T6sFrRsNgJH6b8S+HcOInTsoaLFiRv7SYxGYliV47AEukv4G2G+9XO4i4y9P90u5i7KM+J5FRlR6sfiISPozGHUBe9EAKYQcqaSSGP7FWsyNl6DGq/pDkG8IJYqNr21Sl9N1cdhK/Hdd4J80q05A9f3AyzHjtU4YVcvz4TCKr1FJLugBUsz120cA8FxGXweIQRWCzGvSeGA=" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-market/values.yaml b/autogpt_platform/infra/helm/autogpt-market/values.yaml deleted file mode 100644 index 6b6bd1add999..000000000000 --- a/autogpt_platform/infra/helm/autogpt-market/values.yaml +++ /dev/null @@ -1,98 +0,0 @@ -# Default values for autogpt-market. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Automatically mount a ServiceAccount's API credentials? - automount: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} -podLabels: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -# Additional volumes on the output Deployment definition. -volumes: [] -# - name: foo -# secret: -# secretName: mysecret -# optional: false - -# Additional volumeMounts on the output Deployment definition. -volumeMounts: [] -# - name: foo -# mountPath: "/etc/foo" -# readOnly: true - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/autogpt_platform/infra/helm/autogpt-server/.helmignore b/autogpt_platform/infra/helm/autogpt-server/.helmignore deleted file mode 100644 index 0e8a0eb36f4c..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/autogpt_platform/infra/helm/autogpt-server/Chart.yaml b/autogpt_platform/infra/helm/autogpt-server/Chart.yaml deleted file mode 100644 index 5dd24327d4dd..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: autogpt-server -description: A Helm chart for AutoGPT on Kubernetes - -type: application - - -version: 0.1.0 - -appVersion: "1.0.0" diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/NOTES.txt b/autogpt_platform/infra/helm/autogpt-server/templates/NOTES.txt deleted file mode 100644 index 2b660011ad17..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "autogpt-server.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "autogpt-server.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "autogpt-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "autogpt-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/_helpers.tpl b/autogpt_platform/infra/helm/autogpt-server/templates/_helpers.tpl deleted file mode 100644 index 2ff84f3d7274..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "autogpt-server.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "autogpt-server.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "autogpt-server.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "autogpt-server.labels" -}} -helm.sh/chart: {{ include "autogpt-server.chart" . }} -{{ include "autogpt-server.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "autogpt-server.selectorLabels" -}} -app.kubernetes.io/name: {{ include "autogpt-server.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "autogpt-server.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "autogpt-server.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/backendconfig.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/backendconfig.yaml deleted file mode 100644 index da23ed215b2b..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/backendconfig.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: cloud.google.com/v1 -kind: BackendConfig -metadata: - name: {{ include "autogpt-server.fullname" . }}-backend-config -spec: - customRequestHeaders: - headers: - - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - customResponseHeaders: - headers: - - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - timeoutSec: 1800 - connectionDraining: - drainingTimeoutSec: 1800 \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/configmap.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/configmap.yaml deleted file mode 100644 index f5b5eeae1b17..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "autogpt-server.fullname" . }}-config - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} -data: - {{- range $key, $value := .Values.env }} - {{ $key }}: {{ $value | quote }} - {{- end }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml deleted file mode 100644 index c71a1a13fb28..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "autogpt-server.fullname" . }}-executor - labels: - app.kubernetes.io/component: executor -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - app.kubernetes.io/component: executor - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - app.kubernetes.io/component: executor - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "autogpt-server.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - envFrom: - - configMapRef: - name: {{ include "autogpt-server.fullname" . }}-config - - secretRef: - name: {{ include "autogpt-server.fullname" . }}-secrets - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["poetry", "run", "executor"] - ports: - - name: http - containerPort: {{ .Values.serviceExecutor.port }} - protocol: TCP - - name: db-http - containerPort: {{ .Values.serviceDBManager.port }} - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/deployment.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/deployment.yaml deleted file mode 100644 index ad896d1f991a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/deployment.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "autogpt-server.fullname" . }} - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "autogpt-server.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "autogpt-server.labels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "autogpt-server.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - envFrom: - - configMapRef: - name: {{ include "autogpt-server.fullname" . }}-config - - secretRef: - name: {{ include "autogpt-server.fullname" . }}-secrets - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["poetry", "run", "rest"] - ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - - name: pyro - containerPort: 8004 - protocol: TCP - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/frontendconfig.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/frontendconfig.yaml deleted file mode 100644 index 91848af9344d..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/frontendconfig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: networking.gke.io/v1beta1 -kind: FrontendConfig -metadata: - name: {{ include "autogpt-server.fullname" . }}-frontend-config -spec: - redirectToHttps: - enabled: true - responseCodeName: MOVED_PERMANENTLY_DEFAULT diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/hpa.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/hpa.yaml deleted file mode 100644 index f2e1af78ae41..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "autogpt-server.fullname" . }} - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "autogpt-server.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/ingress.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/ingress.yaml deleted file mode 100644 index 115d67031c8a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "autogpt-server.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/managedcert.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/managedcert.yaml deleted file mode 100644 index 97fe878f20ee..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/managedcert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: networking.gke.io/v1 -kind: ManagedCertificate -metadata: - name: {{ include "autogpt-server.fullname" . }}-cert -spec: - domains: - - {{ .Values.domain }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/sealed-secrets.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/sealed-secrets.yaml deleted file mode 100644 index 9f6ce0cae6da..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/sealed-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: {{ include "autogpt-server.fullname" . }}-secrets - namespace: {{ .Release.Namespace }} - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" -spec: - encryptedData: - {{- range $key, $value := .Values.secrets }} - {{ $key }}: {{ $value }} - {{- end }} - template: - metadata: - name: {{ .Release.Name }}-secrets - namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml deleted file mode 100644 index 6d8d13ec6066..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "autogpt-server.fullname" . }}-executor - labels: - app.kubernetes.io/component: executor - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.serviceExecutor.type }} - ports: - - port: {{ .Values.serviceExecutor.port }} - targetPort: http - protocol: TCP - name: http - - port: {{ .Values.serviceDBManager.port }} - targetPort: db-http - protocol: TCP - name: db-http - selector: - app.kubernetes.io/component: executor \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/service.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/service.yaml deleted file mode 100644 index b944873174b4..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/service.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "autogpt-server.fullname" . }} - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - {{- if .Values.service.pyroDaemonPort }} - - port: {{ .Values.service.pyroDaemonPort }} - targetPort: pyro - protocol: TCP - name: pyro - {{- end }} - selector: - {{- include "autogpt-server.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/serviceaccount.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/serviceaccount.yaml deleted file mode 100644 index 2a403f9c7423..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "autogpt-server.serviceAccountName" . }} - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/tests/test-connection.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/tests/test-connection.yaml deleted file mode 100644 index 0f0d4593f2cf..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "autogpt-server.fullname" . }}-test-connection" - labels: - {{- include "autogpt-server.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "autogpt-server.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml deleted file mode 100644 index 1c837db541fa..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml +++ /dev/null @@ -1,126 +0,0 @@ -# dev values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-backend-dev/agpt-backend-dev - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com" - name: "dev-agpt-server-sa" - -service: - type: ClusterIP - port: 8006 - pyroDaemonPort: 8004 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -serviceExecutor: - type: ClusterIP - port: 8002 - targetPort: 8002 - annotations: - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -serviceDBManager: - type: ClusterIP - port: 8005 - targetPort: 8005 - annotations: - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-dev-agpt-server-ip" - networking.gke.io/managed-certificates: "autogpt-server-cert" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-server-frontend-config" - hosts: - - host: dev-server.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-server - port: 8006 - defaultBackend: - service: - name: autogpt-server - port: - number: 8006 - -resources: - requests: - cpu: 200m - memory: 256Mi - limits: - cpu: 2 - memory: 10Gi - -livenessProbe: - httpGet: - path: /health - port: 8006 - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 -readinessProbe: - httpGet: - path: /health - port: 8006 - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - -domain: "dev-server.agpt.co" - -cors: - allowOrigin: "https://dev-builder.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -env: - APP_ENV: "dev" - PYRO_HOST: "0.0.0.0" - ENABLE_AUTH: "true" - REDIS_HOST: "redis-dev-master.redis-dev.svc.cluster.local" - REDIS_PORT: "6379" - NUM_GRAPH_WORKERS: 10 - NUM_NODE_WORKERS: 3 - ENABLE_CREDIT: "true" - BACKEND_CORS_ALLOW_ORIGINS: '["https://dev-builder.agpt.co"]' - SUPABASE_SERVICE_ROLE_KEY: "" - GITHUB_CLIENT_ID: "" - GITHUB_CLIENT_SECRET: "" - FRONTEND_BASE_URL: "https://dev-builder.agpt.co/" - SUPABASE_URL: "https://adfjtextkuilwuhzdjpf.supabase.co" - AGENTSERVER_HOST: "autogpt-server.dev-agpt.svc.cluster.local" - EXECUTIONMANAGER_HOST: "autogpt-server-executor.dev-agpt.svc.cluster.local" - DATABASEMANAGER_HOST: "autogpt-server-executor.dev-agpt.svc.cluster.local" - -secrets: - ANTHROPIC_API_KEY: "AgBllA6KzTdyLs6Tc+HrwIeSjdsPQxdU/4qpqT64H4K3nTehS6kpCW1qtH6eBChs1v+m857sUgsrB9u8+P0aAa3DcgZ/gNg+G1GX6vAY2NJvP/2Q+Hiwi1cAn+R3ChHejG9P2C33hTa6+V9cpUI9xUWOwWLOIQZpLvAc7ltsi0ZJ06qFO0Zhj+H9K768h7U3XaivwywX7PT7BnUTiT6AQkAwD2misBkeSQZdsllOD0th3b2245yieqal9osZHlSlslI9c6EMpH0n+szSND7goyjgsik0Tb0xJU6kGggdcw9hl4x91rYDYNPs0hFES9HUxzfiAid6Y2rDUVBXoNg7K7pMR6/foIkl+gCg/1lqOS0FRlUVyAQGJEx6XphyX/SftgLaI7obaVnzjErrpLWY1ZRiD8VVZD40exf8FddGOXwPvxYHrrrPotlTDLONZMn4Fl46tJCTsoQfHCjco+sz7/nLMMnHx+l1D0eKBuGPVsKTtbWozhLCNuWEgcWb4kxJK5sd1g/GylD43g8hFW531Vbpk1J1rpf7Hurd/aTUjwSXmdxB2qXTT4HRG+Us6PnhMIuf/yxilTs4WNShY0zHhYgnQFSM3oCTL6XXG1dqdOwY2k6+k2wCQtpK45boVN5PpBrQuDuFdWb/jM5jH6L8ns0dMMlY3lHM459u7FEn8rum/xXdP/JvpFb+yct3Rgc54SOT5HuVUNAHzzmbWhY4RG4b3i21L2SlsVUwjKvu+PlN4MN5KPilvHe3yODXZu0Gp0ClzDNZQiKQU67H0uYr6eRccMDsHtMlPELqnjyQZ+OriydzB3qXidAkguKNmzPypz0LyTMnry7YpNRGyUw=" - OPENAI_API_KEY: "AgBzA0t5U4eXqjAIZ1z2zKWGSYKuPuWMe38gg9DyU5ELbvpWbkBuknl4B1+2PH9Cy1Ma0NGfRCW5p5iqX94ay5y16lWycExgw//ue67E0x5YxZw7Bmp65g5a8IGl1y2uSEEJU7DGGKOSGU7a0vjtLHqy9GfhuGMMF8bKy2Mfz1Q+46f9rtwTs25mk+8tGvL0HJqjgX38Xuu8lbZrab8ywiO66cIJo2B5ncx+kkQ46ApLwWgpsjK/AEbvoWdlCws2PM0Tn3CLV2vDkFSPLyoBOfNfHRcCJuVi8nhzPB2W4XnRqdMYy5/HhRqbU5Fcp4eFSqiMwtd8KdpymijrawcdTgQJX8luv7F5DOVukP1WAMT4a8s7vumwtEeFruobBH8ztrHpGD9rIFJQKCsZwzWEBIRicU2yQlb7L8EhUkCqkUa3yNui7nS4sxRnQx24QHMCdUAdgNB0PiU51RDVbY+r2Rbpj1i6htmp5a64bd+n3jow/D2DYxlMXVEpcfLnhPhYfpsZegCoIaBcOMyCg+p1PUKh9w5TUbByLHAXiwdMk+vS3qf49fCOwvsqq0gBeCeY+7lBPYc3iDR+S0V6rnVv3PzM3fD5ighLGm7+z5eHrKxQapflELAmm+t6usz9wHMRoAzQdu1iuYeaoq07fu/yN2pdIpZ4bYB1vFvpqGq1E/XLFaoVy9tT63vLjwL/URxhk4kUYejCXST3gemm6o2BPoj2tU00SKzttLuJbcaYsyGRyiH5xhcwcVIIMsau+gqG1ofMVp8YJBxIKD0JNyg+/bE+iORIjZeAoRexUfhZfiEyjmPj5bHJgtkMoiWrLnBSIbhjDrW5narzxXgWyjoelSH8x1ko0kVGtHHDCdWoTIHjMA16HiLqv3BqzeB5cXNeqY1afbZe8KH1rUlSJB4Tg2qz6+AEUQ==" - SUPABASE_JWT_SECRET: "AgCXWGuGOPbdUZsn1G+amfHxm1CZAmuiULAml7sDJ+SUXUBlBWOf/wb0Gf9vnjPrpS5QqeYUQDzVPIXRqs1BkL7m51zAYt4U5K1XGgF4VmUv5Jqm/99iLB/biuVBuGj32wuYzGNEfuPPz6sfg51AfPfuOCDE/bX9xD+M5E++wVQChulm0Lqab5GdBgZC2M90Cb57EjNbwkCnNhO1HY2etwMKJ5q4J6N8gW1nxdWemUFEtQuHRBwEhCA+XRVf4MHQPwixb0Kn7cA+D6OthxWaxsXgg0li/kY7tF4xed2XXkfhARFbATryExcnAXLOucWS1+NKjLSUCZdqeqR/+C6uKyAYQNj60WU9ikDG5LJrLgnB2dXVBDNFHWbVtWtHABdyIVENZlXCBYtIJUpDBVFVIZp/GOyR9mhwPil0qZOiLE6HXiRENyMcZxNk1E9BHQZHS6WKExsi7RP3kJVFcWknBvH8IydkoINRfGO+LNy+H8EK51ml60iq6pvNVRwcxfZBuNcdJQrWflsLbi2dT6u9tWM27COnV2UCWqJuslVhdEAdpeB/nErgnBcSWXl4vtApasxYw7l5QWTU2597TvMidqm9ardvFOiuj9SxRdLZ/H3x3rsn8yn3C22E8Ism4ciEA9wxjwL3pgWiSsRsIsTpI0++lHSSY7hZvsarwFWcgwzjZhufqjVTbRJiHGOeXijiAqj+b5haCkdYmJCFeJuph11GABtORqnVh2xkPfzB3iWpfshX+udtjr7vdJCcpQyRbq972I8sTqFJXQc5hXQYu8/JWApKnpYMFq7MtrCKGurYxLPx7pYaf1sA" - REDIS_PASSWORD: "AgBKMJoMuj4Aze7QZFm0mmR+7FJ/1Shc/fvFMc1yv1WcyT12ngDlSdmw6eW6PaAxnrzTRZbjGNxDVONS/8g86OvEEe+OiZjI7iaGxipGkxeKMzHPbHgQt97gKRT0wEQ8K6d67gD72YZDpVmYKMOWlMDIWl64404O1Xq4FJeBQQiB57MpP5VBX0Haxe+piYfyCcli/V9mZqLb8rzutl+IovCzd3z+rpJ2EC9kgCWjGzH0Kaylmrg86ZFFSQScTcv+UQ6/7y2WldVJPohMFEOFbxUXEThzkPxy7rryNNDrQ2M704a+/ixAqhQ9nJmaAfMNdFgp4T0oEQlsTPBEsXwCt3yzqbdAm+eAohe2X60d+trNsHdMGEzgWDFtTLEjCdKml9a7GJMJsZsf2Qb1AnvdwlLFWm9jm8X+x9YXrHvakso+zvRCB1uvVEB+77ys4y0flBXDheFOTsS7cnGfumexGV/0IrJPBujVJM1q6J1ilPGTYqWVpSznl4taCPvkGjFtsKj1JHlc1FMkyV9vmkHfMfC/YuYYzMpKcfMQlUh22gpth69ENhN3DNUUEH3m5Ea4hzG5lsiCJ9XFJyJ4RSqUU3U58zy18ONEzlX1qNb26oqTSe2j5+29JpTAOkmcRyMBH0WHhB1Us5vgYjN0WNKY4EKLO53kxJDJIKiquEb1mWAmy9yzft+LhroqpyhAUtTvh5MLVs1CCpUX2Q==" - DATABASE_URL: "AgBiuPoCatLyHm2T4JojAjXxjd59gDazf2eSPGFjtagTe/ue6crSW9oios4+kzDhSoK+t6CVqBKtRZRK2pzeKJ0xNsEQbCPU8xGrymUS2HsBuadSKz6opJzsrF7V8cFsiZWl8aoJqV1QR2pbRf/o6ws/g2PiXnbykDPwViamQlN+iZXzYA35h8QPYgXLkdWXzqII6cnpxdkgDQGFuZxkKTm6yqX4tKwCT5GcpNNV333IxX33ljZQDwBJENxAGs43wH8KOhSeVq5uGArJz04teagn6zAxVhP6ZnoK77FCCCHzgQ5eupigBxWnLXYSuC0652hcmCWnVTy+eJzGAWvCwdTk45xZ2fyvxj6uTc5DG9Pqk1U5SlLr9C9yvou9Qwd30M4q/Sj9t4WtH4wMIuCHRp5uaTzDHdW+XHIhflRIPJD4XTXvotsbawCgpulwowrtWXtiDZmUJ1IOw12tXnBROk62lglfeb4y0zCc1snpBQeAJd1GWrksZ/j+VRTl6wJFCPfnQot1g6qccBah4Uiz266o2aybcbZH6nIu/hCrRX8QSFrZQZODJoLGZH1XDjYEPX/LHVaCRsQiBiFuWZbYqcU4RhmOiM/KKTimBsl0lzlAMEz8ITL0sLJnjJleqdqPuDp0IAkAZCjHK9cshJIv5Kxp+m9TFRSSscCRSFeVCqROaxZsYKpfdb0JaHFWaZ/h8Is=" - SENTRY_DSN: "AgB9i02k9BgaIXF0p9Qyyeo0PRa9bd3UiPBWQ3V4Jn19Vy5XAzKfYvqP8t+vafN2ffY+wCk1FlhYzdIuFjh3oRvdKvtwGEBZk6nLFiUrw/GSum0ueR2OzEy+AwGFXA9FstD0KCMJvyehSv9xRm9kqLOC4Xb/5lOWwTNF3AKqkEMEeKrOWx4OLXG6MLdR7OicY45BCE5WvcV2PizDaN5w3J72eUxFP0HjXit/aW/gK32IJME0RxeuQZ5TnPKTNrooYPR0eWXd2PgYshFjQ2ARy/OsvOrD10y8tQ3M5qx/HNWLC/r0lEu2np+9iUIAE1ufSwjmNSyi4V8usdZWq7xnf3vuKlSgmveqKkLbwQUWj1BpLNIjUvyY+1Rk1rxup/WCgaw+xOZd6sR/qTIjILv5GuzpU0AiwEm7sgl2pmpFXq6n6QjNOfZoPBTL73f4bpXNJ3EyMYDbPxOtGDz91B+bDtOsMr1DNWQslKkk3EIilm/l0+NuLKxf/e2HwM3sB15mkQqVZBdbiVOr7B27cR9xAnr296KE/BU6E9dp/fl+IgcaonMpTsE61pCLHWxQXNBO5X078/zhmaXBQyEBNQ5SPDr9u3pHWrrLkBtXwldZvgmLMMVFMAzrVVkJB4lC9sZj0pXPhda0/BsA4xcGRELj/PizwSr+kb3lDumNMqzEap5ZjEGCBpeeIVSo19v+RoEDw0AFmyxfYx2+91HsgiEqjEUg+J6yDmjAoRpOD1wRZOnnpR8ufMiqdBteCG8B5SXkhgto1WtDyOMVlX2wbmBFVetv2nAbMIA/l4E/Yv8HXiJsTqAkeYc5Qak6/SMGnZTw7Q==" - SUPABASE_SERVICE_ROLE_KEY: "AgBKJDPEiTQUYLY0B/NKaAkxH7whrGuxQVtRdz9mEr/Bx06n1Yu1Zm4/oEQp3OvYerRvQWuv1k3//jf3eiya4ZW9+ZntfPdQWL9/tzq+/spevFtiEvuQ8uuUhtNOU4IGt27KTTlhCfeHKte8jtLQ/lwcrSrfPZ1T8Gy8PXdsAgakGUauEs2oHuX2XUaPE9UFF4HRAhmjPZ9e7u7Zfgcj8D+otjrwNVC5ZXFM7/ha0roeZHdpTvOcemKjxhiZA0FmdkXgOCPihNxlz0sKcupCEte6ocnSkpL3pBflBsa9+NLz7kLCUQPeOCExkMTndyqWk1kFci6j35cBP6PQlHfWPdo8OFCdG+3EfvEt5+4PQ08d7nXRZqowBiQdE2/e8qA/dZc8cJ7ecpza+9Qf/pNIl+9Ix0EFvmB6rpbO9w5Ptw2yMOAebVl7qV+A65GelvcPWROK5Vfftwx8KT2sn9ldVOYy+C7OafgOm8qaL7mEMePSwJy68MKpnMm/TceE7xxZ2sMSWEl9FMn4QXEawD4LQrJHKpum6XyUG2FlMkogHMikOEbJzz1ICAcHB6OWJXo3wU+fK8jkI4/UYioFSfF9MQXaC8bUGc4NT6T62KvjnrdkmOHG7HcN4UNQ7yBa/fP1pM7peYQdwAKr4Oxl4v3i96uKRdCuIimYiWpcxklkQhmSsMLKFMZGDDvv1BNtL6oxK4ZaEyWoorEyjkd2UrSpbP6cvyVMVWbTl1/BD350NRn6OYTpGIXwmAhqVWuuyt8kfLLU6Ot2MYcq/i16qvc3dA5XizLKHY95X8R+DlUCEzawF75Sx++eMPKU/o5rxhZNRjvffIcXtw1Hy/uqVCqilmSt33RqUsehOxQUqHBIW7L7sAik/L+hgTiE3MwN8XSfGncDB/bNweJh3ZSXsdwZD2bleEY1nWpsXVhcJDNcdW3YscJbsyTCGQcOb0zEQaxSmfLAd3rIa+SAZpFEOsD8A5kZjI4QpmqPkhNHeF8=" - ENCRYPTION_KEY: "AgAlH+nrWFAwm3DxUjlKTdjNeqJjs2ozS7VcIv7it9HmV7LYVntyWgaOVch0JJe6RKQ1U+xXD7Y0jSywk9iTPQe1R429q9uNk3Jnukd/U8UiD0WoFcvte7+ZhESFb5jyZqNEYHCYUDhQyi+Xkm2ha2PQG0hMFrLSabjok9YVO0lU6zroyJpPKs7WpoWaBlfOpqwCfDShKj50gpY5q/xgENkzDX83nKB+WX8BauGqw9GNFKcSZA4ZANHMLoJpqxhNwDqHJg0P9cUd59QfyrftNbr5xwpG+z0Qz/WehC4EuPj2eBn34GF+C02F7T7m6IqQd3x03gh5cyFUP37iQ/KY+CKif+slJMxC86pBVstGSvqAqX+43g/y2P3sQHTMKB+yXsnjkRPIeSAohqCntKDv4CfF1deVLLP5oVikFJOHAPdzVPDawex8hClzxmtVBa1loe44lEDnwHAQwZ+CGYhK6UxdnxEZWpu0om+SqWdiPor9rfY2U6ek6AymMjAci4pZAFgUNbv4saWQo8pXKyyhYfJ1jzwsnAl+tk72HnidVFOkoWkRiWDCiJV4ZwQNnJoKzq+8lE88GbFIc5aa+6a/+W092yWPgRoSwXy6gzDuWmHo6pfStVDxmS8c8e9pSBDyCFX6gN1Qqb1CIXRNcVq+vspwcLrYbs53i7lPUEpVatCIwPmOXvNqzr9C8zstUG5Znjt/p3KAEnRNnD7RmbKxLo6RUIHbn4hsicb74I8bjMHgVoqjAXT0pNCFN5JtPw==" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml deleted file mode 100644 index 17eb39cd41fc..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml +++ /dev/null @@ -1,129 +0,0 @@ -# prod values, overwrite base values as needed. - -image: - repository: us-east1-docker.pkg.dev/agpt-prod/agpt-backend-prod/agpt-backend-prod - pullPolicy: Always - tag: "latest" - -serviceAccount: - annotations: - iam.gke.io/gcp-service-account: "prod-agpt-server-sa@agpt-prod.iam.gserviceaccount.com" - name: "prod-agpt-server-sa" - -service: - type: ClusterIP - port: 8006 - pyroDaemonPort: 8004 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -serviceExecutor: - type: ClusterIP - port: 8002 - targetPort: 8002 - annotations: - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -serviceDBManager: - type: ClusterIP - port: 8005 - targetPort: 8005 - annotations: - beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-prod-agpt-backend-ip" - networking.gke.io/managed-certificates: "autogpt-server-cert" - networking.gke.io/v1beta1.FrontendConfig: "autogpt-server-frontend-config" - hosts: - - host: backend.agpt.co - paths: - - path: / - pathType: Prefix - backend: - service: - name: autogpt-server - port: 8006 - defaultBackend: - service: - name: autogpt-server - port: - number: 8006 - -resources: - requests: - cpu: 200m - memory: 256Mi - limits: - cpu: 2 - memory: 10Gi - -cors: - allowOrigin: "https://platform.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -livenessProbe: - httpGet: - path: /health - port: 8006 - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 -readinessProbe: - httpGet: - path: /health - port: 8006 - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - -domain: "backend.agpt.co" - -env: - APP_ENV: "prod" - PYRO_HOST: "0.0.0.0" - ENABLE_AUTH: "true" - REDIS_HOST: "redis-prod-master.redis-prod.svc.cluster.local" - REDIS_PORT: "6379" - NUM_GRAPH_WORKERS: 10 - NUM_NODE_WORKERS: 3 - ENABLE_CREDIT: "true" - BACKEND_CORS_ALLOW_ORIGINS: '["https://platform.agpt.co"]' - FRONTEND_BASE_URL: "https://platform.agpt.co/" - SUPABASE_URL: "https://bgwpwdsxblryihinutbx.supabase.co" - AGENTSERVER_HOST: "autogpt-server.prod-agpt.svc.cluster.local" - EXECUTIONMANAGER_HOST: "autogpt-server-executor.prod-agpt.svc.cluster.local" - DATABASEMANAGER_HOST: "autogpt-server-executor.prod-agpt.svc.cluster.local" - PYRO_CLIENT_COMM_TIMEOUT: 15 - PYRO_CLIENT_COMM_RETRY: 3 - -secrets: - REPLICATE_API_KEY: "AgCPCgcYb+tE8/k45Y7/my4G2jWPCuEMTXJIn1fG1q4x4ZJPFzb43m7Uqtwn23NkmUZ5Qvh8BXedrtHwxapuYzw/P6c7xK66xfLKRbTWtYk4twS3sxPb+pt1FXY4USEjj5yeIFduybkqhE2QfnGoyrbDZ4Bz3AIgnrRD0Ee5m9u5yNZTPmJqZZqg4MRdUBCxCWIJBkW6DCE9nCPAQeNPD6e+lZ1j+/LocT2HX/ZlcsPXCxbn6wkxoyLqA0vUKSG9azS6oLvn0/3Cb01ozG8S2OEAqWIImFqhKGMfGqL6jSZWln43cmQdMTzSzM+HiprA9JHjZqGK7wOV9HZvSR+58IXoJGPBEIM7jIg5KqPjpZY4KFZBp5OiiRRYu+nCbuD+KsY/7ogjPHjbi1rpR8TrtXdzWNmwsTTmjytB/KEqeUpLWOEPgArFPyrNTS5/nmREH7r9jNEhfIRdTlS3IVGGXp/VN8napbNND1GDyzowvF771neq7/zTmfCRCJ4J0gwPNKM5rzOuRW+caEf2qOFBKIldVa/J0PFg5bAgpGL6jhpXHj0Q/+j1s3FA/D2ZebZTPIpKe40It3sWsS/0Qjhbj1GMbL4yUWvGpBSUTk7kZazkaVND1LbhjC+4AolTQdIU4MgW0bkmDn5ZI4a9/dHyLS3lFeYNSQ6vnbz+Id7zB3O0D6/FH8nfAUGL8V+J3eFKMp+G67z+XYH6WGABaNicz41zFBDF5hRax+k/ZziPPlFY0kDc3cAB6pLc" - IDEOGRAM_API_KEY: "AgBTMZopEC5qALJvordVcdbUnwOEhLR5v6+7bTWg8GF2GSeNn2jKqM+o+wr2FjZJ0vtfyS+MjpOrr1xXrhdWLHg6HXyonjg67jS4BwxFrX60MbnkuoeYDX10O30JloAaMcq3a7OzLa/2r9RjqICO0fappaYHuysTcj6XD+wHsgQgZBSaqaomP7WR0YEIEiLVJaVFfQJaj1lqffIXxSQHE/oqafKqV3CeBPcD2jgwvErBMOBldTNDY2ehSmS54ebwLcXcLwf6JoQjXeit2Zry2ffnW5eNIIwYVl5GO4JT6rE2lB4B6jDs0z/y7toXdN5pGuVoYGDia8OKd7MuW3IlAWkhYLcoKla62/YzcC1JffMrqV++lWt4WFcuXWvL6UUNshwCdX/LQ9/tMt81cCQuin4mrVPxrEYALkin6HBaOWChCbhVS31lPWmFLM+vE+dvogY9Zp3PubxP5E3gsRLKn2LeAEXiGjBlf2H3IQ6/YI/WonsT1pKTHMkegHmvNz79XCFAJLnUIXlffznyTj+A+5VAVVl+i90mc2UtQLyEVuMbwK3lcoKB0IzNCs8OY/9DkuoROIikPOg79ZVmo+d1DzSl3y2tlR64Sw/pd5TL58+/MVbLFI35mKo1HKoxN+kUIDehFfZ8Sn8+8MkUsuAT7xfDvgYZpIxC2138XqTFJn2PhvdbQGB4l9dGIo+fjrddWuoEhAzZXJ8EmxTUaY+SRPKyWqKgf+w+qjdzRKqsE/zIo5Xj3LrnJh3VEC01waR1TdM+qIRTlpAO8m5oYHO8QB32GnabUbjPRDVIq2Vkp9qKpwgWtrBHTQ==" - GROQ_API_KEY: "AgCxjMuIUxeJYxvGFMMRV3vOeTs7eJbA+oHsjCi6dCVL4/rk9GBK+NSDuG87ltIk5iwXsx75arP8YLHjifC0Jn5lfzxy4KLmQSkgfXBw+X05nO1zNoSWCadVhZDKAu1YL/FTD874f2UsSRLMV9BkqW2YNjN+WXab+dDTkicNcNTV6q/HKn6vMLeQd5PDv0Nbtup7B3C6rfSnIiKC0YH0Bqvc5BPEmw+6PVK9nPpdJiL6IxPX84LsJ/T1vMRNxlkFgEAN+3CZyx5q3ycMEQjOsBQGWny1HDeGuYeeYxRbg8PWMT+mx5uDampxqf66ztT1+PxpBx/+pgReSvWot5zGI1uN20Fiqav/n8VYF9x0wvYfFaSSGWeosjJ195MZDjq0cjWsy14lhGPbA839aZm+E6EQ3hmFzQULM4iR1sGu1OP87GhE6HbJ3Os4Gmsbo3XqWEy2puWSqcnZbkZvely5MGU6HDQ0L09EDMTG1PmmI3VmRiPUmJGxe+GtHaCmtJINsBrrbvjIki3TLSGwbIITKh5OEy5Y9My9H7WWZnzX8Dppkpqti1eUxh/GdtIZvLBve2N9nw65NRcx0sNp2knsO7Yk2+J2I9IrEwE8eC/AeBt7ii1ukCf1CSPNDj42GtqWgrQ15X85i7XCudmi2n4QfVL9/ZGOIjt95m8Ge+/o1Q4ltZBJ0wNgQPHClr12s/2H02BkmoJfUBlVQsGSc7yDz+cwPHLGb+tpjdPwENkm8yizTgK9/SJYa8gNLxFlJRa5MqZyMuye2A1mBQ==" - REVID_API_KEY: "AgB2+w7euCOnPTTag2oZWnTDiuHZJGjpsIVzIhlXXL4HURNEesANasrjyaQo1Lw7Zi2QDEKF+0XnZduOs0q5kRED3CUD9QN2aDClblOXC1g5zfmsrRp2wpISdsvOmPuMbzmVgIGA8fxSASm8+tlGh8T+QvlmXVvfD6ZWAbLXEW/4Inrz8o9RyEIjoS/g6NynVYg4CaY4xdG6KZIUuR3VkiI8irH8mXKf5O4LKNC9qKTMF8/tYyyv1gS8GAiU9JcuWKUYpqHoNah293d+vTVXVwo6o0GoQ+huxh+90cS3D1FPhiWHABeLYS292brnshJY3AuoCAPZxyQK69EXZgjUFCc+m5n2juF27P38QcCxtgr66kMXwg582OikJ77nDg6QHafIGnqSkUG3O184UOAzUe/iOjjDNlpxQaZoRQXP37zPIZcingWUx4zvZVjbsQcKSqdiI5u6K8kDw7F8wfCJI+3Y6YH9k7cWE+6ZmK1U7hEh3YKmqI5I0e4WolljRv8PlsWLZdgN5u5M7NqtYjqEhdd2fJ9fJYedXeATRefUHtthhvLeSbg3wS0f90pldIej+da1ZPpnToBN/o2YUA03pbQmty0Ce4EVBbwEN9sSNJGC1hicquURQP0baLBTsXzVZRkTT8OckxRkCN8UysTdkMtIf10AdQ0QVe6lAxR0DjnBL/ysgpSF1ZyKBWm6l7rBEsIIWXjBJpeGo1arVQVtepk8q1nLLWVpykJIfRnPRTCE41/Z9c0=" - ANTHROPIC_API_KEY: "AgB+40jZoawJ6HaeyyLZvDp2ByF4EPy2Ce806D/lekwJVmxpYXgkQdLJyav6bt9c1g5eDShJqezx1T+jGV+ApQbhSwmO403nJdYO825Fd3XVJ5K0xfFNt8DOTC9r2egWFvJZL40s/Y24kpr2Mmsqp+Sk9DxMNdYG/Z4PnT8PLWgb3yIYGGPVjlWlHL82gn4/B1bVTk14/cGXX9eSr0ktKKmS2OGLMYUwLT3oYGy4bRq9bH91XwjjdW6vMluNBGYibpi2f4h3nYORaQn42OhzTqON3XUdvNmsw1ZH0raMAJq47SU0lC6Ar9MzwbtUWY3tF6BlTmyx3gPavjQCnXg5cRxmY8JklrynDoyN+SBludzaWDzdAjr4vGPpkOo56RBY+28tnNjmxgyttGIYfFa8DEsrrJJgZZxSUvRqwJc0TWIKRFP1aIHkQ5DclUilFtNfPMezxwcFqrsYTEvtDjsls/E8uTNUN99cVQ2x0PxDsLKr9xVKAKkzzOBEvKEAJy0t5RtRV9A6kc0b16YbjIkFphip4e7HJTWKRvavknw+MXjGXXQrz9+xp8LrjRcgCyZp3BqSo+gsX8KQJSnhiFfKvgt7RdVaUVUA+sn5fIQGPWA5IkbI4gS12BRFDw59+Doc5FbCGUip4jDL8I2bPuNKQZLmSMx93Nu/60WBRhKXYz+GNzLzvhk0IpEI3d2GeWvC61p/f5eKnsLKNLDrc3k8rFHiUmXXhB+oQXMRSUFqq4hen32VVPWRhzT8nefww5Tud21CBg5+87x6WHOnB/A4vw+VuKD3fdeo9tn4HlD3w2funOVu9yv+NaP+MTeHus2PBeab/OtKLH09ezxnhmA=" - OPENAI_API_KEY: "AgAjPjhje52qw5YSXjRAwoXU0WyDEIAHnz2CjFtSjkpbsvvXFPlPMlOd/y7/dvABoyZHB9Ukxjna6opqV/hK/vHR9ncp9i7cDYX3Rekj+mkA6arMdqdJ0eikAGqWYPieu8RcBn6pHFGmoC8ZZPgk6Eh3Wyi4OCaPfH/O1bTq/RBQU5VDFvYfaeDZmYIu6SkD88pI0lT12Dklk1apsHlS+g3/rpQwDXgemE/pdmcNnt1zS6Ifu4isN7yg1pg1Thja+UiQnEkIiZkvmD39LO8HrwOFt8guJctRZ5gnVxPmSEdJLN089/fj5VXxTO1kTprbh1KeG9RKYS5LEPNYpgcl9/o884qMc/r0/+Cy7gL5R1THrEPHurVg8JfssCq8k0SaEtCElQ2081Scc/0p/k4URpXrsxUKZ8XUTIvYS0y2mEJPAAqaHAkwthY8sizhOwqWWnt8dGbCPwfQ11TiNSMikKIim9Bwm4tKM9aEolROSkivbGqFQQYSkensyp2mTqx7iFYlGBa7Z7PFRBZgPzD2FojWc6o5tLui5Xgi67ukO5WeaBhO6eMd2CuIlXqu+5x3+ixIytp9Jpke4mZKwbjYai4j3iELbzEwbGkjsnDyWNYn+1KnPOogd6i5+YPn09FbQO2Qvg2t3yUP/ePeX+fdRYk7AnS/o6nllqj9GLas48JFUlEx+KSO4qwrflRqPUmfmD3wPDTYR2q6yJzdatLYzdRQxEctFhgvco63uhW1YH+1ei1YuxutYPkIOqUwbgfIC3XiW7Tr3R8Gd3TimJLQM1etR6dwrEaEm0jTCIKUoZ+65OIAeVtcXIwWtwRjjUOtR8k9B2UdFoJOgtfIFzlxwYj4xUJrzRkCLdFD1W362n2+O5n7QdXDjYXn9KmxVUEph2vloeS8IGrBjM/l743A3trFD4CZ9g==" - DATABASE_URL: "AgAfP8iiQGaA68dGVHQuHiKXldqhWungOlLEy6kg6nkKIY6LAwwUJbF59SrsbJ6Lvaq+40XiPSEV6ZjC1JpDyNQyPYzS6hUO9Ev82ViQ2H4Ba62jehBjXufVhabGurHe+F/WsyrXAEY496yX8I3/voy92bR+r0z66jRKHPwI+OXP2CyvdfIz6ziGwInkdfGdP0WRopvmSzbr/atUc1MGVBGuCvNguYWQ3WUwiF38EPObsoYpgV8fuD4trrFE2imHRs23AXMK/ntkqAjZwVWXfZNwaFECT9y1ue04rjDhuoFsL6lhvsK9Xf07mrTzBjdjJl0eCCTxsm0kZTTCwsPSq6H+6w8bjH33M1qeEnORwMuthFy4p0r3e+qlWbhHHwR6ku9wiwzCavDTd27EEfMKkD3zG7NrnbYA4zelHfG2q3/1/PZCeAOsa5jo0EuMTJr4p1Z6deKS4wevzOqJ/FcU1/5T24aKdxhVMnVrF9HKCLKHD+lJLJE8XgdZLFeded234nQfc9MGoBCD6FJvgfJCrjQh8QCSpm1aBKgu795Esff3ZqXJFiq7YCTQTOv/P6RXR5XA/LEqq1m5pcyBDzKixILE1SEbNdeXbYNhe7SbobKpQ9gq3f2ssCRNZGMgJtde6TQFx7J76IE4Eu9oqZefNQxHvh9lH2l0bROWy5NYKHfAejXnVGxIEVnoyRvyFB/HMOc=" - SUPABASE_JWT_SECRET: "AgAYMdZyP+UhxIdTx6qyRzq9xf1dT7S+DFEC8KSPEFydX9+hAdJVTpprOlgLnqSbfSDmbqcFnCH+aK/6rdRx3HI3v41FogyCNFFxTrfxq1Esk8VuaVh8XrO2xKPd4iGBPZaTrenKlgt89aGdjPJzgl+NlZ5+/BXd95P2uX39DDGr9GJdO14zBt69O+L+Yt7kdd3ZMBjWYibZAzf+YaNIx/M7jjzGLYvxtywMVTrR+6e6GkGQSt5CzBpgk1b6ugPVtFs7PqmMtUqXMQjlrW2u7WVZRWeXO93ukc/TtjO2XUY9JfrgibMf0H81NDDTAAQBNqaDk0LdXsPUo9QGnyeQZTsfAOaeM6lTxX9qCYjneN6pxe60U1BKLURpordRdBs3peAedNJ95GC75qcdSkZE2agjwJvXKs8yy2Ig5eiU/80W27IWPMSLWhMSSf4ixyfkNWM4EfWL45bXlVGvtYaeyqByb0QU1g+II3AukIyO1qOS572y0sGseEv/UlfU2NDBLFejeBZaz4s/20lSyLhP3v1Y9aTs8qWIGl67syFKZoCwPRxwip2v7wIDnlDYXtlxMpQUWDnSUX16zQiVALD3izeDYkd1RViBgdYT/G0tp6lBeV1vnF8tBEGWIl3GJFV0okUflAQ9NIrdC5+BlcQDD08Jn0oGjyje7KE/BfvB1lHT7K+h9rr8B/U8zBSaAe+KFjA8pcjHqXgi4Zx3ayTXdAddyFZd0YqONohEAvXB+BLLdYJVNNXjBFwY62XQ6ojD2ZYWz4m/Wo+/zG0Zm5s/v2VS8UT5qe2Wjs3oGHKIJc6Eo3hVwLefcb7V" - SENTRY_DSN: "AgA+X2HkF9b3+p13JS4vG7VY+8p7su6qJ7smoPKqYh44Vpb7J5Eu9ksPNQkcFTDDPT8jAylqsHWUdI0A8u20+a4lqqGkmPN5tCgyBgAL1pIyvPUQjYUbL7A5lTQKlRLJJ+05h5XbkRU7cWR+G4yDUCDj2HcThne0CNDUbDao9D67ekSLUtp6/d0KO45Efao4MLuqISnypPUBGHmAdWGr2z/w7ItXjvUKt3RpH6pSCrGzjlKPKhenKdTsk/NX4Z+ew/JBbHiDQjKCdj0UlXFWH7Q4axaFy0T8tsqf/UN7n/QTalYE+v28isxrHvoR6h7kZETQV/gl0y7DdmTCi8/A1j1+e/9zUx6HvK+C/qGMsKMdNgaaVNSdfFp/yfMgXTUn4HGAls4gjVKSSRaIAbBq32NdKkIvRfocuAGsxInwbrDXLR0nzbHG/U/QhlvfL2gfqKRIVRJtEh99VW/KMMeXZUWR9dNt9gfTMtyzL7eta4oEV+g7sdO/9VjDn5wtic2/7eAxgA7wTEoDA8m0whpHH4VcPLHUfKLTHnRXVu6bykAfBgfEKhJBS8DghvPyu73qL5MREuYkGya4n0RQ73h5ja7mYwI0lsefQszP9Fz1lR+757dhJ6+/E7nNnOE/ShD/8xE0V54pd2IvrRoJmcOsIOZ5w+xWfmN8OyLn7wuEpqEuMHEoisLF9RSp2V5iKbB+fFB4o5P1/VqkNPEFBe0jA4K8DAGX+VdChMpjAI47wF22aj+jmTRf+EY+5l+aEvjyU0G7oUPVzzG8rYa6p+v56zeVsmU4SHIDO75J1cH7tnYDeOxk9fAYZgNplS4gKHVT0w==" - SUPABASE_SERVICE_ROLE_KEY: "AgCADpjXfdpTDruyK2F4GRNT/Kl+yaI87mQdXDHQo3jOC3gWoOiRlXg70JG3jIi2cWjAXwU8ySjpT87aJdRwsMToeMD78zr0FbOSB2abx7OPTij8zWFSzhIo4cLoEkvLxZO9HXwQc959Cxh5oBcn6WBhJ5XMUxNWALIem9+Lb5Eu1CwxSF0EDrl3znx3Iqw/zUqnAgS+Ob4AAiJwXNO641ja7dAKYkb2NJ/KCBgmSXAaPfxQByuNkGP4iwmQuxhhJQ/N+LRVCu03J6NLPVw22feKKtZxAAroMDn5wPhRdmzBawqbRsejiCb0JNL2yd574CDN5xzsDur/RYkCpTrMWzgnN3F1VcYMuB9FwYazKU3XqviOYtP8Ca4sUQChHQEOFP8n3Nt0Z17zo1NtgRt8IBpXpDeZFgDZU6Zy8EtpHHn05KT8YqyLDms2LfJhduiuyndbZgeIfr7IcxbU4aBafh+J/tfN7Tlj5NFYxFImKQ0NFg5z6W9zKKkfFMo9WUcOOXgwg8+g6xeZUX9g3rNpMBNf2bt0UfNqSIBeAmUZVKHuEqneFONbgtqOP2NKsKsSfvCsnpKgAndv+eL627qWAuDzywWuoAcxsF/Kvo/fQnv1a+7abCr1Qhf61u3DBriGp6TAVhQ9z7iGqvkuviELt97NKekeevCgdjwWpk78iKBCmxJobBTErdX2Xhrqfc5AHteoUBYv3TS7N8ZcOmfVmZc2ulgLLQZZ5hK30w9FFu28bu01ArfKcSp3U21keaC/cGHBNdUWgAbg3wIH+3y3vU2MRHI6T6sFrRsNgJH6b8S+HcOInTsoaLFiRv7SYxGYliV47AEukv4G2G+9XO4i4y9P90u5i7KM+J5FRlR6sfiISPozGHUBe9EAKYQcqaSSGP7FWsyNl6DGq/pDkG8IJYqNr21Sl9N1cdhK/Hdd4J80q05A9f3AyzHjtU4YVcvz4TCKr1FJLugBUsz120cA8FxGXweIQRWCzGvSeGA=" - REDIS_PASSWORD: "AgB7eiUuFQO88vVMI28xfmJsA2QzEb71r3NyDJ/KTNsjqn7ai1KpjVaaTDyr4Xzo1wOhwwwxlhIoeBwf26wPiraJtkjRU9z9Aotvy0u8SXFm05ObhMjJoY2dBvW6ga3KNaunWoTx5e6NbYPGRIgNtRBVN4PH5Lf7Ou5SZBjJBaVWgIT1x71tB2eD2XksOw2mrfaF0WODsQxXDOaF9BJ4Gn7yIT0Nh76Okn9uhesQxvojaqlAIeAKXyrZJwAH5qL3D772rYsISmbHC0bCBgx4dbbtvsr4YgiR387ri7KGfrEqoFH/jzUp5cwsJNyBpWG1n2O0QXYgbMIsmJP6rdD+KTZkLGBz0wgq/JySCZM9hj54dYtLE7LMmpZn7//EKZk7zsV1u9oSciQisWcJqW8El+IMOAZilqSR2NjpI4cb0xR7/gTLLQF33+wnZwbbHghbDwTowkzOZ0i7qt73YkR8MKrlLhLcCGHjhyb50xr1DJl9mVUoyHXvFOj2tQO/273sMNdKpJvNFi9EEhdirzbcuphnaRm5xXYF1CHKtXUp6EvdxgHqEuoGwh5Kt8dtGMJfSJ40LsARZXCFU7CC6g/faPq93K5QB/bwlOdABeOVF/odqXZQAADX3TQwIPMH36XuqwNggWQ8Igy5o1d3Hi84jVChmjid/Wk8DREmkntzDy+4Jxzqx1rPSThyoOvopirY8VA=" - ENCRYPTION_KEY: "AgCmQ6fVBbbkm884bZyenUPhrbVBb3+sjOFwekFeeptorwVNDTqfOXtoWzl+W+t13tCqHDn8EqEgOGUPSJutAxfiyKcPo9IFDaMskUzaTGUSx/XUmQzHrI9tKP6doSk8V1Vmwm5PRk1elpMP90aG+TtjG1BLFU8JIozEFEvqcmdB9apnXacBV26vP2Gk709DqAYaCkGpXGfoCKDWNjrF/68W8a6UOaRC/+qHuoWXwi03rY16RdPIRRryHICrpp+l6zJToZFHboSV3UpENjJ4tWUW2Qd8pzE5+ZGiZaHcmqp0WtyBmN8d+7m1q2t5RjJ7DTuVmr+XgS5Eb28aHshZK4gdzlqEsYZSMSwxzTgKrDIPCxPqz+TDPA31fQyR1FfwNxgHztXGluUGPAVxtYVij/CGAkQpISHIjR4FR776lMFkddBaVQfbIyXQhnhEeaV9Swxr1EXG9/Nj6q3n13WmCsMVUZYTk147UCeaTdV6Ec4DRDoTVk4uVgGNsjgRS0wLdnW6naPKndOEz8XpjRtnPz1xNeyLW8SF9DAAoOV+zOrfzbzFaFfXozcExFs2OIDa+D9z57j0wi1Nh8qUoFIFVSjIJ5rOztDlDEd/15P5Zvfm5t/GIJNsIUoCEepirqEnQMqs4/J2ZkhL77qPk4QuvY6AMAvx8pOIh/4Z0Fwf2vJtKhN1lNvq9i7NFoiuiaWSzH/LWcsX8U2ibZ+Do5OspJuFIsP6E1v1Mm9hQdmbEp4XRpb4eBvy2L1a5K9vVw==" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-server/values.yaml b/autogpt_platform/infra/helm/autogpt-server/values.yaml deleted file mode 100644 index ad25c9b86fe9..000000000000 --- a/autogpt_platform/infra/helm/autogpt-server/values.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# base values, environment specific variables should be specified/overwritten in environment values - -replicaCount: 1 - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-server-dev/agpt-server-dev - pullPolicy: IfNotPresent - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - create: true - automount: true - annotations: {} - name: "" - -podAnnotations: {} -podLabels: {} - -podSecurityContext: {} - -securityContext: {} - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 1 - memory: 1Gi - - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetMemoryUtilizationPercentage: 80 - -volumes: [] - -volumeMounts: [] - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -domain: "" - -cors: - allowOrigins: - - "https://dev-builder.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/.helmignore b/autogpt_platform/infra/helm/autogpt-websocket-server/.helmignore deleted file mode 100644 index 0e8a0eb36f4c..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/Chart.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/Chart.yaml deleted file mode 100644 index 5cd0a08299fd..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: autogpt-websocket-server -description: A Helm chart for Websocket Server - -type: application - - -version: 0.1.0 - -appVersion: "1.0.0" diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/NOTES.txt b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/NOTES.txt deleted file mode 100644 index 6d5ac4546ea6..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "autogpt-websocket-server.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "autogpt-websocket-server.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "autogpt-websocket-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "autogpt-websocket-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/_helpers.tpl b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/_helpers.tpl deleted file mode 100644 index d8d90c91155f..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "autogpt-websocket-server.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "autogpt-websocket-server.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "autogpt-websocket-server.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "autogpt-websocket-server.labels" -}} -helm.sh/chart: {{ include "autogpt-websocket-server.chart" . }} -{{ include "autogpt-websocket-server.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "autogpt-websocket-server.selectorLabels" -}} -app.kubernetes.io/name: {{ include "autogpt-websocket-server.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "autogpt-websocket-server.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "autogpt-websocket-server.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/backendconfig.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/backendconfig.yaml deleted file mode 100644 index cfc16c820d8a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/backendconfig.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: cloud.google.com/v1 -kind: BackendConfig -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }}-backend-config -spec: - customRequestHeaders: - headers: - - "Access-Control-Allow-Origin:{{ .Values.cors.allowOrigin }}" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - customResponseHeaders: - headers: - - "Access-Control-Allow-Origin:https://dev-builder.agpt.co" - - "Access-Control-Allow-Methods:{{ .Values.cors.allowMethods | join "," }}" - - "Access-Control-Allow-Headers:{{ .Values.cors.allowHeaders | join "," }}" - - "Access-Control-Max-Age:{{ .Values.cors.maxAge }}" - {{- if .Values.cors.allowCredentials }} - - "Access-Control-Allow-Credentials:true" - {{- end }} - timeoutSec: 1800 - connectionDraining: - drainingTimeoutSec: 1800 \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/configmap.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/configmap.yaml deleted file mode 100644 index ba9f7c8ffd92..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }}-config - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} -data: - {{- range $key, $value := .Values.env }} - {{ $key }}: {{ $value | quote }} - {{- end }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/deployment.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/deployment.yaml deleted file mode 100644 index 975122d65d18..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "autogpt-websocket-server.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "autogpt-websocket-server.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - envFrom: - - configMapRef: - name: {{ include "autogpt-websocket-server.fullname" . }}-config - - secretRef: - name: {{ include "autogpt-websocket-server.fullname" . }}-secrets - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["poetry", "run", "ws"] - ports: - - name: ws - containerPort: {{ .Values.service.port }} - protocol: TCP - {{- if .Values.livenessProbe.enabled }} - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - {{- end }} - {{- if .Values.readinessProbe.enabled }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - {{- end }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/frontendconfig.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/frontendconfig.yaml deleted file mode 100644 index bfb91591d76e..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/frontendconfig.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: networking.gke.io/v1beta1 -kind: FrontendConfig -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }}-frontend-config -spec: - timeoutSec: 1800 diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/hpa.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/hpa.yaml deleted file mode 100644 index d0887512edc7..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "autogpt-websocket-server.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/ingress.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/ingress.yaml deleted file mode 100644 index c9f200d4c0df..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "autogpt-websocket-server.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/managedcert.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/managedcert.yaml deleted file mode 100644 index b7f47a86b95d..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/managedcert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: networking.gke.io/v1 -kind: ManagedCertificate -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }}-cert -spec: - domains: - - {{ .Values.domain }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/sealed-secrets.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/sealed-secrets.yaml deleted file mode 100644 index cd15fae49f8d..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/sealed-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }}-secrets - namespace: {{ .Release.Namespace }} - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" -spec: - encryptedData: - {{- range $key, $value := .Values.secrets }} - {{ $key }}: {{ $value }} - {{- end }} - template: - metadata: - name: {{ .Release.Name }}-secrets - namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/service.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/service.yaml deleted file mode 100644 index d30a6d0bfc5c..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "autogpt-websocket-server.fullname" . }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: 8001 - protocol: TCP - name: ws - selector: - {{- include "autogpt-websocket-server.selectorLabels" . | nindent 4 }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/serviceaccount.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/serviceaccount.yaml deleted file mode 100644 index 0dd5795cb5ee..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "autogpt-websocket-server.serviceAccountName" . }} - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/tests/test-connection.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/templates/tests/test-connection.yaml deleted file mode 100644 index bd88e90113a5..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "autogpt-websocket-server.fullname" . }}-test-connection" - labels: - {{- include "autogpt-websocket-server.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "autogpt-websocket-server.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml deleted file mode 100644 index dd26b32f4030..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml +++ /dev/null @@ -1,82 +0,0 @@ -replicaCount: 1 # not scaling websocket server for now - -image: - repository: us-east1-docker.pkg.dev/agpt-dev/agpt-backend-dev/agpt-backend-dev - tag: latest - pullPolicy: Always - -service: - type: ClusterIP - port: 8001 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-websocket-server-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-dev-agpt-ws-server-ip" - networking.gke.io/managed-certificates: "autogpt-websocket-server-cert" - hosts: - - host: dev-ws-server.agpt.co - paths: - - path: /ws - pathType: Prefix - backend: - service: - name: autogpt-websocket-server - port: 8001 - defaultBackend: - service: - name: autogpt-websocket-server - port: - number: 8001 - -domain: "dev-ws-server.agpt.co" - -resources: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 100m - memory: 128Mi - -autoscaling: - enabled: false - -cors: - allowOrigins: "https://dev-builder.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -readinessProbe: - httpGet: - path: / - port: 8001 - initialDelaySeconds: 10 - periodSeconds: 5 -livenessProbe: - httpGet: - path: / - port: 8001 - initialDelaySeconds: 15 - periodSeconds: 10 - -env: - REDIS_HOST: "redis-dev-master.redis-dev.svc.cluster.local" - REDIS_PORT: "6379" - -secrets: - REDIS_PASSWORD: "AgBKMJoMuj4Aze7QZFm0mmR+7FJ/1Shc/fvFMc1yv1WcyT12ngDlSdmw6eW6PaAxnrzTRZbjGNxDVONS/8g86OvEEe+OiZjI7iaGxipGkxeKMzHPbHgQt97gKRT0wEQ8K6d67gD72YZDpVmYKMOWlMDIWl64404O1Xq4FJeBQQiB57MpP5VBX0Haxe+piYfyCcli/V9mZqLb8rzutl+IovCzd3z+rpJ2EC9kgCWjGzH0Kaylmrg86ZFFSQScTcv+UQ6/7y2WldVJPohMFEOFbxUXEThzkPxy7rryNNDrQ2M704a+/ixAqhQ9nJmaAfMNdFgp4T0oEQlsTPBEsXwCt3yzqbdAm+eAohe2X60d+trNsHdMGEzgWDFtTLEjCdKml9a7GJMJsZsf2Qb1AnvdwlLFWm9jm8X+x9YXrHvakso+zvRCB1uvVEB+77ys4y0flBXDheFOTsS7cnGfumexGV/0IrJPBujVJM1q6J1ilPGTYqWVpSznl4taCPvkGjFtsKj1JHlc1FMkyV9vmkHfMfC/YuYYzMpKcfMQlUh22gpth69ENhN3DNUUEH3m5Ea4hzG5lsiCJ9XFJyJ4RSqUU3U58zy18ONEzlX1qNb26oqTSe2j5+29JpTAOkmcRyMBH0WHhB1Us5vgYjN0WNKY4EKLO53kxJDJIKiquEb1mWAmy9yzft+LhroqpyhAUtTvh5MLVs1CCpUX2Q==" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/values.prod.yaml deleted file mode 100644 index f80ffe4c150a..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/values.prod.yaml +++ /dev/null @@ -1,84 +0,0 @@ -replicaCount: 1 # not scaling websocket server for now - -image: - repository: us-east1-docker.pkg.dev/agpt-prod/agpt-backend-prod/agpt-backend-prod - tag: latest - pullPolicy: Always - -service: - type: ClusterIP - port: 8001 - annotations: - cloud.google.com/neg: '{"ingress": true}' - beta.cloud.google.com/backend-config: '{"default": "autogpt-websocket-server-backend-config"}' - -ingress: - enabled: true - className: "gce" - annotations: - kubernetes.io/ingress.class: gce - kubernetes.io/ingress.global-static-ip-name: "agpt-prod-agpt-ws-backend-ip" - networking.gke.io/managed-certificates: "autogpt-websocket-server-cert" - hosts: - - host: ws-backend.agpt.co - paths: - - path: /ws - pathType: Prefix - backend: - service: - name: autogpt-websocket-server - port: 8001 - defaultBackend: - service: - name: autogpt-websocket-server - port: - number: 8001 - -domain: "ws-backend.agpt.co" - -resources: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 100m - memory: 128Mi - -autoscaling: - enabled: false - -cors: - allowOrigins: "https://platform.agpt.co" - allowMethods: - - "GET" - - "POST" - - "PUT" - - "DELETE" - - "OPTIONS" - allowHeaders: - - "Content-Type" - - "Authorization" - maxAge: 3600 - allowCredentials: true - -readinessProbe: - httpGet: - path: / - port: 8001 - initialDelaySeconds: 10 - periodSeconds: 5 -livenessProbe: - httpGet: - path: / - port: 8001 - initialDelaySeconds: 15 - periodSeconds: 10 - -env: - REDIS_HOST: "redis-prod-master.redis-prod.svc.cluster.local" - REDIS_PORT: "6379" - BACKEND_CORS_ALLOW_ORIGINS: '["https://platform.agpt.co"]' - -secrets: - REDIS_PASSWORD: "AgBl/a138QK7k/GzlkjQHIElN+1GK4ao/kw9AgT7iRC48qlWu2xZQlJiC07r3y8MCaY8CljKpggBYN3CmtzYMoIer/FgKNK0pA7vKGSEMIajRJPKZmxMw9NcfXeLPDNz/9Irw3+7DYMWrATXGTsfuvsurVuxWZQQOSrjhzqmd0PyHsLlzflZXZrTncMOailMIBWggtPUoSFm3ytGHFCEp903XEwtoHzVc+LcV4ZOZ8x6GXx9RXwGzlMI3zy8/w9dw1YpeIR8w9yFMp5OnQjsxPP7leiyInD7HNlT/Edi0zWb+WeoVo4rNQt6spURK46FPJVeFyZX3AerM5oQx0ngAH3s55LktMCwFjEY9PtutudrKeXVk23gQ9C2U+7S3c1ebjOlY3f6sovosaXZDf5wbxxjdCAwfHLSqBlI+lTTnrOK9sijMdk1wdpmmap2cXy3QbQa9r0xzCzFHpwGBrtQhFVUyxQL9TENACXU/jBL7hv57MyUUGKfzYdVPMEy6FagBX5UapZxSyKwSR3Cm8Bo16v+y+I/j2zSoFheUQYLsi3JDjtaEDkZ6RLF1H/tecQ5HWtp6kb4YlC7WZhxR0xcKFoi7Bp5bUKSyDRzbkgVhK5LeRG6BhfvJguRSOevGYslB53GqBt/yH27gMW4QCrwGPeLfO2b3f2QVkmLbAghoHSCw/s79O1BMxGNac7Slo1YhJo=" - SUPABASE_JWT_SECRET: "AgAYMdZyP+UhxIdTx6qyRzq9xf1dT7S+DFEC8KSPEFydX9+hAdJVTpprOlgLnqSbfSDmbqcFnCH+aK/6rdRx3HI3v41FogyCNFFxTrfxq1Esk8VuaVh8XrO2xKPd4iGBPZaTrenKlgt89aGdjPJzgl+NlZ5+/BXd95P2uX39DDGr9GJdO14zBt69O+L+Yt7kdd3ZMBjWYibZAzf+YaNIx/M7jjzGLYvxtywMVTrR+6e6GkGQSt5CzBpgk1b6ugPVtFs7PqmMtUqXMQjlrW2u7WVZRWeXO93ukc/TtjO2XUY9JfrgibMf0H81NDDTAAQBNqaDk0LdXsPUo9QGnyeQZTsfAOaeM6lTxX9qCYjneN6pxe60U1BKLURpordRdBs3peAedNJ95GC75qcdSkZE2agjwJvXKs8yy2Ig5eiU/80W27IWPMSLWhMSSf4ixyfkNWM4EfWL45bXlVGvtYaeyqByb0QU1g+II3AukIyO1qOS572y0sGseEv/UlfU2NDBLFejeBZaz4s/20lSyLhP3v1Y9aTs8qWIGl67syFKZoCwPRxwip2v7wIDnlDYXtlxMpQUWDnSUX16zQiVALD3izeDYkd1RViBgdYT/G0tp6lBeV1vnF8tBEGWIl3GJFV0okUflAQ9NIrdC5+BlcQDD08Jn0oGjyje7KE/BfvB1lHT7K+h9rr8B/U8zBSaAe+KFjA8pcjHqXgi4Zx3ayTXdAddyFZd0YqONohEAvXB+BLLdYJVNNXjBFwY62XQ6ojD2ZYWz4m/Wo+/zG0Zm5s/v2VS8UT5qe2Wjs3oGHKIJc6Eo3hVwLefcb7V" \ No newline at end of file diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/values.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/values.yaml deleted file mode 100644 index f4a9a8943769..000000000000 --- a/autogpt_platform/infra/helm/autogpt-websocket-server/values.yaml +++ /dev/null @@ -1,98 +0,0 @@ -# Default values for autogpt-websocket-server. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Automatically mount a ServiceAccount's API credentials? - automount: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} -podLabels: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -# Additional volumes on the output Deployment definition. -volumes: [] -# - name: foo -# secret: -# secretName: mysecret -# optional: false - -# Additional volumeMounts on the output Deployment definition. -volumeMounts: [] -# - name: foo -# mountPath: "/etc/foo" -# readOnly: true - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/autogpt_platform/infra/helm/redis-values.dev.yaml b/autogpt_platform/infra/helm/redis-values.dev.yaml deleted file mode 100644 index d2817564cf80..000000000000 --- a/autogpt_platform/infra/helm/redis-values.dev.yaml +++ /dev/null @@ -1,15 +0,0 @@ -architecture: standalone -auth: - enabled: true - password: password -master: - persistence: - enabled: true - size: 3Gi - configmap: - redis.conf: | - bind 127.0.0.1 - protected-mode yes - requirepass password -replica: - replicaCount: 0 \ No newline at end of file diff --git a/autogpt_platform/infra/helm/redis-values.prod.yaml b/autogpt_platform/infra/helm/redis-values.prod.yaml deleted file mode 100644 index ea5914477505..000000000000 --- a/autogpt_platform/infra/helm/redis-values.prod.yaml +++ /dev/null @@ -1,15 +0,0 @@ -architecture: standalone -auth: - enabled: true - password: "" #empty on purpose -master: - persistence: - enabled: true - size: 3Gi - configmap: - redis.conf: | - bind 127.0.0.1 - protected-mode yes - requirepass password -replica: - replicaCount: 0 \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/.gitignore b/autogpt_platform/infra/terraform/.gitignore deleted file mode 100644 index ad9439c82b2a..000000000000 --- a/autogpt_platform/infra/terraform/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tfstate -*.tfstate.backup -tfplan -.terraform/ \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/.terraform.lock.hcl b/autogpt_platform/infra/terraform/.terraform.lock.hcl deleted file mode 100644 index 5e14d96b4bee..000000000000 --- a/autogpt_platform/infra/terraform/.terraform.lock.hcl +++ /dev/null @@ -1,22 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "4.85.0" - constraints = "~> 4.0" - hashes = [ - "h1:ZVDZuhYSIWhCkSuDkwFeSIJjn0/DcCxak2W/cHW4OQQ=", - "zh:17d60a6a6c1741cf1e09ac6731433a30950285eac88236e623ab4cbf23832ca3", - "zh:1c70254c016439dbb75cab646b4beace6ceeff117c75d81f2cc27d41c312f752", - "zh:35e2aa2cc7ac84ce55e05bb4de7b461b169d3582e56d3262e249ff09d64fe008", - "zh:417afb08d7b2744429f6b76806f4134d62b0354acf98e8a6c00de3c24f2bb6ad", - "zh:622165d09d21d9a922c86f1fc7177a400507f2a8c4a4513114407ae04da2dd29", - "zh:7cdb8e39a8ea0939558d87d2cb6caceded9e21f21003d9e9f9ce648d5db0bc3a", - "zh:851e737dc551d6004a860a8907fda65118fc2c7ede9fa828f7be704a2a39e68f", - "zh:a331ad289a02a2c4473572a573dc389be0a604cdd9e03dd8dbc10297fb14f14d", - "zh:b67fd531251380decd8dd1f849460d60f329f89df3d15f5815849a1dd001f430", - "zh:be8785957acca4f97aa3e800b313b57d1fca07788761c8867c9bc701fbe0bdb5", - "zh:cb6579a259fe020e1f88217d8f6937b2d5ace15b6406370977a1966eb31b1ca5", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} diff --git a/autogpt_platform/infra/terraform/environments/dev.tfvars b/autogpt_platform/infra/terraform/environments/dev.tfvars deleted file mode 100644 index c193e8399a9a..000000000000 --- a/autogpt_platform/infra/terraform/environments/dev.tfvars +++ /dev/null @@ -1,146 +0,0 @@ -project_id = "agpt-dev" -region = "us-central1" -zone = "us-central1-a" -network_name = "dev-gke-network" -subnet_name = "dev-gke-subnet" -subnet_cidr = "10.0.0.0/24" -cluster_name = "dev-gke-cluster" -node_count = 3 -node_pool_name = "dev-main-pool" -machine_type = "e2-highmem-4" -disk_size_gb = 100 -static_ip_names = ["agpt-server-ip", "agpt-builder-ip", "agpt-ws-server-ip", "agpt-market-ip"] - - -service_accounts = { - "dev-agpt-server-sa" = { - display_name = "AutoGPT Dev Server Account" - description = "Service account for agpt dev server" - }, - "dev-agpt-builder-sa" = { - display_name = "AutoGPT Dev Builder Account" - description = "Service account for agpt dev builder" - }, - "dev-agpt-ws-server-sa" = { - display_name = "AutoGPT Dev WebSocket Server Account" - description = "Service account for agpt dev websocket server" - }, - "dev-agpt-market-sa" = { - display_name = "AutoGPT Dev Market Server Account" - description = "Service account for agpt dev market server" - }, - "dev-github-actions-sa" = { - display_name = "GitHub Actions Dev Service Account" - description = "Service account for GitHub Actions deployments to dev" - } -} - -workload_identity_bindings = { - "dev-agpt-server-workload-identity" = { - service_account_name = "dev-agpt-server-sa" - namespace = "dev-agpt" - ksa_name = "dev-agpt-server-sa" - }, - "dev-agpt-builder-workload-identity" = { - service_account_name = "dev-agpt-builder-sa" - namespace = "dev-agpt" - ksa_name = "dev-agpt-builder-sa" - }, - "dev-agpt-ws-server-workload-identity" = { - service_account_name = "dev-agpt-ws-server-sa" - namespace = "dev-agpt" - ksa_name = "dev-agpt-ws-server-sa" - }, - "dev-agpt-market-workload-identity" = { - service_account_name = "dev-agpt-market-sa" - namespace = "dev-agpt" - ksa_name = "dev-agpt-market-sa" - }, - "dev-github-actions-workload-identity" = { - service_account_name = "dev-github-actions-sa" - namespace = "dev-agpt" - ksa_name = "dev-github-actions-sa" - } -} - -role_bindings = { - "roles/container.developer" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/cloudsql.client" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/cloudsql.editor" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/cloudsql.instanceUser" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/iam.workloadIdentityUser" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com" - ] - "roles/compute.networkUser" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/container.hostServiceAgentUser" = [ - "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com", - "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/artifactregistry.writer" = [ - "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/container.viewer" = [ - "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com" - ], - "roles/iam.serviceAccountTokenCreator" = [ - "principalSet://iam.googleapis.com/projects/638488734936/locations/global/workloadIdentityPools/dev-pool/*", - "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com" - ] -} - -pods_ip_cidr_range = "10.1.0.0/16" -services_ip_cidr_range = "10.2.0.0/20" - -public_bucket_names = ["website-artifacts"] -standard_bucket_names = [] -bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"] - -workload_identity_pools = { - "dev-pool" = { - display_name = "Development Identity Pool" - providers = { - "github" = { - issuer_uri = "https://token.actions.githubusercontent.com" - attribute_mapping = { - "google.subject" = "assertion.sub" - "attribute.repository" = "assertion.repository" - "attribute.repository_owner" = "assertion.repository_owner" - } - } - } - service_accounts = { - "dev-github-actions-sa" = [ - "Significant-Gravitas/AutoGPT" - ] - } - } -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/environments/prod.tfvars b/autogpt_platform/infra/terraform/environments/prod.tfvars deleted file mode 100644 index e75b5b3d45ce..000000000000 --- a/autogpt_platform/infra/terraform/environments/prod.tfvars +++ /dev/null @@ -1,141 +0,0 @@ -project_id = "agpt-prod" -region = "us-central1" -zone = "us-central1-a" -network_name = "prod-gke-network" -subnet_name = "prod-gke-subnet" -subnet_cidr = "10.0.0.0/24" -cluster_name = "prod-gke-cluster" -node_count = 4 -node_pool_name = "prod-main-pool" -machine_type = "e2-highmem-4" -disk_size_gb = 100 -static_ip_names = ["agpt-backend-ip", "agpt-frontend-ip", "agpt-ws-backend-ip", "agpt-market-ip"] - - -service_accounts = { - "prod-agpt-backend-sa" = { - display_name = "AutoGPT prod backend Account" - description = "Service account for agpt prod backend" - }, - "prod-agpt-frontend-sa" = { - display_name = "AutoGPT prod frontend Account" - description = "Service account for agpt prod frontend" - }, - "prod-agpt-ws-backend-sa" = { - display_name = "AutoGPT prod WebSocket backend Account" - description = "Service account for agpt prod websocket backend" - }, - "prod-agpt-market-sa" = { - display_name = "AutoGPT prod Market backend Account" - description = "Service account for agpt prod market backend" - }, - "prod-github-actions-sa" = { - display_name = "GitHub Actions Prod Service Account" - description = "Service account for GitHub Actions deployments to prod" - } -} - -workload_identity_bindings = { - "prod-agpt-backend-workload-identity" = { - service_account_name = "prod-agpt-backend-sa" - namespace = "prod-agpt" - ksa_name = "prod-agpt-backend-sa" - }, - "prod-agpt-frontend-workload-identity" = { - service_account_name = "prod-agpt-frontend-sa" - namespace = "prod-agpt" - ksa_name = "prod-agpt-frontend-sa" - }, - "prod-agpt-ws-backend-workload-identity" = { - service_account_name = "prod-agpt-ws-backend-sa" - namespace = "prod-agpt" - ksa_name = "prod-agpt-ws-backend-sa" - }, - "prod-agpt-market-workload-identity" = { - service_account_name = "prod-agpt-market-sa" - namespace = "prod-agpt" - ksa_name = "prod-agpt-market-sa" - } -} - -role_bindings = { - "roles/container.developer" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/cloudsql.client" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/cloudsql.editor" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/cloudsql.instanceUser" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/iam.workloadIdentityUser" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com" - ] - "roles/compute.networkUser" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/container.hostServiceAgentUser" = [ - "serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com", - "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/artifactregistry.writer" = [ - "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/container.viewer" = [ - "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com" - ], - "roles/iam.serviceAccountTokenCreator" = [ - "principalSet://iam.googleapis.com/projects/1021527134101/locations/global/workloadIdentityPools/prod-pool/*", - "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com" - ] -} - -pods_ip_cidr_range = "10.1.0.0/16" -services_ip_cidr_range = "10.2.0.0/20" - -public_bucket_names = ["website-artifacts"] -standard_bucket_names = [] -bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"] - -workload_identity_pools = { - "prod-pool" = { - display_name = "Production Identity Pool" - providers = { - "github" = { - issuer_uri = "https://token.actions.githubusercontent.com" - attribute_mapping = { - "google.subject" = "assertion.sub" - "attribute.repository" = "assertion.repository" - "attribute.repository_owner" = "assertion.repository_owner" - } - } - } - service_accounts = { - "prod-github-actions-sa" = [ - "Significant-Gravitas/AutoGPT" - ] - } - } -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/main.tf b/autogpt_platform/infra/terraform/main.tf deleted file mode 100644 index 047ebd59c661..000000000000 --- a/autogpt_platform/infra/terraform/main.tf +++ /dev/null @@ -1,75 +0,0 @@ -terraform { - required_version = ">= 1.9.0" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } - - backend "gcs" { - bucket = "agpt-dev-terraform" - prefix = "terraform/state" - } - -} - -provider "google" { - project = var.project_id - zone = var.zone -} - -module "static_ips" { - source = "./modules/static_ip" - - project_id = var.project_id - ip_names = var.static_ip_names - region = var.region -} - -module "networking" { - source = "./modules/networking" - - project_id = var.project_id - region = var.region - network_name = var.network_name - subnet_name = var.subnet_name - subnet_cidr = var.subnet_cidr - pods_ip_cidr_range = var.pods_ip_cidr_range - services_ip_cidr_range = var.services_ip_cidr_range -} - -module "gke_cluster" { - source = "./modules/gke_cluster" - - project_id = var.project_id - zone = var.zone - cluster_name = var.cluster_name - node_pool_name = var.node_pool_name - node_count = var.node_count - machine_type = var.machine_type - disk_size_gb = var.disk_size_gb - network = module.networking.network_self_link - subnetwork = module.networking.subnet_self_link - enable_autopilot = var.enable_autopilot -} - -module "iam" { - source = "./modules/iam" - - project_id = var.project_id - service_accounts = var.service_accounts - workload_identity_bindings = var.workload_identity_bindings - role_bindings = var.role_bindings - workload_identity_pools = var.workload_identity_pools -} - -module "storage" { - source = "./modules/storage" - - project_id = var.project_id - region = var.region - standard_bucket_names = var.standard_bucket_names - public_bucket_names = var.public_bucket_names - bucket_admins = var.bucket_admins -} diff --git a/autogpt_platform/infra/terraform/modules/gke_cluster/main.tf b/autogpt_platform/infra/terraform/modules/gke_cluster/main.tf deleted file mode 100644 index 66d1b2b76dc9..000000000000 --- a/autogpt_platform/infra/terraform/modules/gke_cluster/main.tf +++ /dev/null @@ -1,35 +0,0 @@ -resource "google_container_cluster" "primary" { - name = var.cluster_name - location = var.zone - - workload_identity_config { - workload_pool = "${var.project_id}.svc.id.goog" - } - - - dynamic "node_pool" { - for_each = var.enable_autopilot ? [] : [1] - content { - name = var.node_pool_name - node_count = var.node_count - - node_config { - machine_type = var.machine_type - disk_size_gb = var.disk_size_gb - - workload_metadata_config { - mode = "GKE_METADATA" - } - } - } - } - - network = var.network - subnetwork = var.subnetwork - - ip_allocation_policy { - cluster_secondary_range_name = "pods" - services_secondary_range_name = "services" - } -} - diff --git a/autogpt_platform/infra/terraform/modules/gke_cluster/outputs.tf b/autogpt_platform/infra/terraform/modules/gke_cluster/outputs.tf deleted file mode 100644 index 6a2c822f782d..000000000000 --- a/autogpt_platform/infra/terraform/modules/gke_cluster/outputs.tf +++ /dev/null @@ -1,14 +0,0 @@ -output "cluster_name" { - description = "The name of the cluster" - value = google_container_cluster.primary.name -} - -output "cluster_endpoint" { - description = "The endpoint for the cluster" - value = google_container_cluster.primary.endpoint -} - -output "node_pool_name" { - description = "The name of the node pool" - value = var.enable_autopilot ? null : google_container_cluster.primary.node_pool[0].name -} diff --git a/autogpt_platform/infra/terraform/modules/gke_cluster/variables.tf b/autogpt_platform/infra/terraform/modules/gke_cluster/variables.tf deleted file mode 100644 index 80184e7ded32..000000000000 --- a/autogpt_platform/infra/terraform/modules/gke_cluster/variables.tf +++ /dev/null @@ -1,41 +0,0 @@ -variable "project_id" { - description = "The project ID to host the cluster in" -} - -variable "zone" { - description = "The zone to host the cluster in" -} - -variable "cluster_name" { - description = "The name for the GKE cluster" -} - -variable "node_count" { - description = "Number of nodes in the cluster" -} - -variable "node_pool_name" { - description = "Name of the node pool in the cluster" -} - -variable "machine_type" { - description = "Type of machine to use for nodes" -} - -variable "disk_size_gb" { - description = "Size of the disk attached to each node, specified in GB" - default = 100 -} - -variable "network" { - description = "The VPC network to host the cluster in" -} - -variable "subnetwork" { - description = "The subnetwork to host the cluster in" -} - -variable "enable_autopilot" { - description = "Enable Autopilot for this cluster" - type = bool -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/iam/main.tf b/autogpt_platform/infra/terraform/modules/iam/main.tf deleted file mode 100644 index f632f4c42b43..000000000000 --- a/autogpt_platform/infra/terraform/modules/iam/main.tf +++ /dev/null @@ -1,53 +0,0 @@ -resource "google_service_account" "service_accounts" { - for_each = var.service_accounts - account_id = each.key - display_name = each.value.display_name - description = each.value.description -} - -# IAM policy binding for Workload Identity -resource "google_service_account_iam_binding" "workload_identity_binding" { - for_each = var.workload_identity_bindings - service_account_id = google_service_account.service_accounts[each.value.service_account_name].name - role = "roles/iam.workloadIdentityUser" - - members = [ - "serviceAccount:${var.project_id}.svc.id.goog[${each.value.namespace}/${each.value.ksa_name}]" - ] -} - -# Role bindings grouped by role -resource "google_project_iam_binding" "role_bindings" { - for_each = var.role_bindings - project = var.project_id - role = each.key - - members = each.value -} - -resource "google_iam_workload_identity_pool" "pools" { - for_each = var.workload_identity_pools - workload_identity_pool_id = each.key - display_name = each.value.display_name -} - -resource "google_iam_workload_identity_pool_provider" "providers" { - for_each = merge([ - for pool_id, pool in var.workload_identity_pools : { - for provider_id, provider in pool.providers : - "${pool_id}/${provider_id}" => merge(provider, { - pool_id = pool_id - }) - } - ]...) - - workload_identity_pool_id = split("/", each.key)[0] - workload_identity_pool_provider_id = split("/", each.key)[1] - - attribute_mapping = each.value.attribute_mapping - oidc { - issuer_uri = each.value.issuer_uri - allowed_audiences = each.value.allowed_audiences - } - attribute_condition = "assertion.repository_owner==\"Significant-Gravitas\"" -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/iam/outputs.tf b/autogpt_platform/infra/terraform/modules/iam/outputs.tf deleted file mode 100644 index 19354364bebb..000000000000 --- a/autogpt_platform/infra/terraform/modules/iam/outputs.tf +++ /dev/null @@ -1,14 +0,0 @@ -output "service_account_emails" { - description = "The emails of the created service accounts" - value = { for k, v in google_service_account.service_accounts : k => v.email } -} - -output "workload_identity_pools" { - value = google_iam_workload_identity_pool.pools -} - -output "workload_identity_providers" { - value = { - for k, v in google_iam_workload_identity_pool_provider.providers : k => v.name - } -} diff --git a/autogpt_platform/infra/terraform/modules/iam/variables.tf b/autogpt_platform/infra/terraform/modules/iam/variables.tf deleted file mode 100644 index c9563ea0c7b8..000000000000 --- a/autogpt_platform/infra/terraform/modules/iam/variables.tf +++ /dev/null @@ -1,42 +0,0 @@ -variable "project_id" { - description = "The ID of the project" - type = string -} - -variable "service_accounts" { - description = "Map of service accounts to create" - type = map(object({ - display_name = string - description = string - })) - default = {} -} - -variable "workload_identity_bindings" { - description = "Map of Workload Identity bindings to create" - type = map(object({ - service_account_name = string - namespace = string - ksa_name = string - })) - default = {} -} - -variable "role_bindings" { - description = "Map of roles to list of members" - type = map(list(string)) - default = {} -} - -variable "workload_identity_pools" { - type = map(object({ - display_name = string - providers = map(object({ - issuer_uri = string - attribute_mapping = map(string) - allowed_audiences = optional(list(string)) - })) - service_accounts = map(list(string)) # Map of SA to list of allowed principals - })) - default = {} -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/networking/main.tf b/autogpt_platform/infra/terraform/modules/networking/main.tf deleted file mode 100644 index 823fd6b89e08..000000000000 --- a/autogpt_platform/infra/terraform/modules/networking/main.tf +++ /dev/null @@ -1,22 +0,0 @@ -resource "google_compute_network" "vpc_network" { - name = var.network_name - auto_create_subnetworks = false -} - -resource "google_compute_subnetwork" "subnet" { - name = var.subnet_name - ip_cidr_range = var.subnet_cidr - region = var.region - network = google_compute_network.vpc_network.self_link - - secondary_ip_range { - range_name = "pods" - ip_cidr_range = var.pods_ip_cidr_range - } - - secondary_ip_range { - range_name = "services" - ip_cidr_range = var.services_ip_cidr_range - } -} - diff --git a/autogpt_platform/infra/terraform/modules/networking/ouputs.tf b/autogpt_platform/infra/terraform/modules/networking/ouputs.tf deleted file mode 100644 index 24db7330e949..000000000000 --- a/autogpt_platform/infra/terraform/modules/networking/ouputs.tf +++ /dev/null @@ -1,19 +0,0 @@ -output "network_name" { - description = "The name of the VPC network" - value = google_compute_network.vpc_network.name -} - -output "network_self_link" { - description = "The self-link of the VPC network" - value = google_compute_network.vpc_network.self_link -} - -output "subnet_name" { - description = "The name of the subnet" - value = google_compute_subnetwork.subnet.name -} - -output "subnet_self_link" { - description = "The self-link of the subnet" - value = google_compute_subnetwork.subnet.self_link -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/networking/variables.tf b/autogpt_platform/infra/terraform/modules/networking/variables.tf deleted file mode 100644 index aa4d409f02d0..000000000000 --- a/autogpt_platform/infra/terraform/modules/networking/variables.tf +++ /dev/null @@ -1,29 +0,0 @@ -variable "project_id" { - description = "The project ID to host the network in" -} - -variable "region" { - description = "The region to host the network in" -} - -variable "network_name" { - description = "The name of the VPC network" -} - -variable "subnet_name" { - description = "The name of the subnet" -} - -variable "subnet_cidr" { - description = "The CIDR range for the subnet" -} - -variable "pods_ip_cidr_range" { - description = "The IP address range for pods" - default = "10.1.0.0/16" -} - -variable "services_ip_cidr_range" { - description = "The IP address range for services" - default = "10.2.0.0/20" -} diff --git a/autogpt_platform/infra/terraform/modules/static_ip/main.tf b/autogpt_platform/infra/terraform/modules/static_ip/main.tf deleted file mode 100644 index 877b4bf30e84..000000000000 --- a/autogpt_platform/infra/terraform/modules/static_ip/main.tf +++ /dev/null @@ -1,5 +0,0 @@ -resource "google_compute_global_address" "static_ip" { - count = length(var.ip_names) - name = "${var.project_id}-${var.ip_names[count.index]}" - address_type = "EXTERNAL" -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/static_ip/outputs.tf b/autogpt_platform/infra/terraform/modules/static_ip/outputs.tf deleted file mode 100644 index 27a9aa5804a3..000000000000 --- a/autogpt_platform/infra/terraform/modules/static_ip/outputs.tf +++ /dev/null @@ -1,9 +0,0 @@ -output "ip_addresses" { - description = "Map of created static IP addresses" - value = { for i, ip in google_compute_global_address.static_ip : var.ip_names[i] => ip.address } -} - -output "ip_names" { - description = "List of full names of the created static IP addresses" - value = google_compute_global_address.static_ip[*].name -} \ No newline at end of file diff --git a/autogpt_platform/infra/terraform/modules/static_ip/variables.tf b/autogpt_platform/infra/terraform/modules/static_ip/variables.tf deleted file mode 100644 index 4cc6607a4dd1..000000000000 --- a/autogpt_platform/infra/terraform/modules/static_ip/variables.tf +++ /dev/null @@ -1,14 +0,0 @@ -variable "project_id" { - description = "The project ID to prepend to IP names" - type = string -} - -variable "ip_names" { - description = "List of custom names for static IPs" - type = list(string) -} - -variable "region" { - description = "Region to create the static IPs in" - type = string -} diff --git a/autogpt_platform/infra/terraform/modules/storage/main.tf b/autogpt_platform/infra/terraform/modules/storage/main.tf deleted file mode 100644 index a8a103a0dff3..000000000000 --- a/autogpt_platform/infra/terraform/modules/storage/main.tf +++ /dev/null @@ -1,64 +0,0 @@ - -# Public Buckets -resource "google_storage_bucket" "public_buckets" { - for_each = toset(var.public_bucket_names) - name = "${var.project_id}-${each.value}" - location = var.region - force_destroy = true - - uniform_bucket_level_access = true - - cors { - origin = ["*"] - method = ["GET", "HEAD", "OPTIONS"] - response_header = ["*"] - max_age_seconds = 3600 - } -} - -resource "google_storage_bucket_iam_policy" "public_access" { - for_each = google_storage_bucket.public_buckets - - bucket = each.value.name - policy_data = jsonencode({ - bindings = [ - { - role = "roles/storage.objectViewer" - members = ["allUsers"] - }, - { - role = "roles/storage.admin" - members = [for admin in var.bucket_admins : "group:${admin}"] - } - ] - }) -} - -# Standard Buckets, with default permissions -resource "google_storage_bucket" "standard_buckets" { - for_each = toset(var.standard_bucket_names) - name = "${var.project_id}-${each.value}" - location = var.region - force_destroy = true - - uniform_bucket_level_access = true - - versioning { - enabled = true - } - -} - -resource "google_storage_bucket_iam_member" "standard_access" { - for_each = { - for pair in setproduct(keys(google_storage_bucket.standard_buckets), ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]) : - "${pair[0]}-${pair[1]}" => { - bucket = google_storage_bucket.standard_buckets[pair[0]].name - member = "group:${pair[1]}" - } - } - - bucket = each.value.bucket - role = "roles/storage.objectAdmin" - member = each.value.member -} diff --git a/autogpt_platform/infra/terraform/modules/storage/outputs.tf b/autogpt_platform/infra/terraform/modules/storage/outputs.tf deleted file mode 100644 index d2d0f527dc99..000000000000 --- a/autogpt_platform/infra/terraform/modules/storage/outputs.tf +++ /dev/null @@ -1,19 +0,0 @@ -output "public_bucket_names" { - description = "The names of the created website artifacts buckets" - value = { for k, v in google_storage_bucket.public_buckets : k => v.name } -} - -output "public_bucket_urls" { - description = "The URLs of the created website artifacts buckets" - value = { for k, v in google_storage_bucket.public_buckets : k => v.url } -} - -output "standard_bucket_names" { - description = "The names of the created standard buckets" - value = { for k, v in google_storage_bucket.standard_buckets : k => v.name } -} - -output "standard_bucket_urls" { - description = "The URLs of the created standard buckets" - value = { for k, v in google_storage_bucket.standard_buckets : k => v.url } -} diff --git a/autogpt_platform/infra/terraform/modules/storage/variables.tf b/autogpt_platform/infra/terraform/modules/storage/variables.tf deleted file mode 100644 index 57d9abb09442..000000000000 --- a/autogpt_platform/infra/terraform/modules/storage/variables.tf +++ /dev/null @@ -1,27 +0,0 @@ -variable "project_id" { - description = "The ID of the project" - type = string -} - -variable "region" { - description = "The region where the bucket will be created" - type = string -} - -variable "public_bucket_names" { - description = "List of bucket names that should be publicly accessible" - type = list(string) - default = [] -} - -variable "standard_bucket_names" { - description = "List of bucket names that should be publicly accessible" - type = list(string) - default = [] -} - -variable "bucket_admins" { - description = "List of groups that should be admins of the buckets" - type = list(string) - default = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"] -} diff --git a/autogpt_platform/infra/terraform/variables.tf b/autogpt_platform/infra/terraform/variables.tf deleted file mode 100644 index 3b4eb92dff9c..000000000000 --- a/autogpt_platform/infra/terraform/variables.tf +++ /dev/null @@ -1,148 +0,0 @@ -variable "project_id" { - description = "The project ID to host the cluster in" - type = string -} - -variable "region" { - description = "Project region" - type = string - default = "us-central1" -} - -variable "zone" { - description = "The zone to host the cluster in" - type = string - default = "us-central1-a" -} - -variable "network_name" { - description = "The name of the VPC network" - type = string - default = "gke-network" -} - -variable "subnet_name" { - description = "The name of the subnet" - type = string - default = "gke-subnet" -} - -variable "subnet_cidr" { - description = "The CIDR range for the subnet" - type = string - default = "10.0.0.0/24" -} - -variable "cluster_name" { - description = "The name for the GKE cluster" - type = string - default = "gke-cluster" -} - -variable "node_count" { - description = "Number of nodes in the cluster" - type = number - default = 3 -} - -variable "node_pool_name" { - description = "The name for the node pool" - type = string - default = "default-pool" -} - -variable "machine_type" { - description = "Type of machine to use for nodes" - type = string - default = "e2-medium" -} - -variable "disk_size_gb" { - description = "Size of the disk attached to each node, specified in GB" - type = number - default = 100 -} - -variable "enable_autopilot" { - description = "Enable Autopilot for this cluster" - type = bool - default = false -} - -variable "static_ip_names" { - description = "List of custom names for static IPs" - type = list(string) - default = ["ip-1", "ip-2", "ip-3"] -} - -variable "service_accounts" { - description = "Map of service accounts to create" - type = map(object({ - display_name = string - description = string - })) - default = {} -} - -variable "workload_identity_bindings" { - description = "Map of Workload Identity bindings to create" - type = map(object({ - service_account_name = string - namespace = string - ksa_name = string - })) - default = {} -} - -variable "role_bindings" { - description = "Map of roles to list of members" - type = map(list(string)) - default = {} -} - -variable "pods_ip_cidr_range" { - description = "The IP address range for pods" - type = string - default = "10.1.0.0/16" -} - -variable "services_ip_cidr_range" { - description = "The IP address range for services" - type = string - default = "10.2.0.0/20" -} - -variable "public_bucket_names" { - description = "List of bucket names that should be publicly accessible" - type = list(string) - default = [] -} - -variable "standard_bucket_names" { - description = "List of bucket names that should be publicly accessible" - type = list(string) - default = [] -} - -variable "bucket_admins" { - description = "List of groups that should be admins of the buckets" - type = list(string) - default = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"] -} - -variable "workload_identity_pools" { - type = map(object({ - display_name = string - providers = map(object({ - issuer_uri = string - attribute_mapping = map(string) - allowed_audiences = optional(list(string)) - })) - service_accounts = map(list(string)) - })) - default = {} - description = "Configuration for workload identity pools and their providers" -} - - - From 274419d393c65234b25184ec58b4399b1716bf48 Mon Sep 17 00:00:00 2001 From: Zamil Majdy Date: Wed, 20 Nov 2024 00:53:34 +0400 Subject: [PATCH 04/14] fix(backend): Improve typing for blocks StepThroughItemsBlock, CountdownTimerBlock, AddToListBlock, AddToDictionaryBlock (#8713) --- .../backend/backend/blocks/basic.py | 85 +++++++++++++------ .../backend/backend/blocks/iteration.py | 45 +++++++--- .../backend/backend/blocks/time_blocks.py | 15 ++-- 3 files changed, 100 insertions(+), 45 deletions(-) diff --git a/autogpt_platform/backend/backend/blocks/basic.py b/autogpt_platform/backend/backend/blocks/basic.py index fcfd94f6886d..0710565ad088 100644 --- a/autogpt_platform/backend/backend/blocks/basic.py +++ b/autogpt_platform/backend/backend/blocks/basic.py @@ -315,16 +315,26 @@ def run(self, input_data: Input, **kwargs) -> BlockOutput: class AddToDictionaryBlock(Block): class Input(BlockSchema): - dictionary: dict | None = SchemaField( - default=None, + dictionary: dict[Any, Any] = SchemaField( + default={}, description="The dictionary to add the entry to. If not provided, a new dictionary will be created.", - placeholder='{"key1": "value1", "key2": "value2"}', ) key: str = SchemaField( - description="The key for the new entry.", placeholder="new_key" + default="", + description="The key for the new entry.", + placeholder="new_key", + advanced=False, ) value: Any = SchemaField( - description="The value for the new entry.", placeholder="new_value" + default=None, + description="The value for the new entry.", + placeholder="new_value", + advanced=False, + ) + entries: dict[Any, Any] = SchemaField( + default={}, + description="The entries to add to the dictionary. This is the batch version of the `key` and `value` fields.", + advanced=True, ) class Output(BlockSchema): @@ -347,6 +357,10 @@ def __init__(self): "value": "new_value", }, {"key": "first_key", "value": "first_value"}, + { + "dictionary": {"existing_key": "existing_value"}, + "entries": {"new_key": "new_value", "first_key": "first_value"}, + }, ], test_output=[ ( @@ -354,38 +368,49 @@ def __init__(self): {"existing_key": "existing_value", "new_key": "new_value"}, ), ("updated_dictionary", {"first_key": "first_value"}), + ( + "updated_dictionary", + { + "existing_key": "existing_value", + "new_key": "new_value", + "first_key": "first_value", + }, + ), ], ) def run(self, input_data: Input, **kwargs) -> BlockOutput: - # If no dictionary is provided, create a new one - if input_data.dictionary is None: - updated_dict = {} - else: - # Create a copy of the input dictionary to avoid modifying the original - updated_dict = input_data.dictionary.copy() + updated_dict = input_data.dictionary.copy() - # Add the new key-value pair - updated_dict[input_data.key] = input_data.value + if input_data.value is not None and input_data.key: + updated_dict[input_data.key] = input_data.value + + for key, value in input_data.entries.items(): + updated_dict[key] = value yield "updated_dictionary", updated_dict class AddToListBlock(Block): class Input(BlockSchema): - list: List[Any] | None = SchemaField( - default=None, + list: List[Any] = SchemaField( + default=[], + advanced=False, description="The list to add the entry to. If not provided, a new list will be created.", - placeholder='[1, "string", {"key": "value"}]', ) entry: Any = SchemaField( description="The entry to add to the list. Can be of any type (string, int, dict, etc.).", - placeholder='{"new_key": "new_value"}', + advanced=False, + default=None, + ) + entries: List[Any] = SchemaField( + default=[], + description="The entries to add to the list. This is the batch version of the `entry` field.", + advanced=True, ) position: int | None = SchemaField( default=None, description="The position to insert the new entry. If not provided, the entry will be appended to the end of the list.", - placeholder="0", ) class Output(BlockSchema): @@ -409,6 +434,12 @@ def __init__(self): }, {"entry": "first_entry"}, {"list": ["a", "b", "c"], "entry": "d"}, + { + "entry": "e", + "entries": ["f", "g"], + "list": ["a", "b"], + "position": 1, + }, ], test_output=[ ( @@ -422,22 +453,20 @@ def __init__(self): ), ("updated_list", ["first_entry"]), ("updated_list", ["a", "b", "c", "d"]), + ("updated_list", ["a", "f", "g", "e", "b"]), ], ) def run(self, input_data: Input, **kwargs) -> BlockOutput: - # If no list is provided, create a new one - if input_data.list is None: - updated_list = [] - else: - # Create a copy of the input list to avoid modifying the original - updated_list = input_data.list.copy() + entries_added = input_data.entries.copy() + if input_data.entry: + entries_added.append(input_data.entry) - # Add the new entry - if input_data.position is None: - updated_list.append(input_data.entry) + updated_list = input_data.list.copy() + if (pos := input_data.position) is not None: + updated_list = updated_list[:pos] + entries_added + updated_list[pos:] else: - updated_list.insert(input_data.position, input_data.entry) + updated_list += entries_added yield "updated_list", updated_list diff --git a/autogpt_platform/backend/backend/blocks/iteration.py b/autogpt_platform/backend/backend/blocks/iteration.py index 247a92d3c757..16783af59f11 100644 --- a/autogpt_platform/backend/backend/blocks/iteration.py +++ b/autogpt_platform/backend/backend/blocks/iteration.py @@ -2,13 +2,28 @@ from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema from backend.data.model import SchemaField +from backend.util.json import json class StepThroughItemsBlock(Block): class Input(BlockSchema): - items: list | dict = SchemaField( + items: list = SchemaField( + advanced=False, description="The list or dictionary of items to iterate over", placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}", + default=[], + ) + items_object: dict = SchemaField( + advanced=False, + description="The list or dictionary of items to iterate over", + placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}", + default={}, + ) + items_str: str = SchemaField( + advanced=False, + description="The list or dictionary of items to iterate over", + placeholder="[1, 2, 3, 4, 5] or {'key1': 'value1', 'key2': 'value2'}", + default="", ) class Output(BlockSchema): @@ -39,14 +54,20 @@ def __init__(self): ) def run(self, input_data: Input, **kwargs) -> BlockOutput: - items = input_data.items - if isinstance(items, dict): - # If items is a dictionary, iterate over its values - for item in items.values(): - yield "item", item - yield "key", item - else: - # If items is a list, iterate over the list - for index, item in enumerate(items): - yield "item", item - yield "key", index + for data in [input_data.items, input_data.items_object, input_data.items_str]: + if not data: + continue + if isinstance(data, str): + items = json.loads(data) + else: + items = data + if isinstance(items, dict): + # If items is a dictionary, iterate over its values + for item in items.values(): + yield "item", item + yield "key", item + else: + # If items is a list, iterate over the list + for index, item in enumerate(items): + yield "item", item + yield "key", index diff --git a/autogpt_platform/backend/backend/blocks/time_blocks.py b/autogpt_platform/backend/backend/blocks/time_blocks.py index eb886b5352c8..4b060aea5cfc 100644 --- a/autogpt_platform/backend/backend/blocks/time_blocks.py +++ b/autogpt_platform/backend/backend/blocks/time_blocks.py @@ -140,20 +140,25 @@ def run(self, input_data: Input, **kwargs) -> BlockOutput: class CountdownTimerBlock(Block): class Input(BlockSchema): input_message: Any = SchemaField( + advanced=False, description="Message to output after the timer finishes", default="timer finished", ) seconds: Union[int, str] = SchemaField( - description="Duration in seconds", default=0 + advanced=False, description="Duration in seconds", default=0 ) minutes: Union[int, str] = SchemaField( - description="Duration in minutes", default=0 + advanced=False, description="Duration in minutes", default=0 + ) + hours: Union[int, str] = SchemaField( + advanced=False, description="Duration in hours", default=0 + ) + days: Union[int, str] = SchemaField( + advanced=False, description="Duration in days", default=0 ) - hours: Union[int, str] = SchemaField(description="Duration in hours", default=0) - days: Union[int, str] = SchemaField(description="Duration in days", default=0) class Output(BlockSchema): - output_message: str = SchemaField( + output_message: Any = SchemaField( description="Message after the timer finishes" ) From a5734a57d5fa579624eb9c1bc27e8e6c06bb981e Mon Sep 17 00:00:00 2001 From: Aarushi <50577581+aarushik93@users.noreply.github.com> Date: Tue, 19 Nov 2024 23:39:40 +0000 Subject: [PATCH 05/14] fix(platform): Remove settings endpoint (#8715) remove settings endpoint --- .../backend/backend/server/routers/v1.py | 47 +------------------ 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/autogpt_platform/backend/backend/server/routers/v1.py b/autogpt_platform/backend/backend/server/routers/v1.py index a59b9322b4d4..11d4c6a73d92 100644 --- a/autogpt_platform/backend/backend/server/routers/v1.py +++ b/autogpt_platform/backend/backend/server/routers/v1.py @@ -1,12 +1,12 @@ import asyncio import logging from collections import defaultdict -from typing import Annotated, Any, Dict, List +from typing import Annotated, Any, List import pydantic from autogpt_libs.auth.middleware import auth_middleware from autogpt_libs.utils.cache import thread_cached -from fastapi import APIRouter, Body, Depends, HTTPException +from fastapi import APIRouter, Depends, HTTPException from typing_extensions import Optional, TypedDict import backend.data.block @@ -504,49 +504,6 @@ async def get_execution_schedules( ) -######################################################## -##################### Settings ######################## -######################################################## - - -@v1_router.post( - path="/settings", tags=["settings"], dependencies=[Depends(auth_middleware)] -) -async def update_configuration( - updated_settings: Annotated[ - Dict[str, Any], - Body( - examples=[ - { - "config": { - "num_graph_workers": 10, - "num_node_workers": 10, - } - } - ] - ), - ], -): - settings = Settings() - try: - updated_fields: dict[Any, Any] = {"config": [], "secrets": []} - for key, value in updated_settings.get("config", {}).items(): - if hasattr(settings.config, key): - setattr(settings.config, key, value) - updated_fields["config"].append(key) - for key, value in updated_settings.get("secrets", {}).items(): - if hasattr(settings.secrets, key): - setattr(settings.secrets, key, value) - updated_fields["secrets"].append(key) - settings.save() - return { - "message": "Settings updated successfully", - "updated_fields": updated_fields, - } - except Exception as e: - raise HTTPException(status_code=400, detail=str(e)) - - ######################################################## ##################### API KEY ############################## ######################################################## From 33dd2eb9197cd7ceccceff9d957c8f09b4d18b54 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Wed, 20 Nov 2024 02:51:20 +0100 Subject: [PATCH 06/14] dx(backend): Fix `pre-commit` `isort` step (#8726) - Set `tool.isort.profile = "black"` - Explicitly pass the first-party package name in the `isort` jobs in the `pre-commit` config --- .pre-commit-config.yaml | 8 ++++---- autogpt_platform/backend/pyproject.toml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ed86498fd910..f9ef30e34dd2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,7 +105,7 @@ repos: - id: isort name: Lint (isort) - AutoGPT Platform - Backend alias: isort-platform-backend - entry: poetry -C autogpt_platform/backend run isort + entry: poetry -C autogpt_platform/backend run isort -p backend files: ^autogpt_platform/backend/ types: [file, python] language: system @@ -113,7 +113,7 @@ repos: - id: isort name: Lint (isort) - Classic - AutoGPT alias: isort-classic-autogpt - entry: poetry -C classic/original_autogpt run isort + entry: poetry -C classic/original_autogpt run isort -p autogpt files: ^classic/original_autogpt/ types: [file, python] language: system @@ -121,7 +121,7 @@ repos: - id: isort name: Lint (isort) - Classic - Forge alias: isort-classic-forge - entry: poetry -C classic/forge run isort + entry: poetry -C classic/forge run isort -p forge files: ^classic/forge/ types: [file, python] language: system @@ -129,7 +129,7 @@ repos: - id: isort name: Lint (isort) - Classic - Benchmark alias: isort-classic-benchmark - entry: poetry -C classic/benchmark run isort + entry: poetry -C classic/benchmark run isort -p agbenchmark files: ^classic/benchmark/ types: [file, python] language: system diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.toml index da179b8ab3f1..0e2a84a11ef6 100644 --- a/autogpt_platform/backend/pyproject.toml +++ b/autogpt_platform/backend/pyproject.toml @@ -74,6 +74,9 @@ format = "linter:format" lint = "linter:lint" test = "run_tests:test" +[tool.isort] +profile = "black" + [tool.pytest-watcher] now = false clear = true From 5fa5b7104a885708f4379b3e5618ba4ee7a07c1f Mon Sep 17 00:00:00 2001 From: Zamil Majdy Date: Wed, 20 Nov 2024 14:43:34 +0400 Subject: [PATCH 07/14] fix(frontend): Monitor Page got all the request doubled on each page refresh (#8727) fix(frontend): Avoid refreshing page on each auth state change event --- autogpt_platform/frontend/src/components/SupabaseProvider.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogpt_platform/frontend/src/components/SupabaseProvider.tsx b/autogpt_platform/frontend/src/components/SupabaseProvider.tsx index d852a5406407..6e0fd52ba137 100644 --- a/autogpt_platform/frontend/src/components/SupabaseProvider.tsx +++ b/autogpt_platform/frontend/src/components/SupabaseProvider.tsx @@ -37,7 +37,9 @@ export default function SupabaseProvider({ if (event === "SIGNED_IN") { api.createUser(); } - router.refresh(); + if (event === "SIGNED_OUT") { + router.refresh(); + } }); return () => { From d84ddfcf1aac8e624cfe01252edb187a12c015a8 Mon Sep 17 00:00:00 2001 From: Swifty Date: Wed, 20 Nov 2024 13:51:06 +0100 Subject: [PATCH 08/14] fix(block): Updated model_version to prevent conflicts with pydantic naming (#8729) changed model_version name to avoid conflicts --- .../backend/backend/blocks/ai_music_generator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autogpt_platform/backend/backend/blocks/ai_music_generator.py b/autogpt_platform/backend/backend/blocks/ai_music_generator.py index f2f80a1e8f46..6b2c086a0a80 100644 --- a/autogpt_platform/backend/backend/blocks/ai_music_generator.py +++ b/autogpt_platform/backend/backend/blocks/ai_music_generator.py @@ -63,7 +63,7 @@ class Input(BlockSchema): placeholder="e.g., 'An upbeat electronic dance track with heavy bass'", title="Prompt", ) - model_version: MusicGenModelVersion = SchemaField( + music_gen_model_version: MusicGenModelVersion = SchemaField( description="Model to use for generation", default=MusicGenModelVersion.STEREO_LARGE, title="Model Version", @@ -118,7 +118,7 @@ def __init__(self): test_input={ "credentials": TEST_CREDENTIALS_INPUT, "prompt": "An upbeat electronic dance track with heavy bass", - "model_version": MusicGenModelVersion.STEREO_LARGE, + "music_gen_model_version": MusicGenModelVersion.STEREO_LARGE, "duration": 8, "temperature": 1.0, "top_k": 250, @@ -134,7 +134,7 @@ def __init__(self): ), ], test_mock={ - "run_model": lambda api_key, model_version, prompt, duration, temperature, top_k, top_p, classifier_free_guidance, output_format, normalization_strategy: "https://replicate.com/output/generated-audio-url.wav", + "run_model": lambda api_key, music_gen_model_version, prompt, duration, temperature, top_k, top_p, classifier_free_guidance, output_format, normalization_strategy: "https://replicate.com/output/generated-audio-url.wav", }, test_credentials=TEST_CREDENTIALS, ) @@ -153,7 +153,7 @@ def run( ) result = self.run_model( api_key=credentials.api_key, - model_version=input_data.model_version, + music_gen_model_version=input_data.music_gen_model_version, prompt=input_data.prompt, duration=input_data.duration, temperature=input_data.temperature, @@ -182,7 +182,7 @@ def run( def run_model( self, api_key: SecretStr, - model_version: MusicGenModelVersion, + music_gen_model_version: MusicGenModelVersion, prompt: str, duration: int, temperature: float, @@ -200,7 +200,7 @@ def run_model( "meta/musicgen:671ac645ce5e552cc63a54a2bbff63fcf798043055d2dac5fc9e36a837eedcfb", input={ "prompt": prompt, - "model_version": model_version, + "music_gen_model_version": music_gen_model_version, "duration": duration, "temperature": temperature, "top_k": top_k, From c84cc292f1b61a2a2bc0fafddbb531d0c1b2c128 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:08:07 +0400 Subject: [PATCH 09/14] build(deps): bump fastapi from 0.115.4 to 0.115.5 in /autogpt_platform/market in the production-dependencies group (#8705) build(deps): bump fastapi Bumps the production-dependencies group in /autogpt_platform/market with 1 update: [fastapi](https://github.com/fastapi/fastapi). Updates `fastapi` from 0.115.4 to 0.115.5 - [Release notes](https://github.com/fastapi/fastapi/releases) - [Commits](https://github.com/fastapi/fastapi/compare/0.115.4...0.115.5) --- updated-dependencies: - dependency-name: fastapi dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zamil Majdy --- autogpt_platform/market/poetry.lock | 8 ++++---- autogpt_platform/market/pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autogpt_platform/market/poetry.lock b/autogpt_platform/market/poetry.lock index 07615a821cd6..c52141b74117 100644 --- a/autogpt_platform/market/poetry.lock +++ b/autogpt_platform/market/poetry.lock @@ -247,13 +247,13 @@ test = ["pytest (>=6)"] [[package]] name = "fastapi" -version = "0.115.4" +version = "0.115.5" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" optional = false python-versions = ">=3.8" files = [ - {file = "fastapi-0.115.4-py3-none-any.whl", hash = "sha256:0b504a063ffb3cf96a5e27dc1bc32c80ca743a2528574f9cdc77daa2d31b4742"}, - {file = "fastapi-0.115.4.tar.gz", hash = "sha256:db653475586b091cb8b2fec2ac54a680ac6a158e07406e1abae31679e8826349"}, + {file = "fastapi-0.115.5-py3-none-any.whl", hash = "sha256:596b95adbe1474da47049e802f9a65ab2ffa9c2b07e7efee70eb8a66c9f2f796"}, + {file = "fastapi-0.115.5.tar.gz", hash = "sha256:0e7a4d0dc0d01c68df21887cce0945e72d3c48b9f4f79dfe7a7d53aa08fbb289"}, ] [package.dependencies] @@ -1298,4 +1298,4 @@ watchmedo = ["PyYAML (>=3.10)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "4f7e4bbed535e40688e953dd0bfab80f704ba6017fc01360941f5cf858ef5f4c" +content-hash = "985f87e9d6e2b7232f880a476c69c626bc4227156d8a57d8f1867236b215f82f" diff --git a/autogpt_platform/market/pyproject.toml b/autogpt_platform/market/pyproject.toml index 7b0269416031..76876d2d0da3 100644 --- a/autogpt_platform/market/pyproject.toml +++ b/autogpt_platform/market/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.10" prisma = "^0.15.0" python-dotenv = "^1.0.1" uvicorn = "^0.32.0" -fastapi = "^0.115.4" +fastapi = "^0.115.5" sentry-sdk = { extras = ["fastapi"], version = "^2.18.0" } fuzzywuzzy = "^0.18.0" python-levenshtein = "^0.26.1" From aea6e7caed4c40b95eebf76f55084a3bd3226553 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:20:27 +0400 Subject: [PATCH 10/14] build(deps): bump the production-dependencies group in /autogpt_platform/frontend with 7 updates (#8703) build(deps): bump the production-dependencies group Bumps the production-dependencies group in /autogpt_platform/frontend with 7 updates: | Package | From | To | | --- | --- | --- | | @radix-ui/react-icons | `1.3.1` | `1.3.2` | | [@radix-ui/react-scroll-area](https://github.com/radix-ui/primitives) | `1.2.0` | `1.2.1` | | [@radix-ui/react-tooltip](https://github.com/radix-ui/primitives) | `1.1.3` | `1.1.4` | | [@sentry/nextjs](https://github.com/getsentry/sentry-javascript) | `8.37.1` | `8.38.0` | | [elliptic](https://github.com/indutny/elliptic) | `6.6.0` | `6.6.1` | | [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) | `0.456.0` | `0.460.0` | | [react-day-picker](https://github.com/gpbl/react-day-picker) | `9.3.0` | `9.3.2` | Updates `@radix-ui/react-icons` from 1.3.1 to 1.3.2 Updates `@radix-ui/react-scroll-area` from 1.2.0 to 1.2.1 - [Changelog](https://github.com/radix-ui/primitives/blob/main/release-process.md) - [Commits](https://github.com/radix-ui/primitives/commits) Updates `@radix-ui/react-tooltip` from 1.1.3 to 1.1.4 - [Changelog](https://github.com/radix-ui/primitives/blob/main/release-process.md) - [Commits](https://github.com/radix-ui/primitives/commits) Updates `@sentry/nextjs` from 8.37.1 to 8.38.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.37.1...8.38.0) Updates `elliptic` from 6.6.0 to 6.6.1 - [Commits](https://github.com/indutny/elliptic/compare/v6.6.0...v6.6.1) Updates `lucide-react` from 0.456.0 to 0.460.0 - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/0.460.0/packages/lucide-react) Updates `react-day-picker` from 9.3.0 to 9.3.2 - [Release notes](https://github.com/gpbl/react-day-picker/releases) - [Changelog](https://github.com/gpbl/react-day-picker/blob/main/CHANGELOG.md) - [Commits](https://github.com/gpbl/react-day-picker/compare/v9.3.0...v9.3.2) --- updated-dependencies: - dependency-name: "@radix-ui/react-icons" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: "@radix-ui/react-scroll-area" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: "@radix-ui/react-tooltip" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: "@sentry/nextjs" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: elliptic dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: lucide-react dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: react-day-picker dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zamil Majdy --- autogpt_platform/frontend/package.json | 12 +- autogpt_platform/frontend/yarn.lock | 303 +++++++++++++------------ 2 files changed, 164 insertions(+), 151 deletions(-) diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.json index 7a6ac50b7e93..d2586fa4fc89 100644 --- a/autogpt_platform/frontend/package.json +++ b/autogpt_platform/frontend/package.json @@ -31,17 +31,17 @@ "@radix-ui/react-context-menu": "^2.2.1", "@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-dropdown-menu": "^2.1.2", - "@radix-ui/react-icons": "^1.3.1", + "@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-label": "^2.1.0", "@radix-ui/react-popover": "^1.1.2", "@radix-ui/react-radio-group": "^1.2.1", - "@radix-ui/react-scroll-area": "^1.2.0", + "@radix-ui/react-scroll-area": "^1.2.1", "@radix-ui/react-select": "^2.1.2", "@radix-ui/react-separator": "^1.1.0", "@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-switch": "^1.1.1", "@radix-ui/react-toast": "^1.2.2", - "@radix-ui/react-tooltip": "^1.1.3", + "@radix-ui/react-tooltip": "^1.1.4", "@sentry/nextjs": "^8", "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.46.1", @@ -54,13 +54,13 @@ "cookie": "1.0.1", "date-fns": "^4.1.0", "dotenv": "^16.4.5", - "elliptic": "6.6.0", - "lucide-react": "^0.456.0", + "elliptic": "6.6.1", + "lucide-react": "^0.460.0", "moment": "^2.30.1", "next": "^14.2.13", "next-themes": "^0.4.3", "react": "^18", - "react-day-picker": "^9.3.0", + "react-day-picker": "^9.3.2", "react-dom": "^18", "react-hook-form": "^7.53.2", "react-icons": "^5.3.0", diff --git a/autogpt_platform/frontend/yarn.lock b/autogpt_platform/frontend/yarn.lock index 591a03b1cf7d..53d88538f2a2 100644 --- a/autogpt_platform/frontend/yarn.lock +++ b/autogpt_platform/frontend/yarn.lock @@ -1026,10 +1026,10 @@ react-confetti "^6.1.0" strip-ansi "^7.1.0" -"@date-fns/tz@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@date-fns/tz/-/tz-1.1.2.tgz#c8036db48ae9e7165f40a951942a14070e0c6ec1" - integrity sha512-Xmg2cPmOPQieCLAdf62KtFPU9y7wbQDq1OAzrs/bEQFvhtCPXDiks1CHDE/sTXReRfh/MICVkw/vY6OANHUGiA== +"@date-fns/tz@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@date-fns/tz/-/tz-1.2.0.tgz#81cb3211693830babaf3b96aff51607e143030a6" + integrity sha512-LBrd7MiJZ9McsOgxqWX7AaxrDjcFVjWH/tIKJd7pnR7McaslGYOP1QmmiBXdJH/H/yLCT+rcQ7FaPBUxRGUtrg== "@emnapi/runtime@^1.2.0": version "1.3.1" @@ -1775,13 +1775,13 @@ dependencies: "@opentelemetry/semantic-conventions" "1.27.0" -"@opentelemetry/instrumentation-amqplib@^0.42.0": - version "0.42.0" - resolved "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.42.0.tgz" - integrity sha512-fiuU6OKsqHJiydHWgTRQ7MnIrJ2lEqsdgFtNIH4LbAUJl/5XmrIeoDzDnox+hfkgWK65jsleFuQDtYb5hW1koQ== +"@opentelemetry/instrumentation-amqplib@^0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.43.0.tgz#e18b7d763b69c605a7abf9869e1c278f9bfdc1eb" + integrity sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.53.0" + "@opentelemetry/instrumentation" "^0.54.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@opentelemetry/instrumentation-connect@0.40.0": @@ -1877,6 +1877,14 @@ "@opentelemetry/instrumentation" "^0.54.0" "@opentelemetry/semantic-conventions" "^1.27.0" +"@opentelemetry/instrumentation-knex@0.41.0": + version "0.41.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.41.0.tgz#74d611489e823003a825097bac019c6c2ad061a5" + integrity sha512-OhI1SlLv5qnsnm2dOVrian/x3431P75GngSpnR7c4fcVFv7prXGYu29Z6ILRWJf/NJt6fkbySmwdfUUnFnHCTg== + dependencies: + "@opentelemetry/instrumentation" "^0.54.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + "@opentelemetry/instrumentation-koa@0.43.0": version "0.43.0" resolved "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.43.0.tgz" @@ -1956,6 +1964,15 @@ "@opentelemetry/redis-common" "^0.36.2" "@opentelemetry/semantic-conventions" "^1.27.0" +"@opentelemetry/instrumentation-tedious@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.15.0.tgz#da82f4d153fb6ff7d1f85d39872ac40bf9db12ea" + integrity sha512-Kb7yo8Zsq2TUwBbmwYgTAMPK0VbhoS8ikJ6Bup9KrDtCx2JC01nCb+M0VJWXt7tl0+5jARUbKWh5jRSoImxdCw== + dependencies: + "@opentelemetry/instrumentation" "^0.54.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + "@types/tedious" "^4.0.14" + "@opentelemetry/instrumentation-undici@0.6.0": version "0.6.0" resolved "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.6.0.tgz" @@ -2223,10 +2240,10 @@ "@radix-ui/react-primitive" "2.0.0" "@radix-ui/react-use-callback-ref" "1.1.0" -"@radix-ui/react-icons@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@radix-ui/react-icons/-/react-icons-1.3.1.tgz#462c85fd726a77854cd5956e29eb19a575aa7ce5" - integrity sha512-QvYompk0X+8Yjlo/Fv4McrzxohDdM5GgLHyQcPpcsPvlOSXCGFjdbuyGL5dzRbg0GpknAjQJJZzdiRK7iWVuFQ== +"@radix-ui/react-icons@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-icons/-/react-icons-1.3.2.tgz#09be63d178262181aeca5fb7f7bc944b10a7f441" + integrity sha512-fyQIhGDhzfc9pK2kH6Pl9c4BDJGfMkPqkyIgYDthyNYoNg3wVhoJMMh19WS4Up/1KMPFVpNsT2q3WmXn2N1m6g== "@radix-ui/react-id@1.1.0", "@radix-ui/react-id@^1.1.0": version "1.1.0" @@ -2357,10 +2374,10 @@ "@radix-ui/react-use-callback-ref" "1.1.0" "@radix-ui/react-use-controllable-state" "1.1.0" -"@radix-ui/react-scroll-area@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.0.tgz#d09fd693728b09c50145935bec6f91efc2661729" - integrity sha512-q2jMBdsJ9zB7QG6ngQNzNwlvxLQqONyL58QbEGwuyRZZb/ARQwk3uQVbCF7GvQVOtV6EU/pDxAw3zRzJZI3rpQ== +"@radix-ui/react-scroll-area@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.1.tgz#610c53e07d017e24b62bd73a0a6eb23fa7331b3b" + integrity sha512-FnM1fHfCtEZ1JkyfH/1oMiTcFBQvHKl4vD9WnpwkLgtF+UmnXMCad6ECPTaAjcDjam+ndOEJWgHyKDGNteWSHw== dependencies: "@radix-ui/number" "1.1.0" "@radix-ui/primitive" "1.1.0" @@ -2444,10 +2461,10 @@ "@radix-ui/react-use-layout-effect" "1.1.0" "@radix-ui/react-visually-hidden" "1.1.0" -"@radix-ui/react-tooltip@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.1.3.tgz#4250b14723f2d8477e7a3d0526c169f91d1f2f74" - integrity sha512-Z4w1FIS0BqVFI2c1jZvb/uDVJijJjJ2ZMuPV81oVgTZ7g3BZxobplnMVvXtFWgtozdvYJ+MFWtwkM5S2HnAong== +"@radix-ui/react-tooltip@^1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.1.4.tgz#152d8485859b80d395d6b3229f676fef3cec56b3" + integrity sha512-QpObUH/ZlpaO4YgHSaYzrLO2VuO+ZBFFgGzjMUPwtiYnAzzNNDPJeEGRrT7qNOrWm/Jr08M1vlp+vTHtnSQ0Uw== dependencies: "@radix-ui/primitive" "1.1.0" "@radix-ui/react-compose-refs" "1.1.0" @@ -2553,61 +2570,61 @@ resolved "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.3.0.tgz" integrity sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew== -"@sentry-internal/browser-utils@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.37.1.tgz#374028d8e37047aeda14b226707e6601de65996e" - integrity sha512-OSR/V5GCsSCG7iapWtXCT/y22uo3HlawdEgfM1NIKk1mkP15UyGQtGEzZDdih2H+SNuX1mp9jQLTjr5FFp1A5w== +"@sentry-internal/browser-utils@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.38.0.tgz#d7f6d398778906efb0c017e63d3c59d3203dfa7d" + integrity sha512-5QMVcssrAcmjKT0NdFYcX0b0wwZovGAZ9L2GajErXtHkBenjI2sgR2+5J7n+QZGuk2SC1qhGmT1O9i3p3UEwew== dependencies: - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" -"@sentry-internal/feedback@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.37.1.tgz#e2d5fc934ca3b4925a5f5d0e63549830a1cf147e" - integrity sha512-Se25NXbSapgS2S+JssR5YZ48b3OY4UGmAuBOafgnMW91LXMxRNWRbehZuNUmjjHwuywABMxjgu+Yp5uJDATX+g== +"@sentry-internal/feedback@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.38.0.tgz#726661a01f7ff40b93c8ee05c985fd0436a1c033" + integrity sha512-AW5HCCAlc3T1jcSuNhbFVNO1CHyJ5g5tsGKEP4VKgu+D1Gg2kZ5S2eFatLBUP/BD5JYb1A7p6XPuzYp1XfMq0A== dependencies: - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" -"@sentry-internal/replay-canvas@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.37.1.tgz#e8a5e350e486b16938b3dd99886be23b7b6eff18" - integrity sha512-1JLAaPtn1VL5vblB0BMELFV0D+KUm/iMGsrl4/JpRm0Ws5ESzQl33DhXVv1IX/ZAbx9i14EjR7MG9+Hj70tieQ== +"@sentry-internal/replay-canvas@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.38.0.tgz#26e9bc937dab73e1a26d57dc1015b7ff1f2d76c5" + integrity sha512-OxmlWzK9J8mRM+KxdSnQ5xuxq+p7TiBzTz70FT3HltxmeugvDkyp6803UcFqHOPHR35OYeVLOalym+FmvNn9kw== dependencies: - "@sentry-internal/replay" "8.37.1" - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry-internal/replay" "8.38.0" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" -"@sentry-internal/replay@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.37.1.tgz#6dc2e3955879f6e7ab830db1ddee54e0a9b401f3" - integrity sha512-E/Plhisk/pXJjOdOU12sg8m/APTXTA21iEniidP6jW3/+O0tD/H/UovEqa4odNTqxPMa798xHQSQNt5loYiaLA== +"@sentry-internal/replay@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.38.0.tgz#9a9b945a3c066f5610a363774e3c99420c3f4fce" + integrity sha512-mQPShKnIab7oKwkwrRxP/D8fZYHSkDY+cvqORzgi+wAwgnunytJQjz9g6Ww2lJu98rHEkr5SH4V4rs6PZYZmnQ== dependencies: - "@sentry-internal/browser-utils" "8.37.1" - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry-internal/browser-utils" "8.38.0" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" "@sentry/babel-plugin-component-annotate@2.22.6": version "2.22.6" resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.22.6.tgz#829d6caf2c95c1c46108336de4e1049e6521435e" integrity sha512-V2g1Y1I5eSe7dtUVMBvAJr8BaLRr4CLrgNgtPaZyMT4Rnps82SrZ5zqmEkLXPumlXhLUWR6qzoMNN2u+RXVXfQ== -"@sentry/browser@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.37.1.tgz#2e6e4accc395ad9e6313e07b09415370c71e5874" - integrity sha512-5ym+iGiIpjIKKpMWi9S3/tXh9xneS+jqxwRTJqed3cb8i4ydfMAAP8sM3U8xMCWWABpWyIUW+fpewC0tkhE1aQ== +"@sentry/browser@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.38.0.tgz#c562accdc2bbe0b0074d98bfe7ff460e39ce3109" + integrity sha512-AZR+b0EteNZEGv6JSdBD22S9VhQ7nrljKsSnzxobBULf3BpwmhmCzTbDrqWszKDAIDYmL+yQJIR2glxbknneWQ== dependencies: - "@sentry-internal/browser-utils" "8.37.1" - "@sentry-internal/feedback" "8.37.1" - "@sentry-internal/replay" "8.37.1" - "@sentry-internal/replay-canvas" "8.37.1" - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry-internal/browser-utils" "8.38.0" + "@sentry-internal/feedback" "8.38.0" + "@sentry-internal/replay" "8.38.0" + "@sentry-internal/replay-canvas" "8.38.0" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" "@sentry/bundler-plugin-core@2.22.6": version "2.22.6" @@ -2677,47 +2694,47 @@ "@sentry/cli-win32-i686" "2.38.2" "@sentry/cli-win32-x64" "2.38.2" -"@sentry/core@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.37.1.tgz#4bafb25c762ec8680874056f6160df276c1cc7c6" - integrity sha512-82csXby589iDupM3VgCHJeWZagUyEEaDnbFcoZ/Z91QX2Sjq8FcF5OsforoXjw09i0XTFqlkFAnQVpDBmMXcpQ== +"@sentry/core@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.38.0.tgz#5d1b74770c79e489e786018a3e514cddeb777bcb" + integrity sha512-sGD+5TEHU9G7X7zpyaoJxpOtwjTjvOd1f/MKBrWW2vf9UbYK+GUJrOzLhMoSWp/pHSYgvObkJkDb/HwieQjvhQ== dependencies: - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" "@sentry/nextjs@^8": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-8.37.1.tgz#e4e64b6388e8ab7e2d8e4cb7981775865bc3ada9" - integrity sha512-MMe+W1Jd/liYA47RU8qCFSYATgnVEAcFoREnbK2L4ooIDB2RP7jB8AX9LWD9ZWg9MduyQdDoFsI9OPIO3WmfuQ== + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-8.38.0.tgz#e279ff08b8bbde338bc9d1ce2c40dc0649d8c8d6" + integrity sha512-axKkeAXbpiO8hQjVtDSLyXYqCN9ptnNHxNmKlYuRTJtwv4hPZ31AIhurEN2y7dUBvXv3QTBv+9kvEkdN8qHvXA== dependencies: "@opentelemetry/api" "^1.9.0" "@opentelemetry/instrumentation-http" "0.53.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@rollup/plugin-commonjs" "26.0.1" - "@sentry-internal/browser-utils" "8.37.1" - "@sentry/core" "8.37.1" - "@sentry/node" "8.37.1" - "@sentry/opentelemetry" "8.37.1" - "@sentry/react" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" - "@sentry/vercel-edge" "8.37.1" + "@sentry-internal/browser-utils" "8.38.0" + "@sentry/core" "8.38.0" + "@sentry/node" "8.38.0" + "@sentry/opentelemetry" "8.38.0" + "@sentry/react" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" + "@sentry/vercel-edge" "8.38.0" "@sentry/webpack-plugin" "2.22.6" chalk "3.0.0" resolve "1.22.8" rollup "3.29.5" stacktrace-parser "^0.1.10" -"@sentry/node@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.37.1.tgz#d061bad391a53b3d20d3399d2a2c5466a6ec54f3" - integrity sha512-ACRZmqOBHRPKsyVhnDR4+RH1QQr7WMdH7RNl62VlKNZGLvraxW1CUqTSeNUFUuOwks3P6nozROSQs8VMSC/nVg== +"@sentry/node@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.38.0.tgz#a59883b2b1b4c5515f95c65af1965df20bc14d69" + integrity sha512-nwW0XqZFQseXYn0i6i6nKPkbjgHMBEFSF9TnK6mHHqJHHObHIZ6qu5CfvGKgxATia8JPIg9NN8XcyYOnQMi07w== dependencies: "@opentelemetry/api" "^1.9.0" "@opentelemetry/context-async-hooks" "^1.25.1" "@opentelemetry/core" "^1.25.1" "@opentelemetry/instrumentation" "^0.54.0" - "@opentelemetry/instrumentation-amqplib" "^0.42.0" + "@opentelemetry/instrumentation-amqplib" "^0.43.0" "@opentelemetry/instrumentation-connect" "0.40.0" "@opentelemetry/instrumentation-dataloader" "0.12.0" "@opentelemetry/instrumentation-express" "0.44.0" @@ -2729,6 +2746,7 @@ "@opentelemetry/instrumentation-http" "0.53.0" "@opentelemetry/instrumentation-ioredis" "0.43.0" "@opentelemetry/instrumentation-kafkajs" "0.4.0" + "@opentelemetry/instrumentation-knex" "0.41.0" "@opentelemetry/instrumentation-koa" "0.43.0" "@opentelemetry/instrumentation-lru-memoizer" "0.40.0" "@opentelemetry/instrumentation-mongodb" "0.48.0" @@ -2738,58 +2756,59 @@ "@opentelemetry/instrumentation-nestjs-core" "0.40.0" "@opentelemetry/instrumentation-pg" "0.44.0" "@opentelemetry/instrumentation-redis-4" "0.42.0" + "@opentelemetry/instrumentation-tedious" "0.15.0" "@opentelemetry/instrumentation-undici" "0.6.0" "@opentelemetry/resources" "^1.26.0" "@opentelemetry/sdk-trace-base" "^1.26.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@prisma/instrumentation" "5.19.1" - "@sentry/core" "8.37.1" - "@sentry/opentelemetry" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/core" "8.38.0" + "@sentry/opentelemetry" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" import-in-the-middle "^1.11.2" -"@sentry/opentelemetry@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.37.1.tgz#366a86edf0c2d080e30eaddca367cd614a0ce850" - integrity sha512-P/Rp7R+qNiRYz9qtVMV12YL9CIrZjzXWGVUBZjJayHu37jdvMowCol5G850QPYy0E2O0AQnFtxBno2yeURn8QQ== +"@sentry/opentelemetry@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.38.0.tgz#b4bae78c56f72b4bdc2a921c59a53339e776582d" + integrity sha512-AfjmIf/v7+x2WplhkX66LyGKvrzzPeSgff9uJ0cFCC2s0yd1qA2VPuIwEyr5i/FOJOP5bvFr8tu/hz3LA4+F5Q== dependencies: - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" -"@sentry/react@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.37.1.tgz#25ba2703b79436c9154e6f287959a8a3c040e8cb" - integrity sha512-HanDqBFTgIUhUsYztAHhSti+sEhQ8YopAymXgnpqkJ7j1PLHXZgQAre6M4Uvixu28WS5MDHC1onnAIBDgYRDYw== +"@sentry/react@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.38.0.tgz#513cbd9ba35bb0258d10b74d272800cbc5f05631" + integrity sha512-5396tewO00wbJFHUkmU+ikmp4A+wuBpStNc7UDyAm642jfbPajj51+GWld/ZYNFiQaZ/8I9tvvpHqVLnUh21gg== dependencies: - "@sentry/browser" "8.37.1" - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/browser" "8.38.0" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" hoist-non-react-statics "^3.3.2" -"@sentry/types@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.37.1.tgz#e92a7d346cfa29116568f4ffb58f65caedee0149" - integrity sha512-ryMOTROLSLINKFEbHWvi7GigNrsQhsaScw2NddybJGztJQ5UhxIGESnxGxWCufBmWFDwd7+5u0jDPCVUJybp7w== +"@sentry/types@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.38.0.tgz#9c48734a8b4055bfd553a0141efec78e9680ed09" + integrity sha512-fP5H9ZX01W4Z/EYctk3mkSHi7d06cLcX2/UWqwdWbyPWI+pL2QpUPICeO/C+8SnmYx//wFj3qWDhyPCh1PdFAA== -"@sentry/utils@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.37.1.tgz#6e020cd222d56d79953ea9d4630d91b3e323ceda" - integrity sha512-Qtn2IfpII12K17txG/ZtTci35XYjYi4CxbQ3j7nXY7toGv/+MqPXwV5q2i9g94XaSXlE5Wy9/hoCZoZpZs/djA== +"@sentry/utils@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.38.0.tgz#2f91ca7d044f6e17b993c866ca02a981c4c1bc25" + integrity sha512-3X7MgIKIx+2q5Al7QkhaRB4wV6DvzYsaeIwdqKUzGLuRjXmNgJrLoU87TAwQRmZ6Wr3IoEpThZZMNrzYPXxArw== dependencies: - "@sentry/types" "8.37.1" + "@sentry/types" "8.38.0" -"@sentry/vercel-edge@8.37.1": - version "8.37.1" - resolved "https://registry.yarnpkg.com/@sentry/vercel-edge/-/vercel-edge-8.37.1.tgz#cbd4690f420cb2696b41db40bd3238fbdfc07ce9" - integrity sha512-LBf1UFNermpDtV+n5tsOJgtc6b+9/uLsffvq64ktnx9x+Pz2/3sFAHauikB/fwmo0MLxYk9AIng5b2QL5+uv4Q== +"@sentry/vercel-edge@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@sentry/vercel-edge/-/vercel-edge-8.38.0.tgz#e748dd3ddcc46ee87a9ae0bf539cdab1e24547b4" + integrity sha512-JckfcK/bZZj2CGOcHhgi4lcHAWpMqOnx8g9YcIWc8Bj8MfpavXciYBU+L0AnYiXwnW1v3E4M0pMrb+jccvGtEw== dependencies: "@opentelemetry/api" "^1.9.0" - "@sentry/core" "8.37.1" - "@sentry/types" "8.37.1" - "@sentry/utils" "8.37.1" + "@sentry/core" "8.38.0" + "@sentry/types" "8.38.0" + "@sentry/utils" "8.38.0" "@sentry/webpack-plugin@2.22.6": version "2.22.6" @@ -3735,6 +3754,13 @@ resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz" integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw== +"@types/tedious@^4.0.14": + version "4.0.14" + resolved "https://registry.yarnpkg.com/@types/tedious/-/tedious-4.0.14.tgz#868118e7a67808258c05158e9cad89ca58a2aec1" + integrity sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw== + dependencies: + "@types/node" "*" + "@types/unist@*", "@types/unist@^3.0.0": version "3.0.3" resolved "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz" @@ -5734,23 +5760,10 @@ electron-to-chromium@^1.5.28: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz" integrity sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw== -elliptic@6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210" - integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA== - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - -elliptic@^6.5.3, elliptic@^6.5.5: - version "6.5.7" - resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz" - integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== +elliptic@6.6.1, elliptic@^6.5.3, elliptic@^6.5.5: + version "6.6.1" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06" + integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g== dependencies: bn.js "^4.11.9" brorand "^1.1.0" @@ -8188,10 +8201,10 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lucide-react@^0.456.0: - version "0.456.0" - resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.456.0.tgz#14906c3355cc65d3380b7b2294b331aeda1bb392" - integrity sha512-DIIGJqTT5X05sbAsQ+OhA8OtJYyD4NsEMCA/HQW/Y6ToPQ7gwbtujIoeAaup4HpHzV35SQOarKAWH8LYglB6eA== +lucide-react@^0.460.0: + version "0.460.0" + resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.460.0.tgz#5681364b6bd94d1d475944f0385239c0b1408e35" + integrity sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg== lz-string@^1.5.0: version "1.5.0" @@ -9550,12 +9563,12 @@ react-confetti@^6.1.0: dependencies: tween-functions "^1.2.0" -react-day-picker@^9.3.0: - version "9.3.0" - resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-9.3.0.tgz#00e979a495d98ce8886bb3625c51133ba5c2acc8" - integrity sha512-xXgZISTXlwQ1Igt4cBttXF+aK1Xvd00azcGVY74PNCAe8PxtULFVWGT1UfdavFiVScF04dyV8QcybKZAw570QQ== +react-day-picker@^9.3.2: + version "9.3.2" + resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-9.3.2.tgz#d507d99fbf52cfbbfa35b38f8a31d47a52322410" + integrity sha512-Rj2gPPVYKqZbSF8DxaLteHY+45zd6swf5yE3hmJ8m6VEqPI2ve9CuZsDvQ10tIt3ckRJ9hmLa5t0SsmLlXllhw== dependencies: - "@date-fns/tz" "^1.1.2" + "@date-fns/tz" "^1.2.0" date-fns "^4.1.0" react-docgen-typescript@^2.2.2: From cf43248ab8b39a416bdd7da8856e1a460a2966f7 Mon Sep 17 00:00:00 2001 From: Krzysztof Czerwinski <34861343+kcze@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:08:22 +0000 Subject: [PATCH 11/14] feat(frontend): Show Agent Output on Monitor page (#8501) * Show Output in Monitor * Updates * Updates * Move hardcoded ids to a dedicated enum --------- Co-authored-by: Toran Bruce Richards Co-authored-by: Aarushi <50577581+aarushik93@users.noreply.github.com> Co-authored-by: Zamil Majdy --- .../src/components/RunnerUIWrapper.tsx | 1 - .../components/edit/control/BlocksControl.tsx | 4 +- .../src/components/monitor/FlowRunInfo.tsx | 174 +++++++++++++----- .../components/runner-ui/RunnerOutputUI.tsx | 3 +- .../src/lib/autogpt-server-api/types.ts | 11 +- 5 files changed, 137 insertions(+), 56 deletions(-) diff --git a/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx b/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx index 6c3a117a53be..8a2b7f798f1c 100644 --- a/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx +++ b/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx @@ -89,7 +89,6 @@ const RunnerUIWrapper = forwardRef( const outputs = outputBlocks.map((node) => ({ id: node.id, type: "output" as const, - outputSchema: node.data.outputSchema as BlockIORootSchema, hardcodedValues: { name: (node.data.hardcodedValues as any).name || "Output", description: diff --git a/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx b/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx index fcd21c316a11..6a19771aed53 100644 --- a/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx +++ b/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx @@ -10,7 +10,7 @@ import { PopoverContent, PopoverTrigger, } from "@/components/ui/popover"; -import { Block, BlockUIType } from "@/lib/autogpt-server-api"; +import { Block, BlockUIType, SpecialBlockID } from "@/lib/autogpt-server-api"; import { MagnifyingGlassIcon, PlusIcon } from "@radix-ui/react-icons"; import { IconToyBrick } from "@/components/ui/icons"; import { getPrimaryCategoryColor } from "@/lib/utils"; @@ -57,7 +57,7 @@ export const BlocksControl: React.FC = ({ const agentList = flows.map( (flow) => ({ - id: "e189baac-8c20-45a1-94a7-55177ea42565", // TODO: fetch this programmatically. + id: SpecialBlockID.AGENT, name: flow.name, description: `Ver.${flow.version}` + diff --git a/autogpt_platform/frontend/src/components/monitor/FlowRunInfo.tsx b/autogpt_platform/frontend/src/components/monitor/FlowRunInfo.tsx index f866feda5f77..b98c2c68b7df 100644 --- a/autogpt_platform/frontend/src/components/monitor/FlowRunInfo.tsx +++ b/autogpt_platform/frontend/src/components/monitor/FlowRunInfo.tsx @@ -1,13 +1,20 @@ -import React, { useCallback } from "react"; -import AutoGPTServerAPI, { GraphMeta } from "@/lib/autogpt-server-api"; +import React, { useCallback, useEffect, useMemo, useState } from "react"; +import AutoGPTServerAPI, { + BlockIORootSchema, + Graph, + GraphMeta, + NodeExecutionResult, + SpecialBlockID, +} from "@/lib/autogpt-server-api"; import { FlowRun } from "@/lib/types"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import Link from "next/link"; import { Button, buttonVariants } from "@/components/ui/button"; import { IconSquare } from "@/components/ui/icons"; -import { Pencil2Icon } from "@radix-ui/react-icons"; +import { ExitIcon, Pencil2Icon } from "@radix-ui/react-icons"; import moment from "moment/moment"; import { FlowRunStatusBadge } from "@/components/monitor/FlowRunStatusBadge"; +import RunnerOutputUI, { BlockOutput } from "../runner-ui/RunnerOutputUI"; export const FlowRunInfo: React.FC< React.HTMLAttributes & { @@ -15,6 +22,66 @@ export const FlowRunInfo: React.FC< flowRun: FlowRun; } > = ({ flow, flowRun, ...props }) => { + const [isOutputOpen, setIsOutputOpen] = useState(false); + const [blockOutputs, setBlockOutputs] = useState([]); + const api = useMemo(() => new AutoGPTServerAPI(), []); + + const fetchBlockResults = useCallback(async () => { + const executionResults = await api.getGraphExecutionInfo( + flow.id, + flowRun.id, + ); + + // Create a map of the latest COMPLETED execution results of output nodes by node_id + const latestCompletedResults = executionResults + .filter( + (result) => + result.status === "COMPLETED" && + result.block_id === SpecialBlockID.OUTPUT, + ) + .reduce((acc, result) => { + const existing = acc.get(result.node_id); + + // Compare dates if there's an existing result + if (existing) { + const existingDate = existing.end_time || existing.add_time; + const currentDate = result.end_time || result.add_time; + + if (currentDate > existingDate) { + acc.set(result.node_id, result); + } + } else { + acc.set(result.node_id, result); + } + + return acc; + }, new Map()); + + // Transform results to BlockOutput format + setBlockOutputs( + Array.from(latestCompletedResults.values()).map((result) => ({ + id: result.node_id, + type: "output" as const, + hardcodedValues: { + name: result.input_data.name || "Output", + description: result.input_data.description || "Output from the agent", + value: result.input_data.value, + }, + // Change this line to extract the array directly + result: result.output_data?.output || undefined, + })), + ); + }, [api, flow.id, flow.version, flowRun.id]); + + // Fetch graph and execution data + useEffect(() => { + if (!isOutputOpen || blockOutputs.length > 0) { + return; + } + + fetchBlockResults(); + }, [isOutputOpen, blockOutputs]); + if (flowRun.graphID != flow.id) { throw new Error( `FlowRunInfo can't be used with non-matching flowRun.flowID and flow.id`, @@ -22,58 +89,67 @@ export const FlowRunInfo: React.FC< } const handleStopRun = useCallback(() => { - const api = new AutoGPTServerAPI(); api.stopGraphExecution(flow.id, flowRun.id); }, [flow.id, flowRun.id]); return ( - - -
- - {flow.name} v{flow.version} - -

- Agent ID: {flow.id} + <> + + +

+ + {flow.name} v{flow.version} + +

+ Agent ID: {flow.id} +

+

+ Run ID: {flowRun.id} +

+
+
+ {flowRun.status === "running" && ( + + )} + + + Open in Builder + +
+ + +
+ Status:{" "} + +
+

+ Started:{" "} + {moment(flowRun.startTime).format("YYYY-MM-DD HH:mm:ss")}

-

- Run ID: {flowRun.id} +

+ Finished:{" "} + {moment(flowRun.endTime).format("YYYY-MM-DD HH:mm:ss")}

-
-
- {flowRun.status === "running" && ( - - )} - - Open in Builder - -
- - -
- Status:{" "} - -
-

- Started:{" "} - {moment(flowRun.startTime).format("YYYY-MM-DD HH:mm:ss")} -

-

- Finished:{" "} - {moment(flowRun.endTime).format("YYYY-MM-DD HH:mm:ss")} -

-

- Duration (run time): {flowRun.duration} ( - {flowRun.totalRunTime}) seconds -

- {/*

Total cost: €1,23

*/} - - +

+ Duration (run time): {flowRun.duration} ( + {flowRun.totalRunTime}) seconds +

+ + + setIsOutputOpen(false)} + blockOutputs={blockOutputs} + /> + ); }; + export default FlowRunInfo; diff --git a/autogpt_platform/frontend/src/components/runner-ui/RunnerOutputUI.tsx b/autogpt_platform/frontend/src/components/runner-ui/RunnerOutputUI.tsx index 8e39eb3d4863..4751e151ea86 100644 --- a/autogpt_platform/frontend/src/components/runner-ui/RunnerOutputUI.tsx +++ b/autogpt_platform/frontend/src/components/runner-ui/RunnerOutputUI.tsx @@ -11,9 +11,8 @@ import { BlockIORootSchema } from "@/lib/autogpt-server-api/types"; import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; -interface BlockOutput { +export interface BlockOutput { id: string; - outputSchema: BlockIORootSchema; hardcodedValues: { name: string; description: string; diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts index 47ea96a293df..0794cc8611c6 100644 --- a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts +++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts @@ -241,11 +241,12 @@ export type GraphExecuteResponse = { /* Mirror of backend/data/execution.py:ExecutionResult */ export type NodeExecutionResult = { - graph_exec_id: string; - node_exec_id: string; graph_id: string; graph_version: number; + graph_exec_id: string; + node_exec_id: string; node_id: string; + block_id: string; status: "INCOMPLETE" | "QUEUED" | "RUNNING" | "COMPLETED" | "FAILED"; input_data: { [key: string]: any }; output_data: { [key: string]: Array }; @@ -319,6 +320,12 @@ export enum BlockUIType { AGENT = "Agent", } +export enum SpecialBlockID { + AGENT = "e189baac-8c20-45a1-94a7-55177ea42565", + INPUT = "c0a8e994-ebf1-4a9c-a4d8-89d09c86741b", + OUTPUT = "363ae599-353e-4804-937e-b2ee3cef3da4", +} + export type AnalyticsMetrics = { metric_name: string; metric_value: number; From 92bfbfad57a57e03e1acd05574d8db73e525c58a Mon Sep 17 00:00:00 2001 From: Nicholas Tindle Date: Wed, 20 Nov 2024 09:21:16 -0600 Subject: [PATCH 12/14] feat: generate simple auth tests (#8709) --- .github/workflows/platform-frontend-ci.yml | 4 + autogpt_platform/frontend/package.json | 1 + .../frontend/playwright.config.ts | 8 +- .../frontend/src/tests/auth.spec.ts | 46 ++++++++++ .../frontend/src/tests/fixtures/index.ts | 18 ++++ .../src/tests/fixtures/login-page.fixture.ts | 14 ++++ .../src/tests/fixtures/test-user.fixture.ts | 83 +++++++++++++++++++ .../frontend/src/tests/pages/login.page.ts | 51 ++++++++++++ .../frontend/src/tests/title.spec.ts | 2 +- .../frontend/src/tests/util.spec.ts | 2 +- .../src/tests/utils/user-generator.ts | 9 ++ autogpt_platform/frontend/yarn.lock | 5 ++ 12 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 autogpt_platform/frontend/src/tests/auth.spec.ts create mode 100644 autogpt_platform/frontend/src/tests/fixtures/index.ts create mode 100644 autogpt_platform/frontend/src/tests/fixtures/login-page.fixture.ts create mode 100644 autogpt_platform/frontend/src/tests/fixtures/test-user.fixture.ts create mode 100644 autogpt_platform/frontend/src/tests/pages/login.page.ts create mode 100644 autogpt_platform/frontend/src/tests/utils/user-generator.ts diff --git a/.github/workflows/platform-frontend-ci.yml b/.github/workflows/platform-frontend-ci.yml index ce3633013bb9..7c1f792917f0 100644 --- a/.github/workflows/platform-frontend-ci.yml +++ b/.github/workflows/platform-frontend-ci.yml @@ -69,6 +69,10 @@ jobs: run: | cp ../supabase/docker/.env.example ../.env + - name: Copy backend .env + run: | + cp ../backend/.env.example ../backend/.env + - name: Run docker compose run: | docker compose -f ../docker-compose.yml up -d diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.json index d2586fa4fc89..f1e6ee6c4881 100644 --- a/autogpt_platform/frontend/package.json +++ b/autogpt_platform/frontend/package.json @@ -23,6 +23,7 @@ "defaults" ], "dependencies": { + "@faker-js/faker": "^9.2.0", "@hookform/resolvers": "^3.9.1", "@next/third-parties": "^15.0.3", "@radix-ui/react-avatar": "^1.1.1", diff --git a/autogpt_platform/frontend/playwright.config.ts b/autogpt_platform/frontend/playwright.config.ts index 75c9f68d4c80..e1bcd8d98a56 100644 --- a/autogpt_platform/frontend/playwright.config.ts +++ b/autogpt_platform/frontend/playwright.config.ts @@ -4,10 +4,10 @@ import { defineConfig, devices } from "@playwright/test"; * Read environment variables from file. * https://github.com/motdotla/dotenv */ -// import dotenv from 'dotenv'; -// import path from 'path'; -// dotenv.config({ path: path.resolve(__dirname, '.env') }); - +import dotenv from "dotenv"; +import path from "path"; +dotenv.config({ path: path.resolve(__dirname, ".env") }); +dotenv.config({ path: path.resolve(__dirname, "../backend/.env") }); /** * See https://playwright.dev/docs/test-configuration. */ diff --git a/autogpt_platform/frontend/src/tests/auth.spec.ts b/autogpt_platform/frontend/src/tests/auth.spec.ts new file mode 100644 index 000000000000..dc082b2c2ca8 --- /dev/null +++ b/autogpt_platform/frontend/src/tests/auth.spec.ts @@ -0,0 +1,46 @@ +import { test, expect } from "./fixtures"; + +test.describe("Authentication", () => { + test("user can login successfully", async ({ page, loginPage, testUser }) => { + await page.goto("/login"); // Make sure we're on the login page + await loginPage.login(testUser.email, testUser.password); + // expect to be redirected to the home page + await expect(page).toHaveURL("/"); + // expect to see the Monitor text + await expect(page.getByText("Monitor")).toBeVisible(); + }); + + test("user can logout successfully", async ({ + page, + loginPage, + testUser, + }) => { + await page.goto("/login"); // Make sure we're on the login page + await loginPage.login(testUser.email, testUser.password); + + // Expect to be on the home page + await expect(page).toHaveURL("/"); + // Click on the user menu + await page.getByRole("button", { name: "CN" }).click(); + // Click on the logout menu item + await page.getByRole("menuitem", { name: "Log out" }).click(); + // Expect to be redirected to the login page + await expect(page).toHaveURL("/login"); + }); + + test("login in, then out, then in again", async ({ + page, + loginPage, + testUser, + }) => { + await page.goto("/login"); // Make sure we're on the login page + await loginPage.login(testUser.email, testUser.password); + await page.goto("/"); + await page.getByRole("button", { name: "CN" }).click(); + await page.getByRole("menuitem", { name: "Log out" }).click(); + await expect(page).toHaveURL("/login"); + await loginPage.login(testUser.email, testUser.password); + await expect(page).toHaveURL("/"); + await expect(page.getByText("Monitor")).toBeVisible(); + }); +}); diff --git a/autogpt_platform/frontend/src/tests/fixtures/index.ts b/autogpt_platform/frontend/src/tests/fixtures/index.ts new file mode 100644 index 000000000000..7436ced68120 --- /dev/null +++ b/autogpt_platform/frontend/src/tests/fixtures/index.ts @@ -0,0 +1,18 @@ +import { test as base } from "@playwright/test"; +import { createTestUserFixture } from "./test-user.fixture"; +import { createLoginPageFixture } from "./login-page.fixture"; +import type { TestUser } from "./test-user.fixture"; +import { LoginPage } from "../pages/login.page"; + +type Fixtures = { + testUser: TestUser; + loginPage: LoginPage; +}; + +// Combine fixtures +export const test = base.extend({ + testUser: createTestUserFixture, + loginPage: createLoginPageFixture, +}); + +export { expect } from "@playwright/test"; diff --git a/autogpt_platform/frontend/src/tests/fixtures/login-page.fixture.ts b/autogpt_platform/frontend/src/tests/fixtures/login-page.fixture.ts new file mode 100644 index 000000000000..fad6c1c7b01a --- /dev/null +++ b/autogpt_platform/frontend/src/tests/fixtures/login-page.fixture.ts @@ -0,0 +1,14 @@ +/* eslint-disable react-hooks/rules-of-hooks */ +import { test as base } from "@playwright/test"; +import { LoginPage } from "../pages/login.page"; + +export const loginPageFixture = base.extend<{ loginPage: LoginPage }>({ + loginPage: async ({ page }, use) => { + await use(new LoginPage(page)); + }, +}); + +// Export just the fixture function +export const createLoginPageFixture = async ({ page }, use) => { + await use(new LoginPage(page)); +}; diff --git a/autogpt_platform/frontend/src/tests/fixtures/test-user.fixture.ts b/autogpt_platform/frontend/src/tests/fixtures/test-user.fixture.ts new file mode 100644 index 000000000000..76a935aa98bb --- /dev/null +++ b/autogpt_platform/frontend/src/tests/fixtures/test-user.fixture.ts @@ -0,0 +1,83 @@ +/* eslint-disable react-hooks/rules-of-hooks */ +import { createClient, SupabaseClient } from "@supabase/supabase-js"; +import { faker } from "@faker-js/faker"; + +export type TestUser = { + email: string; + password: string; + id?: string; +}; + +let supabase: SupabaseClient; + +function getSupabaseAdmin() { + if (!supabase) { + supabase = createClient( + process.env.SUPABASE_URL!, + process.env.SUPABASE_SERVICE_ROLE_KEY!, + { + auth: { + autoRefreshToken: false, + persistSession: false, + }, + }, + ); + } + return supabase; +} + +async function createTestUser(userData: TestUser): Promise { + const supabase = getSupabaseAdmin(); + + const { data: authUser, error: authError } = await supabase.auth.signUp({ + email: userData.email, + password: userData.password, + }); + + if (authError) { + throw new Error(`Failed to create test user: ${authError.message}`); + } + + return { + ...userData, + id: authUser.user?.id, + }; +} + +async function deleteTestUser(userId: string) { + const supabase = getSupabaseAdmin(); + + try { + const { error } = await supabase.auth.admin.deleteUser(userId); + + if (error) { + console.warn(`Warning: Failed to delete test user: ${error.message}`); + } + } catch (error) { + console.warn( + `Warning: Error during user cleanup: ${(error as Error).message}`, + ); + } +} + +function generateUserData(): TestUser { + return { + email: `test.${faker.string.uuid()}@example.com`, + password: faker.internet.password({ length: 12 }), + }; +} + +// Export just the fixture function +export const createTestUserFixture = async ({}, use) => { + let user: TestUser | null = null; + + try { + const userData = generateUserData(); + user = await createTestUser(userData); + await use(user); + } finally { + if (user?.id) { + await deleteTestUser(user.id); + } + } +}; diff --git a/autogpt_platform/frontend/src/tests/pages/login.page.ts b/autogpt_platform/frontend/src/tests/pages/login.page.ts new file mode 100644 index 000000000000..8abc87588d2b --- /dev/null +++ b/autogpt_platform/frontend/src/tests/pages/login.page.ts @@ -0,0 +1,51 @@ +import { Page } from "@playwright/test"; + +export class LoginPage { + constructor(private page: Page) {} + + async login(email: string, password: string) { + console.log("Attempting login with:", { email, password }); // Debug log + + // Fill email + const emailInput = this.page.getByPlaceholder("user@email.com"); + await emailInput.waitFor({ state: "visible" }); + await emailInput.fill(email); + + // Fill password + const passwordInput = this.page.getByPlaceholder("password"); + await passwordInput.waitFor({ state: "visible" }); + await passwordInput.fill(password); + + // Check terms + const termsCheckbox = this.page.getByLabel("I agree to the Terms of Use"); + await termsCheckbox.waitFor({ state: "visible" }); + await termsCheckbox.click(); + + // TODO: This is a workaround to wait for the page to load after filling the email and password + const emailInput2 = this.page.getByPlaceholder("user@email.com"); + await emailInput2.waitFor({ state: "visible" }); + await emailInput2.fill(email); + + // Fill password + const passwordInput2 = this.page.getByPlaceholder("password"); + await passwordInput2.waitFor({ state: "visible" }); + await passwordInput2.fill(password); + + // Wait for the button to be ready + const loginButton = this.page.getByRole("button", { name: "Log in" }); + await loginButton.waitFor({ state: "visible" }); + + // Start waiting for navigation before clicking + const navigationPromise = this.page.waitForURL("/", { timeout: 60000 }); + + console.log("About to click login button"); // Debug log + await loginButton.click(); + + console.log("Waiting for navigation"); // Debug log + await navigationPromise; + + console.log("Navigation complete, waiting for network idle"); // Debug log + await this.page.waitForLoadState("networkidle", { timeout: 60000 }); + console.log("Login process complete"); // Debug log + } +} diff --git a/autogpt_platform/frontend/src/tests/title.spec.ts b/autogpt_platform/frontend/src/tests/title.spec.ts index e7e95c949bd3..c80123cb7fd5 100644 --- a/autogpt_platform/frontend/src/tests/title.spec.ts +++ b/autogpt_platform/frontend/src/tests/title.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "@playwright/test"; +import { test, expect } from "./fixtures"; test("has title", async ({ page }) => { await page.goto("/"); diff --git a/autogpt_platform/frontend/src/tests/util.spec.ts b/autogpt_platform/frontend/src/tests/util.spec.ts index eebc5aae025d..84fb9a3de6ac 100644 --- a/autogpt_platform/frontend/src/tests/util.spec.ts +++ b/autogpt_platform/frontend/src/tests/util.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "@playwright/test"; +import { test, expect } from "./fixtures"; import { setNestedProperty } from "../lib/utils"; const testCases = [ diff --git a/autogpt_platform/frontend/src/tests/utils/user-generator.ts b/autogpt_platform/frontend/src/tests/utils/user-generator.ts new file mode 100644 index 000000000000..dd8775fc0727 --- /dev/null +++ b/autogpt_platform/frontend/src/tests/utils/user-generator.ts @@ -0,0 +1,9 @@ +import { faker } from "@faker-js/faker"; + +export function generateUser() { + return { + email: faker.internet.email(), + password: faker.internet.password(), + name: faker.person.fullName(), + }; +} diff --git a/autogpt_platform/frontend/yarn.lock b/autogpt_platform/frontend/yarn.lock index 53d88538f2a2..2445587c6912 100644 --- a/autogpt_platform/frontend/yarn.lock +++ b/autogpt_platform/frontend/yarn.lock @@ -1202,6 +1202,11 @@ resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== +"@faker-js/faker@^9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.2.0.tgz#269ee3a5d2442e88e10d984e106028422bcb9551" + integrity sha512-ulqQu4KMr1/sTFIYvqSdegHT8NIkt66tFAkugGnHA+1WAfEn6hMzNR+svjXGFRVLnapxvej67Z/LwchFrnLBUg== + "@floating-ui/core@^1.6.0": version "1.6.7" resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz" From 26a6bd4d10228d4bfe6a49074412cb01b4256269 Mon Sep 17 00:00:00 2001 From: Nicholas Tindle Date: Wed, 20 Nov 2024 09:29:45 -0600 Subject: [PATCH 13/14] docs(platform): update docs for security ssrf (#8675) --- .../backend/backend/util/request.py | 2 + docs/content/platform/new_blocks.md | 64 ++++++++++++++++++- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/autogpt_platform/backend/backend/util/request.py b/autogpt_platform/backend/backend/util/request.py index a0774c02f214..9fb97d05e4c0 100644 --- a/autogpt_platform/backend/backend/util/request.py +++ b/autogpt_platform/backend/backend/util/request.py @@ -9,6 +9,7 @@ # List of IP networks to block BLOCKED_IP_NETWORKS = [ + # --8<-- [start:BLOCKED_IP_NETWORKS] ipaddress.ip_network("0.0.0.0/8"), # "This" Network ipaddress.ip_network("10.0.0.0/8"), # Private-Use ipaddress.ip_network("127.0.0.0/8"), # Loopback @@ -17,6 +18,7 @@ ipaddress.ip_network("192.168.0.0/16"), # Private-Use ipaddress.ip_network("224.0.0.0/4"), # Multicast ipaddress.ip_network("240.0.0.0/4"), # Reserved for Future Use + # --8<-- [end:BLOCKED_IP_NETWORKS] ] diff --git a/docs/content/platform/new_blocks.md b/docs/content/platform/new_blocks.md index b262d8a37cf8..4ef48ea738bd 100644 --- a/docs/content/platform/new_blocks.md +++ b/docs/content/platform/new_blocks.md @@ -337,15 +337,73 @@ For the WikipediaSummaryBlock: This approach allows us to test the block's logic comprehensively without relying on external services, while also accommodating non-deterministic outputs. +## Security Best Practices for SSRF Prevention + +When creating blocks that handle external URL inputs or make network requests, it's crucial to use the platform's built-in SSRF protection mechanisms. The `backend.util.request` module provides a secure `Requests` wrapper class that should be used for all HTTP requests. + +### Using the Secure Requests Wrapper + +```python +from backend.util.request import requests + +class MyNetworkBlock(Block): + def run(self, input_data: Input, **kwargs) -> BlockOutput: + try: + # The requests wrapper automatically validates URLs and blocks dangerous requests + response = requests.get(input_data.url) + yield "result", response.text + except ValueError as e: + # URL validation failed + raise RuntimeError(f"Invalid URL provided: {e}") + except requests.exceptions.RequestException as e: + # Request failed + raise RuntimeError(f"Request failed: {e}") +``` + +The `Requests` wrapper provides these security features: + +1. **URL Validation**: + - Blocks requests to private IP ranges (RFC 1918) + - Validates URL format and protocol + - Resolves DNS and checks IP addresses + - Supports whitelisting trusted origins + +2. **Secure Defaults**: + - Disables redirects by default + - Raises exceptions for non-200 status codes + - Supports custom headers and validators + +3. **Protected IP Ranges**: + The wrapper denies requests to these networks: + + ```python title="backend/util/request.py" + --8<-- "autogpt_platform/backend/backend/util/request.py:BLOCKED_IP_NETWORKS" + ``` + +### Custom Request Configuration + +If you need to customize the request behavior: + +```python +from backend.util.request import Requests + +# Create a custom requests instance with specific trusted origins +custom_requests = Requests( + trusted_origins=["api.trusted-service.com"], + raise_for_status=True, + extra_headers={"User-Agent": "MyBlock/1.0"} +) +``` + ## Tips for Effective Block Testing 1. **Provide realistic test_input**: Ensure your test input covers typical use cases. 2. **Define appropriate test_output**: - - For deterministic outputs, use specific expected values. - - For non-deterministic outputs or when only the type matters, use Python types (e.g., `str`, `int`, `dict`). - - You can mix specific values and types, e.g., `("key1", str), ("key2", 42)`. + - For deterministic outputs, use specific expected values. + - For non-deterministic outputs or when only the type matters, use Python types (e.g., `str`, `int`, `dict`). + - You can mix specific values and types, e.g., `("key1", str), ("key2", 42)`. 3. **Use test_mock for network calls**: This prevents tests from failing due to network issues or API changes. From 19095be249991c861e9a161c5e57d4e78bd7d023 Mon Sep 17 00:00:00 2001 From: Simone Busoli Date: Wed, 20 Nov 2024 11:20:46 -0800 Subject: [PATCH 14/14] docs: replace docker-compose with docker compose (#8502) Co-authored-by: Swifty Co-authored-by: Aarushi <50577581+aarushik93@users.noreply.github.com> --- classic/original_autogpt/.devcontainer/docker-compose.yml | 2 +- docs/content/classic/share-your-logs.md | 2 +- docs/content/platform/getting-started.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classic/original_autogpt/.devcontainer/docker-compose.yml b/classic/original_autogpt/.devcontainer/docker-compose.yml index 75871fa0b627..a4f40f740f24 100644 --- a/classic/original_autogpt/.devcontainer/docker-compose.yml +++ b/classic/original_autogpt/.devcontainer/docker-compose.yml @@ -1,5 +1,5 @@ # To boot the app run the following: -# docker-compose run auto-gpt +# docker compose run auto-gpt version: '3.9' services: diff --git a/docs/content/classic/share-your-logs.md b/docs/content/classic/share-your-logs.md index 279c6da92ab9..d34f84df548c 100644 --- a/docs/content/classic/share-your-logs.md +++ b/docs/content/classic/share-your-logs.md @@ -14,7 +14,7 @@ To print out debug logs: .\autogpt.bat --debug # on Windows -docker-compose run --rm auto-gpt --debug # in Docker +docker compose run --rm auto-gpt --debug # in Docker ``` ## Inspect and share logs diff --git a/docs/content/platform/getting-started.md b/docs/content/platform/getting-started.md index bbb9278bc7a0..f4e82392be5a 100644 --- a/docs/content/platform/getting-started.md +++ b/docs/content/platform/getting-started.md @@ -56,7 +56,7 @@ You can check if you have Docker installed by running the following command: ```bash docker -v -docker-compose -v +docker compose -v ``` Once you have Docker and Docker Compose installed, you can proceed to the next step.