From b3c0285db3dd5d5140481bf5118812e8dbc89795 Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Mon, 28 Apr 2025 12:25:06 -0500 Subject: feat: model selection for given provider (#57) * feat: model selection for given provider * tweak: adjust cfg validation func, remove duplicated logic, consolidate agent updating into agent.go * tweak: make the model dialog scrollable, adjust padding slightly for modal" * feat: add provider selection, add hints, simplify some logic, add horizontal scrolling support, additional scroll indicators" * remove nav help * update docs * increase number of visible models, make horizontal scroll "wrap" * add provider popularity rankings --- internal/llm/agent/agent.go | 20 ++++++++++++++++++++ internal/llm/models/anthropic.go | 6 +++--- internal/llm/models/models.go | 9 +++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) (limited to 'internal/llm') diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index c5f024073..80dfeb0fd 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -42,6 +42,7 @@ type Service interface { Cancel(sessionID string) IsSessionBusy(sessionID string) bool IsBusy() bool + Update(agentName config.AgentName, modelID models.ModelID) (models.Model, error) } type agent struct { @@ -436,6 +437,25 @@ func (a *agent) TrackUsage(ctx context.Context, sessionID string, model models.M return nil } +func (a *agent) Update(agentName config.AgentName, modelID models.ModelID) (models.Model, error) { + if a.IsBusy() { + return models.Model{}, fmt.Errorf("cannot change model while processing requests") + } + + if err := config.UpdateAgentModel(agentName, modelID); err != nil { + return models.Model{}, fmt.Errorf("failed to update config: %w", err) + } + + provider, err := createAgentProvider(agentName) + if err != nil { + return models.Model{}, fmt.Errorf("failed to create provider for model %s: %w", modelID, err) + } + + a.provider = provider + + return a.provider.Model(), nil +} + func createAgentProvider(agentName config.AgentName) (provider.Provider, error) { cfg := config.Get() agentConfig, ok := cfg.Agents[agentName] diff --git a/internal/llm/models/anthropic.go b/internal/llm/models/anthropic.go index 87e9b4c89..d5f410e90 100644 --- a/internal/llm/models/anthropic.go +++ b/internal/llm/models/anthropic.go @@ -11,8 +11,8 @@ const ( Claude3Opus ModelID = "claude-3-opus" ) +// https://docs.anthropic.com/en/docs/about-claude/models/all-models var AnthropicModels = map[ModelID]Model{ - // Anthropic Claude35Sonnet: { ID: Claude35Sonnet, Name: "Claude 3.5 Sonnet", @@ -29,13 +29,13 @@ var AnthropicModels = map[ModelID]Model{ ID: Claude3Haiku, Name: "Claude 3 Haiku", Provider: ProviderAnthropic, - APIModel: "claude-3-haiku-latest", + APIModel: "claude-3-haiku-20240307", // doesn't support "-latest" CostPer1MIn: 0.25, CostPer1MInCached: 0.30, CostPer1MOutCached: 0.03, CostPer1MOut: 1.25, ContextWindow: 200000, - DefaultMaxTokens: 5000, + DefaultMaxTokens: 4096, }, Claude37Sonnet: { ID: Claude37Sonnet, diff --git a/internal/llm/models/models.go b/internal/llm/models/models.go index bad0ebdaa..5dd28359f 100644 --- a/internal/llm/models/models.go +++ b/internal/llm/models/models.go @@ -33,6 +33,15 @@ const ( ProviderMock ModelProvider = "__mock" ) +// Providers in order of popularity +var ProviderPopularity = map[ModelProvider]int{ + ProviderAnthropic: 1, + ProviderOpenAI: 2, + ProviderGemini: 3, + ProviderGROQ: 4, + ProviderBedrock: 5, +} + var SupportedModels = map[ModelID]Model{ // // // GEMINI -- cgit v1.2.3