Add fail-fast on init for missing provider credentials
This commit is contained in:
@@ -136,6 +136,9 @@ func (r *Registry) Get(name string) (Provider, bool) {
|
||||
func (r *Registry) Models() []struct{ Provider, Model string } {
|
||||
var out []struct{ Provider, Model string }
|
||||
for _, m := range r.modelList {
|
||||
if _, ok := r.providers[m.Provider]; !ok {
|
||||
continue
|
||||
}
|
||||
out = append(out, struct{ Provider, Model string }{Provider: m.Provider, Model: m.Name})
|
||||
}
|
||||
return out
|
||||
@@ -156,7 +159,9 @@ func (r *Registry) Default(model string) (Provider, error) {
|
||||
if p, ok := r.providers[providerName]; ok {
|
||||
return p, nil
|
||||
}
|
||||
return nil, fmt.Errorf("model %q is mapped to provider %q, but that provider is not available", model, providerName)
|
||||
}
|
||||
return nil, fmt.Errorf("model %q not configured", model)
|
||||
}
|
||||
|
||||
for _, p := range r.providers {
|
||||
|
||||
@@ -475,7 +475,7 @@ func TestRegistry_Default(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "returns first provider for unknown model",
|
||||
name: "returns error for unknown model",
|
||||
setupReg: func() *Registry {
|
||||
reg, _ := NewRegistry(
|
||||
map[string]config.ProviderEntry{
|
||||
@@ -490,11 +490,34 @@ func TestRegistry_Default(t *testing.T) {
|
||||
)
|
||||
return reg
|
||||
},
|
||||
modelName: "unknown-model",
|
||||
validate: func(t *testing.T, p Provider) {
|
||||
assert.NotNil(t, p)
|
||||
// Should return first available provider
|
||||
modelName: "unknown-model",
|
||||
expectError: true,
|
||||
errorMsg: "not configured",
|
||||
},
|
||||
{
|
||||
name: "returns error for model whose provider is unavailable",
|
||||
setupReg: func() *Registry {
|
||||
reg, _ := NewRegistry(
|
||||
map[string]config.ProviderEntry{
|
||||
"openai": {
|
||||
Type: "openai",
|
||||
APIKey: "", // unavailable provider
|
||||
},
|
||||
"google": {
|
||||
Type: "google",
|
||||
APIKey: "test-key",
|
||||
},
|
||||
},
|
||||
[]config.ModelEntry{
|
||||
{Name: "gpt-4", Provider: "openai"},
|
||||
{Name: "gemini-pro", Provider: "google"},
|
||||
},
|
||||
)
|
||||
return reg
|
||||
},
|
||||
modelName: "gpt-4",
|
||||
expectError: true,
|
||||
errorMsg: "not available",
|
||||
},
|
||||
{
|
||||
name: "returns first provider for empty model name",
|
||||
@@ -542,6 +565,31 @@ func TestRegistry_Default(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestRegistry_Models_FiltersUnavailableProviders(t *testing.T) {
|
||||
reg, err := NewRegistry(
|
||||
map[string]config.ProviderEntry{
|
||||
"openai": {
|
||||
Type: "openai",
|
||||
APIKey: "", // unavailable provider
|
||||
},
|
||||
"google": {
|
||||
Type: "google",
|
||||
APIKey: "test-key",
|
||||
},
|
||||
},
|
||||
[]config.ModelEntry{
|
||||
{Name: "gpt-4", Provider: "openai"},
|
||||
{Name: "gemini-pro", Provider: "google"},
|
||||
},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
models := reg.Models()
|
||||
require.Len(t, models, 1)
|
||||
assert.Equal(t, "gemini-pro", models[0].Model)
|
||||
assert.Equal(t, "google", models[0].Provider)
|
||||
}
|
||||
|
||||
func TestBuildProvider(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
||||
Reference in New Issue
Block a user