From 8abde7ef4cafb461679fa922ce243e1a638cb699 Mon Sep 17 00:00:00 2001 From: "colel1410@gmail.com" Date: Fri, 15 Dec 2023 11:57:03 -0800 Subject: [PATCH] removed stale prints and comments, readded non stream completion for now --- wavesrv/pkg/cmdrunner/cmdrunner.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wavesrv/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go index 9c7b4a63f..5f9ec48e4 100644 --- a/wavesrv/pkg/cmdrunner/cmdrunner.go +++ b/wavesrv/pkg/cmdrunner/cmdrunner.go @@ -1449,7 +1449,6 @@ func doOpenAICompletion(cmd *sstore.CmdType, opts *sstore.OpenAIOptsType, prompt }() var respPks []*packet.OpenAIPacketType var err error - log.Printf("TODO: fix this condition - short circuited to access cloud code path\n") // run open ai completion locally respPks, err = openai.RunCompletion(ctx, opts, prompt) if err != nil { @@ -1502,7 +1501,6 @@ func doOpenAIStreamCompletion(cmd *sstore.CmdType, opts *sstore.OpenAIOptsType, }() var ch chan *packet.OpenAIPacketType var err error - log.Printf("TODO: fix this condition - short circuited to access cloud code path\n") if opts.APIToken == "" { clientData, err := sstore.EnsureClientData(ctx) if err != nil { @@ -1513,10 +1511,8 @@ func doOpenAIStreamCompletion(cmd *sstore.CmdType, opts *sstore.OpenAIOptsType, writeErrorToPty(cmd, fmt.Sprintf("Error: must have telemetry enabled to use wave cloud"), outputPos) return } - // run open ai completion in the cloud ch, err = openai.RunCloudCompletionStream(ctx, opts, prompt) } else { - // run open ai completion locally ch, err = openai.RunCompletionStream(ctx, opts, prompt) } if err != nil { @@ -1592,7 +1588,11 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstor return nil, fmt.Errorf("cannot add new line: %v", err) } prompt := []sstore.OpenAIPromptMessageType{{Role: sstore.OpenAIRoleUser, Content: promptStr}} - go doOpenAIStreamCompletion(cmd, opts, prompt) + if resolveBool(pk.Kwargs["stream"], true) { + go doOpenAIStreamCompletion(cmd, opts, prompt) + } else { + go doOpenAICompletion(cmd, opts, prompt) + } updateHistoryContext(ctx, line, cmd) updateMap := make(map[string]interface{}) updateMap[sstore.ScreenField_SelectedLine] = line.LineNum