From 004bdd906071500c08be20494a5858eafec41ad3 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Mon, 17 Mar 2025 16:13:26 +0100 Subject: [PATCH 01/13] ci: canary workflow --- .github/workflows/canary.yml | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/canary.yml diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml new file mode 100644 index 0000000..35488c4 --- /dev/null +++ b/.github/workflows/canary.yml @@ -0,0 +1,55 @@ +name: Canary Tests + +on: + pull_request: + branches: + - main + push: + branches: + - main + # schedule: + # - cron: "0 0 * * *" + +jobs: + sdk-tests: + runs-on: ubuntu-latest + environment: development + + steps: + + - name: Install Poetry for SDK + uses: snok/install-poetry@v1 + + - name: Checkout SDK repo + uses: actions/checkout@v4 + with: + repository: NapthaAI/naptha-sdk + fetch-depth: 1 + + - name: Set up SDK env variables + env: + NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} + NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} + NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} + run: | + cp .env.example .env + + # override defaults + echo -e "\n" >> .env + + # set dummy user + echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" + echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env + echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env + echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + + - name: Install SDK dependencies + working-directory: $GITHUB_WORKSPACE/sdk-dir + run: | + poetry lock + poetry install + + - name: Run + working-directory: $GITHUB_WORKSPACE/sdk-dir + run: | + poetry run pytest -v tests/test_cli.py From 9ddbf774c9f86555ff9028ce0d076dddb6247650 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Mon, 17 Mar 2025 16:14:48 +0100 Subject: [PATCH 02/13] fix: missing dir --- .github/workflows/canary.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 35488c4..702b2a2 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -44,7 +44,6 @@ jobs: echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - name: Install SDK dependencies - working-directory: $GITHUB_WORKSPACE/sdk-dir run: | poetry lock poetry install From 9498a1330f6ec37f3706f8866e63b00f35b3d43f Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Mon, 17 Mar 2025 16:16:54 +0100 Subject: [PATCH 03/13] fix: missing dir --- .github/workflows/canary.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 702b2a2..74a7bd4 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -49,6 +49,5 @@ jobs: poetry install - name: Run - working-directory: $GITHUB_WORKSPACE/sdk-dir run: | poetry run pytest -v tests/test_cli.py From 3c60e92f1b6528ad228cc259f3b554ca8d0fe629 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 10:21:30 +0100 Subject: [PATCH 04/13] comment out ci --- .github/workflows/build-node-container.yml | 56 +++--- .github/workflows/launch-node.yml | 202 ++++++++++----------- .github/workflows/sdk-tests.yml | 144 +++++++-------- 3 files changed, 201 insertions(+), 201 deletions(-) diff --git a/.github/workflows/build-node-container.yml b/.github/workflows/build-node-container.yml index c5b1054..67d3a45 100644 --- a/.github/workflows/build-node-container.yml +++ b/.github/workflows/build-node-container.yml @@ -1,34 +1,34 @@ -name: Build and Publish Node Container +# name: Build and Publish Node Container -on: - push: - branches: - - main +# on: +# push: +# branches: +# - main -jobs: - build-and-push: - runs-on: ubuntu-latest +# jobs: +# build-and-push: +# runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 +# steps: +# - name: Checkout code +# uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Login to DockerHub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - file: ./Dockerfile-node - push: true - platforms: linux/amd64,linux/arm64 - tags: | - napthaai/node:latest - napthaai/node:${{ github.sha }} +# - name: Build and push +# uses: docker/build-push-action@v5 +# with: +# context: . +# file: ./Dockerfile-node +# push: true +# platforms: linux/amd64,linux/arm64 +# tags: | +# napthaai/node:latest +# napthaai/node:${{ github.sha }} diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index 4a516ec..4913978 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -1,104 +1,104 @@ -name: Install and launch node - -on: - pull_request: - branches: - - main - push: - branches: - - main - -jobs: - launch-node-docker: - runs-on: ubuntu-latest - environment: development - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build node image - uses: docker/build-push-action@v5 - with: - context: . - file: ./Dockerfile-node - push: false - load: true - platforms: linux/amd64 - tags: | - napthaai/node:latest - napthaai/node:${{ github.sha }} - - - name: Set up env variables - env: - NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} - NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} - NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} - run: | - cp .env.example .env - - # override defaults - echo -e "\n" >> .env - echo "LOCAL_HUB=true" >> .env - - # make sure to launch via docker - echo "LAUNCH_DOCKER=true" >> .env - - # avoid downloading large models - echo "OLLAMA_MODELS=" >> .env - echo "VLLM_MODELS=" >> .env - echo "OPENAI_MODELS=" >> .env - - # set dummy user - echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" - echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env - echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env - echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - - - name: Launch node - run: bash launch.sh +# name: Install and launch node + +# on: +# pull_request: +# branches: +# - main +# push: +# branches: +# - main + +# jobs: +# launch-node-docker: +# runs-on: ubuntu-latest +# environment: development + +# steps: +# - name: Checkout code +# uses: actions/checkout@v4 + +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 + +# - name: Build node image +# uses: docker/build-push-action@v5 +# with: +# context: . +# file: ./Dockerfile-node +# push: false +# load: true +# platforms: linux/amd64 +# tags: | +# napthaai/node:latest +# napthaai/node:${{ github.sha }} + +# - name: Set up env variables +# env: +# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} +# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} +# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} +# run: | +# cp .env.example .env + +# # override defaults +# echo -e "\n" >> .env +# echo "LOCAL_HUB=true" >> .env + +# # make sure to launch via docker +# echo "LAUNCH_DOCKER=true" >> .env + +# # avoid downloading large models +# echo "OLLAMA_MODELS=" >> .env +# echo "VLLM_MODELS=" >> .env +# echo "OPENAI_MODELS=" >> .env + +# # set dummy user +# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" +# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env +# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env +# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + +# - name: Launch node +# run: bash launch.sh - launch-node: - runs-on: ${{ matrix.os }} - environment: development - strategy: - matrix: - os: [ubuntu-latest, macos-14] - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up env variables - env: - NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} - NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} - NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} - run: | - cp .env.example .env - - # override defaults - echo -e "\n" >> .env - echo "LOCAL_HUB=true" >> .env - - # avoid downloading large models - echo "OLLAMA_MODELS=" >> .env - echo "VLLM_MODELS=" >> .env - echo "OPENAI_MODELS=" >> .env - - # set dummy user - echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" - echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env - echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env - echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - - - name: Install node - run: bash launch.sh - - - name: Check Health - run: curl http://localhost:7001/health +# launch-node: +# runs-on: ${{ matrix.os }} +# environment: development +# strategy: +# matrix: +# os: [ubuntu-latest, macos-14] + +# steps: +# - name: Checkout code +# uses: actions/checkout@v4 + +# - name: Set up env variables +# env: +# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} +# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} +# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} +# run: | +# cp .env.example .env + +# # override defaults +# echo -e "\n" >> .env +# echo "LOCAL_HUB=true" >> .env + +# # avoid downloading large models +# echo "OLLAMA_MODELS=" >> .env +# echo "VLLM_MODELS=" >> .env +# echo "OPENAI_MODELS=" >> .env + +# # set dummy user +# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" +# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env +# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env +# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + +# - name: Install node +# run: bash launch.sh + +# - name: Check Health +# run: curl http://localhost:7001/health diff --git a/.github/workflows/sdk-tests.yml b/.github/workflows/sdk-tests.yml index 303eb9f..08aa9b8 100644 --- a/.github/workflows/sdk-tests.yml +++ b/.github/workflows/sdk-tests.yml @@ -1,90 +1,90 @@ -name: Tests with SDK +# name: Tests with SDK -on: - pull_request: - branches: - - main - push: - branches: - - main +# on: +# pull_request: +# branches: +# - main +# push: +# branches: +# - main -jobs: - sdk-tests: - runs-on: ubuntu-latest - environment: development +# jobs: +# sdk-tests: +# runs-on: ubuntu-latest +# environment: development - steps: +# steps: - ### firsty, install Naptha node +# ### firsty, install Naptha node - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 1 +# - name: Checkout code +# uses: actions/checkout@v4 +# with: +# fetch-depth: 1 - - name: Set up NODE env variables - env: - NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} - NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} - NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} - run: | - cp .env.example .env +# - name: Set up NODE env variables +# env: +# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} +# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} +# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} +# run: | +# cp .env.example .env - # override defaults - echo -e "\n" >> .env - echo "LOCAL_HUB=true" >> .env +# # override defaults +# echo -e "\n" >> .env +# echo "LOCAL_HUB=true" >> .env - # set dummy user - echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" - echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env - echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env - echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env +# # set dummy user +# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" +# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env +# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env +# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - - name: Install node - run: bash launch.sh +# - name: Install node +# run: bash launch.sh - - name: Install Poetry for SDK - uses: snok/install-poetry@v1 +# - name: Install Poetry for SDK +# uses: snok/install-poetry@v1 - ### secondly, install Naptha SDK +# ### secondly, install Naptha SDK - - name: Checkout SDK repo - uses: actions/checkout@v4 - with: - repository: NapthaAI/naptha-sdk - fetch-depth: 1 - path: $GITHUB_WORKSPACE/sdk-dir +# - name: Checkout SDK repo +# uses: actions/checkout@v4 +# with: +# repository: NapthaAI/naptha-sdk +# fetch-depth: 1 +# path: $GITHUB_WORKSPACE/sdk-dir - - name: Set up SDK env variables - env: - NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} - NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} - NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} - working-directory: $GITHUB_WORKSPACE/sdk-dir - run: | - cp .env.example .env +# - name: Set up SDK env variables +# env: +# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} +# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} +# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} +# working-directory: $GITHUB_WORKSPACE/sdk-dir +# run: | +# cp .env.example .env - # override defaults - echo -e "\n" >> .env - echo "LOCAL_HUB=true" >> .env - echo "HUB_URL=ws://localhost:3001/rpc" >> .env - echo "NODE_URL=http://localhost:7001" >> .env +# # override defaults +# echo -e "\n" >> .env +# echo "LOCAL_HUB=true" >> .env +# echo "HUB_URL=ws://localhost:3001/rpc" >> .env +# echo "NODE_URL=http://localhost:7001" >> .env - # set dummy user - echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" - echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env - echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env - echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env +# # set dummy user +# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" +# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env +# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env +# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - - name: Install SDK dependencies - working-directory: $GITHUB_WORKSPACE/sdk-dir - run: | - poetry lock - poetry install +# - name: Install SDK dependencies +# working-directory: $GITHUB_WORKSPACE/sdk-dir +# run: | +# poetry lock +# poetry install - ### Run tests +# ### Run tests - - name: Run SDK tests - working-directory: $GITHUB_WORKSPACE/sdk-dir - run: | - poetry run pytest -v tests/test_cli.py +# - name: Run SDK tests +# working-directory: $GITHUB_WORKSPACE/sdk-dir +# run: | +# poetry run pytest -v tests/test_cli.py From 3e89b57400b160d5e34da93e25d1ccb9af0229be Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 10:21:41 +0100 Subject: [PATCH 05/13] ci: discord notification --- .github/workflows/canary.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 74a7bd4..6debf4b 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -51,3 +51,10 @@ jobs: - name: Run run: | poetry run pytest -v tests/test_cli.py + + - name: Discord notification + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + uses: Ilshidur/action-discord@master + with: + args: 'This is a Test Message - The project {{ EVENT_PAYLOAD.repository.full_name }} has been deployed.' \ No newline at end of file From f39ff9d4fb19e58b57657958a0f12ed992dac5a3 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 10:40:12 +0100 Subject: [PATCH 06/13] ci: discord notification pip lib --- .github/workflows/canary.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 6debf4b..0061672 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -48,13 +48,12 @@ jobs: poetry lock poetry install - - name: Run + - name: Install Discord Notification Library run: | - poetry run pytest -v tests/test_cli.py + poetry add pytest-discord - - name: Discord notification + - name: Run env: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - uses: Ilshidur/action-discord@master - with: - args: 'This is a Test Message - The project {{ EVENT_PAYLOAD.repository.full_name }} has been deployed.' \ No newline at end of file + PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + run: | + poetry run pytest -v tests/test_cli.py From 2555b68f5cf89dc0ee5482263749fb96f1a319e6 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 10:50:28 +0100 Subject: [PATCH 07/13] ci: discord attach resuts md file --- .github/workflows/canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 0061672..1ca1ef1 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -56,4 +56,4 @@ jobs: env: PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | - poetry run pytest -v tests/test_cli.py + poetry run pytest -v tests/test_cli.py --discord-attach-file From 95c5026384883ae171ce2fa506f959a0e9852950 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 11:04:12 +0100 Subject: [PATCH 08/13] ci: short tracebacks --- .github/workflows/canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 1ca1ef1..64c55f0 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -56,4 +56,4 @@ jobs: env: PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | - poetry run pytest -v tests/test_cli.py --discord-attach-file + poetry run pytest -v tests/test_cli.py --tb=short From c857388e74201959a11b1a55f1cc6e2bd677d782 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 11:12:17 +0100 Subject: [PATCH 09/13] ci: line tracebacks --- .github/workflows/canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 64c55f0..0a6f891 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -56,4 +56,4 @@ jobs: env: PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | - poetry run pytest -v tests/test_cli.py --tb=short + poetry run pytest -v tests/test_cli.py --tb=line From 5b419bd5060ed991757692e585f77ff082b95bcc Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 11:29:39 +0100 Subject: [PATCH 10/13] ci: discord attach file --- .github/workflows/canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 0a6f891..0b4a34c 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -56,4 +56,4 @@ jobs: env: PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | - poetry run pytest -v tests/test_cli.py --tb=line + poetry run pytest -v tests/test_cli.py --tb=line --discord-attach-file From be0a33a1315d982abcc4736f4a8c8d3a8b035b1d Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 23:29:28 +0100 Subject: [PATCH 11/13] fix: use forked pytest-discord --- .github/workflows/canary.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 0b4a34c..d1ef408 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -50,10 +50,10 @@ jobs: - name: Install Discord Notification Library run: | - poetry add pytest-discord + poetry add https://github.com/enricorotundo/pytest-discord/releases/download/v0.1.2/pytest_discord-0.1.2-py3-none-any.whl - name: Run env: PYTEST_DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | - poetry run pytest -v tests/test_cli.py --tb=line --discord-attach-file + poetry run pytest -v tests/test_cli.py --tb=no --discord-attach-file From 509d45b0b34c666d378066eaff18394606f92f75 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 23:41:29 +0100 Subject: [PATCH 12/13] ci: add cron schedule --- .github/workflows/canary.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index d1ef408..bd9c525 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -7,8 +7,9 @@ on: push: branches: - main - # schedule: - # - cron: "0 0 * * *" + # TODO delete the targets above + schedule: + - cron: "0 12 * * *" jobs: sdk-tests: From 66399a4e20363d4d9b9a1385dd67cd06f446e178 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Tue, 18 Mar 2025 23:42:15 +0100 Subject: [PATCH 13/13] fix: restore ci workflows --- .github/workflows/build-node-container.yml | 56 +++--- .github/workflows/launch-node.yml | 202 ++++++++++----------- .github/workflows/sdk-tests.yml | 144 +++++++-------- 3 files changed, 201 insertions(+), 201 deletions(-) diff --git a/.github/workflows/build-node-container.yml b/.github/workflows/build-node-container.yml index 67d3a45..c5b1054 100644 --- a/.github/workflows/build-node-container.yml +++ b/.github/workflows/build-node-container.yml @@ -1,34 +1,34 @@ -# name: Build and Publish Node Container +name: Build and Publish Node Container -# on: -# push: -# branches: -# - main +on: + push: + branches: + - main -# jobs: -# build-and-push: -# runs-on: ubuntu-latest +jobs: + build-and-push: + runs-on: ubuntu-latest -# steps: -# - name: Checkout code -# uses: actions/checkout@v4 + steps: + - name: Checkout code + uses: actions/checkout@v4 -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 -# - name: Login to DockerHub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} -# - name: Build and push -# uses: docker/build-push-action@v5 -# with: -# context: . -# file: ./Dockerfile-node -# push: true -# platforms: linux/amd64,linux/arm64 -# tags: | -# napthaai/node:latest -# napthaai/node:${{ github.sha }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile-node + push: true + platforms: linux/amd64,linux/arm64 + tags: | + napthaai/node:latest + napthaai/node:${{ github.sha }} diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index 4913978..4a516ec 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -1,104 +1,104 @@ -# name: Install and launch node - -# on: -# pull_request: -# branches: -# - main -# push: -# branches: -# - main - -# jobs: -# launch-node-docker: -# runs-on: ubuntu-latest -# environment: development - -# steps: -# - name: Checkout code -# uses: actions/checkout@v4 - -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 - -# - name: Build node image -# uses: docker/build-push-action@v5 -# with: -# context: . -# file: ./Dockerfile-node -# push: false -# load: true -# platforms: linux/amd64 -# tags: | -# napthaai/node:latest -# napthaai/node:${{ github.sha }} - -# - name: Set up env variables -# env: -# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} -# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} -# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} -# run: | -# cp .env.example .env - -# # override defaults -# echo -e "\n" >> .env -# echo "LOCAL_HUB=true" >> .env - -# # make sure to launch via docker -# echo "LAUNCH_DOCKER=true" >> .env - -# # avoid downloading large models -# echo "OLLAMA_MODELS=" >> .env -# echo "VLLM_MODELS=" >> .env -# echo "OPENAI_MODELS=" >> .env - -# # set dummy user -# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" -# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env -# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env -# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - -# - name: Launch node -# run: bash launch.sh +name: Install and launch node + +on: + pull_request: + branches: + - main + push: + branches: + - main + +jobs: + launch-node-docker: + runs-on: ubuntu-latest + environment: development + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build node image + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile-node + push: false + load: true + platforms: linux/amd64 + tags: | + napthaai/node:latest + napthaai/node:${{ github.sha }} + + - name: Set up env variables + env: + NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} + NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} + NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} + run: | + cp .env.example .env + + # override defaults + echo -e "\n" >> .env + echo "LOCAL_HUB=true" >> .env + + # make sure to launch via docker + echo "LAUNCH_DOCKER=true" >> .env + + # avoid downloading large models + echo "OLLAMA_MODELS=" >> .env + echo "VLLM_MODELS=" >> .env + echo "OPENAI_MODELS=" >> .env + + # set dummy user + echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" + echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env + echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env + echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + + - name: Launch node + run: bash launch.sh -# launch-node: -# runs-on: ${{ matrix.os }} -# environment: development -# strategy: -# matrix: -# os: [ubuntu-latest, macos-14] - -# steps: -# - name: Checkout code -# uses: actions/checkout@v4 - -# - name: Set up env variables -# env: -# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} -# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} -# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} -# run: | -# cp .env.example .env - -# # override defaults -# echo -e "\n" >> .env -# echo "LOCAL_HUB=true" >> .env - -# # avoid downloading large models -# echo "OLLAMA_MODELS=" >> .env -# echo "VLLM_MODELS=" >> .env -# echo "OPENAI_MODELS=" >> .env - -# # set dummy user -# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" -# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env -# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env -# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - -# - name: Install node -# run: bash launch.sh - -# - name: Check Health -# run: curl http://localhost:7001/health + launch-node: + runs-on: ${{ matrix.os }} + environment: development + strategy: + matrix: + os: [ubuntu-latest, macos-14] + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up env variables + env: + NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} + NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} + NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} + run: | + cp .env.example .env + + # override defaults + echo -e "\n" >> .env + echo "LOCAL_HUB=true" >> .env + + # avoid downloading large models + echo "OLLAMA_MODELS=" >> .env + echo "VLLM_MODELS=" >> .env + echo "OPENAI_MODELS=" >> .env + + # set dummy user + echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" + echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env + echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env + echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + + - name: Install node + run: bash launch.sh + + - name: Check Health + run: curl http://localhost:7001/health diff --git a/.github/workflows/sdk-tests.yml b/.github/workflows/sdk-tests.yml index 08aa9b8..303eb9f 100644 --- a/.github/workflows/sdk-tests.yml +++ b/.github/workflows/sdk-tests.yml @@ -1,90 +1,90 @@ -# name: Tests with SDK +name: Tests with SDK -# on: -# pull_request: -# branches: -# - main -# push: -# branches: -# - main +on: + pull_request: + branches: + - main + push: + branches: + - main -# jobs: -# sdk-tests: -# runs-on: ubuntu-latest -# environment: development +jobs: + sdk-tests: + runs-on: ubuntu-latest + environment: development -# steps: + steps: -# ### firsty, install Naptha node + ### firsty, install Naptha node -# - name: Checkout code -# uses: actions/checkout@v4 -# with: -# fetch-depth: 1 + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 1 -# - name: Set up NODE env variables -# env: -# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} -# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} -# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} -# run: | -# cp .env.example .env + - name: Set up NODE env variables + env: + NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} + NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} + NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} + run: | + cp .env.example .env -# # override defaults -# echo -e "\n" >> .env -# echo "LOCAL_HUB=true" >> .env + # override defaults + echo -e "\n" >> .env + echo "LOCAL_HUB=true" >> .env -# # set dummy user -# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" -# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env -# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env -# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + # set dummy user + echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" + echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env + echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env + echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env -# - name: Install node -# run: bash launch.sh + - name: Install node + run: bash launch.sh -# - name: Install Poetry for SDK -# uses: snok/install-poetry@v1 + - name: Install Poetry for SDK + uses: snok/install-poetry@v1 -# ### secondly, install Naptha SDK + ### secondly, install Naptha SDK -# - name: Checkout SDK repo -# uses: actions/checkout@v4 -# with: -# repository: NapthaAI/naptha-sdk -# fetch-depth: 1 -# path: $GITHUB_WORKSPACE/sdk-dir + - name: Checkout SDK repo + uses: actions/checkout@v4 + with: + repository: NapthaAI/naptha-sdk + fetch-depth: 1 + path: $GITHUB_WORKSPACE/sdk-dir -# - name: Set up SDK env variables -# env: -# NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} -# NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} -# NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} -# working-directory: $GITHUB_WORKSPACE/sdk-dir -# run: | -# cp .env.example .env + - name: Set up SDK env variables + env: + NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} + NAPTHA_HUB_PVT_KEY: ${{ secrets.NAPTHA_HUB_PVT_KEY }} + NAPTHA_HUB_PASSWORD: ${{ secrets.NAPTHA_HUB_PASSWORD }} + working-directory: $GITHUB_WORKSPACE/sdk-dir + run: | + cp .env.example .env -# # override defaults -# echo -e "\n" >> .env -# echo "LOCAL_HUB=true" >> .env -# echo "HUB_URL=ws://localhost:3001/rpc" >> .env -# echo "NODE_URL=http://localhost:7001" >> .env + # override defaults + echo -e "\n" >> .env + echo "LOCAL_HUB=true" >> .env + echo "HUB_URL=ws://localhost:3001/rpc" >> .env + echo "NODE_URL=http://localhost:7001" >> .env -# # set dummy user -# echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" -# echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env -# echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env -# echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env + # set dummy user + echo "${NAPTHA_HUB_PVT_KEY}" > "${NAPTHA_HUB_USERNAME}.pem" + echo "PRIVATE_KEY=${NAPTHA_HUB_USERNAME}.pem" >> .env + echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env + echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env -# - name: Install SDK dependencies -# working-directory: $GITHUB_WORKSPACE/sdk-dir -# run: | -# poetry lock -# poetry install + - name: Install SDK dependencies + working-directory: $GITHUB_WORKSPACE/sdk-dir + run: | + poetry lock + poetry install -# ### Run tests + ### Run tests -# - name: Run SDK tests -# working-directory: $GITHUB_WORKSPACE/sdk-dir -# run: | -# poetry run pytest -v tests/test_cli.py + - name: Run SDK tests + working-directory: $GITHUB_WORKSPACE/sdk-dir + run: | + poetry run pytest -v tests/test_cli.py