diff --git a/go.mod b/go.mod index 3d861d463..09fcce303 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,9 @@ -module github.com/tmc/langchaingo +module github.com/golangisfun123/langchaingo go 1.22.0 +replace github.com/tmc/langchaingo => github.com/golangisfun123/langchaingo v0.0.0-20250130221257-ff25c0c0abde + require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 @@ -62,7 +64,6 @@ require ( github.com/containerd/log v0.1.0 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/deepmap/oapi-codegen/v2 v2.1.0 // indirect github.com/distribution/reference v0.5.0 // indirect github.com/dlclark/regexp2 v1.10.0 // indirect github.com/docker/docker v25.0.5+incompatible // indirect @@ -212,9 +213,10 @@ require ( github.com/nlpodyssey/cybertron v0.2.1 github.com/opensearch-project/opensearch-go v1.1.0 github.com/pgvector/pgvector-go v0.1.1 - github.com/pinecone-io/go-pinecone v0.4.1 + github.com/pinecone-io/go-pinecone/v2 v2.2.0 github.com/pkoukk/tiktoken-go v0.1.6 github.com/redis/rueidis v1.0.34 + github.com/tmc/langchaingo v0.0.0-00010101000000-000000000000 github.com/weaviate/weaviate v1.24.1 github.com/weaviate/weaviate-go-client/v4 v4.13.1 gitlab.com/golang-commonmark/markdown v0.0.0-20211110145824-bf3e522c626a @@ -224,7 +226,7 @@ require ( golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d google.golang.org/api v0.183.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.1 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 921d592b1..14b58b883 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20190105021004-abcd57078448/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= @@ -160,8 +160,6 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deepmap/oapi-codegen/v2 v2.1.0 h1:I/NMVhJCtuvL9x+S2QzZKpSjGi33oDZwPRdemvOZWyQ= -github.com/deepmap/oapi-codegen/v2 v2.1.0/go.mod h1:R1wL226vc5VmCNJUvMyYr3hJMm5reyv25j952zAVXZ8= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= @@ -345,6 +343,8 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangisfun123/langchaingo v0.0.0-20250130221257-ff25c0c0abde h1:DtfsoLNIs/ca75ZMhl6IEsVg7FQPrzcko5D8uXV94hg= +github.com/golangisfun123/langchaingo v0.0.0-20250130221257-ff25c0c0abde/go.mod h1:eLVX/wSWnElIiAyob9pOUH4hsy+4Ir3JJskDQ6DCqz8= github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -582,8 +582,8 @@ github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pgvector/pgvector-go v0.1.1 h1:kqJigGctFnlWvskUiYIvJRNwUtQl/aMSUZVs0YWQe+g= github.com/pgvector/pgvector-go v0.1.1/go.mod h1:wLJgD/ODkdtd2LJK4l6evHXTuG+8PxymYAVomKHOWac= -github.com/pinecone-io/go-pinecone v0.4.1 h1:hRJgtGUIHwvM1NvzKe+YXog4NxYi9x3NdfFhQ2QWBWk= -github.com/pinecone-io/go-pinecone v0.4.1/go.mod h1:KwWSueZFx9zccC+thBk13+LDiOgii8cff9bliUI4tQs= +github.com/pinecone-io/go-pinecone/v2 v2.2.0 h1:m986bbA7jIXfzsVGB6cBwo4ii0b1vNM9uu5j7Xg9f5Y= +github.com/pinecone-io/go-pinecone/v2 v2.2.0/go.mod h1:FLf4Tu9q7/D0ImhapnKaVgBavaB8lXp8WDrryNVrl+E= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -1010,8 +1010,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f h1:rqzndB2lIQGivcXdTuY3Y9NBvr70X+y77woofSRluec= google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f/go.mod h1:gxndsbNG1n4TZcHGgsYEfVGnTxqfEdfiDv6/DADXX9o= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/vectorstores/pinecone/pinecone.go b/vectorstores/pinecone/pinecone.go index 8bc47b6af..9dbb82bd7 100644 --- a/vectorstores/pinecone/pinecone.go +++ b/vectorstores/pinecone/pinecone.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/google/uuid" - "github.com/pinecone-io/go-pinecone/pinecone" + "github.com/pinecone-io/go-pinecone/v2/pinecone" "github.com/tmc/langchaingo/embeddings" "github.com/tmc/langchaingo/schema" "github.com/tmc/langchaingo/vectorstores" @@ -65,7 +65,12 @@ func (s Store) AddDocuments(ctx context.Context, nameSpace := s.getNameSpace(opts) - indexConn, err := s.client.IndexWithNamespace(s.host, nameSpace) + indexConn, err := s.client.Index( + pinecone.NewIndexConnParams{ + Host: s.host, + Namespace: nameSpace, + }, + ) if err != nil { return nil, err } @@ -117,7 +122,7 @@ func (s Store) AddDocuments(ctx context.Context, ) } - _, err = indexConn.UpsertVectors(&ctx, pineconeVectors) + _, err = indexConn.UpsertVectors(ctx, pineconeVectors) if err != nil { return nil, err } @@ -131,7 +136,12 @@ func (s Store) SimilaritySearch(ctx context.Context, query string, numDocuments opts := s.getOptions(options...) nameSpace := s.getNameSpace(opts) - indexConn, err := s.client.IndexWithNamespace(s.host, nameSpace) + indexConn, err := s.client.Index( + pinecone.NewIndexConnParams{ + Host: s.host, + Namespace: nameSpace, + }, + ) if err != nil { return nil, err } @@ -157,11 +167,11 @@ func (s Store) SimilaritySearch(ctx context.Context, query string, numDocuments } queryResult, err := indexConn.QueryByVectorValues( - &ctx, + ctx, &pinecone.QueryByVectorValuesRequest{ Vector: vector, TopK: uint32(numDocuments), - Filter: protoFilterStruct, + MetadataFilter: protoFilterStruct, IncludeMetadata: true, IncludeValues: true, },