Skip to content

Minor refactor, simplified how "interactive" mode works #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Minor refactor, simplified how "interactive" mode works #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be6b30d
Simplified template ReplaceAll, systemPrompt handling
phillmv May 20, 2025
2fa67c8
Moved for loop contents to ChatWithUser func.
phillmv May 20, 2025
692ac6d
simplified how initialPrompt is handled
phillmv May 21, 2025
c7b411d
chat prompt should quit cleanly if provided with ^D
phillmv May 21, 2025
9dda179
the singleShot var really controls whether chat is interactive or not…
phillmv May 21, 2025
31028ae
Rename ExitChatError to ErrExitChat
phillmv May 22, 2025
d1d49fb
OR'd instead of ELSE IF'd
phillmv May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 73 additions & 69 deletions cmd/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,19 +258,19 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {
return err
}

interactiveMode := true
initialPrompt := ""
singleShot := false
pipedContent := ""

if len(args) > 1 {
initialPrompt = strings.Join(args[1:], " ")
singleShot = true
interactiveMode = false
}

if isPipe(os.Stdin) {
promptFromPipe, _ := io.ReadAll(os.Stdin)
if len(promptFromPipe) > 0 {
singleShot = true
interactiveMode = false
pipedContent = strings.TrimSpace(string(promptFromPipe))
if initialPrompt != "" {
initialPrompt = initialPrompt + "\n" + pipedContent
Expand All @@ -289,28 +289,26 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {
systemPrompt: systemPrompt,
}

// If a prompt file is passed, load the messages from the file, templating {{input}} from stdin
if pf != nil {
// If there is no prompt file, add the initialPrompt to the conversation.
// If a prompt file is passed, load the messages from the file, templating {{input}}
// using the initialPrompt.
if pf == nil {
conversation.AddMessage(azuremodels.ChatMessageRoleUser, initialPrompt)
} else {
interactiveMode = false

for _, m := range pf.Messages {
content := m.Content
if strings.ToLower(m.Role) == "user" {
content = strings.ReplaceAll(content, "{{input}}", initialPrompt)
}
switch strings.ToLower(m.Role) {
case "system":
if conversation.systemPrompt == "" {
conversation.systemPrompt = content
} else {
conversation.AddMessage(azuremodels.ChatMessageRoleSystem, content)
}
conversation.systemPrompt = content
case "user":
content = strings.ReplaceAll(content, "{{input}}", initialPrompt)
conversation.AddMessage(azuremodels.ChatMessageRoleUser, content)
case "assistant":
conversation.AddMessage(azuremodels.ChatMessageRoleAssistant, content)
}
}

initialPrompt = ""
}

mp := ModelParameters{}
Expand All @@ -326,63 +324,15 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {
}

for {
prompt := ""
if initialPrompt != "" {
prompt = initialPrompt
initialPrompt = ""
}

if prompt == "" && pf == nil {
fmt.Printf(">>> ")
reader := bufio.NewReader(os.Stdin)
prompt, err = reader.ReadString('\n')
if err != nil {
return err
}
}

prompt = strings.TrimSpace(prompt)

if prompt == "" && pf == nil {
continue
}

if strings.HasPrefix(prompt, "/") {
if prompt == "/bye" || prompt == "/exit" || prompt == "/quit" {
if interactiveMode {
conversation, err = cmdHandler.ChatWithUser(conversation, mp)
if errors.Is(err, ErrExitChat) || errors.Is(err, io.EOF) {
break
} else if err != nil {
return err
}

if prompt == "/parameters" {
cmdHandler.handleParametersPrompt(conversation, mp)
continue
}

if prompt == "/reset" || prompt == "/clear" {
cmdHandler.handleResetPrompt(conversation)
continue
}

if strings.HasPrefix(prompt, "/set ") {
cmdHandler.handleSetPrompt(prompt, mp)
continue
}

if strings.HasPrefix(prompt, "/system-prompt ") {
conversation = cmdHandler.handleSystemPrompt(prompt, conversation)
continue
}

if prompt == "/help" {
cmdHandler.handleHelpPrompt()
continue
}

cmdHandler.handleUnrecognizedPrompt(prompt)
continue
}

conversation.AddMessage(azuremodels.ChatMessageRoleUser, prompt)

req := azuremodels.ChatCompletionOptions{
Messages: conversation.GetMessages(),
Model: modelName,
Expand Down Expand Up @@ -431,7 +381,7 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {

conversation.AddMessage(azuremodels.ChatMessageRoleAssistant, messageBuilder.String())

if singleShot || pf != nil {
if !interactiveMode {
break
}
}
Expand Down Expand Up @@ -618,3 +568,57 @@ func (h *runCommandHandler) handleCompletionChoice(choice azuremodels.ChatChoice
func (h *runCommandHandler) writeToOut(message string) {
h.cfg.WriteToOut(message)
}

var ErrExitChat = errors.New("exiting chat")

func (h *runCommandHandler) ChatWithUser(conversation Conversation, mp ModelParameters) (Conversation, error) {
fmt.Printf(">>> ")
reader := bufio.NewReader(os.Stdin)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bufio

image of bufo the frog


prompt, err := reader.ReadString('\n')
if err != nil {
return conversation, err
}

prompt = strings.TrimSpace(prompt)
if prompt == "" {
return conversation, nil
}

if strings.HasPrefix(prompt, "/") {
if prompt == "/bye" || prompt == "/exit" || prompt == "/quit" {
return conversation, ErrExitChat
}

if prompt == "/parameters" {
h.handleParametersPrompt(conversation, mp)
return conversation, nil
}

if prompt == "/reset" || prompt == "/clear" {
h.handleResetPrompt(conversation)
return conversation, nil
}

if strings.HasPrefix(prompt, "/set ") {
h.handleSetPrompt(prompt, mp)
return conversation, nil
}

if strings.HasPrefix(prompt, "/system-prompt ") {
conversation = h.handleSystemPrompt(prompt, conversation)
return conversation, nil
}

if prompt == "/help" {
h.handleHelpPrompt()
return conversation, nil
}

h.handleUnrecognizedPrompt(prompt)
return conversation, nil
}

conversation.AddMessage(azuremodels.ChatMessageRoleUser, prompt)
return conversation, nil
}
4 changes: 2 additions & 2 deletions cmd/run/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ messages:
_, err = runCmd.ExecuteC()
require.NoError(t, err)

require.Equal(t, 3, len(capturedReq.Messages))
require.Equal(t, 2, len(capturedReq.Messages))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the most sus change in the whole PR, but I think it's because I fixed a bug. I checked out the version in the main branch, with 3 messages, and added some code to print the Messages out. This is what I got back:

=== RUN   TestRun/--file_pre-loads_YAML_from_file
Message 1:
  Content: You are a text summarizer.
  Role: system
Message 2:
  Content: Hello there!
  Role: user
Message 3:
  Content:
  Role: user

i.e. the third and final message was simply empty. So, I sheepishly just decremented this number.

require.Equal(t, "You are a text summarizer.", *capturedReq.Messages[0].Content)
require.Equal(t, "Hello there!", *capturedReq.Messages[1].Content)

Expand Down Expand Up @@ -220,7 +220,7 @@ messages:
_, err = runCmd.ExecuteC()
require.NoError(t, err)

require.Len(t, capturedReq.Messages, 3)
require.Len(t, capturedReq.Messages, 2)
require.Equal(t, "You are a text summarizer.", *capturedReq.Messages[0].Content)
require.Equal(t, initialPrompt+"\n"+piped, *capturedReq.Messages[1].Content) // {{input}} -> "Please summarize the provided text.\nHello there!"

Expand Down
Loading