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
basis for updatable and version controlled models and settings
Dane Schneider84aced2ac4d7
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex a4c562c5..ce23b696 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -1526,3 +1526,67 @@ func (a *Api) DeleteBranch(planId, branch string) *shared.ApiError {return nil}++func (a *Api) GetSettings(planId, branch string) (*shared.PlanSettings, *shared.ApiError) {+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", getApiHost(), planId, branch)++ resp, err := authenticatedFastClient.Get(serverUrl)++ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %s", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := handleApiError(resp, errorBody)+ tokenRefreshed, apiErr := refreshTokenIfNeeded(apiErr)+ if tokenRefreshed {+ return a.GetSettings(planId, branch)+ }+ return nil, apiErr+ }++ var settings shared.PlanSettings+ err = json.NewDecoder(resp.Body).Decode(&settings)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %s", err)}+ }++ return &settings, nil+}++func (a *Api) UpdateSettings(planId, branch string, req shared.UpdateSettingsRequest) *shared.ApiError {+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", getApiHost(), planId, branch)++ reqBytes, err := json.Marshal(req)+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %s", err)}+ }++ request, err := http.NewRequest(http.MethodPut, serverUrl, bytes.NewBuffer(reqBytes))+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %s", err)}+ }+ request.Header.Set("Content-Type", "application/json")++ resp, err := authenticatedFastClient.Do(request)+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %s", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)++ apiErr := handleApiError(resp, errorBody)+ tokenRefreshed, apiErr := refreshTokenIfNeeded(apiErr)+ if tokenRefreshed {+ return a.UpdateSettings(planId, branch, req)+ }+ return apiErr+ }++ return nil++}diff --git a/app/cli/cmd/models.go b/app/cli/cmd/models.gonew file mode 100644index 00000000..6c59baa9--- /dev/null+++ b/app/cli/cmd/models.go@@ -0,0 +1,17 @@+package cmd++import "github.com/spf13/cobra"++func init() {+ RootCmd.AddCommand(modelsCmd)+}++var modelsCmd = &cobra.Command{+ Use: "models",+ Short: "Show model settings",+ Run: models,+}++func models(cmd *cobra.Command, args []string) {++}diff --git a/app/cli/go.mod b/app/cli/go.modindex c4c3f1f3..299dd064 100644--- a/app/cli/go.mod+++ b/app/cli/go.mod@@ -5,9 +5,9 @@ go 1.21.3require (github.com/atotto/clipboard v0.1.4github.com/charmbracelet/lipgloss v0.9.1- github.com/davecgh/go-spew v1.1.1github.com/fatih/color v1.16.0github.com/muesli/reflow v0.3.0+ github.com/muesli/termenv v0.15.2github.com/olekukonko/tablewriter v0.0.5github.com/plandex-ai/survey/v2 v2.0.0-00010101000000-000000000000github.com/spf13/cobra v1.8.0@@ -19,7 +19,6 @@ require (github.com/andybalholm/cascadia v1.3.2 // indirectgithub.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirectgithub.com/aymerick/douceur v0.2.0 // indirect- github.com/catppuccin/go v0.2.0 // indirectgithub.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirectgithub.com/cqroot/multichoose v0.1.1 // indirectgithub.com/dlclark/regexp2 v1.10.0 // indirect@@ -35,8 +34,8 @@ require (github.com/mitchellh/go-homedir v1.1.0 // indirectgithub.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirectgithub.com/muesli/cancelreader v0.2.2 // indirect- github.com/muesli/termenv v0.15.2 // indirectgithub.com/rivo/uniseg v0.4.4 // indirect+ github.com/sashabaranov/go-openai v1.19.4 // indirectgithub.com/yuin/goldmark v1.6.0 // indirectgithub.com/yuin/goldmark-emoji v1.0.2 // indirectgolang.org/x/net v0.18.0 // indirect@@ -51,7 +50,6 @@ require (github.com/charmbracelet/bubbletea v0.25.0github.com/charmbracelet/glamour v0.6.0github.com/charmbracelet/glow v1.5.1- github.com/charmbracelet/huh v0.3.0github.com/cqroot/prompt v0.9.3github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203github.com/inconshreveable/mousetrap v1.1.0 // indirect@@ -61,7 +59,6 @@ require (github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06github.com/spf13/pflag v1.0.5 // indirectgithub.com/xlab/treeprint v1.2.0- golang.org/x/crypto v0.19.0golang.org/x/text v0.14.0 // indirect)diff --git a/app/cli/go.sum b/app/cli/go.sumindex cd221d4f..676cb7a6 100644--- a/app/cli/go.sum+++ b/app/cli/go.sum@@ -224,8 +224,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBgithub.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A=github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE=github.com/calmh/randomart v1.1.0/go.mod h1:DQUbPVyP+7PAs21w/AnfMKG5NioxS3TbZ2F9MSK/jFM=-github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA=-github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=@@ -244,8 +242,6 @@ github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8ogithub.com/charmbracelet/glow v1.5.1 h1:o1mwT4xXXpkfUhJG6euQayNxLZf9yKctOCNHLztrwdE=github.com/charmbracelet/glow v1.5.1/go.mod h1:rGgop0a2/4gXWiAxUW1iEQseoE+9Ctpb7M4sM9cY9CU=github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=-github.com/charmbracelet/huh v0.3.0 h1:CxPplWkgW2yUTDDG0Z4S5HH8SJOosWHd4LxCvi0XsKE=-github.com/charmbracelet/huh v0.3.0/go.mod h1:fujUdKX8tC45CCSaRQdw789O6uaCRwx8l2NDyKfC4jA=github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=@@ -638,6 +634,8 @@ github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjgithub.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY=github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=+github.com/sashabaranov/go-openai v1.19.4 h1:GbaDiqvgYCabyqzuIbcEeT6/ZX1nVfur+++oTBfOgks=+github.com/sashabaranov/go-openai v1.19.4/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=@@ -735,8 +733,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOmgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=-golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=@@ -970,16 +966,12 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=-golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=-golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=diff --git a/app/cli/types/api.go b/app/cli/types/api.goindex a171db09..54830026 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -78,4 +78,7 @@ type ApiClient interface {ListBranches(planId string) ([]*shared.Branch, *shared.ApiError)DeleteBranch(planId, branch string) *shared.ApiErrorCreateBranch(planId, branch string, req shared.CreateBranchRequest) *shared.ApiError++ GetSettings(planId, branch string) (*shared.PlanSettings, *shared.ApiError)+ UpdateSettings(planId, branch string, req shared.UpdateSettingsRequest) *shared.ApiError}diff --git a/app/server/db/models.go b/app/server/db/data_models.gosimilarity index 100%rename from app/server/db/models.gorename to app/server/db/data_models.godiff --git a/app/server/db/plan_helpers.go b/app/server/db/plan_helpers.goindex ee27e54e..4327239b 100644--- a/app/server/db/plan_helpers.go+++ b/app/server/db/plan_helpers.go@@ -398,3 +398,13 @@ func ValidatePlanAccess(planId, userId, orgId string) (*Plan, error) {return nil, nil}++func BumpPlanUpdatedAt(planId string, t time.Time) error {+ _, err := Conn.Exec("UPDATE plans SET updated_at = $1 WHERE id = $2", t, planId)++ if err != nil {+ return fmt.Errorf("error updating plan updated at: %v", err)+ }++ return nil+}diff --git a/app/server/db/settings_helpers.go b/app/server/db/settings_helpers.gonew file mode 100644index 00000000..1c046a79--- /dev/null+++ b/app/server/db/settings_helpers.go@@ -0,0 +1,68 @@+package db++import (+ "encoding/json"+ "fmt"+ "os"+ "path/filepath"+ "time"++ "github.com/plandex/plandex/shared"+)++func GetPlanSettings(plan *Plan, fillDefaultModelSet bool) (*shared.PlanSettings, error) {+ planDir := getPlanDir(plan.OrgId, plan.Id)+ settingsPath := filepath.Join(planDir, "settings.json")++ var settings *shared.PlanSettings++ bytes, err := os.ReadFile(settingsPath)++ if os.IsNotExist(err) {+ // if it doesn't exist, return default settings object+ settings = &shared.PlanSettings{+ UpdatedAt: plan.CreatedAt,+ }+ } else if err != nil {+ return nil, fmt.Errorf("error reading settings file: %v", err)+ }++ err = json.Unmarshal(bytes, &settings)++ if err != nil {+ return nil, fmt.Errorf("error unmarshalling settings: %v", err)+ }++ if settings.ModelSet == nil && fillDefaultModelSet {+ settings.ModelSet = &shared.DefaultModelSet+ }++ return settings, nil+}++func StorePlanSettings(plan *Plan, settings *shared.PlanSettings) error {+ planDir := getPlanDir(plan.OrgId, plan.Id)+ settingsPath := filepath.Join(planDir, "settings.json")++ bytes, err := json.Marshal(settings)++ if err != nil {+ return fmt.Errorf("error marshalling settings: %v", err)+ }++ settings.UpdatedAt = time.Now()++ err = os.WriteFile(settingsPath, bytes, 0644)++ if err != nil {+ return fmt.Errorf("error writing settings file: %v", err)+ }++ err = BumpPlanUpdatedAt(plan.Id, settings.UpdatedAt)++ if err != nil {+ return fmt.Errorf("error bumping plan updated at: %v", err)+ }++ return nil+}diff --git a/app/server/go.mod b/app/server/go.modindex a2f128f1..43dad686 100644--- a/app/server/go.mod+++ b/app/server/go.mod@@ -8,7 +8,7 @@ require (github.com/gorilla/mux v1.8.1github.com/pkg/errors v0.9.1github.com/plandex/plandex/shared v0.0.0-00010101000000-000000000000- github.com/sashabaranov/go-openai v1.19.3+ github.com/sashabaranov/go-openai v1.19.4)require (@@ -20,21 +20,22 @@ require (github.com/jmespath/go-jmespath v0.4.0 // indirectgithub.com/mattn/go-colorable v0.1.13 // indirectgithub.com/mattn/go-isatty v0.0.20 // indirect- github.com/mattn/go-runewidth v0.0.9 // indirect+ github.com/mattn/go-runewidth v0.0.15 // indirectgithub.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirectgithub.com/olekukonko/tablewriter v0.0.5 // indirectgithub.com/pkoukk/tiktoken-go v0.1.6 // indirect+ github.com/rivo/uniseg v0.4.7 // indirectgithub.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect- go.uber.org/atomic v1.7.0 // indirect- golang.org/x/sys v0.14.0 // indirect+ go.uber.org/atomic v1.11.0 // indirect+ golang.org/x/sys v0.17.0 // indirect)require (github.com/atotto/clipboard v0.1.4- github.com/aws/aws-sdk-go v1.50.9+ github.com/aws/aws-sdk-go v1.50.20github.com/fatih/color v1.16.0- github.com/gen2brain/beeep v0.0.0-20230907135156-1a38885a97fc- github.com/golang-migrate/migrate/v4 v4.16.2+ github.com/gen2brain/beeep v0.0.0-20240112042604-c7bb2cd88fea+ github.com/golang-migrate/migrate/v4 v4.17.0github.com/jmoiron/sqlx v1.3.5github.com/lib/pq v1.10.9)diff --git a/app/server/go.sum b/app/server/go.sumindex eb9b7d80..f816f2ee 100644--- a/app/server/go.sum+++ b/app/server/go.sum@@ -6,17 +6,21 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1zgithub.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=github.com/aws/aws-sdk-go v1.50.9 h1:yX66aKnEtRc/uNV/1EH8CudRT5aLwVwcSwTBphuVPt8=github.com/aws/aws-sdk-go v1.50.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=+github.com/aws/aws-sdk-go v1.50.20 h1:xfAnSDVf/azIWTVQXQODp89bubvCS85r70O3nuQ4dnE=+github.com/aws/aws-sdk-go v1.50.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/dhui/dktest v0.3.16 h1:i6gq2YQEtcrjKbeJpBkWjE8MmLZPYllcjOFbTZuPDnw=github.com/dhui/dktest v0.3.16/go.mod h1:gYaA3LRmM8Z4vJl2MA0THIigJoZrwOansEOsp+kqxp0=+github.com/dhui/dktest v0.4.0 h1:z05UmuXZHO/bgj/ds2bGMBu8FI4WA+Ag/m3ghL+om7M=github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=@@ -25,16 +29,21 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=github.com/gen2brain/beeep v0.0.0-20230907135156-1a38885a97fc h1:NNgdMgPX3j33uEAoVVxNxillDPnxT0xbGv8uh4CKIAo=github.com/gen2brain/beeep v0.0.0-20230907135156-1a38885a97fc/go.mod h1:0W7dI87PvXJ1Sjs0QPvWXKcQmNERY77e8l7GFhZB/s4=+github.com/gen2brain/beeep v0.0.0-20240112042604-c7bb2cd88fea h1:oWUHxzaBvwkRWiINbBOY39XIF+n9b4RJEPHdQ8waJUo=+github.com/gen2brain/beeep v0.0.0-20240112042604-c7bb2cd88fea/go.mod h1:0W7dI87PvXJ1Sjs0QPvWXKcQmNERY77e8l7GFhZB/s4=github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=+github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=github.com/golang-migrate/migrate/v4 v4.16.2 h1:8coYbMKUyInrFk1lfGfRovTLAW7PhWp8qQDT2iKfuoA=github.com/golang-migrate/migrate/v4 v4.16.2/go.mod h1:pfcJX4nPHaVdc5nmdCikFBWtm+UBpiZjRNNsyBbp0/o=+github.com/golang-migrate/migrate/v4 v4.17.0 h1:rd40H3QXU0AA4IoLllFcEAEo9dYKRHYND2gB4p7xcaU=+github.com/golang-migrate/migrate/v4 v4.17.0/go.mod h1:+Cp2mtLP4/aXDTKb9wmXYitdrNx2HGs45rbWAo6OsKM=github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=@@ -60,6 +69,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEgithub.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=@@ -81,28 +92,38 @@ github.com/pkoukk/tiktoken-go v0.1.6 h1:JF0TlJzhTbrI30wCvFuiw6FzP2+/bR+FIxUdgEAcgithub.com/pkoukk/tiktoken-go v0.1.6/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=-github.com/sashabaranov/go-openai v1.19.3 h1:xJvkU8Tye6MOKLaoqjh7qXYwKiEYGtlmp06cb8179yo=-github.com/sashabaranov/go-openai v1.19.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=+github.com/sashabaranov/go-openai v1.19.4 h1:GbaDiqvgYCabyqzuIbcEeT6/ZX1nVfur+++oTBfOgks=+github.com/sashabaranov/go-openai v1.19.4/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk=github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o=go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=+golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.goindex 1247bbde..ea848617 100644--- a/app/server/handlers/context_helper.go+++ b/app/server/handlers/context_helper.go@@ -125,6 +125,13 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth}}+ err = db.AddPlanContextTokens(planId, branchName, tokensAdded)+ if err != nil {+ log.Printf("Error updating plan tokens: %v\n", err)+ http.Error(w, "Error updating plan tokens: "+err.Error(), http.StatusInternalServerError)+ return nil, nil+ }+commitMsg := shared.SummaryForLoadContext(apiContexts, tokensAdded, totalTokens) + "\n\n" + shared.TableForLoadContext(apiContexts)err = db.GitAddAndCommit(auth.OrgId, planId, branchName, commitMsg)@@ -134,13 +141,6 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuthreturn nil, nil}- err = db.AddPlanContextTokens(planId, branchName, tokensAdded)- if err != nil {- log.Printf("Error updating plan tokens: %v\n", err)- http.Error(w, "Error updating plan tokens: "+err.Error(), http.StatusInternalServerError)- return nil, nil- }-return &shared.LoadContextResponse{TokensAdded: tokensAdded,TotalTokens: totalTokens,diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.goindex bfc80397..6acb1101 100644--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@ -12,7 +12,7 @@ import ()func CurrentPlanHandler(w http.ResponseWriter, r *http.Request) {- log.Println("Received request for ListPlanChangesHandler")+ log.Println("Received request for CurrentPlanHandler")auth := authenticate(w, r, true)if auth == nil {diff --git a/app/server/handlers/plans_context.go b/app/server/handlers/plans_context.goindex 5f89fddd..5afed9f1 100644--- a/app/server/handlers/plans_context.go+++ b/app/server/handlers/plans_context.go@@ -345,6 +345,12 @@ func DeleteContextHandler(w http.ResponseWriter, r *http.Request) {branch, err := db.GetDbBranch(planId, branchName)+ if err != nil {+ log.Printf("Error getting branch: %v\n", err)+ http.Error(w, "Error getting branch: "+err.Error(), http.StatusInternalServerError)+ return+ }+// read the request bodybody, err := io.ReadAll(r.Body)if err != nil {diff --git a/app/server/handlers/settings.go b/app/server/handlers/settings.gonew file mode 100644index 00000000..64f9bfad--- /dev/null+++ b/app/server/handlers/settings.go@@ -0,0 +1,132 @@+package handlers++import (+ "context"+ "encoding/json"+ "log"+ "net/http"+ "plandex-server/db"++ "github.com/gorilla/mux"+ "github.com/plandex/plandex/shared"+)++func GetSettingsHandler(w http.ResponseWriter, r *http.Request) {+ log.Println("Received request for GetSettingsHandler")++ auth := authenticate(w, r, true)+ if auth == nil {+ return+ }++ vars := mux.Vars(r)+ planId := vars["planId"]+ branch := vars["branch"]++ log.Println("planId: ", planId, "branch: ", branch)++ plan := authorizePlan(w, planId, auth)+ if plan == nil {+ return+ }++ var err error+ ctx, cancel := context.WithCancel(context.Background())+ unlockFn := lockRepo(w, r, auth, db.LockScopeRead, ctx, cancel)+ if unlockFn == nil {+ return+ } else {+ defer (*unlockFn)(err)+ }++ settings, err := db.GetPlanSettings(plan, false)++ if err != nil {+ log.Println("Error getting settings: ", err)+ http.Error(w, "Error getting settings", http.StatusInternalServerError)+ return+ }++ bytes, err := json.Marshal(settings)++ if err != nil {+ log.Println("Error marshalling settings: ", err)+ http.Error(w, "Error marshalling settings", http.StatusInternalServerError)+ return+ }++ log.Println("GetSettingsHandler processed successfully")++ w.Write(bytes)+}++func UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {+ log.Println("Received request for UpdateSettingsHandler")++ auth := authenticate(w, r, true)+ if auth == nil {+ return+ }++ vars := mux.Vars(r)+ planId := vars["planId"]+ branch := vars["branch"]++ log.Println("planId: ", planId, "branch: ", branch)++ plan := authorizePlan(w, planId, auth)++ if plan == nil {+ return+ }++ var req shared.UpdateSettingsRequest+ err := json.NewDecoder(r.Body).Decode(&req)++ if err != nil {+ log.Println("Error decoding request body: ", err)+ http.Error(w, "Error decoding request body", http.StatusInternalServerError)+ return+ }++ ctx, cancel := context.WithCancel(context.Background())+ unlockFn := lockRepo(w, r, auth, db.LockScopeWrite, ctx, cancel)+ if unlockFn == nil {+ return+ } else {+ defer (*unlockFn)(err)+ }++ originalSettings, err := db.GetPlanSettings(plan, false)++ if err != nil {+ log.Println("Error getting settings: ", err)+ http.Error(w, "Error getting settings", http.StatusInternalServerError)+ return+ }++ err = db.StorePlanSettings(plan, req.Settings)++ if err != nil {+ log.Println("Error storing settings: ", err)+ http.Error(w, "Error storing settings", http.StatusInternalServerError)+ return+ }++ commitMsg := getUpdateCommitMsg(req.Settings, originalSettings)++ err = db.GitAddAndCommit(auth.OrgId, planId, branch, commitMsg)++ if err != nil {+ log.Println("Error committing settings: ", err)+ http.Error(w, "Error committing settings", http.StatusInternalServerError)+ return+ }++ log.Println("UpdateSettingsHandler processed successfully")++}++func getUpdateCommitMsg(settings *shared.PlanSettings, originalSettings *shared.PlanSettings) string {+ return ""+}diff --git a/app/server/model/name.go b/app/server/model/name.goindex 1502b269..fc31830c 100644--- a/app/server/model/name.go+++ b/app/server/model/name.go@@ -6,10 +6,11 @@ import ("fmt""plandex-server/model/prompts"+ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")-func GenPlanName(client *openai.Client, planContent string) (string, error) {+func GenPlanName(client *openai.Client, config shared.TaskRoleConfig, planContent string) (string, error) {messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,@@ -25,7 +26,7 @@ func GenPlanName(client *openai.Client, planContent string) (string, error) {resp, err := client.CreateChatCompletion(context.Background(),openai.ChatCompletionRequest{- Model: NameModel,+ Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{{Type: "function",@@ -38,9 +39,10 @@ func GenPlanName(client *openai.Client, planContent string) (string, error) {Name: prompts.PlanNameFn.Name,},},-+ Temperature: config.Temperature,+ TopP: config.TopP,Messages: messages,- ResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ ResponseFormat: config.OpenAIResponseFormat,},)diff --git a/app/server/model/openai_models.go b/app/server/model/openai_models.godeleted file mode 100644index 829447c0..00000000--- a/app/server/model/openai_models.go+++ /dev/null@@ -1,40 +0,0 @@-package model--import (- "os"-- "github.com/sashabaranov/go-openai"-)--const strongModel = openai.GPT4Turbo0125-const mediumModel = openai.GPT4Turbo0125-const weakModel = openai.GPT3Dot5Turbo0125--var PlannerModel = strongModel-var PlanSummaryModel = mediumModel-var BuilderModel = mediumModel-var ShortSummaryModel = weakModel-var NameModel = weakModel-var CommitMsgModel = weakModel-var PlanExecStatusModel = mediumModel--func init() {- if os.Getenv("PLANNER_MODEL") != "" {- PlannerModel = os.Getenv("PLANNER_MODEL")- }- if os.Getenv("PLAN_SUMMARY_MODEL") != "" {- PlanSummaryModel = os.Getenv("PLAN_SUMMARY_MODEL")- }- if os.Getenv("BUILDER_MODEL") != "" {- BuilderModel = os.Getenv("BUILDER_MODEL")- }- if os.Getenv("SHORT_SUMMARY_MODEL") != "" {- ShortSummaryModel = os.Getenv("SHORT_SUMMARY_MODEL")- }- if os.Getenv("NAME_MODEL") != "" {- NameModel = os.Getenv("NAME_MODEL")- }- if os.Getenv("COMMIT_MSG_MODEL") != "" {- CommitMsgModel = os.Getenv("COMMIT_MSG_MODEL")- }-}diff --git a/app/server/model/plan/build.go b/app/server/model/plan/build.goindex b36b2d3a..2ee17867 100644--- a/app/server/model/plan/build.go+++ b/app/server/model/plan/build.go@@ -58,6 +58,7 @@ func Build(client *openai.Client, plan *db.Plan, branch string, auth *types.Servvar modelContext []*db.Contextvar pendingBuildsByPath map[string][]*types.ActiveBuild+ var settings *shared.PlanSettingserr = func() error {defer func() {@@ -95,7 +96,19 @@ func Build(client *openai.Client, plan *db.Plan, branch string, auth *types.ServerrCh <- nil}()- for i := 0; i < 2; i++ {+ go func() {+ res, err := db.GetPlanSettings(plan, true)+ if err != nil {+ log.Printf("Error getting plan settings: %v\n", err)+ errCh <- fmt.Errorf("error getting plan settings: %v", err)+ return+ }++ settings = res+ errCh <- nil+ }()++ for i := 0; i < 3; i++ {err = <-errChif err != nil {log.Printf("Error getting plan data: %v\n", err)@@ -134,13 +147,13 @@ func Build(client *openai.Client, plan *db.Plan, branch string, auth *types.Servlog.Printf("Starting %d builds\n", len(pendingBuildsByPath))for _, pendingBuilds := range pendingBuildsByPath {- go execPlanBuild(client, auth.OrgId, auth.User.Id, branch, active, pendingBuilds)+ go execPlanBuild(client, settings.ModelSet.Builder, auth.OrgId, auth.User.Id, branch, active, pendingBuilds)}return len(pendingBuildsByPath), nil}-func queueBuilds(client *openai.Client, currentOrgId, currentUserId, planId, branch string, activeBuilds []*types.ActiveBuild) {+func queueBuilds(client *openai.Client, config shared.TaskRoleConfig, currentOrgId, currentUserId, planId, branch string, activeBuilds []*types.ActiveBuild) {activePlan := GetActivePlan(planId, branch)filePath := activeBuilds[0].Path@@ -157,11 +170,11 @@ func queueBuilds(client *openai.Client, currentOrgId, currentUserId, planId, brareturn} else {log.Printf("Not building file %s, will execute now\n", filePath)- go execPlanBuild(client, currentOrgId, currentUserId, branch, activePlan, activeBuilds)+ go execPlanBuild(client, config, currentOrgId, currentUserId, branch, activePlan, activeBuilds)}}-func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch string, activePlan *types.ActivePlan, activeBuilds []*types.ActiveBuild) {+func execPlanBuild(client *openai.Client, config shared.TaskRoleConfig, currentOrgId, currentUserId, branch string, activePlan *types.ActivePlan, activeBuilds []*types.ActiveBuild) {log.Printf("execPlanBuild for %d active builds\n", len(activeBuilds))if len(activeBuilds) == 0 {@@ -525,7 +538,7 @@ func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch stif len(nextBuilds) > 0 {log.Println("Calling execPlanBuild for next build in queue")- go execPlanBuild(client, currentOrgId, currentUserId, branch, activePlan, nextBuilds)+ go execPlanBuild(client, config, currentOrgId, currentUserId, branch, activePlan, nextBuilds)}return}@@ -683,7 +696,7 @@ func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch st// }modelReq := openai.ChatCompletionRequest{- Model: model.BuilderModel,+ Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{{Type: "function",@@ -697,9 +710,9 @@ func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch st},},Messages: fileMessages,- Temperature: 0.2,- TopP: 0.1,- ResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ Temperature: config.Temperature,+ TopP: config.TopP,+ ResponseFormat: config.OpenAIResponseFormat,}stream, err := client.CreateChatCompletionStream(activePlan.Ctx, modelReq)diff --git a/app/server/model/plan/describe.go b/app/server/model/plan/commit_msg.gosimilarity index 84%rename from app/server/model/plan/describe.gorename to app/server/model/plan/commit_msg.goindex fbdcf59a..8b174eef 100644--- a/app/server/model/plan/describe.go+++ b/app/server/model/plan/commit_msg.go@@ -5,19 +5,18 @@ import ("encoding/json""fmt""plandex-server/db"- "plandex-server/model""plandex-server/model/prompts""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")-func genPlanDescription(client *openai.Client, planId, branch string, ctx context.Context) (*db.ConvoMessageDescription, error) {+func genPlanDescription(client *openai.Client, config shared.TaskRoleConfig, planId, branch string, ctx context.Context) (*db.ConvoMessageDescription, error) {descResp, err := client.CreateChatCompletion(ctx,openai.ChatCompletionRequest{- Model: model.CommitMsgModel,+ Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{{Type: "function",@@ -40,7 +39,9 @@ func genPlanDescription(client *openai.Client, planId, branch string, ctx contexContent: GetActivePlan(planId, branch).CurrentReplyContent,},},- ResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ Temperature: config.Temperature,+ TopP: config.TopP,+ ResponseFormat: config.OpenAIResponseFormat,},)diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.goindex 4a25c0b1..01ad9196 100644--- a/app/server/model/plan/exec_status.go+++ b/app/server/model/plan/exec_status.go@@ -4,15 +4,15 @@ import ("context""encoding/json""log"- "plandex-server/model""plandex-server/model/prompts""strings""github.com/davecgh/go-spew/spew"+ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")-func ExecStatusShouldContinue(client *openai.Client, message string, ctx context.Context) (bool, error) {+func ExecStatusShouldContinue(client *openai.Client, config shared.TaskRoleConfig, message string, ctx context.Context) (bool, error) {log.Println("Checking if plan should continue based on exec status")// First try to determine if the plan should continue based on the last paragraph without calling the model@@ -50,7 +50,7 @@ func ExecStatusShouldContinue(client *openai.Client, message string, ctx contextresp, err := client.CreateChatCompletion(ctx,openai.ChatCompletionRequest{- Model: model.PlanExecStatusModel,+ Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{{Type: "function",@@ -64,7 +64,9 @@ func ExecStatusShouldContinue(client *openai.Client, message string, ctx context},},Messages: messages,- ResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ ResponseFormat: config.OpenAIResponseFormat,+ Temperature: config.Temperature,+ TopP: config.TopP,},)diff --git a/app/server/model/plan/tell_exec.go b/app/server/model/plan/tell_exec.goindex 4422ca46..c8b05776 100644--- a/app/server/model/plan/tell_exec.go+++ b/app/server/model/plan/tell_exec.go@@ -8,7 +8,6 @@ import ("strings""plandex-server/db"- "plandex-server/model""plandex-server/model/lib""plandex-server/model/prompts""plandex-server/types"@@ -338,11 +337,11 @@ func execTellPlan(// }modelReq := openai.ChatCompletionRequest{- Model: model.PlannerModel,+ Model: state.settings.ModelSet.Planner.BaseModelConfig.ModelName,Messages: state.messages,Stream: true,- Temperature: 0.6,- TopP: 0.7,+ Temperature: state.settings.ModelSet.Planner.Temperature,+ TopP: state.settings.ModelSet.Planner.TopP,}stream, err := client.CreateChatCompletionStream(active.ModelStreamCtx, modelReq)@@ -384,7 +383,7 @@ func execTellPlan(}for _, pendingBuilds := range pendingBuildsByPath {- queueBuilds(client, auth.OrgId, auth.User.Id, planId, branch, pendingBuilds)+ queueBuilds(client, state.settings.ModelSet.Builder, auth.OrgId, auth.User.Id, planId, branch, pendingBuilds)}}()}diff --git a/app/server/model/plan/tell_load.go b/app/server/model/plan/tell_load.goindex 90333a56..dc2ff96a 100644--- a/app/server/model/plan/tell_load.go+++ b/app/server/model/plan/tell_load.go@@ -56,11 +56,20 @@ func (state *activeTellStreamState) loadTellPlan() error {var modelContext []*db.Contextvar convo []*db.ConvoMessagevar summaries []*db.ConvoSummary+ var settings *shared.PlanSettings// get name for plan and rename it's a draftgo func() {+ res, err := db.GetPlanSettings(plan, true)+ if err != nil {+ log.Printf("Error getting plan settings: %v\n", err)+ errCh <- fmt.Errorf("error getting plan settings: %v", err)+ return+ }+ settings = res+if plan.Name == "draft" {- name, err := model.GenPlanName(client, req.Prompt)+ name, err := model.GenPlanName(client, settings.ModelSet.Namer, req.Prompt)if err != nil {log.Printf("Error generating plan name: %v\n", err)@@ -249,6 +258,7 @@ func (state *activeTellStreamState) loadTellPlan() error {state.modelContext = modelContextstate.convo = convostate.summaries = summaries+ state.settings = settingsreturn nil}diff --git a/app/server/model/plan/tell_stream.go b/app/server/model/plan/tell_stream.goindex 5eddac1a..70f4783b 100644--- a/app/server/model/plan/tell_stream.go+++ b/app/server/model/plan/tell_stream.go@@ -34,6 +34,7 @@ type activeTellStreamState struct {replyNumTokens intmessages []openai.ChatCompletionMessagetokensBeforeConvo int+ settings *shared.PlanSettings}func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStream) {@@ -55,6 +56,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStmissingFileResponse := state.missingFileResponsereplyId := state.replyIdreplyParser := state.replyParser+ settings := state.settingsactive := GetActivePlan(planId, branch)@@ -126,7 +128,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStif len(convo) > 0 {// summarize in the background- go summarizeConvo(client, summarizeConvoParams{+ go summarizeConvo(client, settings.ModelSet.PlanSummary, summarizeConvoParams{planId: planId,branch: branch,convo: convo,@@ -207,7 +209,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStMadePlan: false,}} else {- description, err = genPlanDescription(client, planId, branch, active.Ctx)+ description, err = genPlanDescription(client, settings.ModelSet.CommitMsg, planId, branch, active.Ctx)if err != nil {state.onError(fmt.Errorf("failed to generate plan description: %v", err), true, assistantMsg.Id, convoCommitMsg)return@@ -232,7 +234,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt}()go func() {- shouldContinue, err = ExecStatusShouldContinue(client, assistantMsg.Message, active.Ctx)+ shouldContinue, err = ExecStatusShouldContinue(client, settings.ModelSet.ExecStatus, assistantMsg.Message, active.Ctx)if err != nil {state.onError(fmt.Errorf("failed to get exec status: %v", err), false, assistantMsg.Id, convoCommitMsg)errCh <- err@@ -431,7 +433,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStlog.Printf("New file: %s\n", file)if req.BuildMode == shared.BuildModeAuto {log.Printf("Queuing build for %s\n", file)- queueBuilds(client, currentOrgId, currentUserId, planId, branch, []*types.ActiveBuild{{+ queueBuilds(client, settings.ModelSet.Builder, currentOrgId, currentUserId, planId, branch, []*types.ActiveBuild{{ReplyId: replyId,ReplyContent: active.CurrentReplyContent,FileContent: fileContents[i],diff --git a/app/server/model/plan/tell_summary.go b/app/server/model/plan/tell_summary.goindex f74b29ca..10b6d09a 100644--- a/app/server/model/plan/tell_summary.go+++ b/app/server/model/plan/tell_summary.go@@ -149,7 +149,7 @@ type summarizeConvoParams struct {currentOrgId string}-func summarizeConvo(client *openai.Client, params summarizeConvoParams) error {+func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, params summarizeConvoParams) error {log.Printf("summarizeConvo: Called for plan ID %s on branch %s\n", params.planId, params.branch)log.Printf("summarizeConvo: Starting summarizeConvo for planId: %s\n", params.planId)planId := params.planId@@ -215,7 +215,7 @@ func summarizeConvo(client *openai.Client, params summarizeConvoParams) error {})}- summary, err := model.PlanSummary(client, model.PlanSummaryParams{+ summary, err := model.PlanSummary(client, config, model.PlanSummaryParams{Conversation: summaryMessages,LatestConvoMessageId: latestMessageId,LatestConvoMessageCreatedAt: latestMessageSummarizedAt,diff --git a/app/server/model/summarize.go b/app/server/model/summarize.goindex c79b00d5..21eecc3d 100644--- a/app/server/model/summarize.go+++ b/app/server/model/summarize.go@@ -7,6 +7,7 @@ import ("plandex-server/model/prompts""time"+ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")@@ -19,7 +20,7 @@ type PlanSummaryParams struct {PlanId string}-func PlanSummary(client *openai.Client, params PlanSummaryParams) (*db.ConvoSummary, error) {+func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params PlanSummaryParams) (*db.ConvoSummary, error) {messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,@@ -42,8 +43,10 @@ func PlanSummary(client *openai.Client, params PlanSummaryParams) (*db.ConvoSummresp, err := client.CreateChatCompletion(context.Background(),openai.ChatCompletionRequest{- Model: PlanSummaryModel,- Messages: messages,+ Model: config.BaseModelConfig.ModelName,+ Messages: messages,+ Temperature: config.Temperature,+ TopP: config.TopP,},)diff --git a/app/server/routes.go b/app/server/routes.goindex 89dec3fb..b8fc7845 100644--- a/app/server/routes.go+++ b/app/server/routes.go@@ -81,6 +81,9 @@ func routes() *mux.Router {r.HandleFunc("/plans/{planId}/branches/{branch}", handlers.DeleteBranchHandler).Methods("DELETE")r.HandleFunc("/plans/{planId}/{branch}/branches", handlers.CreateBranchHandler).Methods("POST")+ r.HandleFunc("/plans/{planId}/{branch}/settings", handlers.GetSettingsHandler).Methods("GET")+ r.HandleFunc("/plans/{planId}/{branch}/settings", handlers.UpdateSettingsHandler).Methods("PUT")+return r}diff --git a/app/shared/ai_models.go b/app/shared/ai_models.gonew file mode 100644index 00000000..626ea95d--- /dev/null+++ b/app/shared/ai_models.go@@ -0,0 +1,154 @@+package shared++import (+ "github.com/sashabaranov/go-openai"+)++var AvailableModels = []BaseModelConfig{+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT4TurboPreview,+ MaxTokens: 128000,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT4Turbo0125,+ MaxTokens: 128000,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT4Turbo1106,+ MaxTokens: 128000,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT4,+ MaxTokens: 8000,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT3Dot5Turbo,+ MaxTokens: 16385,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT3Dot5Turbo0125,+ MaxTokens: 16385,+ },+ {+ Provider: ModelProviderOpenAI,+ ModelName: openai.GPT3Dot5Turbo1106,+ MaxTokens: 16385,+ },+}++var PlannerModelConfigByName = map[string]PlannerModelConfig{+ openai.GPT4TurboPreview: {+ MaxConvoTokens: 10000,+ },+ openai.GPT4Turbo0125: {+ MaxConvoTokens: 10000,+ },+ openai.GPT4Turbo1106: {+ MaxConvoTokens: 10000,+ },+ openai.GPT4: {+ MaxConvoTokens: 2500,+ },+ openai.GPT3Dot5Turbo: {+ MaxConvoTokens: 5000,+ },+ openai.GPT3Dot5Turbo0125: {+ MaxConvoTokens: 5000,+ },+ openai.GPT3Dot5Turbo1106: {+ MaxConvoTokens: 5000,+ },+}++var TaskModelConfigByName = map[string]TaskModelConfig{+ openai.GPT4TurboPreview: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+ openai.GPT4Turbo0125: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+ openai.GPT4Turbo1106: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+ openai.GPT4: {+ OpenAIResponseFormat: nil,+ },+ openai.GPT3Dot5Turbo: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+ openai.GPT3Dot5Turbo0125: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+ openai.GPT3Dot5Turbo1106: {+ OpenAIResponseFormat: &openai.ChatCompletionResponseFormat{Type: "json_object"},+ },+}++var AvailableModelsByName = map[string]BaseModelConfig{}+var DefaultModelSet ModelSet++func init() {+ for _, model := range AvailableModels {+ AvailableModelsByName[model.ModelName] = model+ }++ DefaultModelSet = ModelSet{+ Planner: PlannerRoleConfig{+ ModelRoleConfig: ModelRoleConfig{+ Role: PlannerRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT4TurboPreview],+ Temperature: 0.6,+ TopP: 0.7,+ },+ PlannerModelConfig: PlannerModelConfigByName[openai.GPT4TurboPreview],+ },+ PlanSummary: ModelRoleConfig{+ Role: PlanSummaryRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT4TurboPreview],+ Temperature: 0.3,+ TopP: 0.5,+ },+ Builder: TaskRoleConfig{+ ModelRoleConfig: ModelRoleConfig{+ Role: BuilderRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT4TurboPreview],+ Temperature: 0.3,+ TopP: 0.1,+ },+ TaskModelConfig: TaskModelConfigByName[openai.GPT4TurboPreview],+ },+ Namer: TaskRoleConfig{+ ModelRoleConfig: ModelRoleConfig{+ Role: NameRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT3Dot5Turbo],+ Temperature: 1.0,+ TopP: 0.5,+ },+ TaskModelConfig: TaskModelConfigByName[openai.GPT3Dot5Turbo],+ },+ CommitMsg: TaskRoleConfig{+ ModelRoleConfig: ModelRoleConfig{+ Role: CommitMsgRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT3Dot5Turbo],+ Temperature: 1.0,+ TopP: 0.5,+ },+ TaskModelConfig: TaskModelConfigByName[openai.GPT3Dot5Turbo],+ },+ ExecStatus: TaskRoleConfig{+ ModelRoleConfig: ModelRoleConfig{+ Role: ExecStatusRole,+ BaseModelConfig: AvailableModelsByName[openai.GPT4TurboPreview],+ Temperature: 0.1,+ TopP: 0.1,+ },+ TaskModelConfig: TaskModelConfigByName[openai.GPT4TurboPreview],+ },+ }+}diff --git a/app/shared/models.go b/app/shared/data_models.gosimilarity index 79%rename from app/shared/models.gorename to app/shared/data_models.goindex 0ff27bcd..ca8eab2d 100644--- a/app/shared/models.go+++ b/app/shared/data_models.go@@ -1,6 +1,10 @@package shared-import "time"+import (+ "time"++ "github.com/sashabaranov/go-openai"+)type Org struct {Id string `json:"id"`@@ -194,3 +198,66 @@ type OrgRole struct {Label string `json:"label"`Description string `json:"description"`}++type ModelProvider string++const ModelProviderOpenAI ModelProvider = "openai"++type BaseModelConfig struct {+ Provider ModelProvider `json:"provider"`+ BaseUrl string `json:"baseUrl"`+ ModelName string `json:"modelName"`+ MaxTokens int `json:"maxTokens"`+}++type PlannerModelConfig struct {+ MaxConvoTokens int `json:"maxConvoTokens"`+}++type TaskModelConfig struct {+ OpenAIResponseFormat *openai.ChatCompletionResponseFormat `json:"openAIResponseFormat"`+}++type ModelRole string++const (+ PlannerRole ModelRole = "planner"+ PlanSummaryRole ModelRole = "planSummary"+ BuilderRole ModelRole = "builder"+ NameRole ModelRole = "name"+ CommitMsgRole ModelRole = "commitMsg"+ ExecStatusRole ModelRole = "execStatus"+)++type ModelRoleConfig struct {+ Role ModelRole `json:"role"`+ BaseModelConfig BaseModelConfig `json:"baseModelConfig"`+ Temperature float32 `json:"temperature"`+ TopP float32 `json:"topP"`+}++type PlannerRoleConfig struct {+ ModelRoleConfig+ PlannerModelConfig+}++type TaskRoleConfig struct {+ ModelRoleConfig+ TaskModelConfig+}++type ModelSet struct {+ Planner PlannerRoleConfig `json:"planner"`+ PlanSummary ModelRoleConfig `json:"planSummary"`+ Builder TaskRoleConfig `json:"builder"`+ Namer TaskRoleConfig `json:"namer"`+ CommitMsg TaskRoleConfig `json:"commitMsg"`+ ExecStatus TaskRoleConfig `json:"execStatus"`+}++type PlanSettings struct {+ MaxConvoTokens *int `json:"maxConvoTokens"`+ MaxContextTokens *int `json:"maxContextTokens"`+ ModelSet *ModelSet `json:"modelSet"`+ UpdatedAt time.Time `json:"updatedAt"`+}diff --git a/app/shared/go.mod b/app/shared/go.modindex 20c098bb..8642d281 100644--- a/app/shared/go.mod+++ b/app/shared/go.mod@@ -10,4 +10,5 @@ require (github.com/dlclark/regexp2 v1.10.0 // indirectgithub.com/google/uuid v1.3.0 // indirectgithub.com/olekukonko/tablewriter v0.0.5+ github.com/sashabaranov/go-openai v1.19.4)diff --git a/app/shared/go.sum b/app/shared/go.sumindex eb4abc85..ef86e107 100644--- a/app/shared/go.sum+++ b/app/shared/go.sum@@ -12,6 +12,8 @@ github.com/pkoukk/tiktoken-go v0.1.6 h1:JF0TlJzhTbrI30wCvFuiw6FzP2+/bR+FIxUdgEAcgithub.com/pkoukk/tiktoken-go v0.1.6/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=+github.com/sashabaranov/go-openai v1.19.4 h1:GbaDiqvgYCabyqzuIbcEeT6/ZX1nVfur+++oTBfOgks=+github.com/sashabaranov/go-openai v1.19.4/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex c683536d..989b16cb 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -180,3 +180,7 @@ type LogResponse struct {type CreateBranchRequest struct {Name string `json:"name"`}++type UpdateSettingsRequest struct {+ Settings *PlanSettings `json:"settings"`+}