fix(coderd/x/chatd): match dated snapshots when selecting the preferred quickgen model
This commit is contained in:
1 parent
b4cc6fc336
commit
cb5f0e0eaf
2 files changed
+21
-1
No files matched your search
@@ -143,6 +143,11 @@ type shortTextCandidate struct {
|
||||
resolved resolvedModelCall
|
||||
}
|
||||
|
||||
// modelSnapshotSuffix matches a dated snapshot suffix on a model ID, such as
|
||||
// claude-haiku-4-5-20251001 or gpt-4o-mini-2024-07-18, which admins commonly
|
||||
// configure in place of the alias.
|
||||
var modelSnapshotSuffix = regexp.MustCompile(`-(\d{8}|\d{4}-\d{2}-\d{2})$`)
|
||||
|
||||
func selectPreferredConfiguredShortTextModelConfig(
|
||||
configs []database.GetEnabledChatModelConfigsByOrganizationRow,
|
||||
) (database.ChatModelConfig, bool) {
|
||||
@@ -151,7 +156,9 @@ func selectPreferredConfiguredShortTextModelConfig(
|
||||
if chatprovider.NormalizeProvider(config.Provider) != preferred.provider {
|
||||
continue
|
||||
}
|
||||
if !strings.EqualFold(strings.TrimSpace(config.ChatModelConfig.Model), preferred.model) {
|
||||
model := strings.TrimSpace(config.ChatModelConfig.Model)
|
||||
if !strings.EqualFold(model, preferred.model) &&
|
||||
!strings.EqualFold(modelSnapshotSuffix.ReplaceAllString(model, ""), preferred.model) {
|
||||
continue
|
||||
}
|
||||
return config.ChatModelConfig, true
|
||||
|
||||
@@ -808,6 +808,19 @@ func Test_selectPreferredConfiguredShortTextModelConfig(t *testing.T) {
|
||||
require.Equal(t, preferredTitleModels[1].model, got.Model)
|
||||
})
|
||||
|
||||
t.Run("matches dated snapshots of a preferred model", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
for _, model := range []string{"claude-haiku-4-5-20251001", "Claude-Haiku-4-5-2025-10-01"} {
|
||||
got, ok := selectPreferredConfiguredShortTextModelConfig([]database.GetEnabledChatModelConfigsByOrganizationRow{
|
||||
{ChatModelConfig: database.ChatModelConfig{Model: "claude-haiku-4-5-preview"}, Provider: "anthropic"},
|
||||
{ChatModelConfig: database.ChatModelConfig{Model: model}, Provider: "anthropic"},
|
||||
})
|
||||
require.True(t, ok, model)
|
||||
require.Equal(t, model, got.Model)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("returns false when no preferred lightweight model is configured", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
||||
Reference in new issue
Block a user