Merge remote-tracking branch 'origin/main' into unittests

Author: Alex-Welsh

.github/dependabot.yml

@@ -13,5 +13,37 @@ updates:
     groups:
       github-actions:
         patterns: ["*"]
+    labels:
+      - automation
+      - gha-update
 
-# TODO: Add web app python dependencies
+  # Automatically propose PRs for Python dependencies
+  - package-ecosystem: pip
+    directories: 
+    - "/web-apps"
+    - "/scripts"
+    schedule:
+      # Check for new versions daily
+      interval: weekly
+    groups:
+      pip-updates:
+        patterns: ["*"]
+    labels:
+      - automation
+      - pip-update
+    commit-message:
+    # Prefix all commit messages with "pip: "
+      prefix: "pip"
+
+  # Automatically propose PRs for Python dependencies
+  # Possibly required for Helm updates?
+  # https://github.com/dependabot/dependabot-core/issues/2237
+  # enable-beta-ecosystems: true
+  - package-ecosystem: "helm" 
+    directory: "/charts/azimuth-llm" # Location of package manifests
+    schedule:
+      # Check for new versions daily
+      interval: weekly
+    labels:
+      - automation
+      - helm-update

.github/workflows/test-pr.yml

@@ -2,7 +2,7 @@
 name: Test pull request
 
 on:
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - synchronize
@@ -29,7 +29,13 @@ jobs:
     needs: [fail_on_remote]
     uses: ./.github/workflows/build-push-images.yml
     with:
-      ref: ${{ github.event.pull_request.head.sha }}
+      ref: ${{ github.sha }}
+    secrets: inherit
+
+  publish_charts:
+    uses: ./.github/workflows/build-push-charts.yml
+    with:
+      ref: ${{ github.sha }}
     secrets: inherit
 
   chart_validation:
@@ -42,11 +48,23 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.sha }}
+
+      - name: Reconfigure docker storage
+        # GitHub runners have an extra 75G disk at /mnt
+        # so we use this to avoid hitting capacity issues
+        # with kind cluster + vLLM container images
+        run: |
+          sudo bash -c 'cat > /etc/docker/daemon.json' << EOF
+          {
+            "data-root": "/mnt/docker-data"
+          }
+          EOF
+          sudo systemctl restart docker
 
       - name: Run Gradio app tests
         run: |
-          ./test-images.sh $(git rev-parse --short ${{ github.event.pull_request.head.sha }})
+          ./test-images.sh $(git rev-parse --short ${{ github.sha }})
         working-directory: web-apps
 
       - name: Install Helm
@@ -71,18 +89,11 @@ jobs:
       # we need to pull these published images and load them into the kind cluster
       # with the tag correct tag.
       - name: Load tagged container images into kind cluster
-        run: ./kind-images.sh $(git rev-parse --short ${{ github.event.pull_request.head.sha }}) ${{ env.CLUSTER_NAME }}
+        run: ./kind-images.sh $(git rev-parse --short ${{ github.sha }}) ${{ env.CLUSTER_NAME }}
         working-directory: web-apps
 
       # https://github.com/helm/charts/blob/master/test/README.md#providing-custom-test-values
       # Each chart/ci/*-values.yaml file will be treated as a separate test case with it's
       # own helm install/test process.
       - name: Run chart install and test
         run: ct install --config ct.yaml
-
-  publish_charts:
-    needs: [chart_validation]
-    uses: ./.github/workflows/build-push-charts.yml
-    with:
-      ref: ${{ github.event.pull_request.head.sha }}
-    secrets: inherit

.github/workflows/update-dependencies.yml

@@ -61,7 +61,7 @@ jobs:
 
       - name: Create Pull Request
         if: ${{ steps.dependency_updates.outputs.new_vllm_tag }}
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           base: main
           branch: update/vllm-${{ steps.dependency_updates.outputs.new_vllm_tag }}

web-apps/chat/app.py

@@ -68,7 +68,7 @@ def build_chat_context(latest_message, history):
     context = []
     if INCLUDE_SYSTEM_PROMPT:
         context.append(SystemMessage(content=settings.model_instruction))
-    else:
+    elif history and len(history) > 0:
         # Mimic system prompt by prepending it to first human message
         history[0]['content'] = f"{settings.model_instruction}\n\n{history[0]['content']}"