Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions backend/pkg/providers/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package providers
import (
"context"
"crypto/rand"
"database/sql"
"encoding/json"
"fmt"
"math"
Expand Down Expand Up @@ -685,7 +686,19 @@ func (pc *providerController) GetProvider(
prvname provider.ProviderName,
userID int64,
) (provider.Provider, error) {
// Lookup default providers first
// Lookup user defined providers first so they take precedence over built-in providers
prv, err := pc.db.GetUserProviderByName(ctx, database.GetUserProviderByNameParams{
Name: string(prvname),
UserID: userID,
})
if err != nil && err != sql.ErrNoRows {
return nil, fmt.Errorf("failed to get provider '%s' from database: %w", prvname, err)
}
if err == nil {
return pc.NewProvider(prv)
}

// Fall back to built-in default providers
switch prvname {
case provider.DefaultProviderNameOpenAI:
return pc.Providers.Get(provider.DefaultProviderNameOpenAI)
Expand All @@ -709,16 +722,7 @@ func (pc *providerController) GetProvider(
return pc.Providers.Get(provider.DefaultProviderNameQwen)
}

// Lookup user defined providers by name and build it
prv, err := pc.db.GetUserProviderByName(ctx, database.GetUserProviderByNameParams{
Name: string(prvname),
UserID: userID,
})
if err != nil {
return nil, fmt.Errorf("failed to get provider '%s' from database: %w", prvname, err)
}

return pc.NewProvider(prv)
return nil, fmt.Errorf("provider '%s' not found", prvname)
}

func (pc *providerController) GetProviders(
Expand Down