Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
Add Ollama support and cloud/local model filtering
Dane Schneider2c6cd1e4575d
diff --git a/app/cli/cmd/models.go b/app/cli/cmd/models.goindex 9f5b52ff..ab5326c2 100644--- a/app/cli/cmd/models.go+++ b/app/cli/cmd/models.go@@ -326,6 +326,10 @@ func listAvailableModels(cmd *cobra.Command, args []string) {table.SetAutoWrapText(false)table.SetHeader([]string{"Model", "Input", "Output", "Reserved"})for _, model := range shared.BuiltInBaseModels {+ if auth.Current.IsCloud && model.IsLocalOnly() {+ continue+ }+table.Append([]string{string(model.ModelId), fmt.Sprintf("%d 🪙", model.MaxTokens), fmt.Sprintf("%d 🪙", model.MaxOutputTokens), fmt.Sprintf("%d 🪙", model.ReservedOutputTokens)})}table.Render()diff --git a/app/server/db/settings_helpers.go b/app/server/db/settings_helpers.goindex f30a757f..a74f2201 100644--- a/app/server/db/settings_helpers.go+++ b/app/server/db/settings_helpers.go@@ -47,9 +47,11 @@ func GetPlanSettings(plan *Plan) (settings *shared.PlanSettings, err error) {log.Printf("GetPlanSettings - no org default settings found for plan %s", plan.Id)}+ log.Println("GetPlanSettings - no default settings found, returning default settings object")// if it doesn't exist, return default settings objectsettings = &shared.PlanSettings{- UpdatedAt: plan.CreatedAt,+ UpdatedAt: plan.CreatedAt,+ ModelPackName: shared.DefaultModelPack.Name,}return settings, nil} else if err != nil {@@ -73,6 +75,10 @@ func StorePlanSettings(plan *Plan, settings shared.PlanSettings) error {settings.UpdatedAt = time.Now()settings.CustomModelPacks = nil+ settings.CustomModels = nil+ settings.CustomModelsById = nil+ settings.CustomProviders = nil+ settings.UsesCustomProviderByModelId = nilsettings.IsCloud = falsesettings.Configured = false@@ -120,7 +126,8 @@ func GetOrgDefaultSettings(orgId string) (settings *shared.PlanSettings, err errlog.Println("GetOrgDefaultSettings - no rows - returning default settings")// if it doesn't exist, return default settings objectsettings := &shared.PlanSettings{- UpdatedAt: time.Time{},+ UpdatedAt: time.Time{},+ ModelPackName: shared.DefaultModelPack.Name,}return settings, nil}@@ -152,7 +159,8 @@ func GetOrgDefaultSettingsForUpdate(orgId string, tx *sqlx.Tx) (settings *sharedif err == sql.ErrNoRows {// if it doesn't exist, return default settings objectsettings := &shared.PlanSettings{- UpdatedAt: time.Time{},+ UpdatedAt: time.Time{},+ ModelPackName: shared.DefaultModelPack.Name,}return settings, nil}diff --git a/app/server/handlers/models.go b/app/server/handlers/models.goindex 476a071b..59884caa 100644--- a/app/server/handlers/models.go+++ b/app/server/handlers/models.go@@ -96,6 +96,13 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {http.Error(w, msg, http.StatusBadRequest)return}++ if shared.BuiltInModelPacksByName[modelPack.Name] != nil {+ msg := fmt.Sprintf("%s is a built-in model pack name, so it can't be used for a custom model pack", modelPack.Name)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }}var existingCustomModelIds = make(map[shared.ModelId]bool)@@ -196,13 +203,19 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {return}} else {- _, builtIn := shared.BuiltInModelProviderConfigs[provider.Provider]+ pc, builtIn := shared.BuiltInModelProviderConfigs[provider.Provider]if !builtIn {msg := fmt.Sprintf("'%s' is not a built-in model provider", provider.Provider)log.Println(msg)http.Error(w, msg, http.StatusUnprocessableEntity)return}+ if os.Getenv("IS_CLOUD") != "" && pc.LocalOnly {+ msg := fmt.Sprintf("'%s' is a local-only model provider, so it can't be used on Plandex Cloud", provider.Provider)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }}}@@ -220,7 +233,7 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {for _, modelId := range allModelIds {_, exists := existingCustomModelIds[modelId]_, creating := inputModelIds[string(modelId)]- _, builtIn := shared.BuiltInBaseModelsById[modelId]+ bm, builtIn := shared.BuiltInBaseModelsById[modelId]if !exists && !creating && !builtIn {msg := fmt.Sprintf("'%s' is not built-in, not being imported, and not an existing custom model", modelId)@@ -228,6 +241,13 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {http.Error(w, msg, http.StatusUnprocessableEntity)return}++ if builtIn && os.Getenv("IS_CLOUD") != "" && bm.IsLocalOnly() {+ msg := fmt.Sprintf("'%s' is a local-only built-in model, so it can't be used on Plandex Cloud", modelId)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }}mp := modelPack.ToModelPack()diff --git a/app/server/handlers/settings.go b/app/server/handlers/settings.goindex b6822d5c..043bdb28 100644--- a/app/server/handlers/settings.go+++ b/app/server/handlers/settings.go@@ -6,6 +6,7 @@ import ("fmt""log""net/http"+ "os""plandex-server/db""reflect"@@ -111,6 +112,37 @@ func UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {return}+ if req.ModelPackName != "" {+ if mp, builtIn := shared.BuiltInModelPacksByName[req.ModelPackName]; builtIn {+ if os.Getenv("IS_CLOUD") != "" && mp.LocalProvider != "" {+ msg := fmt.Sprintf("Built-in local model pack %s can't be used on Plandex Cloud", req.ModelPackName)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }+ }+ }++ if req.ModelPack != nil {+ if req.ModelPack.LocalProvider != "" {+ msg := fmt.Sprintf("Local model pack %s can't be used on Plandex Cloud", req.ModelPack.Name)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }++ ids := req.ModelPack.ToModelPackSchema().AllModelIds()+ for _, id := range ids {+ bm, builtIn := shared.BuiltInBaseModelsById[id]+ if builtIn && os.Getenv("IS_CLOUD") != "" && bm.IsLocalOnly() {+ msg := fmt.Sprintf("Built-in local model %s can't be used on Plandex Cloud", id)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return+ }+ }+ }+ctx, cancel := context.WithCancel(r.Context())var commitMsg string