[Go] regenerate types, set new GenerateResponse.Request field

go/ai/gen.go

@@ -60,6 +60,7 @@ const (
 type GenerateResponse struct {
 	Candidates []*Candidate     `json:"candidates,omitempty"`
 	Custom     any              `json:"custom,omitempty"`
+	Request    *GenerateRequest `json:"request,omitempty"`
 	Usage      *GenerationUsage `json:"usage,omitempty"`
 }
 

go/genkit/dotprompt/genkit.go

@@ -200,10 +200,5 @@ func (p *Prompt) Execute(ctx context.Context, input *ActionInput) (*ai.GenerateR
 		return nil, err
 	}
 
-	// TODO(ianlancetaylor): The TypeScript code stores genReq
-	// with each candidate in resp. The TypeScript code
-	// extends CandidateData with an optional request field.
-	// We don't have a natural way to do that in Go.
-
 	return resp, nil
 }

go/genkit/dotprompt/genkit_test.go

@@ -39,6 +39,7 @@ func (testGenerator) Generate(ctx context.Context, req *ai.GenerateRequest, cb g
 				},
 			},
 		},
+		Request: req,
 	}
 	return r, nil
 }

go/plugins/googleai/googleai.go

@@ -100,7 +100,9 @@ func (g *generator) Generate(ctx context.Context, input *ai.GenerateRequest, cb
 		if err != nil {
 			return nil, err
 		}
-		return translateResponse(resp), nil
+		r := translateResponse(resp)
+		r.Request = input
+		return r, nil
 	}
 
 	// Streaming version.
@@ -134,6 +136,7 @@ func (g *generator) Generate(ctx context.Context, input *ai.GenerateRequest, cb
 		// to return an empty instead of nil result.
 		r = &ai.GenerateResponse{}
 	}
+	r.Request = input
 	return r, nil
 }
 

go/plugins/vertexai/vertexai.go

@@ -74,7 +74,9 @@ func (g *generator) Generate(ctx context.Context, input *ai.GenerateRequest, cb
 	}
 
 	// Translate from a genai.GenerateContentResponse to a ai.GenerateResponse.
-	r := &ai.GenerateResponse{}
+	r := &ai.GenerateResponse{
+		Request: input,
+	}
 	for _, cand := range resp.Candidates {
 		c := &ai.Candidate{}
 		c.Index = int(cand.Index)