fix: tweak the logic to fix config merging #115
Merged
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
rekram1-node
commented
Apr 29, 2025
| // Anthropic configuration | ||
| if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" { | ||
| if viper.Get("providers.anthropic.apiKey") != "" { |
There was a problem hiding this comment.
We set these values right at the beginning of setProviderDefaults
|
@rekram1-node I just merged another provider maybe we can update this to include all providers correctly now ? |
rekram1-node
force-pushed
the
fix-config-merging
branch
from
2bfbe87 to
9493302
Compare
…ons merge properly
rekram1-node
force-pushed
the
fix-config-merging
branch
from
9493302 to
0311320
Compare
|
@kujtimiihoxha added openrouter |
|
@rekram1-node thanks |
kujtimiihoxha
pushed a commit
to PhantomReactor/opencode
that referenced
this pull request
May 2, 2025
…ons merge properly (opencode-ai#115)
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.
Should fix: #71
This fixes issues with merging configurations. Previously, If I didn't set an environment variable for say anthropic, but I had in my configuration file the following:
{ "providers": { "anthropic": { "apiKey": "***", "disabled": false } } }The I would get "Error: model not supported"
These changes ensure that we read in the file configuration before setting defaults so a user won't have to explicitly configure every agent in their configuration file.
Also,
setProviderDefaultswill NOT override settings already configured because viper will check if the values have been set or not.