Merge branch 'microsoft:main' into native-tools

tenowg · web-flow · commit 6d3e5e48821b · 2025-11-15T21:36:21.000-05:00
diff --git a/dotnet/samples/GettingStartedWithAgents/GettingStartedWithAgents.csproj b/dotnet/samples/GettingStartedWithAgents/GettingStartedWithAgents.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="9.0.11" />
     <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.*" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" VersionOverride="9.*" />
     <PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="9.*" />
diff --git a/dotnet/src/Agents/UnitTests/Agents.UnitTests.csproj b/dotnet/src/Agents/UnitTests/Agents.UnitTests.csproj
@@ -19,10 +19,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="9.0.11" />
     <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.*" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" VersionOverride="9.*" />
-    <PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="9.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="9.0.11" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="9.*" />
 		<PackageReference Include="System.Linq.AsyncEnumerable" />
     <PackageReference Include="Moq" />
diff --git a/dotnet/src/VectorData/AzureAISearch/AzureAISearchCollection.cs b/dotnet/src/VectorData/AzureAISearch/AzureAISearchCollection.cs
@@ -270,7 +270,7 @@ public override async IAsyncEnumerable<TRecord> GetAsync(IEnumerable<TKey> keys,
     /// <inheritdoc />
     public override Task DeleteAsync(TKey key, CancellationToken cancellationToken = default)
     {
-        var stringKey = this.GetStringKey(key);
+        var stringKey = GetStringKey(key);
 
         // Remove record.
         return this.RunOperationAsync(
@@ -287,7 +287,7 @@ public override Task DeleteAsync(IEnumerable<TKey> keys, CancellationToken cance
             return Task.CompletedTask;
         }
 
-        var stringKeys = keys is IEnumerable<string> k ? k : keys.Cast<string>();
+        var stringKeys = keys is IEnumerable<string> k ? k : keys.Select(GetStringKey);
 
         // Remove records.
         return this.RunOperationAsync(
@@ -504,7 +504,7 @@ _ when vectorProperty.EmbeddingGenerator is IEmbeddingGenerator<TInput, Embeddin
     {
         const string OperationName = "GetDocument";
 
-        var stringKey = this.GetStringKey(key);
+        var stringKey = GetStringKey(key);
 
         var jsonObject = await this.RunOperationAsync(
             OperationName,
@@ -787,7 +787,7 @@ private Task<T> RunOperationAsync<T>(string operationName, Func<Task<T>> operati
             operationName,
             operation);
 
-    private string GetStringKey(TKey key)
+    private static string GetStringKey(TKey key)
     {
         Verify.NotNull(key);
 
diff --git a/dotnet/src/VectorData/Pinecone/PineconeCollection.cs b/dotnet/src/VectorData/Pinecone/PineconeCollection.cs
@@ -233,7 +233,8 @@ public override async IAsyncEnumerable<TRecord> GetAsync(
         var keysList = keys switch
         {
             IEnumerable<string> k => k.ToList(),
-            IEnumerable<object> k => k.Cast<string>().ToList(),
+            IEnumerable<Guid> k => k.Select(x => x.ToString()).ToList(),
+            IEnumerable<object> k => k.Select(x => x.ToString()!).ToList(),
             _ => throw new UnreachableException("string key should have been validated during model building")
         };
 #pragma warning restore CA1851
@@ -287,7 +288,8 @@ public override Task DeleteAsync(IEnumerable<TKey> keys, CancellationToken cance
         var keysList = keys switch
         {
             IEnumerable<string> k => k.ToList(),
-            IEnumerable<object> k => k.Cast<string>().ToList(),
+            IEnumerable<Guid> k => k.Select(x => x.ToString()).ToList(),
+            IEnumerable<object> k => k.Select(x => x.ToString()!).ToList(),
             _ => throw new UnreachableException("string key should have been validated during model building")
         };
 
diff --git a/dotnet/src/VectorData/Redis/RedisJsonCollection.cs b/dotnet/src/VectorData/Redis/RedisJsonCollection.cs
@@ -284,7 +284,8 @@ public override async IAsyncEnumerable<TRecord> GetAsync(IEnumerable<TKey> keys,
         var keysList = keys switch
         {
             IEnumerable<string> k => k.ToList(),
-            IEnumerable<object> k => k.Cast<string>().ToList(),
+            IEnumerable<Guid> k => k.Select(x => x.ToString()).ToList(),
+            IEnumerable<object> k => k.Select(x => x.ToString()!).ToList(),
             _ => throw new UnreachableException()
         };
 #pragma warning restore CA1851 // Possible multiple enumerations of 'IEnumerable' collection
diff --git a/dotnet/test/VectorData/AzureAISearch.ConformanceTests/TypeTests/AzureAISearchKeyTypeTests.cs b/dotnet/test/VectorData/AzureAISearch.ConformanceTests/TypeTests/AzureAISearchKeyTypeTests.cs
@@ -12,7 +12,7 @@ public class AzureAISearchKeyTypeTests(AzureAISearchKeyTypeTests.Fixture fixture
     : KeyTypeTests(fixture), IClassFixture<AzureAISearchKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs b/dotnet/test/VectorData/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs
@@ -13,16 +13,16 @@ public class CosmosMongoKeyTypeTests(CosmosMongoKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<CosmosMongoKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task ObjectId() => this.Test<ObjectId>(new("652f8c3e8f9b2c1a4d3e6a7b"));
+    public virtual Task ObjectId() => this.Test<ObjectId>(new("652f8c3e8f9b2c1a4d3e6a7b"), new("b7a6e3d4a1c2b9f8e3c8f256"));
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/CosmosNoSql.ConformanceTests/TypeTests/CosmosNoSqlKeyTypeTests.cs b/dotnet/test/VectorData/CosmosNoSql.ConformanceTests/TypeTests/CosmosNoSqlKeyTypeTests.cs
@@ -12,7 +12,7 @@ public class CosmosNoSqlKeyTypeTests(CosmosNoSqlKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<CosmosNoSqlKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/InMemory.ConformanceTests/TypeTests/InMemoryKeyTypeTests.cs b/dotnet/test/VectorData/InMemory.ConformanceTests/TypeTests/InMemoryKeyTypeTests.cs
@@ -14,17 +14,17 @@ public class InMemoryKeyTypeTests(InMemoryKeyTypeTests.Fixture fixture)
     // The InMemory provider supports all .NET types as keys; below are just a few basic tests.
 
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
-    protected override async Task Test<TKey>(TKey keyValue)
+    protected override async Task Test<TKey>(TKey key1, TKey key2)
     {
-        await base.Test(keyValue);
+        await base.Test(key1, key2);
 
         // For InMemory, delete the collection, otherwise the next test that runs will fail because the collection
         // already exists but with the previous key type.
diff --git a/dotnet/test/VectorData/MongoDB.ConformanceTests/TypeTests/MongoKeyTypeTests.cs b/dotnet/test/VectorData/MongoDB.ConformanceTests/TypeTests/MongoKeyTypeTests.cs
@@ -13,16 +13,16 @@ public class MongoKeyTypeTests(MongoKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<MongoKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task ObjectId() => this.Test<ObjectId>(new("652f8c3e8f9b2c1a4d3e6a7b"));
+    public virtual Task ObjectId() => this.Test<ObjectId>(new("652f8c3e8f9b2c1a4d3e6a7b"), new("b7a6e3d4a1c2b9f8e3c8f256"));
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/PgVector.ConformanceTests/TypeTests/PostgresKeyTypeTests.cs b/dotnet/test/VectorData/PgVector.ConformanceTests/TypeTests/PostgresKeyTypeTests.cs
@@ -12,13 +12,13 @@ public class PostgresKeyTypeTests(PostgresKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<PostgresKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/Pinecone.ConformanceTests/TypeTests/PineconeKeyTypeTests.cs b/dotnet/test/VectorData/Pinecone.ConformanceTests/TypeTests/PineconeKeyTypeTests.cs
@@ -12,7 +12,7 @@ public class PineconeKeyTypeTests(PineconeKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<PineconeKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/Qdrant.ConformanceTests/TypeTests/QdrantKeyTypeTests.cs b/dotnet/test/VectorData/Qdrant.ConformanceTests/TypeTests/QdrantKeyTypeTests.cs
@@ -12,7 +12,7 @@ public class QdrantKeyTypeTests(QdrantKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<QdrantKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task ULong() => this.Test<ulong>(8UL);
+    public virtual Task ULong() => this.Test<ulong>(8UL, 9UL);
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/Redis.ConformanceTests/TypeTests/RedisHashSetKeyTypeTests.cs b/dotnet/test/VectorData/Redis.ConformanceTests/TypeTests/RedisHashSetKeyTypeTests.cs
@@ -13,7 +13,7 @@ public class RedisHashSetKeyTypeTests(RedisHashSetKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<RedisHashSetKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/Redis.ConformanceTests/TypeTests/RedisJsonKeyTypeTests.cs b/dotnet/test/VectorData/Redis.ConformanceTests/TypeTests/RedisJsonKeyTypeTests.cs
@@ -13,7 +13,7 @@ public class RedisJsonKeyTypeTests(RedisJsonKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<RedisJsonKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/SqlServer.ConformanceTests/TypeTests/SqlServerKeyTypeTests.cs b/dotnet/test/VectorData/SqlServer.ConformanceTests/TypeTests/SqlServerKeyTypeTests.cs
@@ -12,13 +12,13 @@ public class SqlServerKeyTypeTests(SqlServerKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<SqlServerKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/SqliteVec.ConformanceTests/TypeTests/SqliteKeyTypeTests.cs b/dotnet/test/VectorData/SqliteVec.ConformanceTests/TypeTests/SqliteKeyTypeTests.cs
@@ -12,13 +12,13 @@ public class SqliteKeyTypeTests(SqliteKeyTypeTests.Fixture fixture)
     : KeyTypeTests(fixture), IClassFixture<SqliteKeyTypeTests.Fixture>
 {
     [ConditionalFact]
-    public virtual Task Int() => this.Test<int>(8);
+    public virtual Task Int() => this.Test<int>(8, 9);
 
     [ConditionalFact]
-    public virtual Task Long() => this.Test<long>(8L);
+    public virtual Task Long() => this.Test<long>(8L, 9L);
 
     [ConditionalFact]
-    public virtual Task String() => this.Test<string>("foo");
+    public virtual Task String() => this.Test<string>("foo", "bar");
 
     public new class Fixture : KeyTypeTests.Fixture
     {
diff --git a/dotnet/test/VectorData/VectorData.ConformanceTests/TypeTests/KeyTypeTests.cs b/dotnet/test/VectorData/VectorData.ConformanceTests/TypeTests/KeyTypeTests.cs
@@ -12,57 +12,91 @@ public abstract class KeyTypeTests(KeyTypeTests.Fixture fixture)
     // All MEVD providers are expected to support Guid keys (possibly by storing them as strings).
     // This allows upper layers such as Microsoft.Extensions.DataIngestion to use Guid keys consistently.
     [ConditionalFact]
-    public virtual Task Guid() => this.Test<Guid>(new Guid("603840bf-cf91-4521-8b8e-8b6a2e75910a"));
+    public virtual Task Guid() => this.Test<Guid>(new Guid("603840bf-cf91-4521-8b8e-8b6a2e75910a"), new Guid("f507c6a2-43bd-4d8f-8656-890f2cdaf299"));
 
-    protected virtual async Task Test<TKey>(TKey keyValue)
+    protected virtual async Task Test<TKey>(TKey key1, TKey key2)
         where TKey : notnull
     {
+        Assert.NotEqual(key1, key2);
+
         using var collection = fixture.CreateCollection<TKey>();
 
         await collection.EnsureCollectionDeletedAsync();
         await collection.EnsureCollectionExistsAsync();
 
         var record = new Record<TKey>
         {
-            Key = keyValue,
+            Key = key1,
             Int = 8,
             Vector = new ReadOnlyMemory<float>([1, 2, 3])
         };
 
+        var nextRecord = new Record<TKey>
+        {
+            Key = key2,
+            Int = 9,
+            Vector = new ReadOnlyMemory<float>([3, 2, 1])
+        };
+
         await collection.UpsertAsync(record);
-        await fixture.TestStore.WaitForDataAsync(collection, recordCount: 1);
+        await collection.UpsertAsync([record, nextRecord]);
+        await fixture.TestStore.WaitForDataAsync(collection, recordCount: 2);
 
-        var result = await collection.GetAsync(keyValue);
+        var result = await collection.GetAsync(key1);
 
         Assert.NotNull(result);
-        Assert.Equal(keyValue, result.Key);
+        Assert.Equal(key1, result.Key);
         Assert.Equal(8, result.Int);
 
+        var results = await collection.GetAsync([key1, key2]).ToListAsync();
+        Assert.Equal(2, results.Count);
+        var firstRecord = Assert.Single(results, r => r.Key.Equals(key1));
+        Assert.Equal(8, firstRecord.Int);
+        var secondRecord = Assert.Single(results, r => r.Key.Equals(key2));
+        Assert.Equal(9, secondRecord.Int);
+
         ///////////////////////
         // Test dynamic mapping
         ///////////////////////
-        await collection.DeleteAsync(keyValue);
+        await collection.DeleteAsync(key1);
+        await collection.DeleteAsync([key1, key2]);
         await fixture.TestStore.WaitForDataAsync(collection, recordCount: 0);
 
         using var dynamicCollection = fixture.CreateDynamicCollection<TKey>();
         await dynamicCollection.EnsureCollectionExistsAsync();
 
         var dynamicRecord = new Dictionary<string, object?>
         {
-            [nameof(Record<TKey>.Key)] = keyValue,
+            [nameof(Record<TKey>.Key)] = key1,
             [nameof(Record<TKey>.Int)] = 8,
             [nameof(Record<TKey>.Vector)] = new ReadOnlyMemory<float>([1, 2, 3])
         };
+        var nextDynamicRecord = new Dictionary<string, object?>
+        {
+            [nameof(Record<TKey>.Key)] = key2,
+            [nameof(Record<TKey>.Int)] = 9,
+            [nameof(Record<TKey>.Vector)] = new ReadOnlyMemory<float>([3, 2, 1])
+        };
 
         await dynamicCollection.UpsertAsync(dynamicRecord);
-        await fixture.TestStore.WaitForDataAsync(dynamicCollection, recordCount: 1);
+        await dynamicCollection.UpsertAsync([dynamicRecord, nextDynamicRecord]);
+        await fixture.TestStore.WaitForDataAsync(dynamicCollection, recordCount: 2);
 
-        var dynamicResult = await dynamicCollection.GetAsync(keyValue);
+        var dynamicResult = await dynamicCollection.GetAsync(key1);
 
         Assert.NotNull(dynamicResult);
         Assert.IsType<TKey>(dynamicResult[nameof(Record<TKey>.Key)]);
-        Assert.Equal(keyValue, (TKey)dynamicResult[nameof(Record<TKey>.Key)]!);
+        Assert.Equal(key1, (TKey)dynamicResult[nameof(Record<TKey>.Key)]!);
         Assert.Equal(8, dynamicResult[nameof(Record<TKey>.Int)]);
+
+        var dynamicResults = await dynamicCollection.GetAsync([key1, key2]).ToListAsync();
+        Assert.Equal(2, dynamicResults.Count);
+        var firstDynamicRecord = Assert.Single(dynamicResults, r => r[nameof(Record<TKey>.Key)]!.Equals(key1));
+        Assert.IsType<TKey>(firstDynamicRecord[nameof(Record<TKey>.Key)]);
+        Assert.Equal(8, firstDynamicRecord[nameof(Record<TKey>.Int)]);
+        var secondDynamicRecord = Assert.Single(dynamicResults, r => r[nameof(Record<TKey>.Key)]!.Equals(key2));
+        Assert.IsType<TKey>(secondDynamicRecord[nameof(Record<TKey>.Key)]);
+        Assert.Equal(9, secondDynamicRecord[nameof(Record<TKey>.Int)]);
     }
 
     public abstract class Fixture : VectorStoreFixture

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class AzureAISearchKeyTypeTests(AzureAISearchKeyTypeTests.Fixture fixture`
`12`	`12`	`: KeyTypeTests(fixture), IClassFixture<AzureAISearchKeyTypeTests.Fixture>`
`13`	`13`	`{`
`14`	`14`	`[ConditionalFact]`
`15`		`- public virtual Task String() => this.Test<string>("foo");`
	`15`	`+ public virtual Task String() => this.Test<string>("foo", "bar");`
`16`	`16`
`17`	`17`	`public new class Fixture : KeyTypeTests.Fixture`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class CosmosNoSqlKeyTypeTests(CosmosNoSqlKeyTypeTests.Fixture fixture)`
`12`	`12`	`: KeyTypeTests(fixture), IClassFixture<CosmosNoSqlKeyTypeTests.Fixture>`
`13`	`13`	`{`
`14`	`14`	`[ConditionalFact]`
`15`		`- public virtual Task String() => this.Test<string>("foo");`
	`15`	`+ public virtual Task String() => this.Test<string>("foo", "bar");`
`16`	`16`
`17`	`17`	`public new class Fixture : KeyTypeTests.Fixture`
`18`	`18`	`{`