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
π€ Plandex β apply pending changes βοΈ Create SQL migration scripts for custom models and model sets βοΈ Implement server-side functionality for managing custom models and model sets βοΈ Implement CLI commands for managing custom models and model sets βοΈ Update API client for custom models and model sets management
Dane Schneider6b82a2b51cbd
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex 5e18c2a1..f62781d4 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -1602,3 +1602,59 @@ func (a *Api) UpdateSettings(planId, branch string, req shared.UpdateSettingsReqreturn &updateRes, nil}+func (a *Api) CreateCustomModel(model shared.CustomModel) *shared.ApiError {+ serverUrl := a.baseUrl + "/custom_models"+ body, err := json.Marshal(model)+ if err != nil {+ return &shared.ApiError{Msg: "Failed to marshal model"}+ }++ resp, err := a.client.Post(serverUrl, "application/json", bytes.NewBuffer(body))+ if err != nil {+ return &shared.ApiError{Msg: "Failed to create custom model"}+ }+ defer resp.Body.Close()++ if resp.StatusCode != 200 {+ return &shared.ApiError{Msg: "Failed to create custom model"}+ }++ return nil+}++func (a *Api) ListCustomModels() ([]shared.CustomModel, *shared.ApiError) {+ serverUrl := a.baseUrl + "/custom_models"+ resp, err := a.client.Get(serverUrl)+ if err != nil {+ return nil, &shared.ApiError{Msg: "Failed to list custom models"}+ }+ defer resp.Body.Close()++ var models []shared.CustomModel+ if err := json.NewDecoder(resp.Body).Decode(&models); err != nil {+ return nil, &shared.ApiError{Msg: "Failed to decode custom models"}+ }++ return models, nil+}++func (a *Api) DeleteCustomModel(modelId string) *shared.ApiError {+ serverUrl := a.baseUrl + "/custom_models/" + modelId+ req, err := http.NewRequest("DELETE", serverUrl, nil)+ if err != nil {+ return &shared.ApiError{Msg: "Failed to create request"}+ }++ resp, err := a.client.Do(req)+ if err != nil {+ return &shared.ApiError{Msg: "Failed to delete custom model"}+ }+ defer resp.Body.Close()++ if resp.StatusCode != 200 {+ return &shared.ApiError{Msg: "Failed to delete custom model"}+ }++ return nil+}+diff --git a/app/cli/cmd/models.go b/app/cli/cmd/models.goindex d647c88a..3b3e543b 100644--- a/app/cli/cmd/models.go+++ b/app/cli/cmd/models.go@@ -16,12 +16,49 @@ import (func init() {RootCmd.AddCommand(modelsCmd)+ RootCmd.AddCommand(modelsCmd)+ modelsCmd.AddCommand(listAvailableModelsCmd)+ modelsCmd.AddCommand(createCustomModelCmd)+}++var createCustomModelCmd = &cobra.Command{+ Use: "create",+ Short: "Create a custom model",+ Run: createCustomModel,+}++func createCustomModel(cmd *cobra.Command, args []string) {+ model := shared.CustomModel{}+ term.Ask("Enter model name:", &model.ModelName)+ term.Ask("Enter provider:", &model.Provider)+ term.Ask("Enter base URL:", &model.BaseUrl)+ term.Ask("Enter max tokens:", &model.MaxTokens)+ term.Ask("Enter API key environment variable:", &model.ApiKeyEnvVar)+ term.Ask("Enter description (optional):", &model.Description)++ term.StartSpinner("Creating model...")+ err := api.Client.CreateCustomModel(model)+ term.StopSpinner()++ if err != nil {+ term.OutputErrorAndExit("Error creating model: %v", err)+ return+ }++ fmt.Println("Model created successfully.")}var modelsCmd = &cobra.Command{Use: "models",Short: "Show model settings",Run: models,+ Run: models,+}++var listAvailableModelsCmd = &cobra.Command{+ Use: "available",+ Short: "List all available models",+ Run: listAvailableModels,}func models(cmd *cobra.Command, args []string) {@@ -40,11 +77,21 @@ func models(cmd *cobra.Command, args []string) {modelSet := settings.ModelSetif modelSet == nil {- modelSet = &shared.DefaultModelSet+ modelSet = shared.DefaultModelSet}- color.New(color.Bold, term.ColorHiCyan).Println("π€ Models")+ color.New(color.Bold, term.ColorHiCyan).Println("ποΈ Current Model Set")table := tablewriter.NewWriter(os.Stdout)+ table.SetAutoFormatHeaders(false)+ table.SetAutoWrapText(true)+ table.SetColWidth(64)+ table.SetHeader([]string{modelSet.Name})+ table.Append([]string{modelSet.Description})+ table.Render()+ fmt.Println()++ color.New(color.Bold, term.ColorHiCyan).Println("π€ Models")+ table = tablewriter.NewWriter(os.Stdout)table.SetAutoWrapText(false)table.SetHeader([]string{"Role", "Provider", "Model", "Temperature", "Top P"})@@ -60,10 +107,10 @@ func models(cmd *cobra.Command, args []string) {addModelRow(string(shared.ModelRolePlanner), modelSet.Planner.ModelRoleConfig)addModelRow(string(shared.ModelRolePlanSummary), modelSet.PlanSummary)- addModelRow(string(shared.ModelRoleBuilder), modelSet.Builder.ModelRoleConfig)- addModelRow(string(shared.ModelRoleName), modelSet.Namer.ModelRoleConfig)- addModelRow(string(shared.ModelRoleCommitMsg), modelSet.CommitMsg.ModelRoleConfig)- addModelRow(string(shared.ModelRoleExecStatus), modelSet.ExecStatus.ModelRoleConfig)+ addModelRow(string(shared.ModelRoleBuilder), modelSet.Builder)+ addModelRow(string(shared.ModelRoleName), modelSet.Namer)+ addModelRow(string(shared.ModelRoleCommitMsg), modelSet.CommitMsg)+ addModelRow(string(shared.ModelRoleExecStatus), modelSet.ExecStatus)table.Render()fmt.Println()@@ -104,4 +151,25 @@ func models(cmd *cobra.Command, args []string) {fmt.Println()term.PrintCmds("", "set-model")+ term.PrintCmds("", "set-model")}++func listAvailableModels(cmd *cobra.Command, args []string) {+ term.StartSpinner("Fetching models...")+ models, err := api.Client.ListAvailableModels()+ term.StopSpinner()++ if err != nil {+ term.OutputErrorAndExit("Error fetching models: %v", err)+ return+ }++ table := tablewriter.NewWriter(os.Stdout)+ table.SetHeader([]string{"Name", "Provider", "Max Tokens", "Description"})+ for _, model := range models {+ table.Append([]string{model.ModelName, string(model.Provider), strconv.Itoa(model.MaxTokens), model.Description})+ }+ table.Render()+}++diff --git a/app/cli/types/api.go b/app/cli/types/api.goindex b4d60130..79453ea6 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -81,4 +81,14 @@ type ApiClient interface {GetSettings(planId, branch string) (*shared.PlanSettings, *shared.ApiError)UpdateSettings(planId, branch string, req shared.UpdateSettingsRequest) (*shared.UpdateSettingsResponse, *shared.ApiError)+ // Custom models management+ CreateCustomModel(model shared.CustomModel) *shared.ApiError+ ListCustomModels() ([]shared.CustomModel, *shared.ApiError)+ DeleteCustomModel(modelId string) *shared.ApiError++ // Model sets management+ CreateModelSet(set shared.ModelSet) *shared.ApiError+ ListModelSets() ([]shared.ModelSet, *shared.ApiError)+ DeleteModelSet(setId string) *shared.ApiError}+diff --git a/app/server/db/models.go b/app/server/db/models.gonew file mode 100644index 00000000..8ebce669--- /dev/null+++ b/app/server/db/models.go@@ -0,0 +1,76 @@+package db++import (+ "context"+ "database/sql"+ "github.com/plandex/plandex/shared"+ "log"+)++// CreateCustomModel inserts a new custom model into the database.+func CreateCustomModel(ctx context.Context, db *sql.DB, model shared.CustomModel) error {+ query := `INSERT INTO custom_models (org_id, provider, custom_provider, base_url, model_name, description, max_tokens, api_key_env_var, is_openai_compatible, has_json_mode, has_streaming, has_function_calling, has_streaming_function_calls, default_max_convo_tokens, default_reserved_output_tokens) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)`+ _, err := db.ExecContext(ctx, query, model.OrgId, model.Provider, model.CustomProvider, model.BaseUrl, model.ModelName, model.Description, model.MaxTokens, model.ApiKeyEnvVar, model.IsOpenAICompatible, model.HasJsonResponseMode, model.HasStreaming, model.HasFunctionCalling, model.HasStreamingFunctionCalls, model.DefaultMaxConvoTokens, model.DefaultReservedOutputTokens)+ return err+}++// ListCustomModels retrieves all custom models from the database.+func ListCustomModels(ctx context.Context, db *sql.DB, orgId string) ([]shared.CustomModel, error) {+ query := `SELECT * FROM custom_models WHERE org_id = $1`+ rows, err := db.QueryContext(ctx, query, orgId)+ if err != nil {+ return nil, err+ }+ defer rows.Close()++ var models []shared.CustomModel+ for rows.Next() {+ var model shared.CustomModel+ if err := rows.Scan(&model.Id, &model.OrgId, &model.Provider, &model.CustomProvider, &model.BaseUrl, &model.ModelName, &model.Description, &model.MaxTokens, &model.ApiKeyEnvVar, &model.IsOpenAICompatible, &model.HasJsonResponseMode, &model.HasStreaming, &model.HasFunctionCalling, &model.HasStreamingFunctionCalls, &model.DefaultMaxConvoTokens, &model.DefaultReservedOutputTokens, &model.CreatedAt, &model.UpdatedAt); err != nil {+ return nil, err+ }+ models = append(models, model)+ }+ return models, nil+}++// DeleteCustomModel removes a custom model from the database.+func DeleteCustomModel(ctx context.Context, db *sql.DB, modelId string) error {+ query := `DELETE FROM custom_models WHERE id = $1`+ _, err := db.ExecContext(ctx, query, modelId)+ return err+}++// CreateModelSet inserts a new model set into the database.+func CreateModelSet(ctx context.Context, db *sql.DB, set shared.ModelSet) error {+ query := `INSERT INTO model_sets (org_id, name, description, planner, plan_summary, builder, namer, commit_msg, exec_status) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`+ _, err := db.ExecContext(ctx, query, set.OrgId, set.Name, set.Description, set.Planner, set.PlanSummary, set.Builder, set.Namer, set.CommitMsg, set.ExecStatus)+ return err+}++// ListModelSets retrieves all model sets from the database.+func ListModelSets(ctx context.Context, db *sql.DB, orgId string) ([]shared.ModelSet, error) {+ query := `SELECT * FROM model_sets WHERE org_id = $1`+ rows, err := db.QueryContext(ctx, query, orgId)+ if err != nil {+ return nil, err+ }+ defer rows.Close()++ var sets []shared.ModelSet+ for rows.Next() {+ var set shared.ModelSet+ if err := rows.Scan(&set.Id, &set.OrgId, &set.Name, &set.Description, &set.Planner, &set.PlanSummary, &set.Builder, &set.Namer, &set.CommitMsg, &set.ExecStatus, &set.CreatedAt); err != nil {+ return nil, err+ }+ sets = append(sets, set)+ }+ return sets, nil+}++// DeleteModelSet removes a model set from the database.+func DeleteModelSet(ctx context.Context, db *sql.DB, setId string) error {+ query := `DELETE FROM model_sets WHERE id = $1`+ _, err := db.ExecContext(ctx, query, setId)+ return err+}diff --git a/app/server/handlers/models.go b/app/server/handlers/models.gonew file mode 100644index 00000000..99cd72eb--- /dev/null+++ b/app/server/handlers/models.go@@ -0,0 +1,87 @@+package handlers+import (+ "encoding/json"+ "net/http"+ "plandex-server/db"+ "github.com/gorilla/mux"+ "github.com/plandex/plandex/shared"+)++// CreateCustomModelHandler handles the creation of a new custom model.+func CreateCustomModelHandler(w http.ResponseWriter, r *http.Request) {+ var model shared.CustomModel+ if err := json.NewDecoder(r.Body).Decode(&model); err != nil {+ http.Error(w, "Invalid request body", http.StatusBadRequest)+ return+ }++ if err := db.CreateCustomModel(r.Context(), model); err != nil {+ http.Error(w, "Failed to create custom model", http.StatusInternalServerError)+ return+ }++ w.WriteHeader(http.StatusCreated)+}++// ListCustomModelsHandler handles listing all custom models.+func ListCustomModelsHandler(w http.ResponseWriter, r *http.Request) {+ orgId := r.URL.Query().Get("orgId")+ models, err := db.ListCustomModels(r.Context(), orgId)+ if err != nil {+ http.Error(w, "Failed to fetch custom models", http.StatusInternalServerError)+ return+ }++ json.NewEncoder(w).Encode(models)+}++// DeleteCustomModelHandler handles the deletion of a custom model.+func DeleteCustomModelHandler(w http.ResponseWriter, r *http.Request) {+ modelId := mux.Vars(r)["modelId"]+ if err := db.DeleteCustomModel(r.Context(), modelId); err != nil {+ http.Error(w, "Failed to delete custom model", http.StatusInternalServerError)+ return+ }++ w.WriteHeader(http.StatusOK)+}++// CreateModelSetHandler handles the creation of a new model set.+func CreateModelSetHandler(w http.ResponseWriter, r *http.Request) {+ var set shared.ModelSet+ if err := json.NewDecoder(r.Body).Decode(&set); err != nil {+ http.Error(w, "Invalid request body", http.StatusBadRequest)+ return+ }++ if err := db.CreateModelSet(r.Context(), set); err != nil {+ http.Error(w, "Failed to create model set", http.StatusInternalServerError)+ return+ }++ w.WriteHeader(http.StatusCreated)+}++// ListModelSetsHandler handles listing all model sets.+func ListModelSetsHandler(w http.ResponseWriter, r *http.Request) {+ orgId := r.URL.Query().Get("orgId")+ sets, err := db.ListModelSets(r.Context(), orgId)+ if err != nil {+ http.Error(w, "Failed to fetch model sets", http.StatusInternalServerError)+ return+ }++ json.NewEncoder(w).Encode(sets)+}++// DeleteModelSetHandler handles the deletion of a model set.+func DeleteModelSetHandler(w http.ResponseWriter, r *http.Request) {+ setId := mux.Vars(r)["setId"]+ if err := db.DeleteModelSet(r.Context(), setId); err != nil {+ http.Error(w, "Failed to delete model set", http.StatusInternalServerError)+ return+ }++ w.WriteHeader(http.StatusOK)+}+