Skip to content

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

Give notes added to context with 'plandex load -n 'some note'' a name in the 'context ls' list

Dane Schneider0806c6dcd69c
diff --git a/app/cli/lib/context_load.go b/app/cli/lib/context_load.go
index 3b260916..f634dd52 100644
--- a/app/cli/lib/context_load.go
+++ b/app/cli/lib/context_load.go
@@ -27,16 +27,32 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {
var loadContextReq shared.LoadContextRequest
+ fileInfo, err := os.Stdin.Stat()
+ if err != nil {
+ onErr(fmt.Errorf("failed to stat stdin: %v", err))
+ }
+
+ var apiKeys map[string]string
+ var openAIBase string
+
+ if params.Note != "" || fileInfo.Mode()&os.ModeNamedPipe != 0 {
+ apiKeys = MustVerifyApiKeysSilent()
+ openAIBase = os.Getenv("OPENAI_API_BASE")
+ if openAIBase == "" {
+ openAIBase = os.Getenv("OPENAI_ENDPOINT")
+ }
+ }
+
if params.Note != "" {
loadContextReq = append(loadContextReq, &shared.LoadContextParams{
ContextType: shared.ContextNoteType,
Body: params.Note,
+ ApiKeys: apiKeys,
+ OpenAIBase: openAIBase,
+ OpenAIOrgId: os.Getenv("OPENAI_ORG_ID"),
})
}
- fileInfo, err := os.Stdin.Stat()
- if err != nil {
- onErr(fmt.Errorf("failed to stat stdin: %v", err))
- }
+
if fileInfo.Mode()&os.ModeNamedPipe != 0 {
reader := bufio.NewReader(os.Stdin)
pipedData, err := io.ReadAll(reader)
@@ -45,11 +61,6 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {
}
if len(pipedData) > 0 {
- apiKeys := MustVerifyApiKeysSilent()
- openAIBase := os.Getenv("OPENAI_API_BASE")
- if openAIBase == "" {
- openAIBase = os.Getenv("OPENAI_ENDPOINT")
- }
loadContextReq = append(loadContextReq, &shared.LoadContextParams{
ContextType: shared.ContextPipedDataType,
diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.go
index 20495fad..4e7b3b84 100644
--- a/app/server/handlers/context_helper.go
+++ b/app/server/handlers/context_helper.go
@@ -3,6 +3,7 @@ package handlers
import (
"context"
"encoding/json"
+ "fmt"
"log"
"net/http"
"plandex-server/db"
@@ -10,19 +11,21 @@ import (
"plandex-server/types"
"github.com/plandex/plandex/shared"
+ "github.com/sashabaranov/go-openai"
)
func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, loadReq *shared.LoadContextRequest, plan *db.Plan, branchName string) (*shared.LoadContextResponse, []*db.Context) {
var err error
+ var settings *shared.PlanSettings
+ var client *openai.Client
- // get name for piped data if present (there will only be one)
for _, context := range *loadReq {
- if context.ContextType == shared.ContextPipedDataType {
- settings, err := db.GetPlanSettings(plan, true)
+ if context.ContextType == shared.ContextPipedDataType || context.ContextType == shared.ContextNoteType {
+ settings, err = db.GetPlanSettings(plan, true)
if err != nil {
- log.Printf("Error generating name for piped data: %v\n", err)
- http.Error(w, "Error generating name for piped data: "+err.Error(), http.StatusInternalServerError)
+ log.Printf("Error getting plan settings: %v\n", err)
+ http.Error(w, "Error getting plan settings: "+err.Error(), http.StatusInternalServerError)
return nil, nil
}
@@ -37,19 +40,52 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth
)
envVar := settings.ModelPack.Namer.BaseModelConfig.ApiKeyEnvVar
- client := clients[envVar]
+ client = clients[envVar]
+
+ break
+ }
+ }
+
+ // get name for piped data or notes if present
+ num := 0
+ errCh := make(chan error, len(*loadReq))
+ for _, context := range *loadReq {
+ if context.ContextType == shared.ContextPipedDataType {
+ num++
+
+ go func(context *shared.LoadContextParams) {
+ name, err := model.GenPipedDataName(client, settings.ModelPack.Namer, context.Body)
- name, err := model.GenPipedDataName(client, settings.ModelPack.Namer, context.Body)
+ if err != nil {
+ errCh <- fmt.Errorf("error generating name for piped data: %v", err)
+ }
+ context.Name = name
+ errCh <- nil
+ }(context)
+ } else if context.ContextType == shared.ContextNoteType {
+ num++
+
+ go func(context *shared.LoadContextParams) {
+ name, err := model.GenNoteName(client, settings.ModelPack.Namer, context.Body)
+
+ if err != nil {
+ errCh <- fmt.Errorf("error generating name for note: %v", err)
+ }
+
+ context.Name = name
+ errCh <- nil
+ }(context)
+ }
+ }
+ if num > 0 {
+ for i := 0; i < num; i++ {
+ err := <-errCh
if err != nil {
- log.Printf("Error generating name for piped data: %v\n", err)
- http.Error(w, "Error generating name for piped data: "+err.Error(), http.StatusInternalServerError)
+ log.Printf("Error: %v\n", err)
+ http.Error(w, err.Error(), http.StatusInternalServerError)
return nil, nil
}
-
- context.Name = name
-
- break
}
}
diff --git a/app/server/model/name.go b/app/server/model/name.go
index dece2e88..527f77fb 100644
--- a/app/server/model/name.go
+++ b/app/server/model/name.go
@@ -160,3 +160,82 @@ func GenPipedDataName(client *openai.Client, config shared.ModelRoleConfig, pipe
return nameRes.Name, nil
}
+
+func GenNoteName(client *openai.Client, config shared.ModelRoleConfig, note string) (string, error) {
+ messages := []openai.ChatCompletionMessage{
+ {
+ Role: openai.ChatMessageRoleSystem,
+ Content: prompts.GetNoteNamePrompt(note),
+ },
+ }
+
+ var responseFormat *openai.ChatCompletionResponseFormat
+ if config.BaseModelConfig.HasJsonResponseMode {
+ responseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}
+ }
+
+ log.Println("calling piped data name model")
+ // log.Printf("model: %s\n", config.BaseModelConfig.ModelName)
+ // log.Printf("temperature: %f\n", config.Temperature)
+ // log.Printf("topP: %f\n", config.TopP)
+
+ // log.Printf("messages: %v\n", messages)
+ // log.Println(spew.Sdump(messages))
+
+ resp, err := CreateChatCompletionWithRetries(
+ client,
+ context.Background(),
+ openai.ChatCompletionRequest{
+ Model: config.BaseModelConfig.ModelName,
+ Tools: []openai.Tool{
+ {
+ Type: "function",
+ Function: &prompts.NoteNameFn,
+ },
+ },
+ ToolChoice: openai.ToolChoice{
+ Type: "function",
+ Function: openai.ToolFunction{
+ Name: prompts.NoteNameFn.Name,
+ },
+ },
+ Temperature: config.Temperature,
+ TopP: config.TopP,
+ Messages: messages,
+ ResponseFormat: responseFormat,
+ },
+ )
+
+ var res string
+ var nameRes prompts.NoteNameRes
+
+ if err != nil {
+ fmt.Printf("Error during piped data name model call: %v\n", err)
+ return "", err
+ }
+
+ for _, choice := range resp.Choices {
+ if len(choice.Message.ToolCalls) == 1 &&
+ choice.Message.ToolCalls[0].Function.Name == prompts.NoteNameFn.Name {
+ fnCall := choice.Message.ToolCalls[0].Function
+ res = fnCall.Arguments
+ break
+ }
+ }
+
+ if res == "" {
+ fmt.Println("no nameNote function call found in response")
+ return "", err
+ }
+
+ bytes := []byte(res)
+
+ err = json.Unmarshal(bytes, &nameRes)
+ if err != nil {
+ fmt.Printf("Error unmarshalling piped data name response: %v\n", err)
+ return "", err
+ }
+
+ return nameRes.Name, nil
+
+}
diff --git a/app/server/model/prompts/name.go b/app/server/model/prompts/name.go
index 4f880c7a..506996be 100644
--- a/app/server/model/prompts/name.go
+++ b/app/server/model/prompts/name.go
@@ -50,3 +50,26 @@ var PipedDataNameFn = openai.FunctionDefinition{
func GetPipedDataNamePrompt(text string) string {
return SysPipedDataName + "\n\nContent:\n" + text
}
+
+type NoteNameRes struct {
+ Name string `json:"name"`
+}
+
+const SysNoteName = "You are an AI namer that creates a name for an arbitrary text note. Call the 'nameNote' function with a valid JSON object that includes the 'name' key. 'name' is a *short* lowercase name for the data. Use dashes as word separators. No spaces, numbers, or special characters. Shorten and abbreviate where possible. You must ALWAYS call the 'nameNote' function. Don't call any other function."
+
+var NoteNameFn = openai.FunctionDefinition{
+ Name: "nameNote",
+ Parameters: &jsonschema.Definition{
+ Type: jsonschema.Object,
+ Properties: map[string]jsonschema.Definition{
+ "name": {
+ Type: jsonschema.String,
+ },
+ },
+ Required: []string{"name"},
+ },
+}
+
+func GetNoteNamePrompt(text string) string {
+ return SysNoteName + "\n\nNote:\n" + text
+}
diff --git a/releases/cli/versions/1.0.2.md b/releases/cli/versions/1.0.2.md
new file mode 100644
index 00000000..24bb60f1
--- /dev/null
+++ b/releases/cli/versions/1.0.2.md
@@ -0,0 +1 @@
+- Give notes added to context with `plandex load -n 'some note'` a name in the `context ls` list
\ No newline at end of file
diff --git a/releases/server/versions/1.0.2.md b/releases/server/versions/1.0.2.md
new file mode 100644
index 00000000..262dc08d
--- /dev/null
+++ b/releases/server/versions/1.0.2.md
@@ -0,0 +1 @@
+- Give notes added to context with `plandex load -n 'some note'` automatically generated names.
\ No newline at end of file