googleai: move the PaLM provider into googleai

.golangci.yaml

@@ -18,6 +18,7 @@ linters:
     - tagliatelle # As we're dealing with third parties we must accept snake case.
     - wsl # We don't agree with wsl's style rules
     - exhaustruct
+    - lll
     - varnamelen
     - nlreturn
     - gomnd

embeddings/vertexai_palm_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tmc/langchaingo/llms/vertexai"
+	"github.com/tmc/langchaingo/llms/googleai/palm"
 )
 
 func newVertexEmbedder(t *testing.T, opts ...Option) *EmbedderImpl {
@@ -17,7 +17,7 @@ func newVertexEmbedder(t *testing.T, opts ...Option) *EmbedderImpl {
 		return nil
 	}
 
-	llm, err := vertexai.New()
+	llm, err := palm.New()
 	require.NoError(t, err)
 
 	embedder, err := NewEmbedder(llm, opts...)

llms/doc.go

@@ -6,7 +6,7 @@
 // 1. Hugging Face:      llms/huggingface/
 // 2. Local LLM:         llms/local/
 // 3. OpenAI:            llms/openai/
-// 4. Vertex AI:         llms/vertexai/
+// 4. Google AI:         llms/googleai/
 // 5. Cohere:            llms/cohere/
 //
 // Each subpackage includes provider-specific LLM implementations and helper files for communication

llms/googleai/googleai_llm.go

@@ -1,7 +1,5 @@
 // package googleai implements a langchaingo provider for Google AI LLMs.
-// See https://ai.google.dev/ for more details and documetnation.
-//
-// nolint: lll
+// See https://ai.google.dev/ for more details.
 package googleai
 
 import (

llms/vertexai/internal/vertexaiclient/palm_client.go → llms/googleai/palm/internal/palmclient/palmclient.go

@@ -1,4 +1,4 @@
-package vertexaiclient
+package palmclient
 
 import (
 	"context"

llms/vertexai/vertexai_palm_llm.go → llms/googleai/palm/palm_llm.go

@@ -1,12 +1,15 @@
-package vertexai
+// package palm implements a langchaingo provider for Google Vertex AI legacy
+// PaLM models. Use the newer Gemini models via llms/googleai/vertex if
+// possible.
+package palm
 
 import (
 	"context"
 	"errors"
 
 	"github.com/tmc/langchaingo/callbacks"
 	"github.com/tmc/langchaingo/llms"
-	"github.com/tmc/langchaingo/llms/vertexai/internal/vertexaiclient"
+	"github.com/tmc/langchaingo/llms/googleai/palm/internal/palmclient"
 )
 
 var (
@@ -18,7 +21,7 @@ var (
 
 type LLM struct {
 	CallbacksHandler callbacks.Handler
-	client           *vertexaiclient.PaLMClient
+	client           *palmclient.PaLMClient
 }
 
 var _ llms.Model = (*LLM)(nil)
@@ -44,7 +47,7 @@ func (o *LLM) GenerateContent(ctx context.Context, messages []llms.MessageConten
 	msg0 := messages[0]
 	part := msg0.Parts[0]
 
-	results, err := o.client.CreateCompletion(ctx, &vertexaiclient.CompletionRequest{
+	results, err := o.client.CreateCompletion(ctx, &palmclient.CompletionRequest{
 		Prompts:       []string{part.(llms.TextContent).Text},
 		MaxTokens:     opts.MaxTokens,
 		Temperature:   opts.Temperature,
@@ -73,7 +76,7 @@ func (o *LLM) GenerateContent(ctx context.Context, messages []llms.MessageConten
 
 // CreateEmbedding creates embeddings for the given input texts.
 func (o *LLM) CreateEmbedding(ctx context.Context, inputTexts []string) ([][]float32, error) {
-	embeddings, err := o.client.CreateEmbedding(ctx, &vertexaiclient.EmbeddingRequest{
+	embeddings, err := o.client.CreateEmbedding(ctx, &palmclient.EmbeddingRequest{
 		Input: inputTexts,
 	})
 	if err != nil {
@@ -90,13 +93,13 @@ func (o *LLM) CreateEmbedding(ctx context.Context, inputTexts []string) ([][]flo
 	return embeddings, nil
 }
 
-// New returns a new VertexAI PaLM LLM.
+// New returns a new palmclient PaLM LLM.
 func New(opts ...Option) (*LLM, error) {
 	client, err := newClient(opts...)
 	return &LLM{client: client}, err
 }
 
-func newClient(opts ...Option) (*vertexaiclient.PaLMClient, error) {
+func newClient(opts ...Option) (*palmclient.PaLMClient, error) {
 	// Ensure options are initialized only once.
 	initOptions.Do(initOpts)
 	options := &options{}
@@ -109,5 +112,5 @@ func newClient(opts ...Option) (*vertexaiclient.PaLMClient, error) {
 		return nil, ErrMissingProjectID
 	}
 
-	return vertexaiclient.New(options.projectID, options.clientOptions...)
+	return palmclient.New(options.projectID, options.clientOptions...)
 }

llms/vertexai/vertexai_palm_llm_option.go → llms/googleai/palm/palm_llm_option.go

@@ -1,4 +1,4 @@
-package vertexai
+package palm
 
 import (
 	"net/http"

llms/googleai/vertex/new.go

@@ -1,3 +1,6 @@
+// package vertex implements a langchaingo provider for Google Vertex AI LLMs,
+// including the new Gemini models.
+// See https://cloud.google.com/vertex-ai for more details.
 package vertex
 
 import (

llms/googleai/vertex/vertex.go

@@ -1,6 +1,7 @@
-// DO NOT EDIT: this code is auto-generated from llms/googleai/googleai_llm.go
 package vertex
 
+// DO NOT EDIT: this code is auto-generated from llms/googleai/googleai_llm.go
+
 import (
 	"context"
 	"errors"