Merge branch 'main' into file_ut

Author: tukwila

.github/actions/python-uv/action.yml

@@ -0,0 +1,17 @@
+name: 'Setup Python and uv'
+description: 'Configures a Python version and uv'
+inputs:
+  python-version:
+    type: string
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-python@v6
+      with:
+        python-version: ${{ inputs.python-version }}
+    - name: Setup Python with UV
+      uses: astral-sh/setup-uv@v7
+      with:
+        python-version: ${{ inputs.python-version }}
+        enable-cache: "true"

.github/actions/run-tox/action.yml

@@ -1,5 +1,5 @@
 name: 'Run tox with environment'
-description: 'Runs tox with pdm as the package manager'
+description: 'Runs tox with uv as the package manager'
 inputs:
   python-version:
     type: string
@@ -13,8 +13,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Setup Python with PDM
-      uses: pdm-project/setup-pdm@v4
+    - name: Setup Python with UV
+      uses: ./.github/actions/python-uv
       with:
         python-version: ${{ inputs.python-version }}
     - name: Install system dependencies
@@ -23,11 +23,11 @@ runs:
       shell: bash
     - name: Install dependencies
       run: |
-        pip install tox tox-pdm
+        uv pip install --system tox tox-uv
       shell: bash
     - name: Run tox
       run: |
-        tox run -e "${{ inputs.tox-env }}" -- ${{ inputs.tox-args }} || ret=$?
+        tox run --runner uv-venv-lock-runner -e "${{ inputs.tox-env }}" -- ${{ inputs.tox-args }} || ret=$?
         # errno 5 means all tests were filtered out, ignore
         [[ "${ret:=0}" -eq 5 ]] && exit 0; exit $ret
       shell: bash

.github/workflows/nightly.yml

@@ -29,13 +29,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Python
-        uses: pdm-project/setup-pdm@v4
+      - name: Setup Python with UV
+        uses: ./.github/actions/python-uv
         with:
           python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
-          pip install tox tox-pdm
+          uv pip install --system tox tox-pdm
       - name: Build the package
         run: |
           export GUIDELLM_BUILD_TYPE=nightly

.github/workflows/release-candidate.yml

@@ -28,13 +28,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Python
-        uses: pdm-project/setup-pdm@v4
+      - name: Setup Python with UV
+        uses: ./.github/actions/python-uv
         with:
           python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
-          pip install tox tox-pdm
+          uv pip install --system tox tox-pdm
       - name: Build the package
         run: |
           export GUIDELLM_BUILD_TYPE=candidate

.github/workflows/release.yml

@@ -27,13 +27,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Python
-        uses: pdm-project/setup-pdm@v4
+      - name: Setup Python with UV
+        uses: ./.github/actions/python-uv
         with:
           python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
-          pip install tox tox-pdm
+          uv pip install --system tox tox-pdm
       - name: Build the package
         run: |
           export GUIDELLM_BUILD_TYPE=release

.gitignore

@@ -95,7 +95,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.

.pre-commit-config.yaml

@@ -6,12 +6,21 @@ repos:
     exclude: ^tests/?.*/assets/.+
   - id: end-of-file-fixer
     exclude: ^tests/?.*/assets/.+
-- repo: https://github.com/pdm-project/pdm
-  rev: 2.25.6
+- repo: https://github.com/astral-sh/uv-pre-commit
+  rev: 0.9.15
   hooks:
-    - id: pdm-lock-check
-      name: check lock file matches pyproject
-      entry: sh -c "pdm lock -v --check || pdm lock --update-reuse"
+    - id: uv-lock
+      name: check uv.lock file matches pyproject
+    - id: uv-export
+      name: Update pylock to match uv.lock
+      # NOTE: Arguments should match ./scripts/generate_pylock.sh
+      args:
+        - "--frozen"
+        - "--all-groups"
+        - "--all-extras"
+        - "--format=pylock.toml"
+        - "--output-file=pylock.toml"
+        - "--quiet"
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.11.7
   hooks:

Containerfile

@@ -1,4 +1,3 @@
-# TODO: Update to official python-3.13-minimal image when available
 ARG BASE_IMAGE=quay.io/fedora/python-313-minimal:latest
 
 # Use a multi-stage build to create a lightweight production image
@@ -16,22 +15,23 @@ USER root
 
 # Install build tooling
 RUN dnf install -y git \
-    && /usr/bin/python3 -m venv /tmp/pdm \
-    && /tmp/pdm/bin/pip install --no-cache-dir -U pdm \
-    && ln -s /tmp/pdm/bin/pdm /usr/local/bin/pdm
+    && /usr/bin/python3 -m venv /tmp/uv \
+    && /tmp/uv/bin/pip install --no-cache-dir -U uv \
+    && ln -s /tmp/uv/bin/uv /usr/local/bin/uv
 
-# Disable pdm update check
+# Set the default venv for uv
+# Copy instead of link files with uv
 # Set correct build type for versioning
-ENV PDM_CHECK_UPDATE=false \
+ENV VIRTUAL_ENV=/opt/app-root \
+    UV_LINK_MODE="copy" \
     GUIDELLM_BUILD_TYPE=$GUIDELLM_BUILD_TYPE
 
 # Copy repository files
 # Do this as late as possible to leverage layer caching
 COPY / /src
 
 # Install guidellm and locked dependencies
-RUN pdm use -p /src -f /opt/app-root \
-    && pdm install -p /src -G all --check --prod --no-editable
+RUN uv sync --active --project /src --frozen --no-dev --extra all --no-editable
 
 # Prod image
 FROM $BASE_IMAGE
@@ -51,7 +51,7 @@ USER 1001:0
 # Add guidellm bin to PATH
 # Argument defaults can be set with GUIDELLM_<ARG>
 ENV HOME="/home/guidellm" \
-    GUIDELLM_OUTPUT_PATH="/results/benchmarks.json"
+    GUIDELLM_OUTPUT_DIR="/results"
 
 # Create the user home dir
 WORKDIR $HOME