Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

fix: update model setting system to support ModelId and daily-driver alias

Dane Schneider956d12e21ebc
diff --git a/app/cli/cmd/set_model.go b/app/cli/cmd/set_model.go
index dc9dfe62..c222e45c 100644
--- a/app/cli/cmd/set_model.go
+++ b/app/cli/cmd/set_model.go
@@ -16,8 +16,6 @@ import (
"github.com/spf13/cobra"
)
-var provider string
-
func init() {
RootCmd.AddCommand(modelsSetCmd)
@@ -140,8 +138,12 @@ func updateModelSettings(args []string, originalSettings *shared.PlanSettings) *
if len(args) > 0 {
modelSetOrRoleOrSetting = args[0]
+ compare := modelSetOrRoleOrSetting
+ if compare == "daily" {
+ compare = "daily-driver"
+ }
for _, ms := range shared.BuiltInModelPacks {
- if strings.EqualFold(ms.Name, modelSetOrRoleOrSetting) {
+ if strings.EqualFold(ms.Name, compare) {
modelPack = ms
break
}
@@ -332,7 +334,7 @@ func updateModelSettings(args []string, originalSettings *shared.PlanSettings) *
}
p = strings.ToLower(p)
- if propertyCompact == fmt.Sprintf("%s/%s", p, shared.Compact(m.ModelName)) {
+ if propertyCompact == fmt.Sprintf("%s/%s", p, shared.Compact(string(m.ModelId))) {
selectedModel = m
break
}
diff --git a/app/server/db/models.go b/app/server/db/models.go
index afbacf8f..7285cca4 100644
--- a/app/server/db/models.go
+++ b/app/server/db/models.go
@@ -5,11 +5,10 @@ import (
)
func CreateCustomModel(model *AvailableModel) error {
- query := `INSERT INTO custom_models (org_id, provider, custom_provider, base_url, model_name, description, max_tokens, api_key_env_var, default_max_convo_tokens, default_reserved_output_tokens, preferred_output_format, has_image_support) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+ query := `INSERT INTO custom_models (org_id, provider, custom_provider, base_url, model_name, description, max_tokens, api_key_env_var, default_max_convo_tokens, max_output_tokens, reserved_output_tokens, preferred_output_format, has_image_support) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
RETURNING id, created_at, updated_at`
- err := Conn.QueryRow(query, model.OrgId, model.Provider, model.CustomProvider, model.BaseUrl, model.ModelName, model.Description, model.MaxTokens, model.ApiKeyEnvVar, model.DefaultMaxConvoTokens, model.DefaultReservedOutputTokens, model.PreferredOutputFormat, model.HasImageSupport).Scan(&model.Id, &model.CreatedAt, &model.UpdatedAt)
-
+ err := Conn.QueryRow(query, model.OrgId, model.Provider, model.CustomProvider, model.BaseUrl, model.ModelName, model.Description, model.MaxTokens, model.ApiKeyEnvVar, model.DefaultMaxConvoTokens, model.MaxOutputTokens, model.ReservedOutputTokens, model.PreferredOutputFormat, model.HasImageSupport).Scan(&model.Id, &model.CreatedAt, &model.UpdatedAt)
if err != nil {
return fmt.Errorf("error inserting new custom model: %v", err)
}