Matt Low
3fde58b77d
- More emphasis on `api` package. It now holds database model structs from `lmcli/models` (which is now gone) as well as the tool spec, call, and result types. `tools.Tool` is now `api.ToolSpec`. `api.ChatCompletionClient` was renamed to `api.ChatCompletionProvider`. - Change ChatCompletion interface and implementations to no longer do automatic tool call recursion - they simply return a ToolCall message which the caller can decide what to do with (e.g. prompt for user confirmation before executing) - `api.ChatCompletionProvider` functions have had their ReplyCallback parameter removed, as now they only return a single reply. - Added a top-level `agent` package, moved the current built-in tools implementations under `agent/toolbox`. `tools.ExecuteToolCalls` is now `agent.ExecuteToolCalls`. - Fixed request context handling in openai, google, ollama (use `NewRequestWithContext`), cleaned up request cancellation in TUI - Fix tool call tui persistence bug (we were skipping message with empty content) - Now handle tool calling from TUI layer TODO: - Prompt users before executing tool calls - Automatically send tool results to the model (or make this toggleable)
74 lines
2.1 KiB
Go
74 lines
2.1 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"git.mlow.ca/mlow/lmcli/pkg/api"
|
|
cmdutil "git.mlow.ca/mlow/lmcli/pkg/cmd/util"
|
|
"git.mlow.ca/mlow/lmcli/pkg/lmcli"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func RetryCmd(ctx *lmcli.Context) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "retry <conversation>",
|
|
Short: "Retry the last user reply in a conversation",
|
|
Long: `Prompt the conversation from the last user response.`,
|
|
Args: func(cmd *cobra.Command, args []string) error {
|
|
argCount := 1
|
|
if err := cobra.MinimumNArgs(argCount)(cmd, args); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
},
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
shortName := args[0]
|
|
conversation := cmdutil.LookupConversation(ctx, shortName)
|
|
|
|
// Load the complete thread from the root message
|
|
messages, err := ctx.Store.PathToLeaf(conversation.SelectedRoot)
|
|
if err != nil {
|
|
return fmt.Errorf("Could not retrieve messages for conversation: %s", conversation.Title)
|
|
}
|
|
|
|
offset, _ := cmd.Flags().GetInt("offset")
|
|
if offset < 0 {
|
|
offset = -offset
|
|
}
|
|
|
|
if offset > len(messages)-1 {
|
|
return fmt.Errorf("Offset %d is before the start of the conversation.", offset)
|
|
}
|
|
|
|
retryFromIdx := len(messages) - 1 - offset
|
|
|
|
// decrease retryFromIdx until we hit a user message
|
|
for retryFromIdx >= 0 && messages[retryFromIdx].Role != api.MessageRoleUser {
|
|
retryFromIdx--
|
|
}
|
|
|
|
if messages[retryFromIdx].Role != api.MessageRoleUser {
|
|
return fmt.Errorf("No user messages to retry")
|
|
}
|
|
|
|
fmt.Printf("Idx: %d Message: %v\n", retryFromIdx, messages[retryFromIdx])
|
|
|
|
// Start a new branch at the last user message
|
|
cmdutil.HandleReply(ctx, &messages[retryFromIdx], true)
|
|
return nil
|
|
},
|
|
ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
|
compMode := cobra.ShellCompDirectiveNoFileComp
|
|
if len(args) != 0 {
|
|
return nil, compMode
|
|
}
|
|
return ctx.Store.ConversationShortNameCompletions(toComplete), compMode
|
|
},
|
|
}
|
|
|
|
cmd.Flags().Int("offset", 0, "Offset from the last message to retry from.")
|
|
|
|
applyPromptFlags(ctx, cmd)
|
|
return cmd
|
|
}
|