From 7c893f85b0627a76387501012daf4abd12faba61 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Mon, 18 Aug 2025 14:07:15 -0700
Subject: [PATCH] we must run llama stack build properly

---
 .github/actions/setup-runner/action.yml           |  2 ++
 .github/actions/setup-test-environment/action.yml | 15 ++++++++++++++-
 llama_stack/core/build_venv.sh                    |  6 ++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml
index fb14995c0..08143fa45 100644
--- a/.github/actions/setup-runner/action.yml
+++ b/.github/actions/setup-runner/action.yml
@@ -39,3 +39,5 @@ runs:
           exit 1
         fi
 
+        echo "Installed llama packages"
+        uv pip list | grep llama
diff --git a/.github/actions/setup-test-environment/action.yml b/.github/actions/setup-test-environment/action.yml
index 6031531ad..418a8a6d0 100644
--- a/.github/actions/setup-test-environment/action.yml
+++ b/.github/actions/setup-test-environment/action.yml
@@ -42,8 +42,21 @@ runs:
     - name: Build Llama Stack
       shell: bash
       run: |
+        # Install llama-stack-client-python based on the client-version input
+        if [ "${{ inputs.client-version }}" = "latest" ]; then
+          echo "Installing latest llama-stack-client-python from main branch"
+          export LLAMA_STACK_CLIENT_DIR=git+https://github.com/llamastack/llama-stack-client-python.git@main \
+        elif [ "${{ inputs.client-version }}" = "published" ]; then
+          echo "Installing published llama-stack-client-python from PyPI"
+          unset LLAMA_STACK_CLIENT_DIR
+        else
+          echo "Invalid client-version: ${{ inputs.client-version }}"
+          exit 1
+        fi
+
         echo "Building Llama Stack"
-        uv run llama stack build --template ci-tests --image-type venv
+        LLAMA_STACK_DIR=. \
+          uv run llama stack build --template ci-tests --image-type venv
 
     - name: Configure git for commits
       shell: bash
diff --git a/llama_stack/core/build_venv.sh b/llama_stack/core/build_venv.sh
index a2838803f..e920407a2 100755
--- a/llama_stack/core/build_venv.sh
+++ b/llama_stack/core/build_venv.sh
@@ -151,7 +151,8 @@ run() {
     fi
   else
     if [ -n "$LLAMA_STACK_DIR" ]; then
-      if [ ! -d "$LLAMA_STACK_DIR" ]; then
+      # only warn if DIR does not start with "git+"
+      if [ ! -d "$LLAMA_STACK_DIR" ] && [[ "$LLAMA_STACK_DIR" != git+* ]]; then
         printf "${RED}Warning: LLAMA_STACK_DIR is set but directory does not exist: %s${NC}\n" "$LLAMA_STACK_DIR" >&2
         exit 1
       fi
@@ -162,7 +163,8 @@ run() {
     fi
 
     if [ -n "$LLAMA_STACK_CLIENT_DIR" ]; then
-      if [ ! -d "$LLAMA_STACK_CLIENT_DIR" ]; then
+      # only warn if DIR does not start with "git+"
+      if [ ! -d "$LLAMA_STACK_CLIENT_DIR" ] && [[ "$LLAMA_STACK_CLIENT_DIR" != git+* ]]; then
         printf "${RED}Warning: LLAMA_STACK_CLIENT_DIR is set but directory does not exist: %s${NC}\n" "$LLAMA_STACK_CLIENT_DIR" >&2
         exit 1
       fi