docs(spec): change provider merge to overlay_by_provider_id#265
Closed
rhuss wants to merge 1 commit intollamastack:feature/sdd-v1alpha2from
Closed
docs(spec): change provider merge to overlay_by_provider_id#265rhuss wants to merge 1 commit intollamastack:feature/sdd-v1alpha2from
rhuss wants to merge 1 commit intollamastack:feature/sdd-v1alpha2from
Conversation
rhuss
requested review from
VaishnaviHire,
cdoern,
derekhiggins,
leseb,
mfleader,
nathan-weinberg and
rhdedgar
as code owners
|
This pull request has merge conflicts that must be resolved before it can be merged. @rhuss please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork |
Replace the `replace_by_api_type` provider merge strategy with `overlay_by_provider_id` across all spec artifacts. The previous strategy would silently drop base providers that users didn't explicitly re-declare, breaking distributions that ship multiple default providers per API type. The overlay strategy uses provider-ID-based matching: matching IDs are replaced, unmatched user IDs are appended, and unmatched base IDs are preserved. This keeps distributions intact when users only need to override a single provider. Addresses review feedback from @VaishnaviHire on PR llamastack#263 and aligns with the merge semantics already implemented in PR llamastack#253. Changes: - contracts/config-generation.yaml: strategy + examples - spec.md: add FR-035a for overlay merge semantics - research.md: update R3 decision and rationale - REVIEW.md: update Decision 3 - tasks.md: update T018 and T029 descriptions Assisted-By: 🤖 Claude Code Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
rhuss
force-pushed
the
002-overlay-provider-merge
branch
from
3de36de to
325ea43
Compare
| - {provider_id: sentence-transformers, provider_type: "inline::sentence-transformers"} | ||
| user: [{id: base-inf, provider: ollama, endpoint: "http://ollama:11434"}] | ||
| result: | ||
| - {provider_id: base-inf, provider_type: "remote::ollama", config: {url: "http://ollama:11434"}} |
Collaborator
There was a problem hiding this comment.
Provider url key needs to be base_url rather than url. Example config.yaml
6 tasks
Collaborator
Author
|
Closing in favor of #266, which includes these spec changes alongside the Phase 1+2 implementation (v1alpha2 types + config generation pipeline). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
replace_by_api_typetooverlay_by_provider_idacross all spec artifactsMotivation
Raised by @VaishnaviHire in PR #263 review. The previous
replace_by_api_typestrategy would silently drop base providers (e.g.,inline::sentence-transformersfor embeddings) when a user only wanted to override a single inference provider. This is especially problematic for custom downstream distributions that ship multiple default providers per API type.The overlay strategy matches the implementation already merged in PR #253 and avoids breaking changes when layering user config on top of existing distributions.
Files changed
contracts/config-generation.yamlspec.mdresearch.mdREVIEW.mdtasks.mdNote on code changes
The merge logic (T018) has not been implemented yet, so no code changes are needed. When T018 is implemented, it will follow the updated
overlay_by_provider_idcontract.Assisted-By: 🤖 Claude Code