Skip to content

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

Refactor plan execution to use parameter objects and support local providers

Dane Schneider632b51ed69cf
diff --git a/app/server/model/plan/build_exec.go b/app/server/model/plan/build_exec.go
index 13e26560..49c95d7f 100644
--- a/app/server/model/plan/build_exec.go
+++ b/app/server/model/plan/build_exec.go
@@ -16,14 +16,23 @@ import (
shared "plandex-shared"
)
-func Build(
- clients map[string]model.ClientInfo,
- authVars map[string]string,
- plan *db.Plan,
- branch string,
- auth *types.ServerAuth,
- sessionId string,
-) (int, error) {
+type BuildParams struct {
+ Clients map[string]model.ClientInfo
+ AuthVars map[string]string
+ Plan *db.Plan
+ Branch string
+ Auth *types.ServerAuth
+ SessionId string
+}
+
+func Build(params BuildParams) (int, error) {
+ clients := params.Clients
+ authVars := params.AuthVars
+ plan := params.Plan
+ branch := params.Branch
+ auth := params.Auth
+ sessionId := params.SessionId
+
log.Printf("Build: Called with plan ID %s on branch %s\n", plan.Id, branch)
log.Println("Build: Starting Build operation")
diff --git a/app/server/model/plan/build_validate_and_fix.go b/app/server/model/plan/build_validate_and_fix.go
index fd2dd2c4..a4f6efe5 100644
--- a/app/server/model/plan/build_validate_and_fix.go
+++ b/app/server/model/plan/build_validate_and_fix.go
@@ -199,7 +199,7 @@ func (fileState *activeBuildStreamFileState) buildValidate(
syntaxErrors := params.syntaxErrors
reasons := params.reasons
- baseModelConfig := modelConfig.GetBaseModelConfig(authVars)
+ baseModelConfig := modelConfig.GetBaseModelConfig(authVars, fileState.settings.ModelPack.LocalProvider)
// Get diff for validation
log.Printf("Getting diffs between original and updated content")
@@ -292,6 +292,7 @@ func (fileState *activeBuildStreamFileState) buildValidate(
WillCacheNumTokens: willCacheNumTokens,
SessionId: params.sessionId,
EstimatedOutputTokens: maxExpectedOutputTokens,
+ LocalProvider: fileState.settings.ModelPack.LocalProvider,
})
if err != nil {
diff --git a/app/server/model/plan/build_whole_file.go b/app/server/model/plan/build_whole_file.go
index abb2f441..0cd2848e 100644
--- a/app/server/model/plan/build_whole_file.go
+++ b/app/server/model/plan/build_whole_file.go
@@ -35,7 +35,7 @@ func (fileState *activeBuildStreamFileState) buildWholeFileFallback(buildCtx con
return "", fmt.Errorf("active plan not found for plan ID %s and branch %s", planId, branch)
}
- baseModelConfig := config.GetBaseModelConfig(authVars)
+ baseModelConfig := config.GetBaseModelConfig(authVars, fileState.settings.ModelPack.LocalProvider)
originalFileWithLineNums := shared.AddLineNums(originalFile)
proposedContentWithLineNums := shared.AddLineNums(proposedContent)
@@ -109,7 +109,8 @@ func (fileState *activeBuildStreamFileState) buildWholeFileFallback(buildCtx con
WillCacheNumTokens: willCacheNumTokens,
EstimatedOutputTokens: maxExpectedOutputTokens,
- SessionId: sessionId,
+ SessionId: sessionId,
+ LocalProvider: fileState.settings.ModelPack.LocalProvider,
})
if err != nil {
diff --git a/app/server/model/plan/commit_msg.go b/app/server/model/plan/commit_msg.go
index 5ac7cc96..022d7ea4 100644
--- a/app/server/model/plan/commit_msg.go
+++ b/app/server/model/plan/commit_msg.go
@@ -39,7 +39,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
}
}
- baseModelConfig := config.GetBaseModelConfig(authVars)
+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)
var sysPrompt string
var tools []openai.Tool
@@ -96,6 +96,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
ModelStreamId: state.modelStreamId,
ConvoMessageId: state.replyId,
SessionId: activePlan.SessionId,
+ LocalProvider: settings.ModelPack.LocalProvider,
}
if tools != nil {
@@ -170,7 +171,27 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
}, nil
}
-func GenCommitMsgForPendingResults(auth *types.ServerAuth, plan *db.Plan, clients map[string]model.ClientInfo, settings *shared.PlanSettings, current *shared.CurrentPlanState, sessionId string, ctx context.Context) (string, error) {
+type GenCommitMsgForPendingResultsParams struct {
+ Auth *types.ServerAuth
+ Plan *db.Plan
+ Settings *shared.PlanSettings
+ Current *shared.CurrentPlanState
+ SessionId string
+ Ctx context.Context
+ Clients map[string]model.ClientInfo
+ AuthVars map[string]string
+}
+
+func GenCommitMsgForPendingResults(params GenCommitMsgForPendingResultsParams) (string, error) {
+ auth := params.Auth
+ plan := params.Plan
+ settings := params.Settings
+ current := params.Current
+ sessionId := params.SessionId
+ ctx := params.Ctx
+ clients := params.Clients
+ authVars := params.AuthVars
+
config := settings.ModelPack.CommitMsg
s := ""
@@ -211,13 +232,15 @@ func GenCommitMsgForPendingResults(auth *types.ServerAuth, plan *db.Plan, client
}
modelRes, err := model.ModelRequest(ctx, model.ModelRequestParams{
- Clients: clients,
- Auth: auth,
- Plan: plan,
- ModelConfig: &config,
- Purpose: "Commit message",
- Messages: messages,
- SessionId: sessionId,
+ Clients: clients,
+ AuthVars: authVars,
+ Auth: auth,
+ Plan: plan,
+ ModelConfig: &config,
+ Purpose: "Commit message",
+ Messages: messages,
+ SessionId: sessionId,
+ LocalProvider: settings.ModelPack.LocalProvider,
})
if err != nil {
diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.go
index a09719b2..531ccdab 100644
--- a/app/server/model/plan/exec_status.go
+++ b/app/server/model/plan/exec_status.go
@@ -35,7 +35,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage stri
authVars := state.authVars
config := settings.ModelPack.ExecStatus
- baseModelConfig := config.GetBaseModelConfig(authVars)
+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)
currentSubtask := state.currentSubtask
if currentSubtask == nil {
@@ -155,6 +155,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage stri
ModelStreamId: state.modelStreamId,
ConvoMessageId: state.replyId,
SessionId: sessionId,
+ LocalProvider: settings.ModelPack.LocalProvider,
})
if err != nil {
diff --git a/app/server/model/plan/tell_exec.go b/app/server/model/plan/tell_exec.go
index 1c34003b..8c411e9c 100644
--- a/app/server/model/plan/tell_exec.go
+++ b/app/server/model/plan/tell_exec.go
@@ -20,7 +20,23 @@ import (
"github.com/sashabaranov/go-openai"
)
-func Tell(clients map[string]model.ClientInfo, plan *db.Plan, branch string, auth *types.ServerAuth, req *shared.TellPlanRequest) error {
+type TellParams struct {
+ Clients map[string]model.ClientInfo
+ AuthVars map[string]string
+ Plan *db.Plan
+ Branch string
+ Auth *types.ServerAuth
+ Req *shared.TellPlanRequest
+}
+
+func Tell(params TellParams) error {
+ clients := params.Clients
+ plan := params.Plan
+ branch := params.Branch
+ auth := params.Auth
+ req := params.Req
+ authVars := params.AuthVars
+
log.Printf("Tell: Called with plan ID %s on branch %s\n", plan.Id, branch)
_, err := activatePlan(
@@ -47,7 +63,7 @@ func Tell(clients map[string]model.ClientInfo, plan *db.Plan, branch string, aut
req: req,
iteration: 0,
shouldBuildPending: !req.IsChatOnly && req.BuildMode == shared.BuildModeAuto,
- authVars: req.AuthVars,
+ authVars: authVars,
})
log.Printf("Tell: Tell operation completed successfully for plan ID %s on branch %s\n", plan.Id, branch)
@@ -395,7 +411,9 @@ func execTellPlan(params execTellPlanParams) {
// log.Println("Tell plan - modelConfig:", spew.Sdump(modelConfig))
state.modelConfig = &modelConfig
- baseModelConfig := modelConfig.GetBaseModelConfig(authVars)
+ baseModelConfig := modelConfig.GetBaseModelConfig(authVars, state.settings.ModelPack.LocalProvider)
+
+ state.baseModelConfig = baseModelConfig
// if the model doesn't support cache control, remove the cache control spec from the messages
if !baseModelConfig.SupportsCacheControl {
@@ -467,11 +485,11 @@ func (state *activeTellStreamState) doTellRequest() {
modelConfig := state.modelConfig
active := state.activePlan
- fallbackRes := modelConfig.GetFallbackForModelError(state.numErrorRetry, state.didProviderFallback, state.modelErr, authVars)
+ fallbackRes := modelConfig.GetFallbackForModelError(state.numErrorRetry, state.didProviderFallback, state.modelErr, authVars, state.settings.ModelPack.LocalProvider)
modelConfig = fallbackRes.ModelRoleConfig
stop := []string{"<PlandexFinish/>"}
- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars)
+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)
if fallbackRes.FallbackType == shared.FallbackTypeProvider {
state.didProviderFallback = true
@@ -535,7 +553,7 @@ func (state *activeTellStreamState) doTellRequest() {
state.numErrorRetry, state.numFallbackRetry, baseModelConfig.ModelName)
// start the stream
- stream, err := model.CreateChatCompletionStream(clients, authVars, modelConfig, active.ModelStreamCtx, modelReq)
+ stream, err := model.CreateChatCompletionStream(clients, authVars, modelConfig, state.settings.ModelPack.LocalProvider, active.ModelStreamCtx, modelReq)
if err != nil {
log.Printf("Error starting reply stream: %v\n", err)
go notify.NotifyErr(notify.SeverityError, fmt.Errorf("error starting reply stream: %v", err))
diff --git a/app/server/model/plan/tell_state.go b/app/server/model/plan/tell_state.go
index f56f8d0c..9c579aa6 100644
--- a/app/server/model/plan/tell_state.go
+++ b/app/server/model/plan/tell_state.go
@@ -53,6 +53,7 @@ type activeTellStreamState struct {
firstTokenAt time.Time
originalReq *types.ExtendedChatCompletionRequest
modelConfig *shared.ModelRoleConfig
+ baseModelConfig *shared.BaseModelConfig
fallbackRes shared.FallbackResult
skipConvoMessages map[string]bool
diff --git a/app/server/model/plan/tell_stream_finish.go b/app/server/model/plan/tell_stream_finish.go
index ea52ee93..ee6b0e36 100644
--- a/app/server/model/plan/tell_stream_finish.go
+++ b/app/server/model/plan/tell_stream_finish.go
@@ -126,7 +126,7 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedR
}
}()
- err := summarizeConvo(clients, authVars, settings.ModelPack.PlanSummary, summarizeConvoParams{
+ err := summarizeConvo(clients, authVars, settings.ModelPack.LocalProvider, settings.ModelPack.PlanSummary, summarizeConvoParams{
auth: auth,
plan: plan,
branch: branch,
diff --git a/app/server/model/plan/tell_stream_main.go b/app/server/model/plan/tell_stream_main.go
index 41cbaf68..bcd29325 100644
--- a/app/server/model/plan/tell_stream_main.go
+++ b/app/server/model/plan/tell_stream_main.go
@@ -57,13 +57,13 @@ func (state *activeTellStreamState) listenStream(stream *model.ExtendedChatCompl
}
// Create a timer that will trigger if no chunk is received within the specified duration
- firstTokenTimeout := firstTokenTimeout(state.totalRequestTokens)
+ firstTokenTimeout := firstTokenTimeout(state.totalRequestTokens, state.baseModelConfig.LocalOnly)
log.Printf("listenStream - firstTokenTimeout: %s\n", firstTokenTimeout)
timer := time.NewTimer(firstTokenTimeout)
defer timer.Stop()
streamFinished := false
- baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars)
+ baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)
modelProvider := baseModelConfig.Provider
modelName := baseModelConfig.ModelName
@@ -282,13 +282,19 @@ mainLoop:
}
}
-func firstTokenTimeout(tok int) time.Duration {
+func firstTokenTimeout(tok int, isLocalModel bool) time.Duration {
const (
base = 90 * time.Second
slope = 90 * time.Second
step = 150_000
cap = 15 * time.Minute
)
+
+ // local models can have a long cold start, and timeouts are less relevant
+ if isLocalModel {
+ return cap
+ }
+
if tok <= step {
return base
}
diff --git a/app/server/model/plan/tell_stream_processor.go b/app/server/model/plan/tell_stream_processor.go
index 45303104..7de8a42c 100644
--- a/app/server/model/plan/tell_stream_processor.go
+++ b/app/server/model/plan/tell_stream_processor.go
@@ -58,7 +58,7 @@ func (state *activeTellStreamState) processChunk(choice types.ExtendedChatComple
delta := choice.Delta
content := delta.Content
- baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars)
+ baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)
if baseModelConfig.IncludeReasoning && delta.Reasoning != "" {
content = delta.Reasoning
diff --git a/app/server/model/plan/tell_stream_usage.go b/app/server/model/plan/tell_stream_usage.go
index e24f1f66..7a5c0ab2 100644
--- a/app/server/model/plan/tell_stream_usage.go
+++ b/app/server/model/plan/tell_stream_usage.go
@@ -27,7 +27,7 @@ func (state *activeTellStreamState) handleUsageChunk(usage *openai.Usage) {
sessionId := state.activePlan.SessionId
modelConfig := state.modelConfig
- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars)
+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)
go func() {
defer func() {
@@ -90,7 +90,7 @@ func (state *activeTellStreamState) execHookOnStop(sendStreamErr bool) {
}
modelConfig := state.modelConfig
- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars)
+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)
go func() {
defer func() {
diff --git a/app/server/model/plan/tell_summary.go b/app/server/model/plan/tell_summary.go
index 766c40a1..95dde4a6 100644
--- a/app/server/model/plan/tell_summary.go
+++ b/app/server/model/plan/tell_summary.go
@@ -243,7 +243,7 @@ type summarizeConvoParams struct {
modelPackName string
}
-func summarizeConvo(clients map[string]model.ClientInfo, authVars map[string]string, config shared.ModelRoleConfig, params summarizeConvoParams, ctx context.Context) *shared.ApiError {
+func summarizeConvo(clients map[string]model.ClientInfo, authVars map[string]string, localProvider shared.ModelProvider, config shared.ModelRoleConfig, params summarizeConvoParams, ctx context.Context) *shared.ApiError {
plan := params.plan
planId := plan.Id
log.Printf("summarizeConvo: Called for plan ID %s on branch %s\n", planId, params.branch)
@@ -392,7 +392,7 @@ func summarizeConvo(clients map[string]model.ClientInfo, authVars map[string]str
// latestSummaryCh := make(chan *db.ConvoSummary, 1)
// active.LatestSummaryCh = latestSummaryCh
- summary, apiErr := model.PlanSummary(clients, authVars, config, model.PlanSummaryParams{
+ summary, apiErr := model.PlanSummary(clients, authVars, localProvider, config, model.PlanSummaryParams{
Conversation: summaryMessages,
ConversationNumTokens: numTokens,
LatestConvoMessageId: latestMessageId,