Merge remote-tracking branch 'upstream/main'

Author: m-rafeeq

.github/workflows/redhat-distro-container.yml

@@ -106,8 +106,14 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      - name: Unset VERTEX_AI_PROJECT for fork PRs (secrets not available)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+        run: |
+          echo "Unsetting VERTEX_AI_PROJECT for fork PR (secrets not available)"
+          echo "VERTEX_AI_PROJECT=" >> "$GITHUB_ENV"
+
       - name: Authenticate to Google Cloud (Vertex)
-        if: github.event_name != 'workflow_dispatch'
+        if: github.event_name != 'workflow_dispatch' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
         uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3
         with:
           project_id: ${{ env.VERTEX_AI_PROJECT }}

distribution/build.py

@@ -48,10 +48,15 @@ def is_install_from_source(llama_stack_version):
     return "." not in llama_stack_version or "+rhai" in llama_stack_version
 
 
-def check_package_installed(package_name):
-    """Check if llama binary is installed and accessible."""
-    if not shutil.which(package_name):
-        print(f"Error: {package_name} not found. Please install it first.")
+def check_command_installed(command, package_name=None):
+    """Check if a command is installed and accessible."""
+    if not shutil.which(command):
+        if package_name:
+            print(
+                f"Error: {command} not found. Please run uv pip install {package_name}"
+            )
+        else:
+            print(f"Error: {command} not found. Please install it.")
         sys.exit(1)
 
 
@@ -262,11 +267,10 @@ def generate_containerfile(dependencies, llama_stack_install):
 
 
 def main():
-    check_package_installed("uv")
+    check_command_installed("uv")
     install_llama_stack_from_source(LLAMA_STACK_VERSION)
 
-    print("Checking llama installation...")
-    check_package_installed("llama")
+    check_command_installed("llama", "llama-stack-client")
 
     # Do not perform version check if installing from source
     if not is_install_from_source(LLAMA_STACK_VERSION):

tests/run_integration_tests.sh

@@ -93,9 +93,22 @@ function main() {
     echo "  VLLM_INFERENCE_MODEL: $VLLM_INFERENCE_MODEL"
     echo "  VERTEX_AI_INFERENCE_MODEL: $VERTEX_AI_INFERENCE_MODEL"
     echo "  EMBEDDING_MODEL: $EMBEDDING_MODEL"
+    echo "  VERTEX_AI_PROJECT: ${VERTEX_AI_PROJECT:-<not set>}"
 
     clone_llama_stack
-    for model in "$VLLM_INFERENCE_MODEL" "$VERTEX_AI_INFERENCE_MODEL"; do
+
+    # Build list of models to test based on available configuration
+    models_to_test=("$VLLM_INFERENCE_MODEL")
+
+    # Only include Vertex AI models if VERTEX_AI_PROJECT is set
+    if [ -n "${VERTEX_AI_PROJECT:-}" ]; then
+        echo "VERTEX_AI_PROJECT is set, including Vertex AI models in tests"
+        models_to_test+=("$VERTEX_AI_INFERENCE_MODEL")
+    else
+        echo "VERTEX_AI_PROJECT is not set, skipping Vertex AI models"
+    fi
+
+    for model in "${models_to_test[@]}"; do
         run_integration_tests "$model"
     done
     echo "Integration tests completed successfully!"

tests/smoke.sh

@@ -10,29 +10,42 @@ source "$SCRIPT_DIR/test_utils.sh"
 LLAMA_STACK_BASE_URL="http://127.0.0.1:8321"
 
 function start_and_wait_for_llama_stack_container {
+  # Build docker run command with base arguments
+  docker_args=(
+    -d
+    --pull=never
+    --net=host
+    -p 8321:8321
+    --env "INFERENCE_MODEL=$VLLM_INFERENCE_MODEL"
+    --env "EMBEDDING_MODEL=$EMBEDDING_MODEL"
+    --env "VLLM_URL=$VLLM_URL"
+    --env "ENABLE_SENTENCE_TRANSFORMERS=True"
+    --env "EMBEDDING_PROVIDER=sentence-transformers"
+    --env "TRUSTYAI_LMEVAL_USE_K8S=False"
+    --env "POSTGRES_HOST=${POSTGRES_HOST:-localhost}"
+    --env "POSTGRES_PORT=${POSTGRES_PORT:-5432}"
+    --env "POSTGRES_DB=${POSTGRES_DB:-llamastack}"
+    --env "POSTGRES_USER=${POSTGRES_USER:-llamastack}"
+    --env "POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-llamastack}"
+  )
+
+  # Only add Vertex AI configuration if VERTEX_AI_PROJECT is set
+  if [ -n "${VERTEX_AI_PROJECT:-}" ]; then
+    docker_args+=(
+      --env "VERTEX_AI_PROJECT=$VERTEX_AI_PROJECT"
+      --env "VERTEX_AI_LOCATION=$VERTEX_AI_LOCATION"
+      --env "GOOGLE_APPLICATION_CREDENTIALS=/run/secrets/gcp-credentials"
+    )
+    # Only mount credentials if the file exists
+    if [ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ] && [ -f "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
+      docker_args+=(--volume "$GOOGLE_APPLICATION_CREDENTIALS:/run/secrets/gcp-credentials:ro")
+    fi
+  fi
+
+  docker_args+=(--name llama-stack "$IMAGE_NAME:$GITHUB_SHA")
+
   # Start llama stack
-  docker run \
-    -d \
-    --pull=never \
-    --net=host \
-    -p 8321:8321 \
-    --env INFERENCE_MODEL="$VLLM_INFERENCE_MODEL" \
-    --env EMBEDDING_MODEL="$EMBEDDING_MODEL" \
-    --env VLLM_URL="$VLLM_URL" \
-    --env ENABLE_SENTENCE_TRANSFORMERS=True \
-    --env EMBEDDING_PROVIDER=sentence-transformers \
-    --env TRUSTYAI_LMEVAL_USE_K8S=False \
-    --env VERTEX_AI_PROJECT="$VERTEX_AI_PROJECT" \
-    --env VERTEX_AI_LOCATION="$VERTEX_AI_LOCATION" \
-    --env GOOGLE_APPLICATION_CREDENTIALS="/run/secrets/gcp-credentials" \
-    --env POSTGRES_HOST="${POSTGRES_HOST:-localhost}" \
-    --env POSTGRES_PORT="${POSTGRES_PORT:-5432}" \
-    --env POSTGRES_DB="${POSTGRES_DB:-llamastack}" \
-    --env POSTGRES_USER="${POSTGRES_USER:-llamastack}" \
-    --env POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-llamastack}" \
-    --volume "$GOOGLE_APPLICATION_CREDENTIALS:/run/secrets/gcp-credentials:ro" \
-    --name llama-stack \
-    "$IMAGE_NAME:$GITHUB_SHA"
+  docker run "${docker_args[@]}"
   echo "Started Llama Stack container..."
 
   # Wait for llama stack to be ready by doing a health check
@@ -153,15 +166,28 @@ main() {
   # Track failures
   failed_checks=()
 
+  # Build list of models to test based on available configuration
+  models_to_test=("$VLLM_INFERENCE_MODEL" "$EMBEDDING_MODEL")
+  inference_models_to_test=("$VLLM_INFERENCE_MODEL")
+
+  # Only include Vertex AI models if VERTEX_AI_PROJECT is set
+  if [ -n "${VERTEX_AI_PROJECT:-}" ]; then
+    echo "===> VERTEX_AI_PROJECT is set, including Vertex AI models in tests"
+    models_to_test+=("$VERTEX_AI_INFERENCE_MODEL")
+    inference_models_to_test+=("$VERTEX_AI_INFERENCE_MODEL")
+  else
+    echo "===> VERTEX_AI_PROJECT is not set, skipping Vertex AI models"
+  fi
+
   echo "===> Testing model list for all models..."
-  for model in "$VLLM_INFERENCE_MODEL" "$VERTEX_AI_INFERENCE_MODEL" "$EMBEDDING_MODEL"; do
+  for model in "${models_to_test[@]}"; do
     if ! test_model_list "$model"; then
       failed_checks+=("model_list:$model")
     fi
   done
 
   echo "===> Testing inference for all models..."
-  for model in "$VLLM_INFERENCE_MODEL" "$VERTEX_AI_INFERENCE_MODEL"; do
+  for model in "${inference_models_to_test[@]}"; do
     if ! test_model_openai_inference "$model"; then
       failed_checks+=("inference:$model")
     fi