Skip to content

Commit cd7a9b1

Browse files
XkunWXkunW
committed
Rebase with main and update hf_model field processing logic
2 parents 1c312df + 03e8171 commit cd7a9b1

37 files changed

Lines changed: 8663 additions & 3096 deletions

‎.github/workflows/code_checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run-code-check:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v5.0.0
31+
- uses: actions/checkout@v6.0.1
3232
- name: Install uv
3333
uses: astral-sh/setup-uv@v7
3434
with:

‎.github/workflows/docker.yml‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,56 @@ on:
77
branches:
88
- main
99
paths:
10-
- Dockerfile
10+
- vllm.Dockerfile
11+
- sglang.Dockerfile
1112
- .github/workflows/docker.yml
1213
- uv.lock
1314
pull_request:
1415
branches:
1516
- main
17+
- f/sglang-support
1618
paths:
17-
- Dockerfile
19+
- vllm.Dockerfile
20+
- sglang.Dockerfile
1821
- .github/workflows/docker.yml
1922
- uv.lock
2023

2124
jobs:
2225
push_to_registry:
23-
name: Push Docker image to Docker Hub
26+
name: Build and push Docker images
2427
runs-on:
25-
- self-hosted
26-
- docker
28+
- ubuntu-latest
29+
strategy:
30+
matrix:
31+
backend: [vllm, sglang]
2732
steps:
2833
- name: Checkout repository
29-
uses: actions/checkout@v5.0.0
34+
uses: actions/checkout@v6.0.1
3035

31-
- name: Extract vLLM version
32-
id: vllm-version
36+
- name: Extract backend version
37+
id: backend-version
3338
run: |
34-
VERSION=$(grep -A 1 'name = "vllm"' uv.lock | grep version | cut -d '"' -f 2)
39+
VERSION=$(grep -A 1 "name = \"${{ matrix.backend }}\"" uv.lock | grep version | cut -d '"' -f 2)
3540
echo "version=$VERSION" >> $GITHUB_OUTPUT
3641
42+
- name: Maximize build space
43+
run: |
44+
echo "Disk space before cleanup:"
45+
df -h
46+
# Remove unnecessary pre-installed software
47+
sudo rm -rf /usr/share/dotnet
48+
sudo rm -rf /usr/local/lib/android
49+
sudo rm -rf /opt/ghc
50+
sudo rm -rf /opt/hostedtoolcache/CodeQL
51+
sudo rm -rf /usr/local/share/boost
52+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
53+
# Clean apt cache
54+
sudo apt-get clean
55+
# Remove docker images
56+
docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true
57+
echo "Disk space after cleanup:"
58+
df -h
59+
3760
- name: Set up Docker Buildx
3861
uses: docker/setup-buildx-action@v3
3962

@@ -45,17 +68,18 @@ jobs:
4568

4669
- name: Extract metadata (tags, labels) for Docker
4770
id: meta
48-
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893
71+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
4972
with:
50-
images: vectorinstitute/vector-inference
73+
images: vectorinstitute/vector-inference-${{ matrix.backend }}
5174

5275
- name: Build and push Docker image
5376
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
5477
with:
5578
context: .
56-
file: ./Dockerfile
79+
file: ./${{ matrix.backend }}.Dockerfile
5780
push: true
5881
tags: |
5982
${{ steps.meta.outputs.tags }}
60-
vectorinstitute/vector-inference:${{ steps.vllm-version.outputs.version }}
83+
vectorinstitute/vector-inference-${{ matrix.backend }}:${{ steps.backend-version.outputs.version }}
84+
vectorinstitute/vector-inference-${{ matrix.backend }}:latest
6185
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/docs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Checkout code
54-
uses: actions/checkout@v5.0.0
54+
uses: actions/checkout@v6.0.1
5555
with:
5656
fetch-depth: 0 # Fetch all history for proper versioning
5757

@@ -67,7 +67,7 @@ jobs:
6767
python-version-file: ".python-version"
6868

6969
- name: Install the project
70-
run: uv sync --all-extras --group docs --prerelease=allow
70+
run: uv sync --group docs --prerelease=allow
7171

7272
- name: Build docs
7373
run: uv run --frozen mkdocs build
@@ -76,7 +76,7 @@ jobs:
7676
run: touch site/.nojekyll
7777

7878
- name: Upload artifact
79-
uses: actions/upload-artifact@v5
79+
uses: actions/upload-artifact@v6
8080
with:
8181
name: docs-site
8282
path: site/
@@ -88,7 +88,7 @@ jobs:
8888
runs-on: ubuntu-latest
8989
steps:
9090
- name: Checkout code
91-
uses: actions/checkout@v5.0.0
91+
uses: actions/checkout@v6.0.1
9292
with:
9393
fetch-depth: 0 # Fetch all history for proper versioning
9494

@@ -104,15 +104,15 @@ jobs:
104104
python-version-file: ".python-version"
105105

106106
- name: Install the project
107-
run: uv sync --all-extras --group docs --frozen
107+
run: uv sync --group docs --frozen
108108

109109
- name: Configure Git Credentials
110110
run: |
111111
git config user.name github-actions[bot]
112112
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
113113
114114
- name: Download artifact
115-
uses: actions/download-artifact@v6
115+
uses: actions/download-artifact@v7
116116
with:
117117
name: docs-site
118118
path: site

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
sudo apt-get update
1414
sudo apt-get install libcurl4-openssl-dev libssl-dev
1515
16-
- uses: actions/checkout@v5.0.0
16+
- uses: actions/checkout@v6.0.1
1717

1818
- name: Install uv
1919
uses: astral-sh/setup-uv@v7

‎.github/workflows/unit_tests.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
matrix:
4444
python-version: ["3.10", "3.11", "3.12"]
4545
steps:
46-
- uses: actions/checkout@v5.0.0
46+
- uses: actions/checkout@v6.0.1
4747

4848
- name: Install uv
4949
uses: astral-sh/setup-uv@v7
@@ -58,16 +58,26 @@ jobs:
5858
python-version: ${{ matrix.python-version }}
5959

6060
- name: Install the project
61+
env:
62+
# Ensure uv uses the matrix interpreter instead of `.python-version` (3.10),
63+
# otherwise the "3.11"/"3.12" jobs silently run on 3.10.
64+
UV_PYTHON: ${{ matrix.python-version }}
6165
run: uv sync --dev --prerelease=allow
6266

6367
- name: Install dependencies and check code
68+
env:
69+
UV_PYTHON: ${{ matrix.python-version }}
6470
run: |
6571
uv run --frozen pytest -m "not integration_test" --cov vec_inf --cov-report=xml tests
6672
6773
- name: Install the core package only
74+
env:
75+
UV_PYTHON: ${{ matrix.python-version }}
6876
run: uv sync --no-dev
6977

7078
- name: Run package import tests
79+
env:
80+
UV_PYTHON: ${{ matrix.python-version }}
7181
run: |
7282
uv run --frozen pytest tests/test_imports.py
7383
@@ -76,7 +86,7 @@ jobs:
7686
gpg --keyserver keyserver.ubuntu.com --recv-keys 806BB28AED779869
7787
7888
- name: Upload coverage to Codecov
79-
uses: codecov/codecov-action@v5.5.1
89+
uses: codecov/codecov-action@v5.5.2
8090
with:
8191
token: ${{ secrets.CODECOV_TOKEN }}
8292
files: ./coverage.xml

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
- id: check-toml
1818

1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: 'v0.14.4'
20+
rev: 'v0.14.14'
2121
hooks:
2222
- id: ruff
2323
args: [--fix, --exit-non-zero-on-fix]
@@ -26,7 +26,7 @@ repos:
2626
types_or: [python, jupyter]
2727

2828
- repo: https://github.com/pre-commit/mirrors-mypy
29-
rev: v1.18.2
29+
rev: v1.19.1
3030
hooks:
3131
- id: mypy
3232
entry: python3 -m mypy --config-file pyproject.toml

0 commit comments

Comments
 (0)