artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Move azure openai provider config validation to right place (#64056)

Browse Source 
This validation was done in the azure oauth provider, which mixes two
separate domains.

Test plan: CI, code review.
This commit is contained in:
Erik Seliger 2024-07-31 03:43:17 +02:00 committed by GitHub
parent 4bbb45ad3b
commit 56467e3c48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/frontend/internal/auth/azureoauth/provider.go
View File

@ -71,13 +71,6 @@ func parseConfig(logger log.Logger, cfg conftypes.SiteConfigQuerier, db database
}
existingProviders := make(collections.Set[string])
hasAzure := cfg.SiteConfig().Completions != nil && cfg.SiteConfig().Completions.Provider == "azure-openai"
hasAzureChatModel := cfg.SiteConfig().Completions != nil && cfg.SiteConfig().Completions.AzureChatModel != ""
hasAzureCompletionModel := cfg.SiteConfig().Completions != nil && cfg.SiteConfig().Completions.AzureCompletionModel != ""
if hasAzure && !(hasAzureChatModel && hasAzureCompletionModel) {
problems = append(problems, conf.NewSiteProblem(`when using azure-openai provider its mandatory to set both completions.azureChatModel and completions.azureCompletionModel for proper LLM Token usage`))
}
for _, pr := range cfg.SiteConfig().AuthProviders {
if pr.AzureDevOps == nil {

4
internal/conf/validation/cody.go
View File

@ -33,6 +33,10 @@ func completionsConfigValidator(q conftypes.SiteConfigQuerier) conf.Problems {
problems = append(problems, "'completions.enabled' has been superceded by 'cody.enabled', please migrate to the new configuration.")
}
if completionsConf.Provider == "azure-openai" && (completionsConf.AzureChatModel == "" || completionsConf.AzureCompletionModel == "") {
problems = append(problems, `when using azure-openai provider its mandatory to set both completions.azureChatModel and completions.azureCompletionModel for proper LLM Token usage`)
}
// Check for bedrock Provisioned Capacity ARNs which should instead be
// formatted like:
// "anthropic.claude-v2/arn:aws:bedrock:us-west-2:012345678901:provisioned-model/xxxxxxxx"