fix: separate build and run provider types (#2917)

# What does this PR do?

in #2637, I combined the run and build config provider types to both use
`Provider`

since this includes a provider_id, a user must now specify this when
writing a build yaml. This is not very clear because all a user should
care about upon build is the code to be installed (the module and the
provider_type)

introduce `BuildProvider` and fixup the parts of the code impacted by
this

Signed-off-by: Charlie Doern <cdoern@redhat.com>

llama_stack/templates/starter/build.yaml

@@ -3,96 +3,56 @@ distribution_spec:
   description: Quick start template for running Llama Stack with several popular providers
   providers:
     inference:
-    - provider_id: ${env.ENABLE_CEREBRAS:=__disabled__}
-      provider_type: remote::cerebras
-    - provider_id: ${env.ENABLE_OLLAMA:=__disabled__}
-      provider_type: remote::ollama
-    - provider_id: ${env.ENABLE_VLLM:=__disabled__}
-      provider_type: remote::vllm
-    - provider_id: ${env.ENABLE_TGI:=__disabled__}
-      provider_type: remote::tgi
-    - provider_id: ${env.ENABLE_HF_SERVERLESS:=__disabled__}
-      provider_type: remote::hf::serverless
-    - provider_id: ${env.ENABLE_HF_ENDPOINT:=__disabled__}
-      provider_type: remote::hf::endpoint
-    - provider_id: ${env.ENABLE_FIREWORKS:=__disabled__}
-      provider_type: remote::fireworks
-    - provider_id: ${env.ENABLE_TOGETHER:=__disabled__}
-      provider_type: remote::together
-    - provider_id: ${env.ENABLE_BEDROCK:=__disabled__}
-      provider_type: remote::bedrock
-    - provider_id: ${env.ENABLE_DATABRICKS:=__disabled__}
-      provider_type: remote::databricks
-    - provider_id: ${env.ENABLE_NVIDIA:=__disabled__}
-      provider_type: remote::nvidia
-    - provider_id: ${env.ENABLE_RUNPOD:=__disabled__}
-      provider_type: remote::runpod
-    - provider_id: ${env.ENABLE_OPENAI:=__disabled__}
-      provider_type: remote::openai
-    - provider_id: ${env.ENABLE_ANTHROPIC:=__disabled__}
-      provider_type: remote::anthropic
-    - provider_id: ${env.ENABLE_GEMINI:=__disabled__}
-      provider_type: remote::gemini
-    - provider_id: ${env.ENABLE_GROQ:=__disabled__}
-      provider_type: remote::groq
-    - provider_id: ${env.ENABLE_LLAMA_OPENAI_COMPAT:=__disabled__}
-      provider_type: remote::llama-openai-compat
-    - provider_id: ${env.ENABLE_SAMBANOVA:=__disabled__}
-      provider_type: remote::sambanova
-    - provider_id: ${env.ENABLE_PASSTHROUGH:=__disabled__}
-      provider_type: remote::passthrough
-    - provider_id: sentence-transformers
-      provider_type: inline::sentence-transformers
+    - provider_type: remote::cerebras
+    - provider_type: remote::ollama
+    - provider_type: remote::vllm
+    - provider_type: remote::tgi
+    - provider_type: remote::hf::serverless
+    - provider_type: remote::hf::endpoint
+    - provider_type: remote::fireworks
+    - provider_type: remote::together
+    - provider_type: remote::bedrock
+    - provider_type: remote::databricks
+    - provider_type: remote::nvidia
+    - provider_type: remote::runpod
+    - provider_type: remote::openai
+    - provider_type: remote::anthropic
+    - provider_type: remote::gemini
+    - provider_type: remote::groq
+    - provider_type: remote::llama-openai-compat
+    - provider_type: remote::sambanova
+    - provider_type: remote::passthrough
+    - provider_type: inline::sentence-transformers
     vector_io:
-    - provider_id: ${env.ENABLE_FAISS:=faiss}
-      provider_type: inline::faiss
-    - provider_id: ${env.ENABLE_SQLITE_VEC:=__disabled__}
-      provider_type: inline::sqlite-vec
-    - provider_id: ${env.ENABLE_MILVUS:=__disabled__}
-      provider_type: inline::milvus
-    - provider_id: ${env.ENABLE_CHROMADB:=__disabled__}
-      provider_type: remote::chromadb
-    - provider_id: ${env.ENABLE_PGVECTOR:=__disabled__}
-      provider_type: remote::pgvector
+    - provider_type: inline::faiss
+    - provider_type: inline::sqlite-vec
+    - provider_type: inline::milvus
+    - provider_type: remote::chromadb
+    - provider_type: remote::pgvector
     files:
-    - provider_id: localfs
-      provider_type: inline::localfs
+    - provider_type: inline::localfs
     safety:
-    - provider_id: llama-guard
-      provider_type: inline::llama-guard
+    - provider_type: inline::llama-guard
     agents:
-    - provider_id: meta-reference
-      provider_type: inline::meta-reference
+    - provider_type: inline::meta-reference
     telemetry:
-    - provider_id: meta-reference
-      provider_type: inline::meta-reference
+    - provider_type: inline::meta-reference
     post_training:
-    - provider_id: huggingface
-      provider_type: inline::huggingface
+    - provider_type: inline::huggingface
     eval:
-    - provider_id: meta-reference
-      provider_type: inline::meta-reference
+    - provider_type: inline::meta-reference
     datasetio:
-    - provider_id: huggingface
-      provider_type: remote::huggingface
-    - provider_id: localfs
-      provider_type: inline::localfs
+    - provider_type: remote::huggingface
+    - provider_type: inline::localfs
     scoring:
-    - provider_id: basic
-      provider_type: inline::basic
-    - provider_id: llm-as-judge
-      provider_type: inline::llm-as-judge
-    - provider_id: braintrust
-      provider_type: inline::braintrust
+    - provider_type: inline::basic
+    - provider_type: inline::llm-as-judge
+    - provider_type: inline::braintrust
     tool_runtime:
-    - provider_id: brave-search
-      provider_type: remote::brave-search
-    - provider_id: tavily-search
-      provider_type: remote::tavily-search
-    - provider_id: rag-runtime
-      provider_type: inline::rag-runtime
-    - provider_id: model-context-protocol
-      provider_type: 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
 image_type: conda
 image_name: starter
 additional_pip_packages:

llama_stack/templates/starter/starter.py

@@ -9,6 +9,7 @@ from typing import Any
 
 from llama_stack.apis.models import ModelType
 from llama_stack.distribution.datatypes import (
+    BuildProvider,
     ModelInput,
     Provider,
     ProviderSpec,
@@ -213,131 +214,38 @@ def get_safety_models_for_providers(providers: list[Provider]) -> dict[str, list
 
 def get_distribution_template() -> DistributionTemplate:
     remote_inference_providers, available_models = get_remote_inference_providers()
-
     name = "starter"
-
-    vector_io_providers = [
-        Provider(
-            provider_id="${env.ENABLE_FAISS:=faiss}",
-            provider_type="inline::faiss",
-            config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
-        ),
-        Provider(
-            provider_id="${env.ENABLE_SQLITE_VEC:=__disabled__}",
-            provider_type="inline::sqlite-vec",
-            config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
-        ),
-        Provider(
-            provider_id="${env.ENABLE_MILVUS:=__disabled__}",
-            provider_type="inline::milvus",
-            config=MilvusVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
-        ),
-        Provider(
-            provider_id="${env.ENABLE_CHROMADB:=__disabled__}",
-            provider_type="remote::chromadb",
-            config=ChromaVectorIOConfig.sample_run_config(
-                f"~/.llama/distributions/{name}/",
-                url="${env.CHROMADB_URL:=}",
-            ),
-        ),
-        Provider(
-            provider_id="${env.ENABLE_PGVECTOR:=__disabled__}",
-            provider_type="remote::pgvector",
-            config=PGVectorVectorIOConfig.sample_run_config(
-                f"~/.llama/distributions/{name}",
-                db="${env.PGVECTOR_DB:=}",
-                user="${env.PGVECTOR_USER:=}",
-                password="${env.PGVECTOR_PASSWORD:=}",
-            ),
-        ),
-    ]
-
+    # For build config, use BuildProvider with only provider_type and module
     providers = {
-        "inference": remote_inference_providers
-        + [
-            Provider(
-                provider_id="sentence-transformers",
-                provider_type="inline::sentence-transformers",
-            )
-        ],
-        "vector_io": vector_io_providers,
-        "files": [
-            Provider(
-                provider_id="localfs",
-                provider_type="inline::localfs",
-            )
-        ],
-        "safety": [
-            Provider(
-                provider_id="llama-guard",
-                provider_type="inline::llama-guard",
-            )
-        ],
-        "agents": [
-            Provider(
-                provider_id="meta-reference",
-                provider_type="inline::meta-reference",
-            )
-        ],
-        "telemetry": [
-            Provider(
-                provider_id="meta-reference",
-                provider_type="inline::meta-reference",
-            )
-        ],
-        "post_training": [
-            Provider(
-                provider_id="huggingface",
-                provider_type="inline::huggingface",
-            )
-        ],
-        "eval": [
-            Provider(
-                provider_id="meta-reference",
-                provider_type="inline::meta-reference",
-            )
+        "inference": [BuildProvider(provider_type=p.provider_type, module=p.module) for p in remote_inference_providers]
+        + [BuildProvider(provider_type="inline::sentence-transformers")],
+        "vector_io": [
+            BuildProvider(provider_type="inline::faiss"),
+            BuildProvider(provider_type="inline::sqlite-vec"),
+            BuildProvider(provider_type="inline::milvus"),
+            BuildProvider(provider_type="remote::chromadb"),
+            BuildProvider(provider_type="remote::pgvector"),
         ],
+        "files": [BuildProvider(provider_type="inline::localfs")],
+        "safety": [BuildProvider(provider_type="inline::llama-guard")],
+        "agents": [BuildProvider(provider_type="inline::meta-reference")],
+        "telemetry": [BuildProvider(provider_type="inline::meta-reference")],
+        "post_training": [BuildProvider(provider_type="inline::huggingface")],
+        "eval": [BuildProvider(provider_type="inline::meta-reference")],
         "datasetio": [
-            Provider(
-                provider_id="huggingface",
-                provider_type="remote::huggingface",
-            ),
-            Provider(
-                provider_id="localfs",
-                provider_type="inline::localfs",
-            ),
+            BuildProvider(provider_type="remote::huggingface"),
+            BuildProvider(provider_type="inline::localfs"),
         ],
         "scoring": [
-            Provider(
-                provider_id="basic",
-                provider_type="inline::basic",
-            ),
-            Provider(
-                provider_id="llm-as-judge",
-                provider_type="inline::llm-as-judge",
-            ),
-            Provider(
-                provider_id="braintrust",
-                provider_type="inline::braintrust",
-            ),
+            BuildProvider(provider_type="inline::basic"),
+            BuildProvider(provider_type="inline::llm-as-judge"),
+            BuildProvider(provider_type="inline::braintrust"),
         ],
         "tool_runtime": [
-            Provider(
-                provider_id="brave-search",
-                provider_type="remote::brave-search",
-            ),
-            Provider(
-                provider_id="tavily-search",
-                provider_type="remote::tavily-search",
-            ),
-            Provider(
-                provider_id="rag-runtime",
-                provider_type="inline::rag-runtime",
-            ),
-            Provider(
-                provider_id="model-context-protocol",
-                provider_type="remote::model-context-protocol",
-            ),
+            BuildProvider(provider_type="remote::brave-search"),
+            BuildProvider(provider_type="remote::tavily-search"),
+            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="remote::model-context-protocol"),
         ],
     }
     files_provider = Provider(
@@ -392,7 +300,41 @@ def get_distribution_template() -> DistributionTemplate:
             "run.yaml": RunConfigSettings(
                 provider_overrides={
                     "inference": remote_inference_providers + [embedding_provider],
-                    "vector_io": vector_io_providers,
+                    "vector_io": [
+                        Provider(
+                            provider_id="${env.ENABLE_FAISS:=faiss}",
+                            provider_type="inline::faiss",
+                            config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
+                        ),
+                        Provider(
+                            provider_id="${env.ENABLE_SQLITE_VEC:=__disabled__}",
+                            provider_type="inline::sqlite-vec",
+                            config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
+                        ),
+                        Provider(
+                            provider_id="${env.ENABLE_MILVUS:=__disabled__}",
+                            provider_type="inline::milvus",
+                            config=MilvusVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
+                        ),
+                        Provider(
+                            provider_id="${env.ENABLE_CHROMADB:=__disabled__}",
+                            provider_type="remote::chromadb",
+                            config=ChromaVectorIOConfig.sample_run_config(
+                                f"~/.llama/distributions/{name}/",
+                                url="${env.CHROMADB_URL:=}",
+                            ),
+                        ),
+                        Provider(
+                            provider_id="${env.ENABLE_PGVECTOR:=__disabled__}",
+                            provider_type="remote::pgvector",
+                            config=PGVectorVectorIOConfig.sample_run_config(
+                                f"~/.llama/distributions/{name}",
+                                db="${env.PGVECTOR_DB:=}",
+                                user="${env.PGVECTOR_USER:=}",
+                                password="${env.PGVECTOR_PASSWORD:=}",
+                            ),
+                        ),
+                    ],
                     "files": [files_provider],
                     "post_training": [post_training_provider],
                 },