Skip to content

Commit 5ab5193

Browse files
DaltheCowDaltheCow
committed
merge main
2 parents 9613c3a + 0d9a539 commit 5ab5193

25 files changed

+3842
-840
lines changed

‎.github/workflows/development.yml

Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
python: ["3.9", "3.13"]
1313
steps:
1414
- uses: actions/checkout@v4
15-
with:
16-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
1715
- name: Set up Python
1816
uses: actions/setup-python@v5
1917
with:
@@ -29,9 +27,12 @@ jobs:
2927
runs-on: ubuntu-latest
3028
steps:
3129
- name: Check out code
32-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
31+
32+
- name: Set up Node.js 22
33+
uses: actions/setup-node@v4
3334
with:
34-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
35+
node-version: '22'
3536

3637
- name: Set up Node.js 22
3738
uses: actions/setup-node@v4
@@ -51,8 +52,6 @@ jobs:
5152
python: ["3.9", "3.13"]
5253
steps:
5354
- uses: actions/checkout@v4
54-
with:
55-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
5655
- name: Set up Python
5756
uses: actions/setup-python@v5
5857
with:
@@ -68,9 +67,12 @@ jobs:
6867
runs-on: ubuntu-latest
6968
steps:
7069
- name: Check out code
71-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
71+
72+
- name: Set up Node.js 22
73+
uses: actions/setup-node@v4
7274
with:
73-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
75+
node-version: '22'
7476

7577
- name: Set up Node.js 22
7678
uses: actions/setup-node@v4
@@ -90,8 +92,6 @@ jobs:
9092
python: ["3.9"]
9193
steps:
9294
- uses: actions/checkout@v4
93-
with:
94-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
9595
- name: Set up Python
9696
uses: actions/setup-python@v5
9797
with:
@@ -107,9 +107,12 @@ jobs:
107107
runs-on: ubuntu-latest
108108
steps:
109109
- name: Check out code
110-
uses: actions/checkout@v3
110+
uses: actions/checkout@v4
111+
112+
- name: Set up Node.js 22
113+
uses: actions/setup-node@v4
111114
with:
112-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
115+
node-version: '22'
113116

114117
- name: Set up Node.js 22
115118
uses: actions/setup-node@v4
@@ -129,8 +132,6 @@ jobs:
129132
python: ["3.9", "3.13"]
130133
steps:
131134
- uses: actions/checkout@v4
132-
with:
133-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
134135
- name: Set up Python
135136
uses: actions/setup-python@v5
136137
with:
@@ -146,7 +147,12 @@ jobs:
146147
runs-on: ubuntu-latest
147148
steps:
148149
- name: Check out code
149-
uses: actions/checkout@v3
150+
uses: actions/checkout@v4
151+
152+
- name: Set up Node.js 22
153+
uses: actions/setup-node@v4
154+
with:
155+
node-version: '22'
150156

151157
- name: Set up Node.js 22
152158
uses: actions/setup-node@v4
@@ -166,8 +172,6 @@ jobs:
166172
python: ["3.9", "3.13"]
167173
steps:
168174
- uses: actions/checkout@v4
169-
with:
170-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
171175
- name: Set up Python
172176
uses: actions/setup-python@v5
173177
with:
@@ -183,9 +187,12 @@ jobs:
183187
runs-on: ubuntu-latest
184188
steps:
185189
- name: Check out code
186-
uses: actions/checkout@v3
190+
uses: actions/checkout@v4
191+
192+
- name: Set up Node.js 22
193+
uses: actions/setup-node@v4
187194
with:
188-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
195+
node-version: '22'
189196

190197
- name: Set up Node.js 22
191198
uses: actions/setup-node@v4
@@ -199,6 +206,8 @@ jobs:
199206
run: npm run test:integration
200207

201208
build:
209+
# Only build if the PR branch is local
210+
if: github.event.pull_request.head.repo.full_name == github.repository
202211
runs-on: ubuntu-latest
203212
strategy:
204213
matrix:
@@ -208,7 +217,6 @@ jobs:
208217
uses: actions/checkout@v4
209218
with:
210219
fetch-depth: 0
211-
ref: "${{ github.event.pull_request.merge_commit_sha }}"
212220
- name: Set up Python
213221
uses: actions/setup-python@v5
214222
with:
@@ -353,3 +361,30 @@ jobs:
353361
- name: Skip build notification
354362
if: steps.check-changes.outputs.should_build == 'false'
355363
run: echo "Skipping UI preview build - no relevant files changed"
364+
365+
build-and-push-container:
366+
# Only build if the PR branch is local
367+
if: github.event.pull_request.head.repo.full_name == github.repository
368+
runs-on: ubuntu-latest
369+
permissions:
370+
packages: write
371+
steps:
372+
- name: Checkout
373+
uses: actions/checkout@v4
374+
- name: Buildah build
375+
id: build-image
376+
uses: redhat-actions/buildah-build@v2
377+
with:
378+
image: ${{ github.event.repository.name }}
379+
tags: "pr-${{ github.event.number }}"
380+
containerfiles: |
381+
./deploy/Containerfile
382+
- name: Push To ghcr.io
383+
id: push-to-ghcr
384+
uses: redhat-actions/push-to-registry@v2
385+
with:
386+
image: ${{ steps.build-image.outputs.image }}
387+
tags: ${{ steps.build-image.outputs.tags }}
388+
username: ${{ github.actor }}
389+
password: ${{ github.token }}
390+
registry: ghcr.io/${{ github.repository_owner }}

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
run: npm run test:integration
183183

184184
deploy-ui-build:
185-
needs: [ui-quality-checks, ui-precommit-checks, ui-unit-tests, ui-integration-tests]
185+
needs: [ui-quality-checks, ui-precommit-checks, ui-unit-tests, ui-type-checks, ui-integration-tests]
186186
permissions:
187187
contents: write
188188
runs-on: ubuntu-latest

‎.github/workflows/nightly.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,27 @@ jobs:
244244
user_name: ${{ github.actor }}
245245
user_email: ${{ github.actor }}@users.noreply.github.com
246246
publish_branch: gh-pages
247+
248+
build-and-push-container:
249+
needs: [unit-tests, integration-tests, e2e-tests]
250+
runs-on: ubuntu-latest
251+
steps:
252+
- name: Checkout
253+
uses: actions/checkout@v4
254+
- name: Buildah build
255+
id: build-image
256+
uses: redhat-actions/buildah-build@v2
257+
with:
258+
image: ${{ github.event.repository.name }}
259+
tags: nightly
260+
containerfiles: |
261+
./deploy/Containerfile
262+
- name: Push To ghcr.io
263+
id: push-to-ghcr
264+
uses: redhat-actions/push-to-registry@v2
265+
with:
266+
image: ${{ steps.build-image.outputs.image }}
267+
tags: ${{ steps.build-image.outputs.tags }}
268+
username: ${{ github.actor }}
269+
password: ${{ github.token }}
270+
registry: ghcr.io/${{ github.repository_owner }}

‎.github/workflows/release-candidate.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ jobs:
270270
export $(grep -v '^#' .env.staging | xargs)
271271
272272
# Set asset prefix and base path with git tag
273-
ASSET_PREFIX=https://neuralmagic.github.io/guidellm/release/latest
274-
BASE_PATH=/release/latest
273+
ASSET_PREFIX=https://neuralmagic.github.io/guidellm/ui/release/latest
274+
BASE_PATH=/ui/release/latest
275275
GIT_SHA=${{ github.sha }}
276276
export ASSET_PREFIX=${ASSET_PREFIX}
277277
export BASE_PATH=${BASE_PATH}
@@ -288,3 +288,28 @@ jobs:
288288
user_name: ${{ github.actor }}
289289
user_email: ${{ github.actor }}@users.noreply.github.com
290290
publish_branch: gh-pages
291+
292+
build-and-push-container:
293+
needs: [unit-tests, integration-tests, e2e-tests]
294+
runs-on: ubuntu-latest
295+
steps:
296+
- name: Checkout
297+
uses: actions/checkout@v4
298+
- name: Buildah build
299+
id: build-image
300+
uses: redhat-actions/buildah-build@v2
301+
with:
302+
image: ${{ github.event.repository.name }}
303+
# TODO: Tag version
304+
tags: latest
305+
containerfiles: |
306+
./deploy/Containerfile
307+
- name: Push To ghcr.io
308+
id: push-to-ghcr
309+
uses: redhat-actions/push-to-registry@v2
310+
with:
311+
image: ${{ steps.build-image.outputs.image }}
312+
tags: ${{ steps.build-image.outputs.tags }}
313+
username: ${{ github.actor }}
314+
password: ${{ github.token }}
315+
registry: ghcr.io/${{ github.repository_owner }}

‎.github/workflows/release.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,3 +287,28 @@ jobs:
287287
user_name: ${{ github.actor }}
288288
user_email: ${{ github.actor }}@users.noreply.github.com
289289
publish_branch: gh-pages
290+
291+
build-and-push-container:
292+
needs: [unit-tests, integration-tests, e2e-tests]
293+
runs-on: ubuntu-latest
294+
steps:
295+
- name: Checkout
296+
uses: actions/checkout@v4
297+
- name: Buildah build
298+
id: build-image
299+
uses: redhat-actions/buildah-build@v2
300+
with:
301+
image: ${{ github.event.repository.name }}
302+
# TODO: Tag version
303+
tags: latest stable
304+
containerfiles: |
305+
./deploy/Containerfile
306+
- name: Push To ghcr.io
307+
id: push-to-ghcr
308+
uses: redhat-actions/push-to-registry@v2
309+
with:
310+
image: ${{ steps.build-image.outputs.image }}
311+
tags: ${{ steps.build-image.outputs.tags }}
312+
username: ${{ github.actor }}
313+
password: ${{ github.token }}
314+
registry: ghcr.io/${{ github.repository_owner }}

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ cython_debug/
169169
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
170170
# and can be added to the global gitignore or merged into this file. For a more nuclear
171171
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
172-
#.idea/
172+
.idea/
173173

174174

175175
# MacOS files

‎.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ repos:
33
rev: v4.6.0
44
hooks:
55
- id: trailing-whitespace
6+
exclude: ^tests/?.*/assets/.+
67
- id: end-of-file-fixer
8+
exclude: ^tests/?.*/assets/.+
79
- repo: https://github.com/astral-sh/ruff-pre-commit
810
rev: v0.11.7
911
hooks:
@@ -40,7 +42,6 @@ repos:
4042
pydantic_settings,
4143

4244
# types
43-
types-click,
4445
types-PyYAML,
4546
types-requests,
4647
types-toml,

‎DEVELOPING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,20 @@ src/ui/lib/store/[runInfo/workloadDetails/benchmarks]WindowData.ts
277277

278278
In the future this will be replaced by a configurable untracked file for dev use.
279279

280+
### Logging
281+
282+
Logging is useful for learning how GuideLLM works and finding problems.
283+
284+
Logging is set using the following environment variables:
285+
286+
- `GUIDELLM__LOGGING__DISABLED`: Disable logging (default: false).
287+
- `GUIDELLM__LOGGING__CLEAR_LOGGERS`: Clear existing loggers from loguru (default: true).
288+
- `GUIDELLM__LOGGING__CONSOLE_LOG_LEVEL`: Log level for console logging (default: none, options: DEBUG, INFO, WARNING, ERROR, CRITICAL).
289+
- `GUIDELLM__LOGGING__LOG_FILE`: Path to the log file for file logging (default: guidellm.log if log file level set else none)
290+
- `GUIDELLM__LOGGING__LOG_FILE_LEVEL`: Log level for file logging (default: INFO if log file set else none).
291+
292+
If logging isn't responding to the environment variables, run the `guidellm config` command to validate that the environment variables match and are being set correctly.
293+
280294
## Additional Resources
281295

282296
- [CONTRIBUTING.md](https://github.com/neuralmagic/guidellm/blob/main/CONTRIBUTING.md): Guidelines for contributing to the project.

0 commit comments

Comments
 (0)