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 local provider parameter to model requests
Dane Schneiderb1d7cee7a298
diff --git a/app/server/model/model_request.go b/app/server/model/model_request.goindex 78b0eb14..95ddfe1d 100644--- a/app/server/model/model_request.go+++ b/app/server/model/model_request.go@@ -18,12 +18,13 @@ import ()type ModelRequestParams struct {- Clients map[string]ClientInfo- AuthVars map[string]string- Auth *types.ServerAuth- Plan *db.Plan- ModelConfig *shared.ModelRoleConfig- Purpose string+ Clients map[string]ClientInfo+ AuthVars map[string]string+ Auth *types.ServerAuth+ Plan *db.Plan+ ModelConfig *shared.ModelRoleConfig+ LocalProvider shared.ModelProvider+ Purpose stringMessages []types.ExtendedChatMessagePrediction string@@ -67,12 +68,13 @@ func ModelRequest(modelPackName := params.ModelPackNamepurpose := params.PurposesessionId := params.SessionId+ localProvider := params.LocalProviderif purpose == "" {return nil, fmt.Errorf("purpose is required")}- baseModelConfig := modelConfig.GetBaseModelConfig(authVars)+ baseModelConfig := modelConfig.GetBaseModelConfig(authVars, localProvider)messages = FilterEmptyMessages(messages)messages = CheckSingleSystemMessage(modelConfig, baseModelConfig, messages)@@ -164,7 +166,7 @@ func ModelRequest(}}- res, err := CreateChatCompletionWithInternalStream(clients, authVars, modelConfig, ctx, req, onStream, reqStarted)+ res, err := CreateChatCompletionWithInternalStream(clients, authVars, modelConfig, localProvider, ctx, req, onStream, reqStarted)if err != nil {return nil, errdiff --git a/app/server/model/name.go b/app/server/model/name.goindex 1aee4fe6..1a2af315 100644--- a/app/server/model/name.go+++ b/app/server/model/name.go@@ -29,7 +29,7 @@ func GenPlanName(var tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)var sysPrompt stringif baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {@@ -66,16 +66,17 @@ func GenPlanName(}modelRes, err := ModelRequest(ctx, ModelRequestParams{- Clients: clients,- AuthVars: authVars,- Auth: auth,- Plan: plan,- ModelConfig: &config,- Purpose: "Plan name",- Messages: messages,- Tools: tools,- ToolChoice: toolChoice,- SessionId: sessionId,+ Clients: clients,+ AuthVars: authVars,+ Auth: auth,+ Plan: plan,+ ModelConfig: &config,+ Purpose: "Plan name",+ Messages: messages,+ Tools: tools,+ ToolChoice: toolChoice,+ SessionId: sessionId,+ LocalProvider: settings.ModelPack.LocalProvider,})if err != nil {@@ -109,23 +110,36 @@ func GenPlanName(return planName, nil}+type GenPipedDataNameParams struct {+ Ctx context.Context+ Auth *types.ServerAuth+ Plan *db.Plan+ Settings *shared.PlanSettings+ AuthVars map[string]string+ SessionId string+ Clients map[string]ClientInfo+ PipedContent string+}+func GenPipedDataName(- ctx context.Context,- auth *types.ServerAuth,- plan *db.Plan,- settings *shared.PlanSettings,- clients map[string]ClientInfo,- authVars map[string]string,- pipedContent string,- sessionId string,+ params GenPipedDataNameParams,) (string, error) {+ ctx := params.Ctx+ auth := params.Auth+ plan := params.Plan+ settings := params.Settings+ clients := params.Clients+ authVars := params.AuthVars+ pipedContent := params.PipedContent+ sessionId := params.SessionId+config := settings.ModelPack.Namervar sysPrompt stringvar tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysPipedDataNameXml@@ -161,16 +175,17 @@ func GenPipedDataName(}modelRes, err := ModelRequest(ctx, ModelRequestParams{- Clients: clients,- Auth: auth,- AuthVars: authVars,- Plan: plan,- ModelConfig: &config,- Purpose: "Piped data name",- Messages: messages,- Tools: tools,- ToolChoice: toolChoice,- SessionId: sessionId,+ Clients: clients,+ Auth: auth,+ AuthVars: authVars,+ Plan: plan,+ ModelConfig: &config,+ Purpose: "Piped data name",+ Messages: messages,+ Tools: tools,+ ToolChoice: toolChoice,+ SessionId: sessionId,+ LocalProvider: settings.ModelPack.LocalProvider,})if err != nil {@@ -220,7 +235,7 @@ func GenNoteName(var tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysNoteNameXml@@ -256,16 +271,17 @@ func GenNoteName(}modelRes, err := ModelRequest(ctx, ModelRequestParams{- Clients: clients,- Auth: auth,- AuthVars: authVars,- Plan: plan,- ModelConfig: &config,- Purpose: "Note name",- Messages: messages,- Tools: tools,- ToolChoice: toolChoice,- SessionId: sessionId,+ Clients: clients,+ Auth: auth,+ AuthVars: authVars,+ Plan: plan,+ ModelConfig: &config,+ Purpose: "Note name",+ Messages: messages,+ Tools: tools,+ ToolChoice: toolChoice,+ SessionId: sessionId,+ LocalProvider: settings.ModelPack.LocalProvider,})if err != nil {