Merge pull request #600 from spolti/250509_sync_master

250509 sync master

Author: openshift-merge-bot[bot]

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
 1. If this is your first time, read our contributor guidelines https://www.kubeflow.org/docs/about/contributing/ and developer guide https://github.com/kserve/kserve/blob/master/docs/DEVELOPER_GUIDE.md
-2. Before raising a PR, please run `make go-lint` and `make py-fmt` to check the code style.
+2. Before raising a PR, please run `make precommit` to check the code style.
 3. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
 4. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
 5. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests

.github/workflows/automated-release.yml

@@ -43,7 +43,7 @@ jobs:
           # Bump Versions
           make bump-version
           ./hack/generate-install.sh $RELEASE_TAG
-          ./hack/python-release.sh
+          make poetry-lock
 
           # Update Release Branch and Push Tag
           git diff

.github/workflows/e2e-test.yml

@@ -120,26 +120,8 @@ jobs:
           compression-level: 0
           if-no-files-found: error
 
-  poetry-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install Poetry and version plugin
-        run: ./test/scripts/gh-actions/setup-poetry.sh
-
-      - name: Check poetry lock file consistency
-        run: ./test/scripts/gh-actions/check-poetry-lockfile.sh
-
   predictor-runtime-build:
     runs-on: ubuntu-latest
-    needs: [poetry-check]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -232,7 +214,6 @@ jobs:
 
   explainer-runtime-build:
     runs-on: ubuntu-latest
-    needs: [poetry-check]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -258,7 +239,6 @@ jobs:
 
   graph-tests-images-build:
     runs-on: ubuntu-latest
-    needs: [poetry-check]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4

.github/workflows/golangci-lint.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           platforms: linux/amd64
           context: python
-          file: python/huggingface_server_cpu_openvino.Dockerfile
+          file: python/huggingface_server_cpu.Dockerfile
           push: false
           # https://github.com/docker/buildx/issues/1533
           provenance: false
@@ -94,7 +94,7 @@ jobs:
         with:
           platforms: linux/amd64
           context: python
-          file: python/huggingface_server_cpu_openvino.Dockerfile
+          file: python/huggingface_server_cpu.Dockerfile
           push: true
           tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
           # https://github.com/docker/buildx/issues/1533

.github/workflows/huggingface-cpu-docker-publish.yml

@@ -0,0 +1,104 @@
+name: Huggingface CPU Openvino Docker Publisher
+
+on:
+  push:
+    # Publish `master` as Docker `latest` image.
+    branches:
+      - master
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+  # Run tests for any PRs.
+  pull_request:
+
+env:
+  IMAGE_NAME: huggingfaceserver
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # Run tests.
+  # See also https://docs.docker.com/docker-hub/builds/automated-testing/
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run tests
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: python
+          file: python/huggingface_server_cpu_openvino.Dockerfile
+          push: false
+          # https://github.com/docker/buildx/issues/1533
+          provenance: false
+
+  # Push image to GitHub Packages.
+  # See also https://docs.docker.com/docker-hub/builds/
+  push:
+    # Ensure test job passes before pushing image.
+    needs: test
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Export version variable
+        run: |
+          IMAGE_ID=kserve/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          # [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+
+          # Add "-openvnino" suffix to the version
+          VERSION="${VERSION}-openvino"
+
+          echo VERSION=$VERSION >> $GITHUB_ENV
+          echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: python
+          file: python/huggingface_server_cpu_openvino.Dockerfile
+          push: true
+          tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
+          # https://github.com/docker/buildx/issues/1533
+          provenance: false

.github/workflows/huggingface-openvino-docker-publish.yml

@@ -0,0 +1,35 @@
+name: "Precommit Check"
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  precommit-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+      
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+            python-version: "3.12"
+
+      - name: Install dependencies
+        run: |
+          go mod download
+          cd qpext && go mod download
+
+      - name: Check
+        shell: bash
+        run: |
+          make check

.github/workflows/precommit-check.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

.github/workflows/python-publish.yml

@@ -12,30 +12,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.11"]
-    name: Lint
-    steps:
-      - name: Check out source repository
-        uses: actions/checkout@v4
-      - name: Set up Python environment ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Lint with flake8
-        uses: py-actions/flake8@v2
-        with:
-          args: "--config .flake8"
-          path: "."
-      - name: Check formatting with black
-        uses: psf/black@stable
-        with:
-          options: "--check --diff --config python/pyproject.toml"
-          src: "."
-          version: "~= 24.3"
   build:
     runs-on: ubuntu-latest
     strategy:
@@ -252,7 +228,7 @@ jobs:
           source paddleserver/.venv/bin/activate
           pytest --cov=paddleserver ./paddleserver
 
-      # ----------------------------------------Huggingface Server Unit Tests------------------------------------------------
+      # ----------------------------------------Huggingface OpenVino Server Unit Tests------------------------------------------------
       # load cached huggingface venv if cache exists
       - name: Load cached huggingface venv
         id: huggingface-dependencies
@@ -285,7 +261,55 @@ jobs:
           cd python/huggingfaceserver
           bash tests/setup_vllm.sh
           poetry run -- pytest --cov=huggingfaceserver -vv
+        env:
+          VLLM_TARGET_DEVICE: openvino
 
       - name: Free space after tests
         run: |
-          df -hT
+          df -hT
+      # ----------------------------------------Huggingface CPU Server Unit Tests------------------------------------------------
+      # load cached huggingface cpu venv if cache exists
+      - name: Load cached huggingface cpu venv
+        id: huggingface-cpu-dependencies
+        uses: actions/cache@v4
+        with:
+          path: /mnt/python/huggingfaceserver-cpu-venv
+          key: huggingface-cpu-venv-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/kserve/poetry.lock', '**/huggingfaceserver/poetry.lock') }}
+      # install huggingface cpu server dependencies if cache does not exist
+      - name: Configure poetry for huggingface cpu server
+        run: |
+          poetry config virtualenvs.path /mnt/python/huggingfaceserver-cpu-venv
+          poetry config virtualenvs.in-project false
+      # make poetry visible for vllm cpu installation
+      - name: Install Poetry Plugins cpu
+        run: |
+          poetry self add poetry-version-plugin
+      - name: Install huggingface cpu dependencies
+        run: |
+          sudo mkdir -p /mnt/python/huggingfaceserver-cpu-venv
+          # change permission so that poetry can install without sudo
+          sudo chown -R $USER /mnt/python/huggingfaceserver-cpu-venv
+          cd python/huggingfaceserver
+          make install_cpu_dependencies
+
+      - name: Install huggingface cpu server
+        run: |
+          cd python/huggingfaceserver
+          make dev_install
+      - name: Test huggingfaceserver cpu
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libnuma-dev
+          cd python/huggingfaceserver
+          bash tests/setup_vllm.sh
+          poetry run -- pytest --cov=huggingfaceserver -vv -k 'not test_vllm'
+          # TODO: The following tests need to be reworked since IPEX support is relatively new for both vLLM and KServe
+          # poetry run -- pytest --cov=huggingfaceserver -vv tests/test_vllm_chat_with_reasoning.py
+          # poetry run -- pytest --cov=huggingfaceserver -vv tests/test_vllm_chat_with_tools.py
+          # poetry run -- pytest --cov=huggingfaceserver -vv tests/test_vllm_generative.py
+        env:
+          VLLM_ENGINE_ITERATION_TIMEOUT_S: 3600
+
+      - name: Free space after cpu tests
+        run: |
+          df -hT