Merge branch 'master' into sits-fix-readme-to-latest-release

# Conflicts:
#	serving/docs/configurations_global.md

Author: David Sitsky

.github/workflows/client-test.yml

@@ -62,7 +62,7 @@ jobs:
           cd tests
           djl-serving -m test::Python=file://$PWD/python &> output.log &
           sleep 15
-          python test_client.py
+          python integration/test_client.py
           jobs
           kill %1
       - name: On failure step
@@ -109,7 +109,7 @@ jobs:
           ./gradlew --stop
           ./gradlew :serving:run --args="-m test::Python=file:$(pwd -W)/tests/python" &> output.log &
           sleep 30
-          cd tests/ && python test_client.py
+          cd tests/ && python integration/test_client.py
       - name: On failure step
         if: ${{ failure() }}
         shell: bash

.github/workflows/codeql-analysis-java.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'java' ]
+        language: [ 'java', 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

.github/workflows/continuous.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: install Python Dependencies
-        run: pip3 install numpy yapf
+        run: pip3 install "numpy<2" yapf
       # Enable gradle cache: https://github.com/actions/cache/blob/master/examples.md#java---gradle
       - uses: actions/cache@v4
         with:
@@ -46,7 +46,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew --refresh-dependencies build :jacoco:testCodeCoverageReport --stacktrace
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: serving-${{ matrix.os }}

.github/workflows/docker-nightly-publish.yml

@@ -7,6 +7,13 @@ on:
         description: 'release/nightly/temp, default is nightly'
         required: true
         default: 'nightly'
+  workflow_call:
+    inputs:
+      mode:
+        description: 'release/nightly/temp, default is nightly'
+        type: string
+        required: true
+        default: 'nightly'
   schedule:
     - cron: '0 13 * * *'
 
@@ -29,7 +36,7 @@ jobs:
           $AGENT_TOOLSDIRECTORY
       - uses: actions/checkout@v4
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -52,43 +59,43 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
       - name: Build serving package for nightly
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         run: |
           ./gradlew --refresh-dependencies :serving:dockerDeb -Psnapshot
       - name: Build and push nightly docker image
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT ${{ matrix.arch }}
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT ${{ matrix.arch }}
           docker compose push ${{ matrix.arch }}
       - name: Build and push temp image
-        if: ${{ github.event.inputs.mode == 'temp' }}
+        if: ${{ inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT ${{ matrix.arch }}
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT ${{ matrix.arch }}
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:${{ matrix.arch }}-${GITHUB_SHA}"
           docker tag deepjavalibrary/djl-serving:${{ matrix.arch }}-nightly $tempTag
           docker push $tempTag
       - name: Build and push release docker image
-        if: ${{ github.event.inputs.mode == 'release' }}
+        if: ${{ inputs.mode == 'release' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export BASE_RELEASE_VERSION="${DJL_VERSION}"
           export RELEASE_VERSION="${DJL_VERSION}-"
           docker compose build --no-cache --build-arg djl_version=${DJL_VERSION} ${{ matrix.arch }}
           docker compose push ${{ matrix.arch }}
       - name: Retag image for release
-        if: ${{ matrix.arch == 'cpu' && github.event.inputs.mode == 'release' }}
+        if: ${{ matrix.arch == 'cpu' && inputs.mode == 'release' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           docker tag deepjavalibrary/djl-serving:${DJL_VERSION} deepjavalibrary/djl-serving:latest
           docker push deepjavalibrary/djl-serving:latest
 
@@ -128,7 +135,7 @@ jobs:
         run: |
           yes | docker system prune -a --volumes
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -151,34 +158,34 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
       - name: Build serving package for nightly
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         run: |
           ./gradlew --refresh-dependencies :serving:dockerDeb -Psnapshot
       - name: Build and push nightly docker image
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT aarch64
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT aarch64
           docker compose push aarch64
       - name: Build and push temp image
-        if: ${{ github.event.inputs.mode == 'temp' }}
+        if: ${{ inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT aarch64
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT aarch64
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:aarch64-${GITHUB_SHA}"
           docker tag deepjavalibrary/djl-serving:aarch64-nightly $tempTag
           docker push $tempTag
       - name: Build and push release docker image
-        if: ${{ github.event.inputs.mode == 'release' }}
+        if: ${{ inputs.mode == 'release' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export BASE_RELEASE_VERSION="${DJL_VERSION}"
           export RELEASE_VERSION="${DJL_VERSION}-"
           docker compose build --no-cache --build-arg djl_version=${DJL_VERSION} aarch64
@@ -195,7 +202,7 @@ jobs:
         run: |
           yes | docker system prune -a --volumes
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -218,34 +225,34 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
       - name: Build serving package for nightly
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         run: |
           ./gradlew --refresh-dependencies :serving:dockerDeb -Psnapshot
       - name: Build and push nightly docker image
-        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'nightly' }}
+        if: ${{ inputs.mode == '' || inputs.mode == 'nightly' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT lmi
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT lmi
           docker compose push lmi
       - name: Build and push temp image
-        if: ${{ github.event.inputs.mode == 'temp' }}
+        if: ${{ inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT lmi
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT lmi
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:lmi-$GITHUB_SHA"
           docker tag deepjavalibrary/djl-serving:lmi-nightly $tempTag
           docker push $tempTag
       - name: Build and push release docker image
-        if: ${{ github.event.inputs.mode == 'release' }}
+        if: ${{ inputs.mode == 'release' }}
         working-directory: serving/docker
         run: |
-          DJL_VERSION=$(cat ../../gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export BASE_RELEASE_VERSION="${DJL_VERSION}"
           export RELEASE_VERSION="${DJL_VERSION}-"
           docker compose build --no-cache --build-arg djl_version=${DJL_VERSION} lmi

.github/workflows/instant_benchmark.yml

@@ -129,9 +129,12 @@ jobs:
         run: |
           python3 instant_benchmark.py --parse ${{ inputs.running_template }} \
           --container "${{ inputs.container }}"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: template-${{ inputs.instance }}
+          path: tests/integration/template_tmp.json
     outputs:
       jobs: ${{ steps.generate_matrix.outputs.jobs }}
-      template: ${{ steps.generate_matrix.outputs.template }}
 
   benchmark_run:
     runs-on: [ self-hosted, "${{ inputs.instance }}" ]
@@ -177,10 +180,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
         with:
           registries: "125045733377,875423407011"
+      - name: Download template
+        uses: actions/download-artifact@v4
+        with:
+          path: tests/integration
       - name: Run benchmark job
         working-directory: tests/integration
         run: |
-          echo "${{ needs.environment-setup.outputs.template }}" >> template.json
+          cp template-${{ inputs.instance }}/template_tmp.json template.json
           python3 instant_benchmark.py --template template.json \
           --job ${{ matrix.job }} --instance ${{ inputs.instance }} \
           --record ${{ inputs.record }}