From bed7a70aa82463ba634debba454b03322f1c4cb4 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 16:21:53 +0100 Subject: [PATCH 1/8] chore: rename ci flows --- .github/workflows/build.yml | 47 ------------------- .github/workflows/{test.yml => sdk-tests.yml} | 6 +-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/build.yml rename .github/workflows/{test.yml => sdk-tests.yml} (96%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 5b059a8..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Install and launch node - -on: - pull_request: - branches: - - main - push: - branches: - - main - -jobs: - 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 diff --git a/.github/workflows/test.yml b/.github/workflows/sdk-tests.yml similarity index 96% rename from .github/workflows/test.yml rename to .github/workflows/sdk-tests.yml index 209d1b0..303eb9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/sdk-tests.yml @@ -9,13 +9,13 @@ on: - main jobs: - tests: + sdk-tests: runs-on: ubuntu-latest environment: development steps: - ### Install Naptha node first + ### firsty, install Naptha node - name: Checkout code uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: - name: Install Poetry for SDK uses: snok/install-poetry@v1 - ### Install Naptha SDK second + ### secondly, install Naptha SDK - name: Checkout SDK repo uses: actions/checkout@v4 From 8c380f1c1f1a67ef5fa3ec92be02962cce73573f Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 16:22:16 +0100 Subject: [PATCH 2/8] feat: ci docker node launch --- .github/workflows/launch-node.yml | 91 +++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 .github/workflows/launch-node.yml diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml new file mode 100644 index 0000000..107da35 --- /dev/null +++ b/.github/workflows/launch-node.yml @@ -0,0 +1,91 @@ +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 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: Install node + run: bash launch.sh + + # - name: Check Health + # run: curl -I 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 -I http://localhost:7001/health + From 31debff9ec0744e14445ed9e0b4b854394e92922 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 16:28:34 +0100 Subject: [PATCH 3/8] feat: ci build node image --- .github/workflows/launch-node.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index 107da35..7fbe6f9 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -17,6 +17,20 @@ jobs: - 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 + platforms: linux/amd64,linux/arm64 + tags: | + napthaai/node:latest + napthaai/node:${{ github.sha }} + - name: Set up env variables env: NAPTHA_HUB_USERNAME: ${{ vars.NAPTHA_HUB_USERNAME }} From 511572bf9e7c02b44e2ebcba114a6bd10afbabfc Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 16:57:02 +0100 Subject: [PATCH 4/8] tmp: check if ci use right image tag --- .github/workflows/launch-node.yml | 10 +++++----- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index 7fbe6f9..f514d15 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -28,7 +28,7 @@ jobs: push: false platforms: linux/amd64,linux/arm64 tags: | - napthaai/node:latest + napthaai/node:foo napthaai/node:${{ github.sha }} - name: Set up env variables @@ -57,11 +57,11 @@ jobs: echo "HUB_USERNAME=${NAPTHA_HUB_USERNAME}" >> .env echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - - name: Install node + - name: Launch node run: bash launch.sh - # - name: Check Health - # run: curl -I http://localhost:7001/health + - name: Check Health + run: curl http://localhost:7001/health launch-node: runs-on: ${{ matrix.os }} @@ -101,5 +101,5 @@ jobs: run: bash launch.sh - name: Check Health - run: curl -I http://localhost:7001/health + run: curl http://localhost:7001/health diff --git a/docker-compose.yml b/docker-compose.yml index 04ad4fe..5c8375e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ services: # can replace this with naptha image once it's published to hub, then we just # need to use the .env file UNLESS config.py is modified container_name: node-app - image: napthaai/node:latest + image: napthaai/node:foo env_file: - ./.env From 5aa97226408487b99224c0b8d6d6957ec4c9d746 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 17:11:51 +0100 Subject: [PATCH 5/8] ci: docker build with load flag --- .github/workflows/build-node-container.yml | 56 ++++---- .github/workflows/launch-node.yml | 81 ++++++------ .github/workflows/sdk-tests.yml | 144 ++++++++++----------- 3 files changed, 141 insertions(+), 140 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 f514d15..fb87ed0 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -26,7 +26,8 @@ jobs: context: . file: ./Dockerfile-node push: false - platforms: linux/amd64,linux/arm64 + load: true + platforms: linux/amd64 tags: | napthaai/node:foo napthaai/node:${{ github.sha }} @@ -63,43 +64,43 @@ jobs: - 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 + # 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 fbcb4ba5673206376baa635b0e4f1fdf681c1862 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 17:16:58 +0100 Subject: [PATCH 6/8] curl --- .github/workflows/launch-node.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index fb87ed0..7850a34 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -59,10 +59,12 @@ jobs: echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - name: Launch node - run: bash launch.sh + run: | + bash launch.sh + curl http://localhost:7001/health - - name: Check Health - run: curl http://localhost:7001/health + # - name: Check Health + # run: curl http://localhost:7001/health # launch-node: # runs-on: ${{ matrix.os }} From 2b1aef9c1ba2f482e82f717ebd0ec48a1ef0b538 Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 17:53:19 +0100 Subject: [PATCH 7/8] re-run all ci --- .github/workflows/build-node-container.yml | 56 ++++---- .github/workflows/launch-node.yml | 82 ++++++------ .github/workflows/sdk-tests.yml | 144 ++++++++++----------- docker-compose.yml | 2 +- 4 files changed, 141 insertions(+), 143 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 7850a34..727a267 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -29,7 +29,7 @@ jobs: load: true platforms: linux/amd64 tags: | - napthaai/node:foo + napthaai/node:latest napthaai/node:${{ github.sha }} - name: Set up env variables @@ -63,46 +63,44 @@ jobs: bash launch.sh curl http://localhost:7001/health - # - 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 + 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 diff --git a/docker-compose.yml b/docker-compose.yml index 5c8375e..04ad4fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ services: # can replace this with naptha image once it's published to hub, then we just # need to use the .env file UNLESS config.py is modified container_name: node-app - image: napthaai/node:foo + image: napthaai/node:latest env_file: - ./.env From fc213a5466bae22e643f7a718ddd4104a7c9893a Mon Sep 17 00:00:00 2001 From: Enrico Rotundo Date: Wed, 12 Mar 2025 17:58:37 +0100 Subject: [PATCH 8/8] dont run curl --- .github/workflows/launch-node.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/launch-node.yml b/.github/workflows/launch-node.yml index 727a267..4a516ec 100644 --- a/.github/workflows/launch-node.yml +++ b/.github/workflows/launch-node.yml @@ -59,9 +59,7 @@ jobs: echo "HUB_PASSWORD=${NAPTHA_HUB_PASSWORD}" >> .env - name: Launch node - run: | - bash launch.sh - curl http://localhost:7001/health + run: bash launch.sh launch-node: