-
Notifications
You must be signed in to change notification settings - Fork 1.2k
refactor!: make provider_id mandatory in vector DB registration to avoid ambiguity BREAKING CHANGE #3147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
HabebNawatha
wants to merge
5
commits into
llamastack:main
Choose a base branch
from
HabebNawatha:fix/vector-db-mandatory-provider-id
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
refactor!: make provider_id mandatory in vector DB registration to avoid ambiguity BREAKING CHANGE #3147
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
820ec43
fix: make provider_id a required field in vector DB registration
HabebNawatha e6a5ad5
chore(pre-commit): apply codegen and permissions fixes
HabebNawatha 4374da0
Merge branch 'main' into fix/vector-db-mandatory-provider-id
HabebNawatha 4084158
Merge branch 'main' into fix/vector-db-mandatory-provider-id
HabebNawatha fa71441
refactor(vector-db): remove redundant fallback assignment for provide…
HabebNawatha File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,21 +47,12 @@ async def register_vector_db( | |
self, | ||
vector_db_id: str, | ||
embedding_model: str, | ||
provider_id: str, | ||
embedding_dimension: int | None = 384, | ||
provider_id: str | None = None, | ||
provider_vector_db_id: str | None = None, | ||
vector_db_name: str | None = None, | ||
) -> VectorDB: | ||
provider_vector_db_id = provider_vector_db_id or vector_db_id | ||
if provider_id is None: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. typically i role out a log first to note that the change is breaking but i suppose it's too late for that in this change. |
||
if len(self.impls_by_provider_id) > 0: | ||
provider_id = list(self.impls_by_provider_id.keys())[0] | ||
if len(self.impls_by_provider_id) > 1: | ||
logger.warning( | ||
f"No provider specified and multiple providers available. Arbitrarily selected the first provider {provider_id}." | ||
) | ||
else: | ||
raise ValueError("No provider available. Please configure a vector_io provider.") | ||
model = await lookup_model(self, embedding_model) | ||
if model is None: | ||
raise ModelNotFoundError(embedding_model) | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is
provider_vector_db_id
and why does it take precedence here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fallback
provider_vector_db_id = provider_vector_db_id or vector_db_id
is no longer neededsince the merged logic now uses
provider_vector_db_id or vector_store_id
downstream. Updated.