Skip to content

.Net: [MEVD] Fix dynamic batching APIs for PostgreSQL #13323

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

Merged
roji merged 2 commits into from
Nov 3, 2025
Merged

.Net: [MEVD] Fix dynamic batching APIs for PostgreSQL #13323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c759096
[MEVD] Fix dynamic batching APIs for PostgreSQL
roji Nov 3, 2025
539b60c
Update dotnet/src/VectorData/PgVector/PostgresSqlBuilder.cs
roji Nov 3, 2025
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
2 changes: 1 addition & 1 deletion dotnet/src/VectorData/PgVector/PostgresSqlBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ internal static void BuildGetCommand<TKey>(NpgsqlCommand command, string schema,
internal static void BuildGetBatchCommand<TKey>(NpgsqlCommand command, string schema, string tableName, CollectionModel model, List<TKey> keys, bool includeVectors = false)
where TKey : notnull
{
NpgsqlDbType? keyType = PostgresPropertyMapping.GetNpgsqlDbType(typeof(TKey)) ?? throw new ArgumentException($"Unsupported key type {typeof(TKey).Name}");
NpgsqlDbType? keyType = PostgresPropertyMapping.GetNpgsqlDbType(model.KeyProperty.Type) ?? throw new UnreachableException($"Unsupported key type {model.KeyProperty.Type.Name}");

// Generate the column names
var columns = model.Properties
Expand Down
24 changes: 24 additions & 0 deletions dotnet/test/VectorData/InMemory.ConformanceTests/ModelTests/InMemoryDynamicModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@ public override async Task GetAsync_single_record(bool includeVectors)
AssertEquivalent(expectedRecord, received, includeVectors: true, fixture.TestStore.VectorsComparable);
}

public override async Task GetAsync_multiple_records(bool includeVectors)
{
if (includeVectors)
{
await base.GetAsync_multiple_records(includeVectors);
return;
}

// InMemory always returns the vectors (IncludeVectors = false isn't respected)
var expectedRecords = fixture.TestData.Take(2);
var ids = expectedRecords.Select(record => record[KeyPropertyName]!);

var received = await fixture.Collection.GetAsync(ids, new() { IncludeVectors = false }).ToArrayAsync();

foreach (var record in expectedRecords)
{
AssertEquivalent(
record,
received.Single(r => r[KeyPropertyName]!.Equals(record[KeyPropertyName])),
includeVectors: true,
fixture.TestStore.VectorsComparable);
}
}

public override async Task GetAsync_with_filter(bool includeVectors)
{
if (includeVectors)
Expand Down
104 changes: 50 additions & 54 deletions dotnet/test/VectorData/VectorData.ConformanceTests/ModelTests/DynamicModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,23 @@ public virtual async Task GetAsync_single_record(bool includeVectors)
AssertEquivalent(expectedRecord, received, includeVectors, fixture.TestStore.VectorsComparable);
}

// TODO: https://github.com/microsoft/semantic-kernel/issues/13303
// [ConditionalTheory, MemberData(nameof(IncludeVectorsData))]
// public virtual Task GetAsync_multiple_records(bool includeVectors)
// {
// var expectedRecords = fixture.TestData.Take(2);
// var ids = expectedRecords.Select(record => record[KeyPropertyName]!);

// var received = await fixture.Collection.GetAsync(ids, new() { IncludeVectors = includeVectors }).ToArrayAsync();

// foreach (var record in expectedRecords)
// {
// AssertEquivalent(
// record,
// received.Single(r => r[KeyPropertyName]!.Equals(record[KeyPropertyName])),
// includeVectors,
// fixture.TestStore.VectorsComparable);
// }
// }
[ConditionalTheory, MemberData(nameof(IncludeVectorsData))]
public virtual async Task GetAsync_multiple_records(bool includeVectors)
{
var expectedRecords = fixture.TestData.Take(2);
var ids = expectedRecords.Select(record => record[KeyPropertyName]!);

var received = await fixture.Collection.GetAsync(ids, new() { IncludeVectors = includeVectors }).ToArrayAsync();

foreach (var record in expectedRecords)
{
AssertEquivalent(
record,
received.Single(r => r[KeyPropertyName]!.Equals(record[KeyPropertyName])),
includeVectors,
fixture.TestStore.VectorsComparable);
}
}

[ConditionalFact]
public virtual async Task GetAsync_throws_for_null_key()
Expand Down Expand Up @@ -241,42 +240,39 @@ public virtual async Task Update_single_record()
AssertEquivalent(updated, received, includeVectors: true, fixture.TestStore.VectorsComparable);
}

// TODO: https://github.com/microsoft/semantic-kernel/issues/13303
// [ConditionalFact]
// public virtual async Task Insert_multiple_records()
// {
// Dictionary<string, object?>[] newRecords =
// [
// new()
// {
// [KeyPropertyName] = fixture.GenerateNextKey<TKey>(),
// [IntegerPropertyName] = 100,
// [StringPropertyName] = "New record 1",
// [EmbeddingPropertyName] = new ReadOnlyMemory<float>([10, 0, 1])
// },
// new()
// {
// [KeyPropertyName] = fixture.GenerateNextKey<TKey>(),
// [IntegerPropertyName] = 101,
// [StringPropertyName] = "New record 2",
// [EmbeddingPropertyName] = new ReadOnlyMemory<float>([10, 0, 2])
// },
// ];

// var keys = newRecords.Select(record => record[KeyPropertyName]!).ToArray();
// Assert.Empty(await this.Collection.GetAsync(keys).ToArrayAsync());

// await this.Collection.UpsertAsync(newRecords);

// var received = await this.Collection.GetAsync(keys, new() { IncludeVectors = true }).ToArrayAsync();

// Assert.Collection(
// received.OrderBy(r => r[IntegerPropertyName]),
// r => AssertEquivalent(newRecords[0], r, includeVectors: true, fixture.TestStore.VectorsComparable),
// r => AssertEquivalent(newRecords[1], r, includeVectors: true, fixture.TestStore.VectorsComparable));

// Assert.Equal(fixture.TestData.Count + 2, await this.GetRecordCount());
// }
[ConditionalFact]
public virtual async Task Insert_multiple_records()
{
Dictionary<string, object?>[] newRecords =
[
new()
{
[KeyPropertyName] = fixture.GenerateNextKey<TKey>(),
[IntegerPropertyName] = 100,
[StringPropertyName] = "New record 1",
[EmbeddingPropertyName] = new ReadOnlyMemory<float>([10, 0, 1])
},
new()
{
[KeyPropertyName] = fixture.GenerateNextKey<TKey>(),
[IntegerPropertyName] = 101,
[StringPropertyName] = "New record 2",
[EmbeddingPropertyName] = new ReadOnlyMemory<float>([10, 0, 2])
},
];

var keys = newRecords.Select(record => record[KeyPropertyName]!).ToArray();
Assert.Empty(await this.Collection.GetAsync(keys).ToArrayAsync());

await this.Collection.UpsertAsync(newRecords);

var received = await this.Collection.GetAsync(keys, new() { IncludeVectors = true }).ToArrayAsync();

Assert.Collection(
received.OrderBy(r => r[IntegerPropertyName]),
r => AssertEquivalent(newRecords[0], r, includeVectors: true, fixture.TestStore.VectorsComparable),
r => AssertEquivalent(newRecords[1], r, includeVectors: true, fixture.TestStore.VectorsComparable));
}

#endregion Upsert

Expand Down
Loading