From 62b54fd70c839867690ae96cec06ba0f4c9630dd Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Fri, 31 Jan 2025 21:38:54 -0800
Subject: [PATCH] Use `uv pip install` instead of `pip install`

---
 llama_stack/cli/stack/_build.py               |  4 ++--
 llama_stack/distribution/build.py             |  4 ++--
 llama_stack/distribution/build_conda_env.sh   | 20 ++++++++++---------
 llama_stack/distribution/build_container.sh   | 17 ++++++++--------
 llama_stack/distribution/build_venv.sh        | 19 +++++++++---------
 llama_stack/scripts/install_packages.sh       |  2 +-
 .../meta-reference-gpu/doc_template.md        |  2 +-
 .../doc_template.md                           |  2 +-
 llama_stack/templates/ollama/doc_template.md  |  2 +-
 .../templates/remote-vllm/doc_template.md     |  2 +-
 llama_stack/templates/tgi/doc_template.md     |  2 +-
 11 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/llama_stack/cli/stack/_build.py b/llama_stack/cli/stack/_build.py
index 9d2976dd2..a7e2afd48 100644
--- a/llama_stack/cli/stack/_build.py
+++ b/llama_stack/cli/stack/_build.py
@@ -183,9 +183,9 @@ def run_stack_build_command(
             build_config.distribution_spec.providers
         )
         normal_deps += SERVER_DEPENDENCIES
-        print(f"pip install {' '.join(normal_deps)}")
+        print(f"uv pip install {' '.join(normal_deps)}")
         for special_dep in special_deps:
-            print(f"pip install {special_dep}")
+            print(f"uv pip install {special_dep}")
         return
 
     _run_stack_build_command_from_build_config(
diff --git a/llama_stack/distribution/build.py b/llama_stack/distribution/build.py
index a29c8d5d1..a207143f3 100644
--- a/llama_stack/distribution/build.py
+++ b/llama_stack/distribution/build.py
@@ -95,11 +95,11 @@ def print_pip_install_help(providers: Dict[str, List[Provider]]):
     normal_deps, special_deps = get_provider_dependencies(providers)
 
     cprint(
-        f"Please install needed dependencies using the following commands:\n\npip install {' '.join(normal_deps)}",
+        f"Please install needed dependencies using the following commands:\n\nuv pip install {' '.join(normal_deps)}",
         "yellow",
     )
     for special_dep in special_deps:
-        cprint(f"pip install {special_dep}", "yellow")
+        cprint(f"uv pip install {special_dep}", "yellow")
     print()
 
 
diff --git a/llama_stack/distribution/build_conda_env.sh b/llama_stack/distribution/build_conda_env.sh
index 606fbf19d..3fea09ad5 100755
--- a/llama_stack/distribution/build_conda_env.sh
+++ b/llama_stack/distribution/build_conda_env.sh
@@ -78,10 +78,12 @@ ensure_conda_env_python310() {
   eval "$(conda shell.bash hook)"
   conda deactivate && conda activate "${env_name}"
 
+  $CONDA_PREFIX/bin/pip install uv
+
   if [ -n "$TEST_PYPI_VERSION" ]; then
     # these packages are damaged in test-pypi, so install them first
-    $CONDA_PREFIX/bin/pip install fastapi libcst
-    $CONDA_PREFIX/bin/pip install --extra-index-url https://test.pypi.org/simple/ \
+    uv pip install fastapi libcst
+    uv pip install --extra-index-url https://test.pypi.org/simple/ \
       llama-models==$TEST_PYPI_VERSION \
       llama-stack-client==$TEST_PYPI_VERSION \
       llama-stack==$TEST_PYPI_VERSION \
@@ -90,7 +92,7 @@ ensure_conda_env_python310() {
       IFS='#' read -ra parts <<<"$special_pip_deps"
       for part in "${parts[@]}"; do
         echo "$part"
-        $CONDA_PREFIX/bin/pip install $part
+        uv pip install $part
       done
     fi
   else
@@ -102,7 +104,7 @@ ensure_conda_env_python310() {
       fi
 
       printf "Installing from LLAMA_STACK_DIR: $LLAMA_STACK_DIR\n"
-      $CONDA_PREFIX/bin/pip install --no-cache-dir -e "$LLAMA_STACK_DIR"
+      uv pip install --no-cache-dir -e "$LLAMA_STACK_DIR"
     else
       PYPI_VERSION="${PYPI_VERSION:-}"
       if [ -n "$PYPI_VERSION" ]; then
@@ -110,7 +112,7 @@ ensure_conda_env_python310() {
       else
         SPEC_VERSION="llama-stack"
       fi
-      $CONDA_PREFIX/bin/pip install --no-cache-dir $SPEC_VERSION
+      uv pip install --no-cache-dir $SPEC_VERSION
     fi
 
     if [ -n "$LLAMA_MODELS_DIR" ]; then
@@ -120,18 +122,18 @@ ensure_conda_env_python310() {
       fi
 
       printf "Installing from LLAMA_MODELS_DIR: $LLAMA_MODELS_DIR\n"
-      $CONDA_PREFIX/bin/pip uninstall -y llama-models
-      $CONDA_PREFIX/bin/pip install --no-cache-dir -e "$LLAMA_MODELS_DIR"
+      uv pip uninstall -y llama-models
+      uv pip install --no-cache-dir -e "$LLAMA_MODELS_DIR"
     fi
 
     # Install pip dependencies
     printf "Installing pip dependencies\n"
-    $CONDA_PREFIX/bin/pip install $pip_dependencies
+    uv pip install $pip_dependencies
     if [ -n "$special_pip_deps" ]; then
       IFS='#' read -ra parts <<<"$special_pip_deps"
       for part in "${parts[@]}"; do
         echo "$part"
-        $CONDA_PREFIX/bin/pip install $part
+        uv pip install $part
       done
     fi
   fi
diff --git a/llama_stack/distribution/build_container.sh b/llama_stack/distribution/build_container.sh
index a2820ac13..688e96dc0 100755
--- a/llama_stack/distribution/build_container.sh
+++ b/llama_stack/distribution/build_container.sh
@@ -76,6 +76,7 @@ RUN apt-get update && apt-get install -y \
        bubblewrap \
        && rm -rf /var/lib/apt/lists/*
 
+RUN pip install uv
 EOF
 fi
 
@@ -83,7 +84,7 @@ fi
 # so we can reuse layers.
 if [ -n "$pip_dependencies" ]; then
   add_to_container << EOF
-RUN pip install --no-cache $pip_dependencies
+RUN uv pip install --no-cache $pip_dependencies
 EOF
 fi
 
@@ -91,7 +92,7 @@ if [ -n "$special_pip_deps" ]; then
   IFS='#' read -ra parts <<<"$special_pip_deps"
   for part in "${parts[@]}"; do
     add_to_container <<EOF
-RUN pip install --no-cache $part
+RUN uv pip install --no-cache $part
 EOF
   done
 fi
@@ -109,16 +110,16 @@ if [ -n "$LLAMA_STACK_DIR" ]; then
   # so that changes will be reflected in the container without having to do a
   # rebuild. This is just for development convenience.
   add_to_container << EOF
-RUN pip install --no-cache -e $stack_mount
+RUN uv pip install --no-cache -e $stack_mount
 EOF
 else
   if [ -n "$TEST_PYPI_VERSION" ]; then
     # these packages are damaged in test-pypi, so install them first
     add_to_container << EOF
-RUN pip install fastapi libcst
+RUN uv pip install fastapi libcst
 EOF
     add_to_container << EOF
-RUN pip install --no-cache --extra-index-url https://test.pypi.org/simple/ \
+RUN uv pip install --no-cache --extra-index-url https://test.pypi.org/simple/ \
   llama-models==$TEST_PYPI_VERSION llama-stack-client==$TEST_PYPI_VERSION llama-stack==$TEST_PYPI_VERSION
 
 EOF
@@ -129,7 +130,7 @@ EOF
       SPEC_VERSION="llama-stack"
     fi
     add_to_container << EOF
-RUN pip install --no-cache $SPEC_VERSION
+RUN uv pip install --no-cache $SPEC_VERSION
 EOF
   fi
 fi
@@ -141,8 +142,8 @@ if [ -n "$LLAMA_MODELS_DIR" ]; then
   fi
 
   add_to_container << EOF
-RUN pip uninstall -y llama-models
-RUN pip install --no-cache $models_mount
+RUN uv pip uninstall -y llama-models
+RUN uv pip install --no-cache $models_mount
 
 EOF
 fi
diff --git a/llama_stack/distribution/build_venv.sh b/llama_stack/distribution/build_venv.sh
index 8136e3120..970c4144f 100755
--- a/llama_stack/distribution/build_venv.sh
+++ b/llama_stack/distribution/build_venv.sh
@@ -51,17 +51,18 @@ run() {
   local pip_dependencies="$2"
   local special_pip_deps="$3"
 
+  pip install uv
   if [ -n "$TEST_PYPI_VERSION" ]; then
     # these packages are damaged in test-pypi, so install them first
-    pip install fastapi libcst
-    pip install --extra-index-url https://test.pypi.org/simple/ \
+    uv pip install fastapi libcst
+    uv pip install --extra-index-url https://test.pypi.org/simple/ \
       llama-models==$TEST_PYPI_VERSION llama-stack==$TEST_PYPI_VERSION \
       $pip_dependencies
     if [ -n "$special_pip_deps" ]; then
       IFS='#' read -ra parts <<<"$special_pip_deps"
       for part in "${parts[@]}"; do
         echo "$part"
-        pip install $part
+        uv pip install $part
       done
     fi
   else
@@ -73,9 +74,9 @@ run() {
       fi
 
       printf "Installing from LLAMA_STACK_DIR: $LLAMA_STACK_DIR\n"
-      pip install --no-cache-dir -e "$LLAMA_STACK_DIR"
+      uv pip install --no-cache-dir -e "$LLAMA_STACK_DIR"
     else
-      pip install --no-cache-dir llama-stack
+      uv pip install --no-cache-dir llama-stack
     fi
 
     if [ -n "$LLAMA_MODELS_DIR" ]; then
@@ -85,18 +86,18 @@ run() {
       fi
 
       printf "Installing from LLAMA_MODELS_DIR: $LLAMA_MODELS_DIR\n"
-      pip uninstall -y llama-models
-      pip install --no-cache-dir -e "$LLAMA_MODELS_DIR"
+      uv pip uninstall -y llama-models
+      uv pip install --no-cache-dir -e "$LLAMA_MODELS_DIR"
     fi
 
     # Install pip dependencies
     printf "Installing pip dependencies\n"
-    pip install $pip_dependencies
+    uv pip install $pip_dependencies
     if [ -n "$special_pip_deps" ]; then
       IFS='#' read -ra parts <<<"$special_pip_deps"
       for part in "${parts[@]}"; do
         echo "$part"
-        pip install $part
+        uv pip install $part
       done
     fi
   fi
diff --git a/llama_stack/scripts/install_packages.sh b/llama_stack/scripts/install_packages.sh
index 151b7b9db..20182c767 100755
--- a/llama_stack/scripts/install_packages.sh
+++ b/llama_stack/scripts/install_packages.sh
@@ -11,5 +11,5 @@ VERSION="$1"
 set -euo pipefail
 set -x
 
-pip install -U --extra-index-url https://test.pypi.org/simple \
+uv pip install -U --extra-index-url https://test.pypi.org/simple \
   llama-stack==$VERSION llama-models==$VERSION llama-stack-client==$VERSION
diff --git a/llama_stack/templates/meta-reference-gpu/doc_template.md b/llama_stack/templates/meta-reference-gpu/doc_template.md
index 421812dbc..60556a6f3 100644
--- a/llama_stack/templates/meta-reference-gpu/doc_template.md
+++ b/llama_stack/templates/meta-reference-gpu/doc_template.md
@@ -71,7 +71,7 @@ docker run \
 
 ### Via Conda
 
-Make sure you have done `pip install llama-stack` and have the Llama Stack CLI available.
+Make sure you have done `uv pip install llama-stack` and have the Llama Stack CLI available.
 
 ```bash
 llama stack build --template {{ name }} --image-type conda
diff --git a/llama_stack/templates/meta-reference-quantized-gpu/doc_template.md b/llama_stack/templates/meta-reference-quantized-gpu/doc_template.md
index daa380d20..2b117120c 100644
--- a/llama_stack/templates/meta-reference-quantized-gpu/doc_template.md
+++ b/llama_stack/templates/meta-reference-quantized-gpu/doc_template.md
@@ -73,7 +73,7 @@ docker run \
 
 ### Via Conda
 
-Make sure you have done `pip install llama-stack` and have the Llama Stack CLI available.
+Make sure you have done `uv pip install llama-stack` and have the Llama Stack CLI available.
 
 ```bash
 llama stack build --template {{ name }} --image-type conda
diff --git a/llama_stack/templates/ollama/doc_template.md b/llama_stack/templates/ollama/doc_template.md
index 7c260e2c1..eb4aadd29 100644
--- a/llama_stack/templates/ollama/doc_template.md
+++ b/llama_stack/templates/ollama/doc_template.md
@@ -93,7 +93,7 @@ docker run \
 
 ### Via Conda
 
-Make sure you have done `pip install llama-stack` and have the Llama Stack CLI available.
+Make sure you have done `uv pip install llama-stack` and have the Llama Stack CLI available.
 
 ```bash
 export LLAMA_STACK_PORT=5001
diff --git a/llama_stack/templates/remote-vllm/doc_template.md b/llama_stack/templates/remote-vllm/doc_template.md
index c855f6e62..0ca7279a7 100644
--- a/llama_stack/templates/remote-vllm/doc_template.md
+++ b/llama_stack/templates/remote-vllm/doc_template.md
@@ -119,7 +119,7 @@ docker run \
 
 ### Via Conda
 
-Make sure you have done `pip install llama-stack` and have the Llama Stack CLI available.
+Make sure you have done `uv pip install llama-stack` and have the Llama Stack CLI available.
 
 ```bash
 export INFERENCE_PORT=8000
diff --git a/llama_stack/templates/tgi/doc_template.md b/llama_stack/templates/tgi/doc_template.md
index 18b7d6b86..32988cf57 100644
--- a/llama_stack/templates/tgi/doc_template.md
+++ b/llama_stack/templates/tgi/doc_template.md
@@ -111,7 +111,7 @@ docker run \
 
 ### Via Conda
 
-Make sure you have done `pip install llama-stack` and have the Llama Stack CLI available.
+Make sure you have done `uv pip install llama-stack` and have the Llama Stack CLI available.
 
 ```bash
 llama stack build --template {{ name }} --image-type conda