Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

addLineForCmd should only increment for running commands. also openai lines should increment

Browse Source
This commit is contained in:
sawka 2024-03-08 10:29:02 -08:00
parent c5d4a0e1f3
commit 7e0722275b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wavesrv/pkg/cmdrunner/cmdrunner.go
View File

@ -2858,10 +2858,13 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
if promptStr == "" { if promptStr == "" {
return nil, fmt.Errorf("openai error, prompt string is blank") return nil, fmt.Errorf("openai error, prompt string is blank")
} }
update := scbus.MakeUpdatePacket()
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1)
line, err := sstore.AddOpenAILine(ctx, ids.ScreenId, DefaultUserId, cmd) line, err := sstore.AddOpenAILine(ctx, ids.ScreenId, DefaultUserId, cmd)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot add new line: %v", err) return nil, fmt.Errorf("cannot add new line: %v", err)
} }
if resolveBool(pk.Kwargs["stream"], true) { if resolveBool(pk.Kwargs["stream"], true) {
go doOpenAIStreamCompletion(cmd, clientData.ClientId, opts, prompt) go doOpenAIStreamCompletion(cmd, clientData.ClientId, opts, prompt)
} else { } else {
@ -2876,7 +2879,6 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
// ignore error again (nothing to do) // ignore error again (nothing to do)
log.Printf("openai error updating screen selected line: %v\n", err) log.Printf("openai error updating screen selected line: %v\n", err)
} }
update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, line, cmd) sstore.AddLineUpdate(update, line, cmd)
update.AddUpdate(*screen) update.AddUpdate(*screen)
return update, nil return update, nil
@ -3011,7 +3013,9 @@ func addLineForCmd(ctx context.Context, metaCmd string, shouldFocus bool, ids re
update := scbus.MakeUpdatePacket() update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, rtnLine, cmd) sstore.AddLineUpdate(update, rtnLine, cmd)
update.AddUpdate(*screen) update.AddUpdate(*screen)
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1) if cmd.Status == sstore.CmdStatusRunning {
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1)
}
updateHistoryContext(ctx, rtnLine, cmd, cmd.FeState) updateHistoryContext(ctx, rtnLine, cmd, cmd.FeState)
return update, nil return update, nil
} }