fix(model): resolve catalog provider API keys from declared env vars#368
Open
wangyuxun6699 wants to merge 1 commit into
Open
fix(model): resolve catalog provider API keys from declared env vars#368wangyuxun6699 wants to merge 1 commit into
wangyuxun6699 wants to merge 1 commit into
Conversation
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
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
Fixes #339
This PR fixes credential resolution for built-in catalog providers that declare
apiKeyEnvVar.Previously, catalog providers could inherit protocol, default URL, and model defaults, but
parseModelConfigignoredapiKeyEnvVarwhen resolving credentials. As a result, providers such as Anthropic still failed withmissing_api_keyunless users repeatedapiKey: ${ANTHROPIC_API_KEY}in config.Changes:
apiKeyEnvVaras the default API key source when providerapiKeyis absent.apiKeyconfig higher priority than catalog defaults.resolveApiKeyenv resolution, trimming, and error behavior.ollama.Tests
Added coverage for:
ANTHROPIC_API_KEY.${ENV_VAR}API key behavior.missing_api_keywhen the catalog env var is absent.apiKeyis configured.Verified with:
npm run buildnode --test --test-timeout 60000 dist/tests/model/parseModelConfig.spec.jsnode --test --test-timeout 60000 dist/tests/model/*.spec.jsnpx tsc -p tsconfig.json --noEmit