Skip to content

Enhance: Add ability to do inline prompting to choose oauth/pat #96

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

Merged
merged 1 commit into from
Mar 31, 2025
Merged

Enhance: Add ability to do inline prompting to choose oauth/pat #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions frame.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,10 @@ type Prompt struct {
}

type Field struct {
Name string `json:"name,omitempty"`
Sensitive *bool `json:"sensitive,omitempty"`
Description string `json:"description,omitempty"`
Name string `json:"name,omitempty"`
Sensitive *bool `json:"sensitive,omitempty"`
Description string `json:"description,omitempty"`
Options []string `json:"options,omitempty"`
Copy link
Collaborator

Choose a reason for hiding this comment

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

I've tried to keep the SDKs well-tested. Please add a test case for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

absolutely

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@thedadams Added a test for this. It will likely fail until we have the new build for gptscript

}

type Fields []Field
Expand Down
49 changes: 48 additions & 1 deletion gptscript_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func TestCancelRun(t *testing.T) {
}

func TestAbortChatCompletionRun(t *testing.T) {
tool := ToolDef{Instructions: "What is the capital of the united states?"}
tool := ToolDef{Instructions: "Generate a real long essay about the meaning of life."}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have to fix this. It is flaky and will fail the test if the message are sent in one event


run, err := g.Evaluate(context.Background(), Options{DisableCache: true, IncludeEvents: true}, tool)
if err != nil {
Expand Down Expand Up @@ -1404,6 +1404,53 @@ func TestPromptWithoutPromptAllowed(t *testing.T) {
}
}

func TestPromptWithOptions(t *testing.T) {
run, err := g.Run(context.Background(), "sys.prompt", Options{IncludeEvents: true, Prompt: true, Input: `{"fields":[{"name":"Authentication Method","description":"The authentication token for the user","options":["API Key","OAuth"]}]}`})
if err != nil {
t.Errorf("Error executing tool: %v", err)
}

// Wait for the prompt event
var promptFrame *PromptFrame
for e := range run.Events() {
if e.Prompt != nil {
if e.Prompt.Type == EventTypePrompt {
promptFrame = e.Prompt
break
}
}
}

if promptFrame == nil {
t.Fatalf("No prompt call event")
return
}

if len(promptFrame.Fields) != 1 {
t.Fatalf("Unexpected number of fields: %d", len(promptFrame.Fields))
}

if promptFrame.Fields[0].Name != "Authentication Method" {
t.Errorf("Unexpected field: %s", promptFrame.Fields[0].Name)
}

if promptFrame.Fields[0].Description != "The authentication token for the user" {
t.Errorf("Unexpected description: %s", promptFrame.Fields[0].Description)
}

if len(promptFrame.Fields[0].Options) != 2 {
t.Fatalf("Unexpected number of options: %d", len(promptFrame.Fields[0].Options))
}

if promptFrame.Fields[0].Options[0] != "API Key" {
t.Errorf("Unexpected option: %s", promptFrame.Fields[0].Options[0])
}

if promptFrame.Fields[0].Options[1] != "OAuth" {
t.Errorf("Unexpected option: %s", promptFrame.Fields[0].Options[1])
}
}

func TestGetCommand(t *testing.T) {
currentEnvVar := os.Getenv("GPTSCRIPT_BIN")
t.Cleanup(func() {
Expand Down