Skip to content

[Go] don't pass callback from flow to prompt if flow didn't get one #358

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
ianlancetaylor merged 1 commit into from
Jun 7, 2024
Merged

[Go] don't pass callback from flow to prompt if flow didn't get one #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions go/samples/coffee-shop/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,15 @@ func main() {
}

simpleGreetingFlow := genkit.DefineFlow("simpleGreeting", func(ctx context.Context, input *simpleGreetingInput, cb func(context.Context, string) error) (string, error) {
callback := func(ctx context.Context, c *ai.Candidate) error {
text, err := c.Text()
if err != nil {
return err
var callback func(context.Context, *ai.Candidate) error
if cb != nil {
callback = func(ctx context.Context, c *ai.Candidate) error {
text, err := c.Text()
if err != nil {
return err
}
return cb(ctx, text)
}
return cb(ctx, text)
}
resp, err := simpleGreetingPrompt.Generate(ctx,
&ai.PromptRequest{
Expand Down Expand Up @@ -202,12 +205,15 @@ func main() {
}

genkit.DefineFlow("simpleStructuredGreeting", func(ctx context.Context, input *simpleGreetingInput, cb func(context.Context, string) error) (string, error) {
callback := func(ctx context.Context, c *ai.Candidate) error {
text, err := c.Text()
if err != nil {
return err
var callback func(context.Context, *ai.Candidate) error
if cb != nil {
callback = func(ctx context.Context, c *ai.Candidate) error {
text, err := c.Text()
if err != nil {
return err
}
return cb(ctx, text)
}
return cb(ctx, text)
}
resp, err := simpleStructuredGreetingPrompt.Generate(ctx,
&ai.PromptRequest{
Expand Down