chore: sync downstream changes to midstream main

Signed-off-by: Nathan Weinberg <nweinber@redhat.com>

Author: nathan-weinberg

redhat-distribution/Containerfile.in

@@ -3,9 +3,9 @@ WORKDIR /opt/app-root
 
 RUN pip install sqlalchemy # somehow sqlalchemy[asyncio] is not sufficient
 {dependencies}
-RUN pip install --no-cache llama-stack==0.2.14
+RUN pip install --no-cache llama-stack==0.2.18
 RUN mkdir -p ${{HOME}}/.llama/providers.d ${{HOME}}/.cache
 COPY redhat-distribution/run.yaml ${{APP_ROOT}}/run.yaml
 COPY redhat-distribution/providers.d/ ${{HOME}}/.llama/providers.d/
 
-ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "--config", "/opt/app-root/run.yaml"]
+ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "/opt/app-root/run.yaml"]

redhat-distribution/build.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 
 BASE_REQUIREMENTS = [
-    "llama-stack==0.2.14",
+    "llama-stack==0.2.18",
 ]
 
 
@@ -59,7 +59,7 @@ def check_llama_stack_version():
 
 def get_dependencies():
     """Execute the llama stack build command and capture dependencies."""
-    cmd = "llama stack build --config redhat-distribution/build.yaml --print-deps-only"
+    cmd = "llama stack build redhat-distribution/build.yaml --print-deps-only"
     try:
         result = subprocess.run(cmd, shell=True, capture_output=True, text=True, check=True)
         # Categorize and sort different types of pip install commands

redhat-distribution/build.yaml

@@ -1,32 +1,32 @@
-version: '2'
+version: 2
 distribution_spec:
   description: Red Hat distribution of Llama Stack
   providers:
     inference:
-    - remote::vllm
-    - inline::sentence-transformers
+    - provider_type: remote::vllm
+    - provider_type: inline::sentence-transformers
     vector_io:
-    - inline::milvus
+    - provider_type: inline::milvus
     safety:
-    - remote::trustyai_fms
+    - provider_type: remote::trustyai_fms
     agents:
-    - inline::meta-reference
+    - provider_type: inline::meta-reference
     eval:
-    - remote::trustyai_lmeval
+    - provider_type: remote::trustyai_lmeval
     datasetio:
-    - remote::huggingface
-    - inline::localfs
+    - provider_type: remote::huggingface
+    - provider_type: inline::localfs
     scoring:
-    - inline::basic
-    - inline::llm-as-judge
-    - inline::braintrust
+    - provider_type: inline::basic
+    - provider_type: inline::llm-as-judge
+    - provider_type: inline::braintrust
     telemetry:
-    - inline::meta-reference
+    - provider_type: inline::meta-reference
     tool_runtime:
-    - remote::brave-search
-    - remote::tavily-search
-    - inline::rag-runtime
-    - remote::model-context-protocol
+    - provider_type: remote::brave-search
+    - provider_type: remote::tavily-search
+    - provider_type: inline::rag-runtime
+    - provider_type: remote::model-context-protocol
   container_image: registry.redhat.io/ubi9/python-311:9.6-1749631027
 additional_pip_packages:
 - aiosqlite

redhat-distribution/run.yaml

@@ -135,4 +135,3 @@ tool_groups:
   provider_id: rag-runtime
 server:
   port: 8321
-external_providers_dir: /opt/app-root/src/.llama/providers.d