EnterpriseAI/ClosedCode
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

fix: tweak the logic in config to ensure that env vs file configurations merge properly (#115)

Browse Source
This commit is contained in:
Aiden Cline
2025-05-01 13:22:48 +02:00
committed by GitHub
parent 004cfe7e8e
commit e14de7a211
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/config.go
+13 -9
View File
@@ -129,7 +129,6 @@ func Load(workingDir string, debug bool) (*Config, error) {
configureViper() configureViper()
setDefaults(debug) setDefaults(debug)
setProviderDefaults()
// Read global config // Read global config
if err := readConfig(viper.ReadInConfig()); err != nil { if err := readConfig(viper.ReadInConfig()); err != nil {
@@ -139,6 +138,8 @@ func Load(workingDir string, debug bool) (*Config, error) {
// Load and merge local config // Load and merge local config
mergeLocalConfig(workingDir) mergeLocalConfig(workingDir)
setProviderDefaults()
// Apply configuration to the struct // Apply configuration to the struct
if err := viper.Unmarshal(cfg); err != nil { if err := viper.Unmarshal(cfg); err != nil {
return cfg, fmt.Errorf("failed to unmarshal config: %w", err) return cfg, fmt.Errorf("failed to unmarshal config: %w", err)
@@ -222,7 +223,8 @@ func setDefaults(debug bool) {
} }
} }
// setProviderDefaults configures LLM provider defaults based on environment variables. // setProviderDefaults configures LLM provider defaults based on provider provided by
// environment variables and configuration file.
func setProviderDefaults() { func setProviderDefaults() {
// Set all API keys we can find in the environment // Set all API keys we can find in the environment
if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" { if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" {
@@ -246,9 +248,12 @@ func setProviderDefaults() {
// 2. OpenAI // 2. OpenAI
// 3. Google Gemini // 3. Google Gemini
// 4. Groq // 4. Groq
// 5. AWS Bedrock // 5. OpenRouter
// 6. AWS Bedrock
// 7. Azure
// Anthropic configuration // Anthropic configuration
if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" { if viper.Get("providers.anthropic.apiKey") != "" {
viper.SetDefault("agents.coder.model", models.Claude37Sonnet) viper.SetDefault("agents.coder.model", models.Claude37Sonnet)
viper.SetDefault("agents.task.model", models.Claude37Sonnet) viper.SetDefault("agents.task.model", models.Claude37Sonnet)
viper.SetDefault("agents.title.model", models.Claude37Sonnet) viper.SetDefault("agents.title.model", models.Claude37Sonnet)
@@ -256,7 +261,7 @@ func setProviderDefaults() {
} }
// OpenAI configuration // OpenAI configuration
if apiKey := os.Getenv("OPENAI_API_KEY"); apiKey != "" { if viper.Get("providers.openai.apiKey") != "" {
viper.SetDefault("agents.coder.model", models.GPT41) viper.SetDefault("agents.coder.model", models.GPT41)
viper.SetDefault("agents.task.model", models.GPT41Mini) viper.SetDefault("agents.task.model", models.GPT41Mini)
viper.SetDefault("agents.title.model", models.GPT41Mini) viper.SetDefault("agents.title.model", models.GPT41Mini)
@@ -264,7 +269,7 @@ func setProviderDefaults() {
} }
// Google Gemini configuration // Google Gemini configuration
if apiKey := os.Getenv("GEMINI_API_KEY"); apiKey != "" { if viper.Get("providers.google.gemini.apiKey") != "" {
viper.SetDefault("agents.coder.model", models.Gemini25) viper.SetDefault("agents.coder.model", models.Gemini25)
viper.SetDefault("agents.task.model", models.Gemini25Flash) viper.SetDefault("agents.task.model", models.Gemini25Flash)
viper.SetDefault("agents.title.model", models.Gemini25Flash) viper.SetDefault("agents.title.model", models.Gemini25Flash)
@@ -272,7 +277,7 @@ func setProviderDefaults() {
} }
// Groq configuration // Groq configuration
if apiKey := os.Getenv("GROQ_API_KEY"); apiKey != "" { if viper.Get("providers.groq.apiKey") != "" {
viper.SetDefault("agents.coder.model", models.QWENQwq) viper.SetDefault("agents.coder.model", models.QWENQwq)
viper.SetDefault("agents.task.model", models.QWENQwq) viper.SetDefault("agents.task.model", models.QWENQwq)
viper.SetDefault("agents.title.model", models.QWENQwq) viper.SetDefault("agents.title.model", models.QWENQwq)
@@ -280,8 +285,7 @@ func setProviderDefaults() {
} }
// OpenRouter configuration // OpenRouter configuration
if apiKey := os.Getenv("OPENROUTER_API_KEY"); apiKey != "" { if viper.Get("providers.openrouter.apiKey") != "" {
viper.SetDefault("providers.openrouter.apiKey", apiKey)
viper.SetDefault("agents.coder.model", models.OpenRouterClaude37Sonnet) viper.SetDefault("agents.coder.model", models.OpenRouterClaude37Sonnet)
viper.SetDefault("agents.task.model", models.OpenRouterClaude37Sonnet) viper.SetDefault("agents.task.model", models.OpenRouterClaude37Sonnet)
viper.SetDefault("agents.title.model", models.OpenRouterClaude35Haiku) viper.SetDefault("agents.title.model", models.OpenRouterClaude35Haiku)
internal/llm/models/models.go
+7 -5
View File
@@ -35,11 +35,13 @@ const (
// Providers in order of popularity // Providers in order of popularity
var ProviderPopularity = map[ModelProvider]int{ var ProviderPopularity = map[ModelProvider]int{
ProviderAnthropic: 1, ProviderAnthropic: 1,
ProviderOpenAI: 2, ProviderOpenAI: 2,
ProviderGemini: 3, ProviderGemini: 3,
ProviderGROQ: 4, ProviderGROQ: 4,
ProviderBedrock: 5, ProviderOpenRouter: 5,
ProviderBedrock: 6,
ProviderAzure: 7,
} }
var SupportedModels = map[ModelID]Model{ var SupportedModels = map[ModelID]Model{