Skip to content

fix: Upgrade mongo internal and memory handling to Mong driver V2 #1444

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

Open
zamedic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Upgrade mongo internal and memory handling to Mong driver V2 #1444

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/mongodb/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package mongodb
import (
"context"

"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/mongo/readpref"
"go.mongodb.org/mongo-driver/v2/mongo"
"go.mongodb.org/mongo-driver/v2/mongo/options"
"go.mongodb.org/mongo-driver/v2/mongo/readpref"
)

func NewClient(ctx context.Context, url string) (*mongo.Client, error) {
client, err := mongo.Connect(ctx, options.Client().ApplyURI(url))
client, err := mongo.Connect(options.Client().ApplyURI(url))
if err != nil {
return nil, err
}
Expand Down
18 changes: 10 additions & 8 deletions memory/mongo/mongo_chat_history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/tmc/langchaingo/internal/mongodb"
"github.com/tmc/langchaingo/llms"
"github.com/tmc/langchaingo/schema"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"
)

const (
Expand Down Expand Up @@ -41,14 +41,16 @@ func NewMongoDBChatMessageHistory(ctx context.Context, options ...ChatMessageHis
return nil, err
}

client, err := mongodb.NewClient(ctx, h.url)
if err != nil {
return nil, err
}
if h.client == nil {
client, err := mongodb.NewClient(ctx, h.url)
if err != nil {
return nil, err
}

h.client = client
h.client = client
}

h.collection = client.Database(h.databaseName).Collection(h.collectionName)
h.collection = h.client.Database(h.databaseName).Collection(h.collectionName)
// create session id index
if _, err := h.collection.Indexes().CreateOne(ctx, mongo.IndexModel{Keys: bson.D{{Key: mongoSessionIDKey, Value: 1}}}); err != nil {
return nil, err
Expand Down
10 changes: 9 additions & 1 deletion memory/mongo/mongo_chat_history_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package mongo

import (
"errors"

"go.mongodb.org/mongo-driver/v2/mongo"
)

const (
Expand All @@ -26,7 +28,7 @@ func applyMongoDBChatOptions(options ...ChatMessageHistoryOption) (*ChatMessageH
option(h)
}

if h.url == "" {
if h.url == "" && h.client == nil {
return nil, errMongoInvalidURL
}
if h.sessionID == "" {
Expand Down Expand Up @@ -64,3 +66,9 @@ func WithDataBaseName(name string) ChatMessageHistoryOption {
p.databaseName = name
}
}

func WithDataBaseClient(client *mongo.Client) ChatMessageHistoryOption {
return func(p *ChatMessageHistory) {
p.client = client
}
}
Loading