Skip to content
Closed
Show file tree
Hide file tree
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
17 changes: 16 additions & 1 deletion cmd/gateway_providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,8 @@ func registerProvidersFromDB(registry *providers.Registry, provStore store.Provi
}
registry.Register(providers.NewOpenAIProvider(p.Name, p.APIKey, base, ""))
default:
prov := providers.NewOpenAIProvider(p.Name, p.APIKey, p.APIBase, "")
defaultModel := extractDefaultModel(p.Settings)
prov := providers.NewOpenAIProvider(p.Name, p.APIKey, p.APIBase, defaultModel)
if p.ProviderType == store.ProviderMiniMax {
prov.WithChatPath("/text/chatcompletion_v2")
}
Expand All @@ -326,3 +327,17 @@ func registerProvidersFromDB(registry *providers.Registry, provStore store.Provi
slog.Info("registered provider from DB", "name", p.Name)
}
}

// extractDefaultModel reads default_model from a provider's settings JSONB.
func extractDefaultModel(settings json.RawMessage) string {
if len(settings) == 0 {
return ""
}
var s struct {
DefaultModel string `json:"default_model"`
}
if json.Unmarshal(settings, &s) == nil {
return s.DefaultModel
}
return ""
}
30 changes: 27 additions & 3 deletions internal/gateway/methods/party.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"log/slog"
"sort"

"github.com/google/uuid"

Expand Down Expand Up @@ -45,15 +46,37 @@ func (m *PartyMethods) Register(router *gateway.MethodRouter) {
router.Register(protocol.MethodPartyList, m.handleList)
}

// getEngine returns a party engine using the first available provider.
// getEngine returns a party engine using the best available provider.
// Prefers providers with a non-empty DefaultModel; breaks ties alphabetically
// to avoid non-determinism from Go map iteration order.
func (m *PartyMethods) getEngine() (*party.Engine, error) {
names := m.providerReg.List()
if len(names) == 0 {
return nil, fmt.Errorf("no LLM providers available")
}
provider, err := m.providerReg.Get(names[0])

// Pick the best provider: prefer one with DefaultModel set.
var bestName string
for _, name := range names {
p, err := m.providerReg.Get(name)
if err != nil {
continue
}
if p.DefaultModel() != "" {
if bestName == "" || name < bestName {
bestName = name
}
}
}
// Fallback: alphabetically first provider.
if bestName == "" {
sort.Strings(names)
bestName = names[0]
}

provider, err := m.providerReg.Get(bestName)
if err != nil {
return nil, fmt.Errorf("provider %s: %w", names[0], err)
return nil, fmt.Errorf("provider %s: %w", bestName, err)
}
return party.NewEngine(m.partyStore, m.agentStore, provider), nil
}
Expand Down Expand Up @@ -236,6 +259,7 @@ func (m *PartyMethods) handleRound(ctx context.Context, client *gateway.Client,
result, err = engine.RunStandardRound(ctx, sess, personas, emit)
}
if err != nil {
slog.Error("party: round failed", "session", sess.ID, "round", sess.Round, "mode", mode, "error", err)
client.SendResponse(protocol.NewErrorResponse(req.ID, protocol.ErrInternal, err.Error()))
return
}
Expand Down
Loading