Requested changes

Author: asimurka

docs/providers.md

@@ -84,9 +84,9 @@ Example of LCS config section:
 
 ```yaml
 azure_entra_id:
-  tenant_id: ${env.AZURE_TENANT_ID}
-  client_id: ${env.AZURE_CLIENT_ID}
-  client_secret: ${env.AZURE_CLIENT_SECRET}
+  tenant_id: ${env.TENANT_ID}
+  client_id: ${env.CLIENT_ID}
+  client_secret: ${env.CLIENT_SECRET}
   # scope: "https://cognitiveservices.azure.com/.default"  # optional, this is the default
 ```
 

pyproject.toml

@@ -60,6 +60,7 @@ dependencies = [
     "urllib3==2.6.2",
     # Used for agent card configuration
     "PyYAML>=6.0.0",
+    # Used for Azure Entra ID token managment
     "azure-core",
     "azure-identity",
 ]

scripts/llama-stack-entrypoint.sh

@@ -12,24 +12,24 @@ ENV_FILE="/opt/app-root/.env"
 # Enrich config if lightspeed config exists
 if [ -f "$LIGHTSPEED_CONFIG" ]; then
     echo "Enriching llama-stack config..."
+    ENRICHMENT_FAILED=0
     python3 /opt/app-root/llama_stack_configuration.py \
         -c "$LIGHTSPEED_CONFIG" \
         -i "$INPUT_CONFIG" \
         -o "$ENRICHED_CONFIG" \
-        -e "$ENV_FILE" 2>&1 || true
+        -e "$ENV_FILE" 2>&1 || ENRICHMENT_FAILED=1
 
     # Source .env if generated (contains AZURE_API_KEY)
     if [ -f "$ENV_FILE" ]; then
         # shellcheck source=/dev/null
         set -a && . "$ENV_FILE" && set +a
     fi
 
-    if [ -f "$ENRICHED_CONFIG" ]; then
+    if [ -f "$ENRICHED_CONFIG" ] && [ "$ENRICHMENT_FAILED" -eq 0 ]; then
         echo "Using enriched config: $ENRICHED_CONFIG"
         exec llama stack run "$ENRICHED_CONFIG"
     fi
 fi
 
 echo "Using original config: $INPUT_CONFIG"
 exec llama stack run "$INPUT_CONFIG"
-

src/app/main.py

@@ -46,10 +46,6 @@ async def lifespan(_app: FastAPI) -> AsyncIterator[None]:
         AzureEntraIDManager().set_config(azure_config)
         try:
             await AzureEntraIDManager().refresh_token()
-            os.environ["AZURE_API_KEY"] = (
-                AzureEntraIDManager().access_token.get_secret_value()
-            )
-            logger.info("Azure Entra ID token set in environment")
         except ValueError as e:
             logger.error("Failed to refresh Azure token: %s", e)
 

src/llama_stack_configuration.py

@@ -143,10 +143,10 @@ def construct_vector_dbs_section(
     for brag in byok_rag:
         output.append(
             {
-                "vector_db_id": brag.get("vector_db_id"),
+                "vector_db_id": brag.get("vector_db_id", ""),
                 "provider_id": "byok_" + brag.get("vector_db_id", ""),
-                "embedding_model": brag.get("embedding_model", "all-MiniLM-L6-v2"),
-                "embedding_dimension": brag.get("embedding_dimension", 384),
+                "embedding_model": brag.get("embedding_model", ""),
+                "embedding_dimension": brag.get("embedding_dimension"),
             }
         )
     logger.info(