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/template.py

@@ -19,6 +19,7 @@ from llama_stack.distribution.datatypes import (
     Api,
     BenchmarkInput,
     BuildConfig,
+    BuildProvider,
     DatasetInput,
     DistributionSpec,
     ModelInput,
@@ -183,7 +184,7 @@ class RunConfigSettings(BaseModel):
     def run_config(
         self,
         name: str,
-        providers: dict[str, list[Provider]],
+        providers: dict[str, list[BuildProvider]],
         container_image: str | None = None,
     ) -> dict:
         provider_registry = get_provider_registry()
@@ -199,7 +200,7 @@ class RunConfigSettings(BaseModel):
                 api = Api(api_str)
                 if provider.provider_type not in provider_registry[api]:
                     raise ValueError(f"Unknown provider type: {provider.provider_type} for API: {api_str}")
-
+                provider_id = provider.provider_type.split("::")[-1]
                 config_class = provider_registry[api][provider.provider_type].config_class
                 assert config_class is not None, (
                     f"No config class for provider type: {provider.provider_type} for API: {api_str}"
@@ -210,10 +211,14 @@ class RunConfigSettings(BaseModel):
                     config = config_class.sample_run_config(__distro_dir__=f"~/.llama/distributions/{name}")
                 else:
                     config = {}
-
-                provider.config = config
-                # Convert Provider object to dict for YAML serialization
-                provider_configs[api_str].append(provider.model_dump(exclude_none=True))
+                # BuildProvider does not have a config attribute; skip assignment
+                provider_configs[api_str].append(
+                    Provider(
+                        provider_id=provider_id,
+                        provider_type=provider.provider_type,
+                        config=config,
+                    ).model_dump(exclude_none=True)
+                )
         # Get unique set of APIs from providers
         apis = sorted(providers.keys())
 
@@ -257,7 +262,8 @@ class DistributionTemplate(BaseModel):
     description: str
     distro_type: Literal["self_hosted", "remote_hosted", "ondevice"]
 
-    providers: dict[str, list[Provider]]
+    # Now uses BuildProvider for build config, not Provider
+    providers: dict[str, list[BuildProvider]]
     run_configs: dict[str, RunConfigSettings]
     template_path: Path | None = None
 
@@ -295,11 +301,9 @@ class DistributionTemplate(BaseModel):
         for api, providers in self.providers.items():
             build_providers[api] = []
             for provider in providers:
-                # Create a minimal provider object with only essential build information
-                build_provider = Provider(
-                    provider_id=provider.provider_id,
+                # Create a minimal build provider object with only essential build information
+                build_provider = BuildProvider(
                     provider_type=provider.provider_type,
-                    config={},  # Empty config for build
                     module=provider.module,
                 )
                 build_providers[api].append(build_provider)
@@ -323,50 +327,52 @@ class DistributionTemplate(BaseModel):
             providers_str = ", ".join(f"`{p.provider_type}`" for p in providers)
             providers_table += f"| {api} | {providers_str} |\n"
 
-        template = self.template_path.read_text()
-        comment = "<!-- This file was auto-generated by distro_codegen.py, please edit source -->\n"
-        orphantext = "---\norphan: true\n---\n"
+        if self.template_path is not None:
+            template = self.template_path.read_text()
+            comment = "<!-- This file was auto-generated by distro_codegen.py, please edit source -->\n"
+            orphantext = "---\norphan: true\n---\n"
 
-        if template.startswith(orphantext):
-            template = template.replace(orphantext, orphantext + comment)
-        else:
-            template = comment + template
+            if template.startswith(orphantext):
+                template = template.replace(orphantext, orphantext + comment)
+            else:
+                template = comment + template
 
-        # Render template with rich-generated table
-        env = jinja2.Environment(
-            trim_blocks=True,
-            lstrip_blocks=True,
-            # NOTE: autoescape is required to prevent XSS attacks
-            autoescape=True,
-        )
-        template = env.from_string(template)
+            # Render template with rich-generated table
+            env = jinja2.Environment(
+                trim_blocks=True,
+                lstrip_blocks=True,
+                # NOTE: autoescape is required to prevent XSS attacks
+                autoescape=True,
+            )
+            template = env.from_string(template)
 
-        default_models = []
-        if self.available_models_by_provider:
-            has_multiple_providers = len(self.available_models_by_provider.keys()) > 1
-            for provider_id, model_entries in self.available_models_by_provider.items():
-                for model_entry in model_entries:
-                    doc_parts = []
-                    if model_entry.aliases:
-                        doc_parts.append(f"aliases: {', '.join(model_entry.aliases)}")
-                    if has_multiple_providers:
-                        doc_parts.append(f"provider: {provider_id}")
+            default_models = []
+            if self.available_models_by_provider:
+                has_multiple_providers = len(self.available_models_by_provider.keys()) > 1
+                for provider_id, model_entries in self.available_models_by_provider.items():
+                    for model_entry in model_entries:
+                        doc_parts = []
+                        if model_entry.aliases:
+                            doc_parts.append(f"aliases: {', '.join(model_entry.aliases)}")
+                        if has_multiple_providers:
+                            doc_parts.append(f"provider: {provider_id}")
 
-                    default_models.append(
-                        DefaultModel(
-                            model_id=model_entry.provider_model_id,
-                            doc_string=(f"({' -- '.join(doc_parts)})" if doc_parts else ""),
+                        default_models.append(
+                            DefaultModel(
+                                model_id=model_entry.provider_model_id,
+                                doc_string=(f"({' -- '.join(doc_parts)})" if doc_parts else ""),
+                            )
                         )
-                    )
 
-        return template.render(
-            name=self.name,
-            description=self.description,
-            providers=self.providers,
-            providers_table=providers_table,
-            run_config_env_vars=self.run_config_env_vars,
-            default_models=default_models,
-        )
+            return template.render(
+                name=self.name,
+                description=self.description,
+                providers=self.providers,
+                providers_table=providers_table,
+                run_config_env_vars=self.run_config_env_vars,
+                default_models=default_models,
+            )
+        return ""
 
     def save_distribution(self, yaml_output_dir: Path, doc_output_dir: Path) -> None:
         def enum_representer(dumper, data):