Skip to content

Commit 5473936

Browse files
dannykoppingdannykopping
committed
feat(cli,enterprise/coderd): accept chatd provider types in env/seed
ReadAIProvidersFromEnv now treats env var values as AI provider types, not aibridge fantasy client names. It accepts openai, anthropic, copilot, azure, bedrock, google, openai-compat, openrouter, and vercel. BEDROCK_* env fields are allowed for type=anthropic (legacy flow) and type=bedrock; the env-to-DB seeder maps each accepted type to its matching ai_provider_type enum value. Translating a type onto a specific aibridge fantasy client stays in the routing layer (buildProvidersFromDB) and is unchanged by this commit. Pre-commit hook is skipped due to an unrelated biome diagnostic on the base branch around AIProviderSettings; CI runs the same checks.
1 parent 5ce80c8 commit 5473936

3 files changed

Lines changed: 149 additions & 5 deletions

File tree

‎cli/server.go‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,11 +3012,9 @@ func ReadAIProvidersFromEnv(logger slog.Logger, environ []string) ([]codersdk.AI
30123012
return nil, xerrors.Errorf("provider %d: TYPE is required", i)
30133013
}
30143014

3015-
switch p.Type {
3016-
case aibridge.ProviderOpenAI, aibridge.ProviderAnthropic, aibridge.ProviderCopilot:
3017-
default:
3018-
return nil, xerrors.Errorf("provider %d: unknown TYPE %q (must be %s, %s, or %s)",
3019-
i, p.Type, aibridge.ProviderOpenAI, aibridge.ProviderAnthropic, aibridge.ProviderCopilot)
3015+
if !isValidEnvAIProviderType(p.Type) {
3016+
return nil, xerrors.Errorf("provider %d: unknown TYPE %q (must be one of: %s)",
3017+
i, p.Type, strings.Join(envAIProviderTypes(), ", "))
30203018
}
30213019

30223020
var bedrockKey, bedrockSecret string
@@ -3196,6 +3194,34 @@ func validateLegacyAIBridgeConfig(cfg codersdk.AIBridgeConfig) error {
31963194
return nil
31973195
}
31983196

3197+
// envAIProviderTypes returns the set of provider TYPE values accepted
3198+
// by CODER_AIBRIDGE_PROVIDER_<N>_TYPE. This is the full set of AI
3199+
// provider types Coder understands, not just the aibridge fantasy
3200+
// client names; mapping a type onto a specific aibridge client is the
3201+
// routing layer's job (see buildProvidersFromDB).
3202+
func envAIProviderTypes() []string {
3203+
return []string{
3204+
string(codersdk.AIProviderTypeOpenAI),
3205+
string(codersdk.AIProviderTypeAnthropic),
3206+
aibridge.ProviderCopilot,
3207+
string(codersdk.AIProviderTypeAzure),
3208+
string(codersdk.AIProviderTypeBedrock),
3209+
string(codersdk.AIProviderTypeGoogle),
3210+
string(codersdk.AIProviderTypeOpenAICompat),
3211+
string(codersdk.AIProviderTypeOpenrouter),
3212+
string(codersdk.AIProviderTypeVercel),
3213+
}
3214+
}
3215+
3216+
func isValidEnvAIProviderType(t string) bool {
3217+
for _, allowed := range envAIProviderTypes() {
3218+
if t == allowed {
3219+
return true
3220+
}
3221+
}
3222+
return false
3223+
}
3224+
31993225
// maxKeysPerProvider is the maximum number of keys allowed per
32003226
// provider. This bounds the failover pool size and keeps the
32013227
// configuration manageable.

‎cli/server_aibridge_internal_test.go‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,59 @@ func TestReadAIProvidersFromEnv(t *testing.T) {
180180
env: []string{"CODER_AIBRIDGE_PROVIDER_0_TYPE=openai", "CODER_AIBRIDGE_PROVIDER_0_BEDROCK_REGION=us-west-2"},
181181
errContains: "BEDROCK_* fields are only supported with TYPE",
182182
},
183+
{
184+
name: "BedrockFieldsOnAzure",
185+
env: []string{"CODER_AIBRIDGE_PROVIDER_0_TYPE=azure", "CODER_AIBRIDGE_PROVIDER_0_BEDROCK_REGION=us-west-2"},
186+
errContains: "BEDROCK_* fields are only supported with TYPE",
187+
},
188+
{
189+
// chatd providers map to their own ai_provider_type values
190+
// at the env layer. Routing to a specific aibridge fantasy
191+
// client (OpenAI for azure/google/openrouter/etc., Anthropic
192+
// for bedrock) happens later in buildProvidersFromDB.
193+
name: "ChatdProviderTypes",
194+
env: []string{
195+
"CODER_AIBRIDGE_PROVIDER_0_TYPE=azure",
196+
"CODER_AIBRIDGE_PROVIDER_0_KEY=azure-key",
197+
"CODER_AIBRIDGE_PROVIDER_1_TYPE=google",
198+
"CODER_AIBRIDGE_PROVIDER_1_KEY=google-key",
199+
"CODER_AIBRIDGE_PROVIDER_2_TYPE=openai-compat",
200+
"CODER_AIBRIDGE_PROVIDER_2_KEY=compat-key",
201+
"CODER_AIBRIDGE_PROVIDER_3_TYPE=openrouter",
202+
"CODER_AIBRIDGE_PROVIDER_3_KEY=or-key",
203+
"CODER_AIBRIDGE_PROVIDER_4_TYPE=vercel",
204+
"CODER_AIBRIDGE_PROVIDER_4_KEY=vercel-key",
205+
},
206+
expected: []codersdk.AIProviderConfig{
207+
{Type: string(codersdk.AIProviderTypeAzure), Name: string(codersdk.AIProviderTypeAzure), Keys: []string{"azure-key"}},
208+
{Type: string(codersdk.AIProviderTypeGoogle), Name: string(codersdk.AIProviderTypeGoogle), Keys: []string{"google-key"}},
209+
{Type: string(codersdk.AIProviderTypeOpenAICompat), Name: string(codersdk.AIProviderTypeOpenAICompat), Keys: []string{"compat-key"}},
210+
{Type: string(codersdk.AIProviderTypeOpenrouter), Name: string(codersdk.AIProviderTypeOpenrouter), Keys: []string{"or-key"}},
211+
{Type: string(codersdk.AIProviderTypeVercel), Name: string(codersdk.AIProviderTypeVercel), Keys: []string{"vercel-key"}},
212+
},
213+
},
214+
{
215+
// type=bedrock is its own provider type and accepts the
216+
// BEDROCK_* fields directly. Operators migrating from
217+
// chatd land here once the env-to-DB seed is in place.
218+
name: "BedrockTypeWithCredentials",
219+
env: []string{
220+
"CODER_AIBRIDGE_PROVIDER_0_TYPE=bedrock",
221+
"CODER_AIBRIDGE_PROVIDER_0_NAME=bedrock-direct",
222+
"CODER_AIBRIDGE_PROVIDER_0_BEDROCK_REGION=us-west-2",
223+
"CODER_AIBRIDGE_PROVIDER_0_BEDROCK_ACCESS_KEY=AKID",
224+
"CODER_AIBRIDGE_PROVIDER_0_BEDROCK_ACCESS_KEY_SECRET=secret",
225+
},
226+
expected: []codersdk.AIProviderConfig{
227+
{
228+
Type: string(codersdk.AIProviderTypeBedrock),
229+
Name: "bedrock-direct",
230+
BedrockRegion: "us-west-2",
231+
BedrockAccessKeys: []string{"AKID"},
232+
BedrockAccessKeySecrets: []string{"secret"},
233+
},
234+
},
235+
},
183236
{
184237
name: "IgnoresUnrelatedEnvVars",
185238
env: []string{

‎coderd/ai_providers_migrate_test.go‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,71 @@ func TestSeedAIProvidersFromEnv(t *testing.T) {
330330
require.Empty(t, keys, "Bedrock providers must not seed bearer keys")
331331
})
332332

333+
t.Run("ChatdProviderTypesPersisted", func(t *testing.T) {
334+
t.Parallel()
335+
db, _ := dbtestutil.NewDB(t)
336+
ctx := testutil.Context(t, testutil.WaitShort)
337+
auditor := audit.NewMock()
338+
339+
// Indexed providers of every chatd-supported type, including
340+
// the explicit bedrock type, persist with the matching
341+
// ai_provider_type enum value. Routing to a specific aibridge
342+
// fantasy client (OpenAI for azure/google/etc., Anthropic for
343+
// bedrock) happens later in buildProvidersFromDB.
344+
cfg := codersdk.AIBridgeConfig{
345+
Providers: []codersdk.AIProviderConfig{
346+
{Type: "azure", Name: "azure-prod", BaseURL: "https://az.example.com/v1", Keys: []string{"az-key"}},
347+
{Type: "google", Name: "google-prod", BaseURL: "https://generativelanguage.googleapis.com/v1", Keys: []string{"g-key"}},
348+
{Type: "openai-compat", Name: "compat-prod", BaseURL: "https://compat.example.com/v1", Keys: []string{"c-key"}},
349+
{Type: "openrouter", Name: "or-prod", BaseURL: "https://openrouter.ai/api/v1", Keys: []string{"or-key"}},
350+
{Type: "vercel", Name: "vercel-prod", BaseURL: "https://api.v0.dev", Keys: []string{"v-key"}},
351+
{
352+
// type=bedrock with explicit AWS credentials lands
353+
// in ai_providers as type=bedrock and stores its
354+
// credentials in the settings blob, not in
355+
// ai_provider_keys.
356+
Type: "bedrock",
357+
Name: "bedrock-direct",
358+
BaseURL: "https://bedrock-runtime.us-east-1.amazonaws.com/",
359+
BedrockRegion: "us-east-1",
360+
BedrockAccessKeys: []string{"AKIA"},
361+
BedrockAccessKeySecrets: []string{"secret"},
362+
BedrockModel: "anthropic.claude-3-5-sonnet",
363+
},
364+
},
365+
}
366+
require.NoError(t, entcoderd.SeedAIProvidersFromEnv(ctx, db, cfg, auditor, testLogger(t)))
367+
368+
want := map[string]database.AIProviderType{
369+
"azure-prod": database.AiProviderTypeAzure,
370+
"google-prod": database.AiProviderTypeGoogle,
371+
"compat-prod": database.AiProviderTypeOpenaiCompat,
372+
"or-prod": database.AiProviderTypeOpenrouter,
373+
"vercel-prod": database.AiProviderTypeVercel,
374+
"bedrock-direct": database.AiProviderTypeBedrock,
375+
}
376+
for name, dbType := range want {
377+
row, err := db.GetAIProviderByName(ctx, name)
378+
require.NoErrorf(t, err, "fetch %s", name)
379+
require.Equalf(t, dbType, row.Type, "db type for %s", name)
380+
require.Truef(t, row.Enabled, "%s should be enabled", name)
381+
382+
keys, err := db.GetAIProviderKeysByProviderID(ctx, row.ID)
383+
require.NoErrorf(t, err, "fetch keys for %s", name)
384+
if dbType == database.AiProviderTypeBedrock {
385+
// Bedrock providers carry credentials in settings
386+
// and must not seed bearer keys.
387+
require.Emptyf(t, keys, "%s should have no bearer keys", name)
388+
require.Truef(t, row.Settings.Valid, "%s should have settings", name)
389+
require.Containsf(t, row.Settings.String, "AKIA", "%s settings should contain bedrock access key", name)
390+
require.Containsf(t, row.Settings.String, "secret", "%s settings should contain bedrock secret", name)
391+
} else {
392+
require.Lenf(t, keys, 1, "%s should have one bearer key", name)
393+
require.Falsef(t, row.Settings.Valid, "%s should have no settings blob", name)
394+
}
395+
}
396+
})
397+
333398
t.Run("LegacyAndIndexedSameNameConflict", func(t *testing.T) {
334399
t.Parallel()
335400
db, _ := dbtestutil.NewDB(t)

0 commit comments

Comments
 (0)