Skip to content

Commit 07c8884

Browse files
markurtzmarkurtz
authored
Merge branch 'main' into support_sharegpt
2 parents aa03d52 + c495418 commit 07c8884

File tree

131 files changed

+15910
-10120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+15910
-10120
lines changed

‎.github/workflows/development.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ jobs:
1717
with:
1818
python-version: ${{ matrix.python }}
1919
- name: Install dependencies
20-
run: pip install tox
20+
run: |
21+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
22+
pip install tox tox-pdm
2123
- name: Run quality checks
2224
run: tox -e quality
2325

@@ -52,7 +54,9 @@ jobs:
5254
with:
5355
python-version: ${{ matrix.python }}
5456
- name: Install dependencies
55-
run: pip install tox
57+
run: |
58+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
59+
pip install tox tox-pdm
5660
- name: Run quality checks
5761
run: tox -e types
5862

@@ -122,7 +126,9 @@ jobs:
122126
with:
123127
python-version: ${{ matrix.python }}
124128
- name: Install dependencies
125-
run: pip install tox
129+
run: |
130+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
131+
pip install tox tox-pdm
126132
- name: Run unit tests
127133
run: tox -e test-unit
128134

@@ -157,7 +163,9 @@ jobs:
157163
with:
158164
python-version: ${{ matrix.python }}
159165
- name: Install dependencies
160-
run: pip install tox
166+
run: |
167+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
168+
pip install tox tox-pdm
161169
- name: Run integration tests
162170
run: tox -e test-integration -- -m smoke
163171

‎.github/workflows/e2e.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# This workflow builds a Docker artifact, caches it based on the Dockerfile content,
2+
# and then runs e2e tests using that artifact.
3+
4+
name: E2E Tests
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
pull_request:
11+
branches:
12+
- main
13+
workflow_dispatch:
14+
15+
jobs:
16+
build-and-test:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Check out repository
21+
uses: actions/checkout@v4
22+
23+
# Cache the binary artifact
24+
# The key is based on the runner's OS and the hash of the Dockerfile.
25+
# If the Dockerfile changes, the hash changes, and a new cache is created.
26+
- name: Cache vLLM-sim binary
27+
id: cache-vllm-sim
28+
uses: actions/cache@v4
29+
with:
30+
# The path to the file you want to cache
31+
path: bin/llm-d-inference-sim
32+
# The unique key for the cache
33+
key: vllm-sim-binary-${{ runner.os }}-${{ hashFiles('tests/e2e/vllm-sim.Dockerfile') }}
34+
35+
# Set up Docker Buildx (required for the 'docker build -o' command)
36+
- name: Set up Docker Buildx
37+
uses: docker/setup-buildx-action@v3
38+
39+
# Conditionally build the artifact
40+
# This step only runs if the cache step above did NOT find a match.
41+
# 'steps.cache-vllm-sim.outputs.cache-hit' will be 'true' if the cache was restored.
42+
- name: Build vLLM-sim artifact (if not cached)
43+
if: steps.cache-vllm-sim.outputs.cache-hit != 'true'
44+
run: |
45+
echo "Cache miss. Building artifact..."
46+
docker build . -f tests/e2e/vllm-sim.Dockerfile -o type=local,dest=./
47+
shell: bash
48+
49+
- name: Verify artifact
50+
run: |
51+
if [ -f "bin/llm-d-inference-sim" ]; then
52+
echo "Artifact found."
53+
else
54+
echo "ERROR: Artifact bin/llm-d-inference-sim not found!"
55+
exit 1
56+
fi
57+
shell: bash
58+
59+
- name: Set up Python
60+
uses: actions/setup-python@v5
61+
with:
62+
python-version: ${{ matrix.python }}
63+
- name: Install dependencies
64+
run: |
65+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
66+
pip install tox tox-pdm
67+
- name: Run E2E tests
68+
run: tox -e test-e2e
69+
shell: bash

‎.github/workflows/main.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818
with:
1919
python-version: ${{ matrix.python }}
2020
- name: Install dependencies
21-
run: pip install tox
21+
run: |
22+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
23+
pip install tox tox-pdm
2224
- name: Run quality checks
2325
run: tox -e quality
2426

@@ -53,7 +55,9 @@ jobs:
5355
with:
5456
python-version: ${{ matrix.python }}
5557
- name: Install dependencies
56-
run: pip install tox
58+
run: |
59+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
60+
pip install tox tox-pdm
5761
- name: Run quality checks
5862
run: tox -e types
5963

@@ -123,7 +127,9 @@ jobs:
123127
with:
124128
python-version: ${{ matrix.python }}
125129
- name: Install dependencies
126-
run: pip install tox
130+
run: |
131+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
132+
pip install tox tox-pdm
127133
- name: Run unit tests
128134
run: tox -e test-unit
129135

@@ -158,7 +164,9 @@ jobs:
158164
with:
159165
python-version: ${{ matrix.python }}
160166
- name: Install dependencies
161-
run: pip install tox
167+
run: |
168+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
169+
pip install tox tox-pdm
162170
- name: Run integration tests
163171
run: tox -e test-integration -- -m smoke
164172

‎.github/workflows/nightly.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818
with:
1919
python-version: ${{ matrix.python }}
2020
- name: Install dependencies
21-
run: pip install tox
21+
run: |
22+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
23+
pip install tox tox-pdm
2224
- name: Run link checks
2325
run: tox -e links
2426

@@ -34,7 +36,9 @@ jobs:
3436
with:
3537
python-version: ${{ matrix.python }}
3638
- name: Install dependencies
37-
run: pip install tox
39+
run: |
40+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
41+
pip install tox tox-pdm
3842
- name: Run unit tests
3943
run: tox -e test-unit
4044

@@ -69,7 +73,9 @@ jobs:
6973
with:
7074
python-version: ${{ matrix.python }}
7175
- name: Install dependencies
72-
run: pip install tox
76+
run: |
77+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
78+
pip install tox tox-pdm
7379
- name: Run integration tests
7480
run: tox -e test-integration -- -m "smoke or sanity"
7581

@@ -104,7 +110,9 @@ jobs:
104110
with:
105111
python-version: ${{ matrix.python }}
106112
- name: Install dependencies
107-
run: pip install tox
113+
run: |
114+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
115+
pip install tox tox-pdm
108116
- name: Run integration tests
109117
run: tox -e test-e2e -- -m smoke
110118

@@ -153,7 +161,7 @@ jobs:
153161
with:
154162
python-version: ${{ matrix.python }}
155163
- name: Install dependencies
156-
run: pip install tox
164+
run: pip install tox tox-pdm
157165
- name: Build the package
158166
run: |
159167
export GUIDELLM_BUILD_TYPE=nightly

‎.github/workflows/release-candidate.yml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818
with:
1919
python-version: ${{ matrix.python }}
2020
- name: Install dependencies
21-
run: pip install tox
21+
run: |
22+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
23+
pip install tox tox-pdm
2224
- name: Run link checks
2325
run: tox -e links
2426

@@ -34,7 +36,9 @@ jobs:
3436
with:
3537
python-version: ${{ matrix.python }}
3638
- name: Install dependencies
37-
run: pip install tox
39+
run: |
40+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
41+
pip install tox tox-pdm
3842
- name: Run unit tests
3943
run: tox -e test-unit
4044

@@ -69,7 +73,9 @@ jobs:
6973
with:
7074
python-version: ${{ matrix.python }}
7175
- name: Install dependencies
72-
run: pip install tox
76+
run: |
77+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
78+
pip install tox tox-pdm
7379
- name: Run integration tests
7480
run: tox -e test-integration
7581

@@ -104,7 +110,9 @@ jobs:
104110
with:
105111
python-version: ${{ matrix.python }}
106112
- name: Install dependencies
107-
run: pip install tox
113+
run: |
114+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
115+
pip install tox tox-pdm
108116
- name: Run end-to-end tests
109117
run: tox -e test-e2e
110118

@@ -153,7 +161,9 @@ jobs:
153161
with:
154162
python-version: ${{ matrix.python }}
155163
- name: Install dependencies
156-
run: pip install tox
164+
run: |
165+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
166+
pip install tox tox-pdm
157167
- name: Build the package
158168
run: |
159169
export GUIDELLM_BUILD_TYPE=candidate
@@ -216,8 +226,8 @@ jobs:
216226
export $(grep -v '^#' .env.staging | xargs)
217227
218228
# Set asset prefix and base path with git tag
219-
ASSET_PREFIX=https://blog.vllm.ai/guidellm/ui/release/${TAG}
220-
BASE_PATH=/ui/release/${TAG}
229+
ASSET_PREFIX=https://blog.vllm.ai/guidellm/ui/${{ env.TAG }}
230+
BASE_PATH=/ui/${{ env.TAG }}
221231
GIT_SHA=${{ github.sha }}
222232
export ASSET_PREFIX=${ASSET_PREFIX}
223233
export BASE_PATH=${BASE_PATH}
@@ -229,7 +239,7 @@ jobs:
229239
with:
230240
github_token: ${{ secrets.GITHUB_TOKEN }}
231241
publish_dir: .src/ui/out
232-
destination_dir: ui/release/${TAG}
242+
destination_dir: ui/${{ env.TAG }}
233243
keep_files: false
234244
user_name: ${{ github.actor }}
235245
user_email: ${{ github.actor }}@users.noreply.github.com

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
with:
2222
python-version: ${{ matrix.python }}
2323
- name: Install dependencies
24-
run: pip install tox
24+
run: |
25+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
26+
pip install tox tox-pdm
2527
- name: Build the package
2628
run: |
2729
export GUIDELLM_BUILD_TYPE=release
@@ -63,7 +65,9 @@ jobs:
6365
with:
6466
python-version: ${{ matrix.python }}
6567
- name: Install dependencies
66-
run: pip install tox
68+
run: |
69+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
70+
pip install tox tox-pdm
6771
- name: Run link checks
6872
run: tox -e links
6973

@@ -79,7 +83,9 @@ jobs:
7983
with:
8084
python-version: ${{ matrix.python }}
8185
- name: Install dependencies
82-
run: pip install tox
86+
run: |
87+
curl -sSL https://pdm-project.org/install-pdm.py | python3 -
88+
pip install tox tox-pdm
8389
- name: Run unit tests
8490
run: tox -e test-unit
8591

@@ -114,7 +120,7 @@ jobs:
114120
with:
115121
python-version: ${{ matrix.python }}
116122
- name: Install dependencies
117-
run: pip install tox
123+
run: pip install tox tox-pdm
118124
- name: Run integration tests
119125
run: tox -e test-integration
120126

@@ -149,7 +155,7 @@ jobs:
149155
with:
150156
python-version: ${{ matrix.python }}
151157
- name: Install dependencies
152-
run: pip install tox
158+
run: pip install tox tox-pdm
153159
- name: Run end-to-end tests
154160
run: tox -e test-e2e
155161

@@ -215,8 +221,8 @@ jobs:
215221
export $(grep -v '^#' .env.production | xargs)
216222
217223
# Set asset prefix and base path with git tag
218-
ASSET_PREFIX=https://blog.vllm.ai/guidellm/ui/${TAG}
219-
BASE_PATH=/ui/${TAG}
224+
ASSET_PREFIX=https://blog.vllm.ai/guidellm/ui/${{ env.TAG }}
225+
BASE_PATH=/ui/${{ env.TAG }}
220226
GIT_SHA=${{ github.sha }}
221227
export ASSET_PREFIX=${ASSET_PREFIX}
222228
export BASE_PATH=${BASE_PATH}
@@ -228,7 +234,7 @@ jobs:
228234
with:
229235
github_token: ${{ secrets.GITHUB_TOKEN }}
230236
publish_dir: ./src/ui/out
231-
destination_dir: ui/${TAG}
237+
destination_dir: ui/${{ env.TAG }}
232238
keep_files: false
233239
user_name: ${{ github.actor }}
234240
user_email: ${{ github.actor }}@users.noreply.github.com

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,6 @@ src/ui/next-env.d.ts
230230
!src/ui/public/manifest.json
231231
!src/ui/serve.json
232232
.eslintcache
233+
234+
# e2e tests
235+
bin/

‎Containerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# TODO: Update to official python-3.13-minimal image when available
22
ARG BASE_IMAGE=quay.io/fedora/python-313-minimal:latest
33

4+
# Use a multi-stage build to create a lightweight production image
5+
FROM $BASE_IMAGE as builder
6+
47
# release: take the last version and add a post if build iteration
58
# candidate: increment to next minor, add 'rc' with build iteration
69
# nightly: increment to next minor, add 'a' with build iteration
710
# alpha: increment to next minor, add 'a' with build iteration
811
# dev: increment to next minor, add 'dev' with build iteration
912
ARG GUIDELLM_BUILD_TYPE=dev
1013

11-
# Use a multi-stage build to create a lightweight production image
12-
FROM $BASE_IMAGE as builder
13-
1414
# Switch to root for installing packages
1515
USER root
1616

0 commit comments

Comments
 (0)