From d7dd46d34dceda16510fd8c0021c1d48d2ac280d Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 14:49:12 -0400 Subject: [PATCH 01/17] update the autogpt branch --- .github/workflows/run.yml | 2 +- docker-compose.yml | 5 +++++ vendor/Auto-GPT | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 9aba941..ba181ac 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -11,7 +11,7 @@ jobs: with: submodules: 'true' - name: Run autogpt in docker with mock openai server - run: docker-compose up --no-build + run: docker-compose up --no-build --abort-on-container-exit env: GITHUB_PAT: ${{ secrets.PAT }} GITHUB_REPO: "jmikedupont2/ai-ticket" diff --git a/docker-compose.yml b/docker-compose.yml index ef6e8e8..8dcf09e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,3 +35,8 @@ services: ports: - "5000:5000" + autogpt-standalone: + entrypoint: bash + build: + context: vendor/Auto-GPT/ + diff --git a/vendor/Auto-GPT b/vendor/Auto-GPT index 2717205..6398b2b 160000 --- a/vendor/Auto-GPT +++ b/vendor/Auto-GPT @@ -1 +1 @@ -Subproject commit 271720501967226a1c5fb67fd5eba4a19a058e6a +Subproject commit 6398b2bf100dfe1a7df517548ece655dc46ec491 From 7c8eacf3531eea5f1a66c9291ef3029f036fada1 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 14:50:52 -0400 Subject: [PATCH 02/17] making a standalone autogpt --- docker-compose.yml | 66 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8dcf09e..081a998 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,39 +1,39 @@ version: '3' services: - ai_ticket: - image: ai_ticket - build: - context: . - #entrypoint: /bin/bash - #stdin_open: true # docker run -i - #tty: true # docker run -t - - autogpt: - #entrypoint: bash -c "poetry run pip install /opt/ai-ticket && poetry run autogpt --install-plugin-deps --skip-news -y" - entrypoint: bash -c "poetry run pip install /opt/ai-ticket && poetry run autogpt --install-plugin-deps --skip-news -y --ai-name 'meta-autogpt' --ai-role 'you will introspect autogpt and reveal its internals via reflection and comprehension' --ai-goal 'Observe your behaviour' --ai-goal 'Reflect over your outcomes' --ai-goal 'Orient yourself to your knowledge' --ai-goal 'Decide on your next step' --ai-goal 'Act on your chosen next experiment' " - - # uncomment thse next 3 lines for debugging - #entrypoint: /bin/bash - #stdin_open: true # docker run -i - #tty: true # docker run -t - build: - context: vendor/Auto-GPT/ - depends_on: - - mockopenai - - mockopenai: - depends_on: - - ai_ticket - - environment: - - GITHUB_PAT=${GITHUB_PAT} - - GITHUB_REPO=${GITHUB_REPO} - - build: - context: vendor/lollms/ - ports: - - "5000:5000" + # ai_ticket: + # image: ai_ticket + # build: + # context: . + # #entrypoint: /bin/bash + # #stdin_open: true # docker run -i + # #tty: true # docker run -t + + # autogpt: + # #entrypoint: bash -c "poetry run pip install /opt/ai-ticket && poetry run autogpt --install-plugin-deps --skip-news -y" + # entrypoint: bash -c "poetry run pip install /opt/ai-ticket && poetry run autogpt --install-plugin-deps --skip-news -y --ai-name 'meta-autogpt' --ai-role 'you will introspect autogpt and reveal its internals via reflection and comprehension' --ai-goal 'Observe your behaviour' --ai-goal 'Reflect over your outcomes' --ai-goal 'Orient yourself to your knowledge' --ai-goal 'Decide on your next step' --ai-goal 'Act on your chosen next experiment' " + + # # uncomment thse next 3 lines for debugging + # #entrypoint: /bin/bash + # #stdin_open: true # docker run -i + # #tty: true # docker run -t + # build: + # context: vendor/Auto-GPT/ + # depends_on: + # - mockopenai + + # mockopenai: + # depends_on: + # - ai_ticket + + # environment: + # - GITHUB_PAT=${GITHUB_PAT} + # - GITHUB_REPO=${GITHUB_REPO} + + # build: + # context: vendor/lollms/ + # ports: + # - "5000:5000" autogpt-standalone: entrypoint: bash From 31830271663fae250c73f91758b5d552f56aa195 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 14:57:03 -0400 Subject: [PATCH 03/17] change base image --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 94d9880..dcbd424 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -10,8 +10,8 @@ on: jobs: build-and-publish-docker: - - runs-on: h4ckermike/act_base:latest + runs-on: ubuntu-latest + #runs-on: h4ckermike/act_base:latest steps: - uses: actions/checkout@v3 From be0f4827bc1707244116bad752abb377c6588b34 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:00:43 -0400 Subject: [PATCH 04/17] fixing the path --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 081a998..504cd19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,5 +38,5 @@ services: autogpt-standalone: entrypoint: bash build: - context: vendor/Auto-GPT/ + context: vendor/Auto-GPT/autogpts/autogpt/ From d71999761de6d87287983f71d2871eb97028ab45 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:06:14 -0400 Subject: [PATCH 05/17] build image --- .github/workflows/docker-image.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index dcbd424..fabe217 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,7 +14,9 @@ jobs: #runs-on: h4ckermike/act_base:latest steps: - - uses: actions/checkout@v3 + - uses: meta-introspector/checkout@v3 + with : + submodule: true - name: Build the Docker imaage run: docker-compose build - name: Build the Docker imaage From 2583928d0bf5c193d13e776a6e1024a495812052 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:08:54 -0400 Subject: [PATCH 06/17] fixing --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fabe217..2fe28ae 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: meta-introspector/checkout@v3 with : - submodule: true + submodules: true - name: Build the Docker imaage run: docker-compose build - name: Build the Docker imaage From dfe7901dbd82794dad3ead71594a48cb9e7fd359 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:19:43 -0400 Subject: [PATCH 07/17] update submodule --- vendor/Auto-GPT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/Auto-GPT b/vendor/Auto-GPT index 6398b2b..7c9e318 160000 --- a/vendor/Auto-GPT +++ b/vendor/Auto-GPT @@ -1 +1 @@ -Subproject commit 6398b2bf100dfe1a7df517548ece655dc46ec491 +Subproject commit 7c9e3182c4e9b1d2af3f32e96e86797502ba69c2 From 298b349485235e718909ff6e0ab2eee0aafbd9ba Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:30:07 -0400 Subject: [PATCH 08/17] update the docker compose --- docker-compose.yml | 2 +- vendor/Auto-GPT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 504cd19..081a998 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,5 +38,5 @@ services: autogpt-standalone: entrypoint: bash build: - context: vendor/Auto-GPT/autogpts/autogpt/ + context: vendor/Auto-GPT/ diff --git a/vendor/Auto-GPT b/vendor/Auto-GPT index 7c9e318..df7db52 160000 --- a/vendor/Auto-GPT +++ b/vendor/Auto-GPT @@ -1 +1 @@ -Subproject commit 7c9e3182c4e9b1d2af3f32e96e86797502ba69c2 +Subproject commit df7db52dce1e5ac0fde34e65943ee8250ae97840 From 2ab112fdf644e02abf9b41f1c773e9e0f402dac3 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:40:28 -0400 Subject: [PATCH 09/17] update compose --- runact.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 runact.sh diff --git a/runact.sh b/runact.sh new file mode 100644 index 0000000..468a2f6 --- /dev/null +++ b/runact.sh @@ -0,0 +1,3 @@ +act -P ubuntu-latest=h4ckermike/act_base \ + --verbose \ + --job mock_openai_and_autogpt From e0939eeffcfc84631717fdd50634a549fb32a48b Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:42:43 -0400 Subject: [PATCH 10/17] update --- docker-compose.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 081a998..84a20e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,10 @@ services: autogpt-standalone: entrypoint: bash - build: - context: vendor/Auto-GPT/ + build: + context: vendor/Auto-GPT/ + dockerfile: slim/Dockerfile + args: + OFFICIAL_PYTHON_IMAGE: h4ckermike/ai_ticket:latest + From 91914a15490fa539b736335d6ac62d581968d68a Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 15:50:45 -0400 Subject: [PATCH 11/17] my repo uses DOCKER for the docker tokcen --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2fe28ae..408a1f7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -23,4 +23,4 @@ jobs: run: docker-compose push env: DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} - DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} + DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER }} From 92f060a0a02034e3daf639b7e5303bbe91dd3d6e Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 16:39:23 -0400 Subject: [PATCH 12/17] adding in the docker build --- .github/workflows/docker-image.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 408a1f7..33df825 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -18,7 +18,14 @@ jobs: with : submodules: true - name: Build the Docker imaage - run: docker-compose build + run: docker-compose build + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: "h4ckermike" + password: ${{ secrets.DOCKER }} + logout : 'false' + - name: Build the Docker imaage run: docker-compose push env: From b2dfff01614c37d6e97228e1d3d53da906c233a6 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 16:57:53 -0400 Subject: [PATCH 13/17] try and specialize --- .github/workflows/docker-image.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 33df825..d4ccf72 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,8 +17,10 @@ jobs: - uses: meta-introspector/checkout@v3 with : submodules: true + - name: Build the Docker imaage - run: docker-compose build + run: docker-compose build autogpt-standalone + - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -27,7 +29,8 @@ jobs: logout : 'false' - name: Build the Docker imaage - run: docker-compose push + + run: docker-compose push autogpt-standalone env: - DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} + DOCKER_HUB_USERNAME: "h4ckermike" DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER }} From 4ae7b0e8831ede57d6564d7ddadce86f8cb5d452 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 16:59:25 -0400 Subject: [PATCH 14/17] adding the image name --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 84a20e7..a4ca26e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,8 @@ services: # - "5000:5000" autogpt-standalone: - entrypoint: bash + entrypoint: bash + image: h4ckermike/autogpt-standalone build: context: vendor/Auto-GPT/ dockerfile: slim/Dockerfile From 78224901170f1ffcb580ee2056e02ecca4972812 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 18:19:30 -0400 Subject: [PATCH 15/17] update entrypoint --- vendor/Auto-GPT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/Auto-GPT b/vendor/Auto-GPT index df7db52..49933d0 160000 --- a/vendor/Auto-GPT +++ b/vendor/Auto-GPT @@ -1 +1 @@ -Subproject commit df7db52dce1e5ac0fde34e65943ee8250ae97840 +Subproject commit 49933d0b073c82cfed2f28f5fd4bed272ef7987a From 78dca56d12e940158776837a31fc7b985b0c0286 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 18:29:29 -0400 Subject: [PATCH 16/17] was editing the wrong file --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a4ca26e..8a4c17c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,6 @@ services: # - "5000:5000" autogpt-standalone: - entrypoint: bash image: h4ckermike/autogpt-standalone build: context: vendor/Auto-GPT/ From 2d8708baa62072ff16479bc7779e27272358399a Mon Sep 17 00:00:00 2001 From: mike dupont Date: Mon, 9 Oct 2023 18:31:12 -0400 Subject: [PATCH 17/17] update --- vendor/Auto-GPT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/Auto-GPT b/vendor/Auto-GPT index 49933d0..2c9f2ec 160000 --- a/vendor/Auto-GPT +++ b/vendor/Auto-GPT @@ -1 +1 @@ -Subproject commit 49933d0b073c82cfed2f28f5fd4bed272ef7987a +Subproject commit 2c9f2ec8badcf331c74ed241a2df56abe4408cac