llms: rename convenience function to GenerateFromSinglePrompt

.golangci.yaml

@@ -21,6 +21,7 @@ linters:
     - varnamelen
     - nlreturn
     - gomnd
+    - goerr113
     - wrapcheck # TODO: we should probably enable this one (at least for new code).
     - testpackage
     - nolintlint # see https://github.com/golangci/golangci-lint/issues/3228.

llms/anthropic/anthropicllm.go

@@ -50,7 +50,7 @@ func newClient(opts ...Option) (*anthropicclient.Client, error) {
 
 // Call requests a completion for the given prompt.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/cohere/coherellm.go

@@ -25,7 +25,7 @@ type LLM struct {
 var _ llms.Model = (*LLM)(nil)
 
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/ernie/erniellm.go

@@ -60,7 +60,7 @@ doc: https://cloud.baidu.com/doc/WENXINWORKSHOP/s/flfmc9do2`, ernieclient.ErrNot
 }
 
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/googleai/googleai_llm.go

@@ -1,7 +1,7 @@
 // package googleai implements a langchaingo provider for Google AI LLMs.
 // See https://ai.google.dev/ for more details and documetnation.
 //
-//nolint:goerr113, lll
+// nolint: lll
 package googleai
 
 import (
@@ -64,7 +64,7 @@ func NewGoogleAI(ctx context.Context, opts ...Option) (*GoogleAI, error) {
 
 // Call implements the [llms.Model] interface.
 func (g *GoogleAI) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, g, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, g, prompt, options...)
 }
 
 // GenerateContent implements the [llms.Model] interface.

llms/huggingface/huggingfacellm.go

@@ -25,7 +25,7 @@ var _ llms.Model = (*LLM)(nil)
 
 // Call implements the LLM interface.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/llms.go

@@ -28,9 +28,11 @@ type Model interface {
 	Call(ctx context.Context, prompt string, options ...CallOption) (string, error)
 }
 
-// CallLLM is a helper function for implementing Call in terms of
-// GenerateContent. It's aimed to be used by Model providers.
-func CallLLM(ctx context.Context, llm Model, prompt string, options ...CallOption) (string, error) {
+// GenerateFromSingle prompt is a convenience function for calling an LLM with
+// a single string prompt, expecting a single string response. It's useful for
+// simple, string-only interactions and provides a slightly more ergonomic API
+// than the more general [llms.Model.GenerateContent].
+func GenerateFromSinglePrompt(ctx context.Context, llm Model, prompt string, options ...CallOption) (string, error) {
 	msg := MessageContent{
 		Role:  schema.ChatMessageTypeHuman,
 		Parts: []ContentPart{TextContent{prompt}},
@@ -43,7 +45,7 @@ func CallLLM(ctx context.Context, llm Model, prompt string, options ...CallOptio
 
 	choices := resp.Choices
 	if len(choices) < 1 {
-		return "", errors.New("empty response from model") //nolint:goerr113
+		return "", errors.New("empty response from model")
 	}
 	c1 := choices[0]
 	return c1.Content, nil

llms/local/localllm.go

@@ -30,7 +30,7 @@ var _ llms.Model = (*LLM)(nil)
 
 // Call calls the local LLM binary with the given prompt.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 func (o *LLM) appendGlobalsToArgs(opts llms.CallOptions) {

llms/ollama/ollamallm.go

@@ -41,7 +41,7 @@ func New(opts ...Option) (*LLM, error) {
 
 // Call Implement the call interface for LLM.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/openai/openaillm.go

@@ -40,7 +40,7 @@ func New(opts ...Option) (*LLM, error) {
 
 // Call requests a completion for the given prompt.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.

llms/vertexai/vertexai_palm_llm.go

@@ -25,7 +25,7 @@ var _ llms.Model = (*LLM)(nil)
 
 // Call requests a completion for the given prompt.
 func (o *LLM) Call(ctx context.Context, prompt string, options ...llms.CallOption) (string, error) {
-	return llms.CallLLM(ctx, o, prompt, options...)
+	return llms.GenerateFromSinglePrompt(ctx, o, prompt, options...)
 }
 
 // GenerateContent implements the Model interface.