From f1e604ab162e742c5450e0fddd37a24b5c6fff17 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Sat, 30 Sep 2023 18:21:33 -0400 Subject: [PATCH 1/6] starting to work --- .github/workflows/python-package.yml | 17 ++++++++++------- .gitignore | 4 +++- Makefile | 2 ++ docker-compose.yml | 7 ++++--- runact.sh | 18 ++++++++++++++++++ 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 Makefile create mode 100644 runact.sh diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 42cf029..f076033 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -5,22 +5,25 @@ on: pull_request: branches: [ "main" ] jobs: - build: + python-package-build: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: [ + #"3.10", + "3.x"] steps: - uses: actions/checkout@v3 - name: Checkout repository uses: actions/checkout@master with: submodules: 'true' - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} + #- name: Set up Python ${{ matrix.python-version }} + #3 uses: actions/setup-python@v3 + # with: + # architecture: x64 + # python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip @@ -31,7 +34,7 @@ jobs: # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Docker Compose Action - uses: isbang/compose-action@v1.5.1 + uses: meta-introspector/compose-action@main env: GITHUB_PAT: ${{ secrets.PAT }} GITHUB_REPO: "jmikedupont2/ai-ticket" diff --git a/.gitignore b/.gitignore index 311200f..d54b7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -160,4 +160,6 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ -*~ \ No newline at end of file +*~ +/dckr_pat_.txt +/github_pat.txt diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..53433c5 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +test: + bash ./runact.sh diff --git a/docker-compose.yml b/docker-compose.yml index bc7b3c8..addd9de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ version: '3' services: ai_ticket: - image: ai_ticket - build: - context: . + #image: ai_ticket + build: . + # context: . #entrypoint: /bin/bash #stdin_open: true # docker run -i #tty: true # docker run -t @@ -24,6 +24,7 @@ services: build: context: vendor/Auto-GPT/ depends_on: + - ai_ticket - mockopenai mockopenai: diff --git a/runact.sh b/runact.sh new file mode 100644 index 0000000..997e85a --- /dev/null +++ b/runact.sh @@ -0,0 +1,18 @@ + +#prerequists +# git clone https://github.com/nektos/act -> https://github.com/meta-introspector/actx +# make build + + +# git clone https://github.com/moovweb/gvm +# cd gvm/ &&./autogen.sh && make install + +act \ + -s GITHUB_TOKEN=`cat github_pat.txt` \ + -s GITHUB_PAT=`cat github_pat.txt` \ + -s DOCKER=`cat dckr_pat_.txt` \ + -P ubuntu-latest=localhost/my_local_act \ + --verbose \ + --job python-package-build + +# --pull=false \ From e25f2c2f67175528da98328a4b40f6a1c0346bee Mon Sep 17 00:00:00 2001 From: mike dupont Date: Sat, 30 Sep 2023 21:29:06 -0400 Subject: [PATCH 2/6] working better now just need to add a job --- .github/workflows/debug.yml | 20 ++++++++++++++++++++ .github/workflows/python-package.yml | 24 ++++++++++++++++++++++-- .secrets.example.txt | 4 ++++ runact.sh | 10 +++------- 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/debug.yml create mode 100644 .secrets.example.txt diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml new file mode 100644 index 0000000..5d63fd2 --- /dev/null +++ b/.github/workflows/debug.yml @@ -0,0 +1,20 @@ +name: Python package +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] +jobs: + debug: + runs-on: ubuntu-latest + steps: + - name: test + env: + GITHUB_PAT: ${{ secrets.PAT }} + GITHUB_1: ${{ secrets.PAT }} + DOCKERTEST: ${{ secrets.DOCKER }} + run: echo pat ${{ secrets.PAT }} docker ${{ secrets.DOCKER }} and test1 ${DOCKERTEST} and $GITHUB_1 + - name: test2 + env: + GITHUB_PAT: ${{ secrets.PAT }} + run: docker-compose -e GIHUB_PAT="${{ secrets.PAT }}" up diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f076033..d0ed12a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -14,6 +14,8 @@ jobs: #"3.10", "3.x"] steps: + + - uses: actions/checkout@v3 - name: Checkout repository uses: actions/checkout@master @@ -29,12 +31,30 @@ jobs: python -m pip install --upgrade pip #python -m pip install flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install podman-compose #- name: Lint with flake8 # run: | # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Docker Compose Action - uses: meta-introspector/compose-action@main + - name: Docker Compose Action build + #uses: meta-introspector/compose-action@main env: GITHUB_PAT: ${{ secrets.PAT }} GITHUB_REPO: "jmikedupont2/ai-ticket" + run: docker-compose build + + - name: Docker Compose Action echo + env: + GITHUB_PAT: ${{ secrets.PAT }} + GITHUB_REPO: "jmikedupont2/ai-ticket" + run: echo pat ${{ secrets.PAT }} +# run: echo docker-compose up -e GITHUB_PAT=${{ secrets.PAT }} -e GITHUB_REPO="jmikedupont2/ai-ticket" + + - name: Docker Compose Action do it + #uses: meta-introspector/compose-action@main + env: + GITHUB_PAT: ${{ secrets.PAT }} + GITHUB_REPO: "jmikedupont2/ai-ticket" + run: | + GITHUB_PAT=${{ secrets.PAT }} GITHUB_REPO="jmikedupont2/ai-ticket" docker-compose up + diff --git a/.secrets.example.txt b/.secrets.example.txt new file mode 100644 index 0000000..3c53809 --- /dev/null +++ b/.secrets.example.txt @@ -0,0 +1,4 @@ +GITHUB_TOKEN= +GITHUB_PAT= +PAT=this isused +DOCKER= diff --git a/runact.sh b/runact.sh index 997e85a..b9b418c 100644 --- a/runact.sh +++ b/runact.sh @@ -6,13 +6,9 @@ # git clone https://github.com/moovweb/gvm # cd gvm/ &&./autogen.sh && make install - -act \ - -s GITHUB_TOKEN=`cat github_pat.txt` \ - -s GITHUB_PAT=`cat github_pat.txt` \ - -s DOCKER=`cat dckr_pat_.txt` \ - -P ubuntu-latest=localhost/my_local_act \ - --verbose \ +# use .secrets PAT And DOCKER +act -P ubuntu-latest=localhost/my_local_act \ + --verbose \ --job python-package-build # --pull=false \ From 8ee3da370cf6f419fa4f2c017575e68bef2bc4d6 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Sat, 30 Sep 2023 21:44:39 -0400 Subject: [PATCH 3/6] you are the metagpt --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index addd9de..e5af758 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: #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 From 1a06e7653b3fb9c33b0e98f36081f98157b6031b Mon Sep 17 00:00:00 2001 From: mike dupont Date: Sun, 1 Oct 2023 11:45:40 -0400 Subject: [PATCH 4/6] use images --- docker-compose.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e5af758..d750b63 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,10 @@ version: '3' services: ai_ticket: - #image: ai_ticket - build: . + + image: h4ckermike/ai-ticket:ai_ticket + + #build: . # context: . #entrypoint: /bin/bash #stdin_open: true # docker run -i @@ -21,13 +23,17 @@ services: - GITHUB_REPO="jmikedupont2/ai-ticket" - OPENAI_API_KEY=your-openai-api-key - OPENAI_API_BASE=http://mockopenai:5000/v1 - build: - context: vendor/Auto-GPT/ + + image: h4ckermike/ai-ticket:autogpt + + #build: + # context: vendor/Auto-GPT/ depends_on: - ai_ticket - mockopenai mockopenai: + image: h4ckermike/ai-ticket:mockopenai depends_on: - ai_ticket @@ -35,8 +41,14 @@ services: - GITHUB_PAT=${GITHUB_PAT} - GITHUB_REPO=${GITHUB_REPO} - build: - context: vendor/lollms/ + + + + #build: + # context: vendor/lollms/ ports: - "5000:5000" + + #todo the act runner + #h4ckermike/ai-ticket:my_local_act From 5a7cb0fc23a8f1d2c205a931007bffefddafead9 Mon Sep 17 00:00:00 2001 From: mike dupont Date: Sun, 1 Oct 2023 16:20:15 -0400 Subject: [PATCH 5/6] update ports --- docker-compose.yml | 28 ++++++++-------------------- vendor/lollms | 2 +- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d750b63..baeef35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,8 @@ version: '3' services: ai_ticket: - - image: h4ckermike/ai-ticket:ai_ticket - - #build: . + #image: ai_ticket + build: . # context: . #entrypoint: /bin/bash #stdin_open: true # docker run -i @@ -22,18 +20,14 @@ services: - GITHUB_PAT="${GITHUB_PAT}" - GITHUB_REPO="jmikedupont2/ai-ticket" - OPENAI_API_KEY=your-openai-api-key - - OPENAI_API_BASE=http://mockopenai:5000/v1 - - image: h4ckermike/ai-ticket:autogpt - - #build: - # context: vendor/Auto-GPT/ + - OPENAI_API_BASE=http://mockopenai:8080/v1 + build: + context: vendor/Auto-GPT/ depends_on: - ai_ticket - mockopenai mockopenai: - image: h4ckermike/ai-ticket:mockopenai depends_on: - ai_ticket @@ -41,14 +35,8 @@ services: - GITHUB_PAT=${GITHUB_PAT} - GITHUB_REPO=${GITHUB_REPO} - - - - #build: - # context: vendor/lollms/ + build: + context: vendor/lollms/ ports: - - "5000:5000" - + - "5000:8080" - #todo the act runner - #h4ckermike/ai-ticket:my_local_act diff --git a/vendor/lollms b/vendor/lollms index 43f8069..15e4b4f 160000 --- a/vendor/lollms +++ b/vendor/lollms @@ -1 +1 @@ -Subproject commit 43f806912e9acc449f0c97dbecf37da7cad7501c +Subproject commit 15e4b4fc39dc97d428d47b5c632cba370e1e4e52 From d4ad244541f2bfefa95e32474347864bce1b644d Mon Sep 17 00:00:00 2001 From: Mike DuPont Date: Mon, 2 Oct 2023 22:52:08 +0000 Subject: [PATCH 6/6] use port 5000 --- .env.example | 2 +- docker-compose.yml | 2 +- vendor/lollms | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 1e6dabb..a0ca93a 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,2 @@ -GITHUB_PAT= +GITHUB_PAT=github_pat_ GITHUB_REPO=jmikedupont2/ai-ticket \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index baeef35..8d2d9d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - GITHUB_PAT="${GITHUB_PAT}" - GITHUB_REPO="jmikedupont2/ai-ticket" - OPENAI_API_KEY=your-openai-api-key - - OPENAI_API_BASE=http://mockopenai:8080/v1 + - OPENAI_API_BASE=http://mockopenai:5000/v1 build: context: vendor/Auto-GPT/ depends_on: diff --git a/vendor/lollms b/vendor/lollms index 15e4b4f..43f8069 160000 --- a/vendor/lollms +++ b/vendor/lollms @@ -1 +1 @@ -Subproject commit 15e4b4fc39dc97d428d47b5c632cba370e1e4e52 +Subproject commit 43f806912e9acc449f0c97dbecf37da7cad7501c