waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

indicator fixup (mismatch of increments/decrements) (#411)

Browse Source 
* addLineForCmd should only increment for running commands.  also openai lines should increment

* small fix for openai chat styles
This commit is contained in:
Mike Sawka
2024-03-08 10:33:10 -08:00
committed by GitHub
parent c5d4a0e1f3
commit a2795fb74d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wavesrv/pkg/cmdrunner/cmdrunner.go
+6 -2
View File
@@ -2858,10 +2858,13 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
if promptStr == "" {
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)
if err != nil {
return nil, fmt.Errorf("cannot add new line: %v", err)
}
if resolveBool(pk.Kwargs["stream"], true) {
go doOpenAIStreamCompletion(cmd, clientData.ClientId, opts, prompt)
} else {
@@ -2876,7 +2879,6 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
// ignore error again (nothing to do)
log.Printf("openai error updating screen selected line: %v\n", err)
}
update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, line, cmd)
update.AddUpdate(*screen)
return update, nil
@@ -3011,7 +3013,9 @@ func addLineForCmd(ctx context.Context, metaCmd string, shouldFocus bool, ids re
update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, rtnLine, cmd)
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)
return update, nil
}