From 339c730585199165cea9469baf2ed38f2c9bd4a0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Aug 2026 10:29:26 +0000 Subject: [PATCH 1/7] Rename CosmosMongoDB to CosmosDocumentDB Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- .github/workflows/mevd.yml | 4 +- CommunityToolkit.AI.slnx | 6 +- MEVD/MEVD.slnf | 6 +- .../AssemblyInfo.cs | 0 .../CosmosDocumentDB.csproj} | 8 +- .../CosmosDocumentDBCollection.cs} | 52 +++---- ...osmosDocumentDBCollectionCreateMapping.cs} | 18 +-- .../CosmosDocumentDBCollectionOptions.cs} | 14 +- ...osmosDocumentDBCollectionSearchMapping.cs} | 8 +- .../CosmosDocumentDBConstants.cs} | 4 +- .../CosmosDocumentDBDynamicCollection.cs} | 8 +- .../CosmosDocumentDBFilterTranslator.cs} | 4 +- ...sDocumentDBServiceCollectionExtensions.cs} | 142 +++++++++--------- .../CosmosDocumentDBVectorStore.cs} | 24 +-- .../CosmosDocumentDBVectorStoreOptions.cs} | 12 +- .../MongoShared/BsonValueFactory.cs | 2 +- .../MongoShared/ErrorHandlingAsyncCursor.cs | 2 +- .../MongoShared/IMongoMapper.cs | 2 +- .../MongoShared/MongoConstants.cs | 2 +- .../MongoShared/MongoDynamicMapper.cs | 2 +- .../MongoShared/MongoMapper.cs | 2 +- .../MongoShared/MongoModelBuilder.cs | 2 +- .../MongoShared/README.md | 2 +- .../README.md | 4 +- .../CosmosDocumentDB.ConformanceTests.csproj} | 4 +- .../CosmosDocumentDBBsonMappingTests.cs} | 24 +-- ...mosDocumentDBCollectionManagementTests.cs} | 8 +- ...smosDocumentDBDependencyInjectionTests.cs} | 72 ++++----- .../CosmosDocumentDBDistanceFunctionTests.cs} | 12 +- ...smosDocumentDBEmbeddingGenerationTests.cs} | 32 ++-- .../CosmosDocumentDBFilterTests.cs} | 12 +- .../CosmosDocumentDBIndexKindTests.cs} | 10 +- ...DocumentDBTestSuiteImplementationTests.cs} | 4 +- .../CosmosDocumentDBBasicModelTests.cs | 18 +++ .../CosmosDocumentDBMultiVectorModelTests.cs} | 10 +- .../CosmosDocumentDBNoDataModelTests.cs | 18 +++ .../CosmosDocumentDBNoVectorModelTests.cs | 18 +++ .../Properties/AssemblyAttributes.cs | 0 .../Support/CosmosDocumentDBFixture.cs} | 6 +- .../CosmosDocumentDBTestEnvironment.cs} | 10 +- .../Support/CosmosDocumentDBTestStore.cs} | 20 +-- .../CosmosDocumentDBDataTypeTests.cs} | 10 +- .../CosmosDocumentDBEmbeddingTypeTests.cs} | 10 +- .../CosmosDocumentDBKeyTypeTests.cs} | 10 +- .../.editorconfig | 0 .../CosmosDocumentDB.UnitTests.csproj} | 6 +- .../CosmosDocumentDBCollectionTests.cs} | 56 +++---- .../CosmosDocumentDBHotelModel.cs} | 4 +- .../CosmosDocumentDBVectorStoreTests.cs} | 18 +-- .../ModelTests/CosmosMongoBasicModelTests.cs | 18 --- .../ModelTests/CosmosMongoNoDataModelTests.cs | 18 --- .../CosmosMongoNoVectorModelTests.cs | 18 --- README.md | 10 +- 53 files changed, 393 insertions(+), 393 deletions(-) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/AssemblyInfo.cs (100%) rename MEVD/src/{CosmosMongoDB/CosmosMongoDB.csproj => CosmosDocumentDB/CosmosDocumentDB.csproj} (71%) rename MEVD/src/{CosmosMongoDB/CosmosMongoCollection.cs => CosmosDocumentDB/CosmosDocumentDBCollection.cs} (92%) rename MEVD/src/{CosmosMongoDB/CosmosMongoCollectionCreateMapping.cs => CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs} (84%) rename MEVD/src/{CosmosMongoDB/CosmosMongoCollectionOptions.cs => CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs} (74%) rename MEVD/src/{CosmosMongoDB/CosmosMongoCollectionSearchMapping.cs => CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs} (94%) rename MEVD/src/{CosmosMongoDB/CosmosMongoConstants.cs => CosmosDocumentDB/CosmosDocumentDBConstants.cs} (67%) rename MEVD/src/{CosmosMongoDB/CosmosMongoDynamicCollection.cs => CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs} (74%) rename MEVD/src/{CosmosMongoDB/CosmosMongoFilterTranslator.cs => CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs} (98%) rename MEVD/src/{CosmosMongoDB/CosmosMongoServiceCollectionExtensions.cs => CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs} (63%) rename MEVD/src/{CosmosMongoDB/CosmosMongoVectorStore.cs => CosmosDocumentDB/CosmosDocumentDBVectorStore.cs} (82%) rename MEVD/src/{CosmosMongoDB/CosmosMongoVectorStoreOptions.cs => CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs} (56%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/BsonValueFactory.cs (95%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/ErrorHandlingAsyncCursor.cs (97%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/IMongoMapper.cs (92%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/MongoConstants.cs (97%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/MongoDynamicMapper.cs (99%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/MongoMapper.cs (99%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/MongoModelBuilder.cs (98%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/MongoShared/README.md (77%) rename MEVD/src/{CosmosMongoDB => CosmosDocumentDB}/README.md (86%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj => CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj} (88%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoBsonMappingTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs} (79%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoCollectionManagementTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs} (55%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoDependencyInjectionTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs} (73%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoDistanceFunctionTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs} (71%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoEmbeddingGenerationTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs} (51%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoFilterTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs} (89%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoIndexKindTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs} (67%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/CosmosMongoTestSuiteImplementationTests.cs => CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs} (75%) create mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs rename MEVD/test/{CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoMultiVectorModelTests.cs => CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs} (53%) create mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs create mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs rename MEVD/test/{CosmosMongoDB.ConformanceTests => CosmosDocumentDB.ConformanceTests}/Properties/AssemblyAttributes.cs (100%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/Support/CosmosMongoFixture.cs => CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs} (50%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestEnvironment.cs => CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs} (70%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestStore.cs => CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs} (60%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoDataTypeTests.cs => CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs} (86%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoEmbeddingTypeTests.cs => CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs} (50%) rename MEVD/test/{CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs => CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs} (65%) rename MEVD/test/{CosmosMongoDB.UnitTests => CosmosDocumentDB.UnitTests}/.editorconfig (100%) rename MEVD/test/{CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj => CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj} (73%) rename MEVD/test/{CosmosMongoDB.UnitTests/CosmosMongoCollectionTests.cs => CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs} (90%) rename MEVD/test/{CosmosMongoDB.UnitTests/CosmosMongoHotelModel.cs => CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs} (93%) rename MEVD/test/{CosmosMongoDB.UnitTests/CosmosMongoVectorStoreTests.cs => CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs} (73%) delete mode 100644 MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoBasicModelTests.cs delete mode 100644 MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoDataModelTests.cs delete mode 100644 MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoVectorModelTests.cs diff --git a/.github/workflows/mevd.yml b/.github/workflows/mevd.yml index ba2e6ba..7456fa4 100644 --- a/.github/workflows/mevd.yml +++ b/.github/workflows/mevd.yml @@ -155,10 +155,10 @@ jobs: fail-fast: false matrix: provider: ${{ fromJson(needs.discover.outputs.all_providers) }} - # AzureAISearch and CosmosMongoDB require cloud instances and can't run in CI. + # AzureAISearch and CosmosDocumentDB require cloud instances and can't run in CI. exclude: - provider: AzureAISearch - - provider: CosmosMongoDB + - provider: CosmosDocumentDB steps: - uses: actions/checkout@v6 diff --git a/CommunityToolkit.AI.slnx b/CommunityToolkit.AI.slnx index f0c7ed0..ce0171a 100644 --- a/CommunityToolkit.AI.slnx +++ b/CommunityToolkit.AI.slnx @@ -10,7 +10,7 @@ - + @@ -25,8 +25,8 @@ - - + + diff --git a/MEVD/MEVD.slnf b/MEVD/MEVD.slnf index 18885dd..8277058 100644 --- a/MEVD/MEVD.slnf +++ b/MEVD/MEVD.slnf @@ -5,7 +5,7 @@ [ "MEVD/src/AzureAISearch/AzureAISearch.csproj", "MEVD/src/CosmosNoSql/CosmosNoSql.csproj", - "MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj", + "MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj", "MEVD/src/InMemory/InMemory.csproj", "MEVD/src/PgVector/PgVector.csproj", "MEVD/src/Qdrant/Qdrant.csproj", @@ -18,8 +18,8 @@ "MEVD/test/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj", "MEVD/test/CosmosNoSql.UnitTests/CosmosNoSql.UnitTests.csproj", "MEVD/test/CosmosNoSql.ConformanceTests/CosmosNoSql.ConformanceTests.csproj", - "MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj", - "MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj", + "MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj", + "MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj", "MEVD/test/InMemory.UnitTests/InMemory.UnitTests.csproj", "MEVD/test/InMemory.ConformanceTests/InMemory.ConformanceTests.csproj", "MEVD/test/PgVector.UnitTests/PgVector.UnitTests.csproj", diff --git a/MEVD/src/CosmosMongoDB/AssemblyInfo.cs b/MEVD/src/CosmosDocumentDB/AssemblyInfo.cs similarity index 100% rename from MEVD/src/CosmosMongoDB/AssemblyInfo.cs rename to MEVD/src/CosmosDocumentDB/AssemblyInfo.cs diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj b/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj similarity index 71% rename from MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj index fb19b0f..75bcecc 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj @@ -2,17 +2,17 @@ 1.0.0 - CommunityToolkit.VectorData.CosmosMongoDB + CommunityToolkit.VectorData.CosmosDocumentDB $(AssemblyName) net10.0;net8.0;netstandard2.1;net472 true - Azure CosmosDB MongoDB vCore provider for Microsoft.Extensions.VectorData - Azure CosmosDB MongoDB vCore provider for Microsoft.Extensions.VectorData by the .NET Community Toolkit + Azure DocumentDB vCore provider for Microsoft.Extensions.VectorData + Azure DocumentDB vCore provider for Microsoft.Extensions.VectorData by the .NET Community Toolkit - + diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoCollection.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs similarity index 92% rename from MEVD/src/CosmosMongoDB/CosmosMongoCollection.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs index 766b533..6f83af0 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoCollection.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs @@ -15,15 +15,15 @@ using MEVD = Microsoft.Extensions.VectorData; using Microsoft.Shared.Diagnostics; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Service for storing and retrieving vector records, that uses Azure CosmosDB MongoDB as the underlying storage. +/// Service for storing and retrieving vector records, that uses Azure DocumentDB as the underlying storage. /// /// The data type of the record key. Must be either . /// The data model to use for adding, updating and retrieving data from storage. #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public class CosmosMongoCollection : VectorStoreCollection +public class CosmosDocumentDBCollection : VectorStoreCollection where TKey : notnull where TRecord : class #pragma warning restore CA1711 // Identifiers should not have incorrect suffix @@ -40,10 +40,10 @@ public class CosmosMongoCollection : VectorStoreCollectionThe default options for vector search. private static readonly MEVD.VectorSearchOptions s_defaultVectorSearchOptions = new(); - /// that can be used to manage the collections in Azure CosmosDB MongoDB. + /// that can be used to manage the collections in Azure DocumentDB. private readonly IMongoDatabase _mongoDatabase; - /// Azure CosmosDB MongoDB collection to perform record operations. + /// Azure DocumentDB collection to perform record operations. private readonly IMongoCollection _mongoCollection; /// Interface for mapping between a storage model, and the consumer record data model. @@ -70,28 +70,28 @@ public class CosmosMongoCollection : VectorStoreCollection - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// that can be used to manage the collections in Azure CosmosDB MongoDB. - /// The name of the collection that this will access. + /// that can be used to manage the collections in Azure DocumentDB. + /// The name of the collection that this will access. /// Optional configuration options for this class. - [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate CosmosMongoDynamicCollection instead.")] - [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate CosmosMongoDynamicCollection instead.")] - public CosmosMongoCollection( + [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate CosmosDocumentDBDynamicCollection instead.")] + [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate CosmosDocumentDBDynamicCollection instead.")] + public CosmosDocumentDBCollection( IMongoDatabase mongoDatabase, string name, - CosmosMongoCollectionOptions? options = default) + CosmosDocumentDBCollectionOptions? options = default) : this( mongoDatabase, name, static options => typeof(TRecord) == typeof(Dictionary) - ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(CosmosMongoDynamicCollection))) + ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(CosmosDocumentDBDynamicCollection))) : new MongoModelBuilder().Build(typeof(TRecord), typeof(TKey), options.Definition, options.EmbeddingGenerator), options) { } - internal CosmosMongoCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, CosmosMongoCollectionOptions? options) + internal CosmosDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, CosmosDocumentDBCollectionOptions? options) { // Verify. Throw.IfNull(mongoDatabase); @@ -102,7 +102,7 @@ internal CosmosMongoCollection(IMongoDatabase mongoDatabase, string name, Func CosmosMongoCollectionSearchMapping.GetSearchQueryForHnswIndex( + IndexKind.Hnsw => CosmosDocumentDBCollectionSearchMapping.GetSearchQueryForHnswIndex( vector, vectorProperty.StorageName, itemsAmount, _efSearch, filter), - IndexKind.IvfFlat => CosmosMongoCollectionSearchMapping.GetSearchQueryForIvfIndex( + IndexKind.IvfFlat => CosmosDocumentDBCollectionSearchMapping.GetSearchQueryForIvfIndex( vector, vectorProperty.StorageName, itemsAmount, filter), _ => throw new InvalidOperationException( - $"Index kind '{vectorProperty.IndexKind}' on {nameof(VectorStoreVectorProperty)} '{vectorProperty.StorageName}' is not supported by the Azure CosmosDB for MongoDB VectorStore. " + + $"Index kind '{vectorProperty.IndexKind}' on {nameof(VectorStoreVectorProperty)} '{vectorProperty.StorageName}' is not supported by the Azure DocumentDB VectorStore. " + $"Supported index kinds are: {string.Join(", ", [IndexKind.Hnsw, IndexKind.IvfFlat])}") }; - var projectionQuery = CosmosMongoCollectionSearchMapping.GetProjectionQuery( + var projectionQuery = CosmosDocumentDBCollectionSearchMapping.GetProjectionQuery( ScorePropertyName, DocumentPropertyName); @@ -406,7 +406,7 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null // Add score threshold filter as a $match stage if specified if (options.ScoreThreshold.HasValue) { - pipeline.Add(CosmosMongoCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); + pipeline.Add(CosmosDocumentDBCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); } const string OperationName = "Aggregate"; @@ -455,7 +455,7 @@ public override async IAsyncEnumerable GetAsync( options ??= new(); // Translate the filter now, so if it fails, we throw immediately. - var translatedFilter = new CosmosMongoFilterTranslator().Translate(filter, _model); + var translatedFilter = new CosmosDocumentDBFilterTranslator().Translate(filter, _model); SortDefinition? sortDefinition = null; var orderBy = options.OrderBy?.Invoke(new()).Values; @@ -503,13 +503,13 @@ private async Task CreateIndexesAsync(string collectionName, CancellationToken c var indexArray = new BsonArray(); - indexArray.AddRange(CosmosMongoCollectionCreateMapping.GetVectorIndexes( + indexArray.AddRange(CosmosDocumentDBCollectionCreateMapping.GetVectorIndexes( _model.VectorProperties, uniqueIndexes, _numLists, _efConstruction)); - indexArray.AddRange(CosmosMongoCollectionCreateMapping.GetFilterableDataIndexes( + indexArray.AddRange(CosmosDocumentDBCollectionCreateMapping.GetFilterableDataIndexes( _model.DataProperties, uniqueIndexes)); diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionCreateMapping.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs similarity index 84% rename from MEVD/src/CosmosMongoDB/CosmosMongoCollectionCreateMapping.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs index 3a7a814..2070f1d 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionCreateMapping.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs @@ -5,12 +5,12 @@ using Microsoft.Extensions.VectorData.ProviderServices; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Contains mapping helpers to use when creating a collection in Azure CosmosDB MongoDB. +/// Contains mapping helpers to use when creating a collection in Azure DocumentDB. /// -internal static class CosmosMongoCollectionCreateMapping +internal static class CosmosDocumentDBCollectionCreateMapping { /// /// Returns an array of indexes to create for vector properties. @@ -104,25 +104,25 @@ public static BsonArray GetFilterableDataIndexes( } /// - /// More information about Azure CosmosDB for MongoDB index kinds here: . + /// More information about Azure DocumentDB index kinds here: . /// private static string GetIndexKind(string? indexKind, string vectorPropertyName) - => CosmosMongoCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch + => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch { IndexKind.Hnsw => "vector-hnsw", IndexKind.IvfFlat => "vector-ivf", - _ => throw new NotSupportedException($"Index kind '{indexKind}' on {nameof(VectorStoreVectorProperty)} '{vectorPropertyName}' is not supported by the Azure CosmosDB for MongoDB VectorStore.") + _ => throw new NotSupportedException($"Index kind '{indexKind}' on {nameof(VectorStoreVectorProperty)} '{vectorPropertyName}' is not supported by the Azure DocumentDB VectorStore.") }; /// - /// More information about Azure CosmosDB for MongoDB distance functions here: . + /// More information about Azure DocumentDB distance functions here: . /// private static string GetDistanceFunction(string? distanceFunction, string vectorPropertyName) - => CosmosMongoCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch + => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch { DistanceFunction.CosineDistance => "COS", DistanceFunction.DotProductSimilarity => "IP", DistanceFunction.EuclideanDistance => "L2", - _ => throw new NotSupportedException($"Distance function '{distanceFunction}' for {nameof(VectorStoreVectorProperty)} '{vectorPropertyName}' is not supported by the Azure CosmosDB for MongoDB VectorStore.") + _ => throw new NotSupportedException($"Distance function '{distanceFunction}' for {nameof(VectorStoreVectorProperty)} '{vectorPropertyName}' is not supported by the Azure DocumentDB VectorStore.") }; } diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionOptions.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs similarity index 74% rename from MEVD/src/CosmosMongoDB/CosmosMongoCollectionOptions.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs index 0fc2d8e..9944e3e 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionOptions.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs @@ -3,23 +3,23 @@ using Microsoft.Extensions.VectorData; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Options when creating a . +/// Options when creating a . /// -public sealed class CosmosMongoCollectionOptions : VectorStoreCollectionOptions +public sealed class CosmosDocumentDBCollectionOptions : VectorStoreCollectionOptions { - internal static readonly CosmosMongoCollectionOptions Default = new(); + internal static readonly CosmosDocumentDBCollectionOptions Default = new(); /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public CosmosMongoCollectionOptions() + public CosmosDocumentDBCollectionOptions() { } - internal CosmosMongoCollectionOptions(CosmosMongoCollectionOptions? source) : base(source) + internal CosmosDocumentDBCollectionOptions(CosmosDocumentDBCollectionOptions? source) : base(source) { NumLists = source?.NumLists ?? Default.NumLists; EfConstruction = source?.EfConstruction ?? Default.EfConstruction; diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionSearchMapping.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs similarity index 94% rename from MEVD/src/CosmosMongoDB/CosmosMongoCollectionSearchMapping.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs index 3aadb66..cd6d78d 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoCollectionSearchMapping.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs @@ -5,12 +5,12 @@ using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Contains mapping helpers to use when searching for documents using Azure CosmosDB MongoDB. +/// Contains mapping helpers to use when searching for documents using Azure DocumentDB. /// -internal static class CosmosMongoCollectionSearchMapping +internal static class CosmosDocumentDBCollectionSearchMapping { /// Returns index kind specified on vector property or default . public static string GetVectorPropertyIndexKind(string? indexKind) => !string.IsNullOrWhiteSpace(indexKind) ? indexKind! : MongoConstants.DefaultIndexKind; @@ -98,7 +98,7 @@ public static BsonDocument GetProjectionQuery(string scorePropertyName, string d /// Returns a $match stage to filter results by score threshold. /// - /// Cosmos MongoDB returns a similarity score where higher values mean more similar, + /// Cosmos DocumentDB returns a similarity score where higher values mean more similar, /// so we filter with $gte to keep results at or above the threshold. /// public static BsonDocument GetScoreThresholdMatchQuery(string scorePropertyName, double scoreThreshold) diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoConstants.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs similarity index 67% rename from MEVD/src/CosmosMongoDB/CosmosMongoConstants.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs index 83dd2e9..ca68c87 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoConstants.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; -internal static class CosmosMongoConstants +internal static class CosmosDocumentDBConstants { public const string VectorStoreSystemName = "azure.cosmosdbmongodb"; } diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoDynamicCollection.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs similarity index 74% rename from MEVD/src/CosmosMongoDB/CosmosMongoDynamicCollection.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs index b5b9a7d..0404675 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoDynamicCollection.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs @@ -4,22 +4,22 @@ using MongoDB.Driver; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// Represents a collection of vector store records in a Mongo database, mapped to a dynamic Dictionary<string, object?>. /// #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public sealed class CosmosMongoDynamicCollection : CosmosMongoCollection> +public sealed class CosmosDocumentDBDynamicCollection : CosmosDocumentDBCollection> #pragma warning restore CA1711 // Identifiers should not have incorrect suffix { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in MongoDB. /// The name of the collection. /// Optional configuration options for this class. - public CosmosMongoDynamicCollection(IMongoDatabase mongoDatabase, string name, CosmosMongoCollectionOptions options) + public CosmosDocumentDBDynamicCollection(IMongoDatabase mongoDatabase, string name, CosmosDocumentDBCollectionOptions options) : base( mongoDatabase, name, diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoFilterTranslator.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs similarity index 98% rename from MEVD/src/CosmosMongoDB/CosmosMongoFilterTranslator.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs index d3dc9e4..6df8fbd 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoFilterTranslator.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs @@ -8,11 +8,11 @@ using Microsoft.Extensions.VectorData.ProviderServices.Filter; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; // MongoDB query reference: https://www.mongodb.com/docs/manual/reference/operator/query // Information specific to vector search pre-filter: https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-stage/#atlas-vector-search-pre-filter -internal class CosmosMongoFilterTranslator : FilterTranslatorBase +internal class CosmosDocumentDBFilterTranslator : FilterTranslatorBase { internal BsonDocument Translate(LambdaExpression lambdaExpression, CollectionModel model) { diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoServiceCollectionExtensions.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs similarity index 63% rename from MEVD/src/CosmosMongoDB/CosmosMongoServiceCollectionExtensions.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs index 3035de2..cb1e03b 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoServiceCollectionExtensions.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs @@ -4,167 +4,167 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.AI; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Driver; using Microsoft.Shared.Diagnostics; namespace Microsoft.Extensions.DependencyInjection; /// -/// Extension methods to register Azure CosmosDB MongoDB instances on an . +/// Extension methods to register Azure DocumentDB instances on an . /// -public static class CosmosMongoServiceCollectionExtensions +public static class CosmosDocumentDBServiceCollectionExtensions { private const string DynamicCodeMessage = "This method is incompatible with NativeAOT, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string UnreferencedCodeMessage = "This method is incompatible with trimming, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string ApplicationId = "CommunityToolkit.MEVD"; /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosMongoVectorStore( + public static IServiceCollection AddCosmosDocumentDBVectorStore( this IServiceCollection services, - CosmosMongoVectorStoreOptions? options = default, + CosmosDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedCosmosMongoVectorStore(services, serviceKey: null, options, lifetime); + => AddKeyedCosmosDocumentDBVectorStore(services, serviceKey: null, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosMongoVectorStore( + public static IServiceCollection AddKeyedCosmosDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, - CosmosMongoVectorStoreOptions? options = default, + CosmosDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); - services.Add(new ServiceDescriptor(typeof(CosmosMongoVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBVectorStore), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetStoreOptions(sp, _ => options); - return new CosmosMongoVectorStore(database, options); + return new CosmosDocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosMongoVectorStore( + public static IServiceCollection AddCosmosDocumentDBVectorStore( this IServiceCollection services, string connectionString, string databaseName, - CosmosMongoVectorStoreOptions? options = default, + CosmosDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedCosmosMongoVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); + => AddKeyedCosmosDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. - /// Connection string required to connect to Azure CosmosDB MongoDB. - /// Database name for Azure CosmosDB MongoDB. - /// Optional options to further configure the . + /// Connection string required to connect to Azure DocumentDB. + /// Database name for Azure DocumentDB. + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosMongoVectorStore( + public static IServiceCollection AddKeyedCosmosDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, string connectionString, string databaseName, - CosmosMongoVectorStoreOptions? options = default, + CosmosDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - services.Add(new ServiceDescriptor(typeof(CosmosMongoVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBVectorStore), serviceKey, (sp, _) => { options = GetStoreOptions(sp, _ => options); MongoClient mongoClient = new(CreateClientSettings(connectionString)); var database = mongoClient.GetDatabase(databaseName); - return new CosmosMongoVectorStore(database, options); + return new CosmosDocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosMongoCollection( + public static IServiceCollection AddCosmosDocumentDBCollection( this IServiceCollection services, string name, - CosmosMongoCollectionOptions? options = default, + CosmosDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosMongoCollection(services, serviceKey: null, name, options, lifetime); + => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosMongoCollection( + public static IServiceCollection AddKeyedCosmosDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, - CosmosMongoCollectionOptions? options = default, + CosmosDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { Throw.IfNull(services); Throw.IfNullOrWhitespace(name); - services.Add(new ServiceDescriptor(typeof(CosmosMongoCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBCollection), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetCollectionOptions(sp, _ => options); - return new CosmosMongoCollection(database, name, options); + return new CosmosDocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -173,72 +173,72 @@ public static IServiceCollection AddKeyedCosmosMongoCollection( } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddCosmosMongoCollection( + public static IServiceCollection AddCosmosDocumentDBCollection( this IServiceCollection services, string name, string connectionString, string databaseName, - CosmosMongoCollectionOptions? options = default, + CosmosDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosMongoCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); + => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. - /// Connection string required to connect to Azure CosmosDB MongoDB. - /// Database name for Azure CosmosDB MongoDB. - /// Optional options to further configure the . + /// Connection string required to connect to Azure DocumentDB. + /// Database name for Azure DocumentDB. + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedCosmosMongoCollection( + public static IServiceCollection AddKeyedCosmosDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, string connectionString, string databaseName, - CosmosMongoCollectionOptions? options = default, + CosmosDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - return AddKeyedCosmosMongoCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); + return AddKeyedCosmosDocumentDBCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddCosmosMongoCollection( + public static IServiceCollection AddCosmosDocumentDBCollection( this IServiceCollection services, string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosMongoCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); + => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. @@ -252,13 +252,13 @@ public static IServiceCollection AddCosmosMongoCollection( /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedCosmosMongoCollection( + public static IServiceCollection AddKeyedCosmosDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { @@ -267,13 +267,13 @@ public static IServiceCollection AddKeyedCosmosMongoCollection( Throw.IfNull(connectionStringProvider); Throw.IfNull(databaseNameProvider); - services.Add(new ServiceDescriptor(typeof(CosmosMongoCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBCollection), serviceKey, (sp, _) => { var options = GetCollectionOptions(sp, optionsProvider); MongoClient mongoClient = new(CreateClientSettings(connectionStringProvider(sp))); var database = mongoClient.GetDatabase(databaseNameProvider(sp)); - return new CosmosMongoCollection(database, name, options); + return new CosmosDocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -286,16 +286,16 @@ private static void AddAbstractions(IServiceCollection services, where TRecord : class { services.Add(new ServiceDescriptor(typeof(VectorStoreCollection), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); services.Add(new ServiceDescriptor(typeof(IVectorSearchable), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); - // Once HybridSearch supports get implemented by CosmosMongoCollection, + // Once HybridSearch supports get implemented by CosmosDocumentDBCollection, // we need to add IKeywordHybridSearchable abstraction here as well. } - private static CosmosMongoVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) + private static CosmosDocumentDBVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) @@ -309,7 +309,7 @@ private static void AddAbstractions(IServiceCollection services, : new(options) { EmbeddingGenerator = embeddingGenerator }; // Create a brand new copy in order to avoid modifying the original options. } - private static CosmosMongoCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) + private static CosmosDocumentDBCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoVectorStore.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs similarity index 82% rename from MEVD/src/CosmosMongoDB/CosmosMongoVectorStore.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs index 4d4b66f..375ce2a 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoVectorStore.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs @@ -10,20 +10,20 @@ using Microsoft.Shared.Diagnostics; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Class for accessing the list of collections in a Azure CosmosDB MongoDB vector store. +/// Class for accessing the list of collections in a Azure DocumentDB vector store. /// /// /// This class can be used with collections of any schema type, but requires you to provide schema information when getting a collection. /// -public sealed class CosmosMongoVectorStore : VectorStore +public sealed class CosmosDocumentDBVectorStore : VectorStore { /// Metadata about vector store. private readonly VectorStoreMetadata _metadata; - /// that can be used to manage the collections in Azure CosmosDB MongoDB. + /// that can be used to manage the collections in Azure DocumentDB. private readonly IMongoDatabase _mongoDatabase; /// A general purpose definition that can be used to construct a collection when needing to proxy schema agnostic operations. @@ -32,11 +32,11 @@ public sealed class CosmosMongoVectorStore : VectorStore private readonly IEmbeddingGenerator? _embeddingGenerator; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// that can be used to manage the collections in Azure CosmosDB MongoDB. + /// that can be used to manage the collections in Azure DocumentDB. /// Optional configuration options for this class. - public CosmosMongoVectorStore(IMongoDatabase mongoDatabase, CosmosMongoVectorStoreOptions? options = default) + public CosmosDocumentDBVectorStore(IMongoDatabase mongoDatabase, CosmosDocumentDBVectorStoreOptions? options = default) { Throw.IfNull(mongoDatabase); @@ -45,7 +45,7 @@ public CosmosMongoVectorStore(IMongoDatabase mongoDatabase, CosmosMongoVectorSto _metadata = new() { - VectorStoreSystemName = CosmosMongoConstants.VectorStoreSystemName, + VectorStoreSystemName = CosmosDocumentDBConstants.VectorStoreSystemName, VectorStoreName = mongoDatabase.DatabaseNamespace?.DatabaseName }; } @@ -55,13 +55,13 @@ public CosmosMongoVectorStore(IMongoDatabase mongoDatabase, CosmosMongoVectorSto [RequiresDynamicCode("This overload of GetCollection() is incompatible with NativeAOT. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] [RequiresUnreferencedCode("This overload of GetCollecttion() is incompatible with trimming. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] #if NET - public override CosmosMongoCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) + public override CosmosDocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #else public override VectorStoreCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #endif => typeof(TRecord) == typeof(Dictionary) ? throw new ArgumentException(VectorDataStrings.GetCollectionWithDictionaryNotSupported) - : new CosmosMongoCollection( + : new CosmosDocumentDBCollection( _mongoDatabase, name, new() @@ -72,11 +72,11 @@ public override VectorStoreCollection GetCollection #if NET - public override CosmosMongoDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) + public override CosmosDocumentDBDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #else public override VectorStoreCollection> GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #endif - => new CosmosMongoDynamicCollection( + => new CosmosDocumentDBDynamicCollection( _mongoDatabase, name, new() diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoVectorStoreOptions.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs similarity index 56% rename from MEVD/src/CosmosMongoDB/CosmosMongoVectorStoreOptions.cs rename to MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs index 50e8a69..d86d52c 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoVectorStoreOptions.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs @@ -3,21 +3,21 @@ using Microsoft.Extensions.AI; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// -/// Options when creating a +/// Options when creating a /// -public sealed class CosmosMongoVectorStoreOptions +public sealed class CosmosDocumentDBVectorStoreOptions { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public CosmosMongoVectorStoreOptions() + public CosmosDocumentDBVectorStoreOptions() { } - internal CosmosMongoVectorStoreOptions(CosmosMongoVectorStoreOptions? source) + internal CosmosDocumentDBVectorStoreOptions(CosmosDocumentDBVectorStoreOptions? source) { EmbeddingGenerator = source?.EmbeddingGenerator; } diff --git a/MEVD/src/CosmosMongoDB/MongoShared/BsonValueFactory.cs b/MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs similarity index 95% rename from MEVD/src/CosmosMongoDB/MongoShared/BsonValueFactory.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs index 7837ed1..fa9eff9 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/BsonValueFactory.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs @@ -6,7 +6,7 @@ using System.Linq; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// A class that constructs the correct BsonValue for a given CLR type. diff --git a/MEVD/src/CosmosMongoDB/MongoShared/ErrorHandlingAsyncCursor.cs b/MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs similarity index 97% rename from MEVD/src/CosmosMongoDB/MongoShared/ErrorHandlingAsyncCursor.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs index ff30423..febc211 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/ErrorHandlingAsyncCursor.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.VectorData; using MongoDB.Driver; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// A decorator for that handles errors on move next. diff --git a/MEVD/src/CosmosMongoDB/MongoShared/IMongoMapper.cs b/MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs similarity index 92% rename from MEVD/src/CosmosMongoDB/MongoShared/IMongoMapper.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs index 1d4363c..cc162bf 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/IMongoMapper.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.AI; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; internal interface IMongoMapper { diff --git a/MEVD/src/CosmosMongoDB/MongoShared/MongoConstants.cs b/MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs similarity index 97% rename from MEVD/src/CosmosMongoDB/MongoShared/MongoConstants.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs index de970a2..4581850 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/MongoConstants.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs @@ -6,7 +6,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.VectorData; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// Constants for MongoDB vector store implementation. diff --git a/MEVD/src/CosmosMongoDB/MongoShared/MongoDynamicMapper.cs b/MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs similarity index 99% rename from MEVD/src/CosmosMongoDB/MongoShared/MongoDynamicMapper.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs index c959e6e..2524002 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/MongoDynamicMapper.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs @@ -12,7 +12,7 @@ using Microsoft.Shared.Diagnostics; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// A mapper that maps between the dynamic data model and the model that the data is stored under, within MongoDB. diff --git a/MEVD/src/CosmosMongoDB/MongoShared/MongoMapper.cs b/MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs similarity index 99% rename from MEVD/src/CosmosMongoDB/MongoShared/MongoMapper.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs index 2e26256..6558093 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/MongoMapper.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs @@ -14,7 +14,7 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Bson.Serialization.Serializers; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; internal sealed class MongoMapper : IMongoMapper where TRecord : class diff --git a/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs b/MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs similarity index 98% rename from MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs rename to MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs index 4cbcbb6..206a05f 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs +++ b/MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs @@ -11,7 +11,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace CommunityToolkit.VectorData.CosmosMongoDB; +namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// Customized MongoDB model builder that adds specialized configuration of property storage names diff --git a/MEVD/src/CosmosMongoDB/MongoShared/README.md b/MEVD/src/CosmosDocumentDB/MongoShared/README.md similarity index 77% rename from MEVD/src/CosmosMongoDB/MongoShared/README.md rename to MEVD/src/CosmosDocumentDB/MongoShared/README.md index 1af63ff..e61c0e0 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/README.md +++ b/MEVD/src/CosmosDocumentDB/MongoShared/README.md @@ -1,5 +1,5 @@ # MongoShared -These files are shared utilities that are identical across the Cosmos MongoDB and the regular MongoDB vector store providers. +These files are shared utilities that are identical across the Cosmos DocumentDB and the regular MongoDB vector store providers. If a regular MongoDB provider is added in the future, these files should be extracted to a shared location and linked into both projects. diff --git a/MEVD/src/CosmosMongoDB/README.md b/MEVD/src/CosmosDocumentDB/README.md similarity index 86% rename from MEVD/src/CosmosMongoDB/README.md rename to MEVD/src/CosmosDocumentDB/README.md index 74f64b5..da51c8e 100644 --- a/MEVD/src/CosmosMongoDB/README.md +++ b/MEVD/src/CosmosDocumentDB/README.md @@ -1,4 +1,4 @@ -# CommunityToolkit.VectorData.CosmosMongoDB +# CommunityToolkit.VectorData.CosmosDocumentDB Azure DocumentDB (with MongoDB compatibility) provider for [Microsoft.Extensions.VectorData](https://learn.microsoft.com/dotnet/ai/vector-stores/overview), by the .NET Community Toolkit. @@ -11,7 +11,7 @@ Azure DocumentDB (with MongoDB compatibility) provider for [Microsoft.Extensions 2. Install the NuGet package: ```bash -dotnet add package CommunityToolkit.VectorData.CosmosMongoDB +dotnet add package CommunityToolkit.VectorData.CosmosDocumentDB ``` For more information, see the [Microsoft.Extensions.VectorData documentation](https://learn.microsoft.com/dotnet/ai/vector-stores/overview). diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj similarity index 88% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj index 2cd96f4..f2e64fa 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj @@ -6,7 +6,7 @@ enable true false - CosmosMongoDB.ConformanceTests + CosmosDocumentDB.ConformanceTests b7762d10-e29b-4bb1-8b74-b6d69a667dd4 @@ -18,7 +18,7 @@ - + diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoBsonMappingTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs similarity index 79% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoBsonMappingTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs index cec9022..9ea31f3 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoBsonMappingTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs @@ -1,22 +1,22 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Bson.Serialization.Attributes; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public sealed class CosmosMongoBsonMappingTests(CosmosMongoBsonMappingTests.Fixture fixture) - : IClassFixture +public sealed class CosmosDocumentDBBsonMappingTests(CosmosDocumentDBBsonMappingTests.Fixture fixture) + : IClassFixture { [Fact] public async Task Upsert_with_bson_model_works() { - var store = (CosmosMongoTestStore)fixture.TestStore; + var store = (CosmosDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonModel"); var definition = new VectorStoreCollectionDefinition @@ -30,7 +30,7 @@ public async Task Upsert_with_bson_model_works() var model = new BsonTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new CosmosMongoCollection( + using var collection = new CosmosDocumentDBCollection( store.Database, collectionName, new() { Definition = definition }); @@ -55,12 +55,12 @@ public async Task Upsert_with_bson_model_works() [Fact] public async Task Upsert_with_bson_vector_store_model_works() { - var store = (CosmosMongoTestStore)fixture.TestStore; + var store = (CosmosDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreModel"); var model = new BsonVectorStoreTestModel { HotelId = "key", HotelName = "Test Name" }; - using var collection = new CosmosMongoCollection(store.Database, collectionName); + using var collection = new CosmosDocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); @@ -82,12 +82,12 @@ public async Task Upsert_with_bson_vector_store_model_works() [Fact] public async Task Upsert_with_bson_vector_store_with_name_model_works() { - var store = (CosmosMongoTestStore)fixture.TestStore; + var store = (CosmosDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreWithNameModel"); var model = new BsonVectorStoreWithNameTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new CosmosMongoCollection(store.Database, collectionName); + using var collection = new CosmosDocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); @@ -108,7 +108,7 @@ public async Task Upsert_with_bson_vector_store_with_name_model_works() public sealed class Fixture : VectorStoreFixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } private sealed class BsonTestModel diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoCollectionManagementTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs similarity index 55% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoCollectionManagementTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs index c7955e9..64276b3 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoCollectionManagementTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoCollectionManagementTests(CosmosMongoFixture fixture) - : CollectionManagementTests(fixture), IClassFixture +public class CosmosDocumentDBCollectionManagementTests(CosmosDocumentDBFixture fixture) + : CollectionManagementTests(fixture), IClassFixture { } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDependencyInjectionTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs similarity index 73% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDependencyInjectionTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs index 1b2317d..340aeb4 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDependencyInjectionTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs @@ -3,15 +3,15 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Driver; using VectorData.ConformanceTests; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoDependencyInjectionTests - : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> +public class CosmosDocumentDBDependencyInjectionTests + : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> { protected const string ConnectionString = "mongodb://localhost:27017"; protected const string DatabaseName = "dbName"; @@ -19,21 +19,21 @@ public class CosmosMongoDependencyInjectionTests protected override void PopulateConfiguration(ConfigurationManager configuration, object? serviceKey = null) => configuration.AddInMemoryCollection( [ - new(CreateConfigKey("CosmosMongo", serviceKey, "ConnectionString"), ConnectionString), - new(CreateConfigKey("CosmosMongo", serviceKey, "DatabaseName"), DatabaseName), + new(CreateConfigKey("CosmosDocumentDB", serviceKey, "ConnectionString"), ConnectionString), + new(CreateConfigKey("CosmosDocumentDB", serviceKey, "DatabaseName"), DatabaseName), ]); private static string ConnectionStringProvider(IServiceProvider sp) - => sp.GetRequiredService().GetRequiredSection("CosmosMongo:ConnectionString").Value!; + => sp.GetRequiredService().GetRequiredSection("CosmosDocumentDB:ConnectionString").Value!; private static string ConnectionStringProvider(IServiceProvider sp, object serviceKey) - => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosMongo", serviceKey, "ConnectionString")).Value!; + => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosDocumentDB", serviceKey, "ConnectionString")).Value!; private static string DatabaseNameProvider(IServiceProvider sp) - => sp.GetRequiredService().GetRequiredSection("CosmosMongo:DatabaseName").Value!; + => sp.GetRequiredService().GetRequiredSection("CosmosDocumentDB:DatabaseName").Value!; private static string DatabaseNameProvider(IServiceProvider sp, object serviceKey) - => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosMongo", serviceKey, "DatabaseName")).Value!; + => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosDocumentDB", serviceKey, "DatabaseName")).Value!; public override IEnumerable> CollectionDelegates { @@ -43,22 +43,22 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddCosmosMongoCollection(name, lifetime: lifetime) + .AddCosmosDocumentDBCollection(name, lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedCosmosMongoCollection(serviceKey, name, lifetime: lifetime); + .AddKeyedCosmosDocumentDBCollection(serviceKey, name, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddCosmosMongoCollection( + ? services.AddCosmosDocumentDBCollection( name, ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedCosmosMongoCollection( + : services.AddKeyedCosmosDocumentDBCollection( serviceKey, name, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddCosmosMongoCollection( + ? services.AddCosmosDocumentDBCollection( name, ConnectionStringProvider, DatabaseNameProvider, lifetime: lifetime) - : services.AddKeyedCosmosMongoCollection( + : services.AddKeyedCosmosDocumentDBCollection( serviceKey, name, sp => ConnectionStringProvider(sp, serviceKey), sp => DatabaseNameProvider(sp, serviceKey), lifetime: lifetime); } } @@ -68,20 +68,20 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe get { yield return (services, serviceKey, lifetime) => serviceKey is null - ? services.AddCosmosMongoVectorStore( + ? services.AddCosmosDocumentDBVectorStore( ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedCosmosMongoVectorStore( + : services.AddKeyedCosmosDocumentDBVectorStore( serviceKey, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, lifetime) => serviceKey is null ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddCosmosMongoVectorStore(lifetime: lifetime) + .AddCosmosDocumentDBVectorStore(lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedCosmosMongoVectorStore(serviceKey, lifetime: lifetime); + .AddKeyedCosmosDocumentDBVectorStore(serviceKey, lifetime: lifetime); } } @@ -90,9 +90,9 @@ public void ConnectionStringProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); } @@ -101,9 +101,9 @@ public void DatabaseNameProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); } @@ -112,15 +112,15 @@ public void ConnectionStringCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosMongoVectorStore(connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosMongoVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBVectorStore(connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddKeyedCosmosDocumentDBVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", connectionString: "", DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: "", DatabaseName)); } @@ -129,15 +129,15 @@ public void DatabaseNameCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosMongoVectorStore(ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedCosmosMongoVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBVectorStore(ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddKeyedCosmosDocumentDBVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddCosmosMongoCollection( + Assert.Throws(() => services.AddCosmosDocumentDBCollection( name: "notNull", ConnectionString, databaseName: "")); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedCosmosMongoCollection( + Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: "")); } } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDistanceFunctionTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs similarity index 71% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDistanceFunctionTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs index 7b1cf5a..fa4f252 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoDistanceFunctionTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoDistanceFunctionTests(CosmosMongoDistanceFunctionTests.Fixture fixture) - : DistanceFunctionTests(fixture), IClassFixture +public class CosmosDocumentDBDistanceFunctionTests(CosmosDocumentDBDistanceFunctionTests.Fixture fixture) + : DistanceFunctionTests(fixture), IClassFixture { public override Task CosineSimilarity() => Assert.ThrowsAsync(base.CosineSimilarity); public override Task EuclideanSquaredDistance() => Assert.ThrowsAsync(base.EuclideanSquaredDistance); @@ -18,14 +18,14 @@ public class CosmosMongoDistanceFunctionTests(CosmosMongoDistanceFunctionTests.F public override Task HammingDistance() => Assert.ThrowsAsync(base.HammingDistance); public override Task ManhattanDistance() => Assert.ThrowsAsync(base.ManhattanDistance); - // CosmosMongo EuclideanDistance doesn't correctly filter by score threshold (returns all results). + // CosmosDocumentDB EuclideanDistance doesn't correctly filter by score threshold (returns all results). // See https://github.com/CommunityToolkit/AI/issues/6. protected override Task TestScoreThreshold(VectorStoreCollection.SearchRecord> collection) => Task.CompletedTask; public new class Fixture() : DistanceFunctionTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; public override bool AssertScores { get; } = false; } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoEmbeddingGenerationTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs similarity index 51% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoEmbeddingGenerationTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs index 88d7714..8330039 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoEmbeddingGenerationTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.AI; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.VectorData; @@ -9,52 +9,52 @@ using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoEmbeddingGenerationTests(CosmosMongoEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, CosmosMongoEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) - : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture +public class CosmosDocumentDBEmbeddingGenerationTests(CosmosDocumentDBEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, CosmosDocumentDBEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) + : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture { public new class StringVectorFixture : EmbeddingGenerationTests.StringVectorFixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => CosmosMongoTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => CosmosDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(CosmosMongoTestStore.Instance.Database) - .AddCosmosMongoVectorStore() + .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) + .AddCosmosDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(CosmosMongoTestStore.Instance.Database) - .AddCosmosMongoCollection(this.CollectionName) + .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) + .AddCosmosDocumentDBCollection(this.CollectionName) ]; } public new class RomOfFloatVectorFixture : EmbeddingGenerationTests.RomOfFloatVectorFixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => CosmosMongoTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => CosmosDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(CosmosMongoTestStore.Instance.Database) - .AddCosmosMongoVectorStore() + .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) + .AddCosmosDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(CosmosMongoTestStore.Instance.Database) - .AddCosmosMongoCollection(this.CollectionName) + .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) + .AddCosmosDocumentDBCollection(this.CollectionName) ]; } } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoFilterTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs similarity index 89% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoFilterTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs index 31e841e..51afcbd 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoFilterTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoFilterTests(CosmosMongoFilterTests.Fixture fixture) - : FilterTests(fixture), IClassFixture +public class CosmosDocumentDBFilterTests(CosmosDocumentDBFilterTests.Fixture fixture) + : FilterTests(fixture), IClassFixture { // Specialized MongoDB syntax for NOT over Contains ($nin) [Fact] @@ -58,7 +58,7 @@ public override Task Contains_over_field_string_List() #region Enumerable.Any / Contains - // CosmosMongo filter translator doesn't support Enumerable.Any or Enumerable.Contains/MemoryExtensions.Contains + // CosmosDocumentDB filter translator doesn't support Enumerable.Any or Enumerable.Contains/MemoryExtensions.Contains public override Task Any_with_Contains_over_inline_string_array() => Assert.ThrowsAsync(() => base.Any_with_Contains_over_inline_string_array()); @@ -86,7 +86,7 @@ public override Task Contains_with_MemoryExtensions_Contains_with_null_comparer( public new class Fixture : FilterTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; protected override string IndexKind => Microsoft.Extensions.VectorData.IndexKind.IvfFlat; protected override string DistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoIndexKindTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs similarity index 67% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoIndexKindTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs index 10b6904..c344d53 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoIndexKindTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoIndexKindTests(CosmosMongoIndexKindTests.Fixture fixture) - : IndexKindTests(fixture), IClassFixture +public class CosmosDocumentDBIndexKindTests(CosmosDocumentDBIndexKindTests.Fixture fixture) + : IndexKindTests(fixture), IClassFixture { // Note: Cosmos Mongo support HNSW, but only in a specific tier. // [Fact] @@ -26,6 +26,6 @@ public virtual Task IvfFlat() public new class Fixture() : IndexKindTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoTestSuiteImplementationTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs similarity index 75% rename from MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoTestSuiteImplementationTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs index ab421b4..ab392f4 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/CosmosMongoTestSuiteImplementationTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs @@ -4,9 +4,9 @@ using VectorData.ConformanceTests; using VectorData.ConformanceTests.ModelTests; -namespace CosmosMongoDB.ConformanceTests; +namespace CosmosDocumentDB.ConformanceTests; -public class CosmosMongoTestSuiteImplementationTests : TestSuiteImplementationTests +public class CosmosDocumentDBTestSuiteImplementationTests : TestSuiteImplementationTests { protected override ICollection IgnoredTestBases { get; } = [ diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs new file mode 100644 index 0000000..89581d8 --- /dev/null +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using CosmosDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace CosmosDocumentDB.ConformanceTests.ModelTests; + +public class CosmosDocumentDBBasicModelTests(CosmosDocumentDBBasicModelTests.Fixture fixture) + : BasicModelTests(fixture), IClassFixture +{ + public new class Fixture : BasicModelTests.Fixture + { + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoMultiVectorModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs similarity index 53% rename from MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoMultiVectorModelTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs index f133234..9f829da 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoMultiVectorModelTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs @@ -1,18 +1,18 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests.ModelTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosMongoDB.ConformanceTests.ModelTests; +namespace CosmosDocumentDB.ConformanceTests.ModelTests; -public class CosmosMongoMultiVectorModelTests(CosmosMongoMultiVectorModelTests.Fixture fixture) - : MultiVectorModelTests(fixture), IClassFixture +public class CosmosDocumentDBMultiVectorModelTests(CosmosDocumentDBMultiVectorModelTests.Fixture fixture) + : MultiVectorModelTests(fixture), IClassFixture { public new class Fixture : MultiVectorModelTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs new file mode 100644 index 0000000..eeb3937 --- /dev/null +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using CosmosDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace CosmosDocumentDB.ConformanceTests.ModelTests; + +public class CosmosDocumentDBNoDataModelTests(CosmosDocumentDBNoDataModelTests.Fixture fixture) + : NoDataModelTests(fixture), IClassFixture +{ + public new class Fixture : NoDataModelTests.Fixture + { + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs new file mode 100644 index 0000000..af63935 --- /dev/null +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using CosmosDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace CosmosDocumentDB.ConformanceTests.ModelTests; + +public class CosmosDocumentDBNoVectorModelTests(CosmosDocumentDBNoVectorModelTests.Fixture fixture) + : NoVectorModelTests(fixture), IClassFixture +{ + public new class Fixture : NoVectorModelTests.Fixture + { + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/Properties/AssemblyAttributes.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs similarity index 100% rename from MEVD/test/CosmosMongoDB.ConformanceTests/Properties/AssemblyAttributes.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoFixture.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs similarity index 50% rename from MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoFixture.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs index ed82665..3ddf034 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoFixture.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs @@ -3,9 +3,9 @@ using VectorData.ConformanceTests.Support; -namespace CosmosMongoDB.ConformanceTests.Support; +namespace CosmosDocumentDB.ConformanceTests.Support; -public class CosmosMongoFixture : VectorStoreFixture +public class CosmosDocumentDBFixture : VectorStoreFixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestEnvironment.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs similarity index 70% rename from MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestEnvironment.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs index 5e7ab5a..905e9be 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestEnvironment.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs @@ -3,25 +3,25 @@ using Microsoft.Extensions.Configuration; -namespace CosmosMongoDB.ConformanceTests.Support; +namespace CosmosDocumentDB.ConformanceTests.Support; #pragma warning disable CA1810 // Initialize all static fields when those fields are declared -public static class CosmosMongoTestEnvironment +public static class CosmosDocumentDBTestEnvironment { public static readonly string? ConnectionString; public static bool IsConnectionStringDefined => ConnectionString is not null; - static CosmosMongoTestEnvironment() + static CosmosDocumentDBTestEnvironment() { var configuration = new ConfigurationBuilder() .AddJsonFile(path: "testsettings.json", optional: true) .AddJsonFile(path: "testsettings.development.json", optional: true) .AddEnvironmentVariables() - .AddUserSecrets() + .AddUserSecrets() .Build(); - ConnectionString = configuration["CosmosMongo:ConnectionString"]; + ConnectionString = configuration["CosmosDocumentDB:ConnectionString"]; } } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestStore.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs similarity index 60% rename from MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestStore.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs index 89224e7..c4602a0 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/Support/CosmosMongoTestStore.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs @@ -1,17 +1,17 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Driver; using VectorData.ConformanceTests.Support; -namespace CosmosMongoDB.ConformanceTests.Support; +namespace CosmosDocumentDB.ConformanceTests.Support; #pragma warning disable CA1001 -public sealed class CosmosMongoTestStore : TestStore +public sealed class CosmosDocumentDBTestStore : TestStore #pragma warning restore CA1001 { - public static CosmosMongoTestStore Instance { get; } = new(); + public static CosmosDocumentDBTestStore Instance { get; } = new(); private MongoClient? _client; private IMongoDatabase? _database; @@ -23,23 +23,23 @@ public sealed class CosmosMongoTestStore : TestStore public override string DefaultDistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; - public CosmosMongoVectorStore GetVectorStore(CosmosMongoVectorStoreOptions options) + public CosmosDocumentDBVectorStore GetVectorStore(CosmosDocumentDBVectorStoreOptions options) => new(this.Database, options); - private CosmosMongoTestStore() + private CosmosDocumentDBTestStore() { } protected override Task StartAsync() { - if (string.IsNullOrWhiteSpace(CosmosMongoTestEnvironment.ConnectionString)) + if (string.IsNullOrWhiteSpace(CosmosDocumentDBTestEnvironment.ConnectionString)) { - throw new InvalidOperationException("Connection string is not configured, set the CosmosMongo:ConnectionString environment variable"); + throw new InvalidOperationException("Connection string is not configured, set the CosmosDocumentDB:ConnectionString environment variable"); } - this._client = new MongoClient(CosmosMongoTestEnvironment.ConnectionString); + this._client = new MongoClient(CosmosDocumentDBTestEnvironment.ConnectionString); this._database = this._client.GetDatabase("VectorSearchTests"); - this.DefaultVectorStore = new CosmosMongoVectorStore(this._database); + this.DefaultVectorStore = new CosmosDocumentDBVectorStore(this._database); return Task.CompletedTask; } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoDataTypeTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs similarity index 86% rename from MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoDataTypeTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs index f526284..d061278 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoDataTypeTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; -namespace CosmosMongoDB.ConformanceTests.TypeTests; +namespace CosmosDocumentDB.ConformanceTests.TypeTests; -public class CosmosMongoDataTypeTests(CosmosMongoDataTypeTests.Fixture fixture) - : DataTypeTests.DefaultRecord>(fixture), IClassFixture +public class CosmosDocumentDBDataTypeTests(CosmosDocumentDBDataTypeTests.Fixture fixture) + : DataTypeTests.DefaultRecord>(fixture), IClassFixture { public override Task Decimal() => this.Test( @@ -37,7 +37,7 @@ public override Task DateTimeOffset() public new class Fixture : DataTypeTests.DefaultRecord>.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; // MongoDB does not support null checks in vector search pre-filters public override bool IsNullFilteringSupported => false; diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoEmbeddingTypeTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs similarity index 50% rename from MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoEmbeddingTypeTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs index 2bf7550..e63cb0d 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoEmbeddingTypeTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs @@ -1,20 +1,20 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; #pragma warning disable CA2000 // Dispose objects before losing scope -namespace CosmosMongoDB.ConformanceTests.TypeTests; +namespace CosmosDocumentDB.ConformanceTests.TypeTests; -public class CosmosMongoEmbeddingTypeTests(CosmosMongoEmbeddingTypeTests.Fixture fixture) - : EmbeddingTypeTests(fixture), IClassFixture +public class CosmosDocumentDBEmbeddingTypeTests(CosmosDocumentDBEmbeddingTypeTests.Fixture fixture) + : EmbeddingTypeTests(fixture), IClassFixture { public new class Fixture : EmbeddingTypeTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs similarity index 65% rename from MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs rename to MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs index d7c22ff..3092a18 100644 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/TypeTests/CosmosMongoKeyTypeTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosMongoDB.ConformanceTests.Support; +using CosmosDocumentDB.ConformanceTests.Support; using MongoDB.Bson; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; -namespace CosmosMongoDB.ConformanceTests.TypeTests; +namespace CosmosDocumentDB.ConformanceTests.TypeTests; -public class CosmosMongoKeyTypeTests(CosmosMongoKeyTypeTests.Fixture fixture) - : KeyTypeTests(fixture), IClassFixture +public class CosmosDocumentDBKeyTypeTests(CosmosDocumentDBKeyTypeTests.Fixture fixture) + : KeyTypeTests(fixture), IClassFixture { [Fact] public virtual Task ObjectId() => this.Test(new("652f8c3e8f9b2c1a4d3e6a7b"), supportsAutoGeneration: true); @@ -26,6 +26,6 @@ public class CosmosMongoKeyTypeTests(CosmosMongoKeyTypeTests.Fixture fixture) public new class Fixture : KeyTypeTests.Fixture { - public override TestStore TestStore => CosmosMongoTestStore.Instance; + public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosMongoDB.UnitTests/.editorconfig b/MEVD/test/CosmosDocumentDB.UnitTests/.editorconfig similarity index 100% rename from MEVD/test/CosmosMongoDB.UnitTests/.editorconfig rename to MEVD/test/CosmosDocumentDB.UnitTests/.editorconfig diff --git a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj similarity index 73% rename from MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj rename to MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj index 25007ca..0e98a37 100644 --- a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj +++ b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj @@ -1,8 +1,8 @@  - CommunityToolkit.VectorData.CosmosMongoDB.UnitTests - CommunityToolkit.VectorData.CosmosMongoDB.UnitTests + CommunityToolkit.VectorData.CosmosDocumentDB.UnitTests + CommunityToolkit.VectorData.CosmosDocumentDB.UnitTests net10.0 true enable @@ -21,7 +21,7 @@ - + diff --git a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoCollectionTests.cs b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs similarity index 90% rename from MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoCollectionTests.cs rename to MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs index 80d12cf..4bb0293 100644 --- a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoCollectionTests.cs +++ b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; @@ -17,17 +17,17 @@ using Xunit; using MEVD = Microsoft.Extensions.VectorData; -namespace CosmosMongoDB.UnitTests; +namespace CosmosDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// -public sealed class CosmosMongoCollectionTests +public sealed class CosmosDocumentDBCollectionTests { private readonly Mock _mockMongoDatabase = new(); private readonly Mock> _mockMongoCollection = new(); - public CosmosMongoCollectionTests() + public CosmosDocumentDBCollectionTests() { this._mockMongoDatabase .Setup(l => l.GetCollection(It.IsAny(), It.IsAny())) @@ -38,7 +38,7 @@ public CosmosMongoCollectionTests() public void ConstructorForModelWithoutKeyThrowsException() { // Act & Assert - var exception = Assert.Throws(() => new CosmosMongoCollection(this._mockMongoDatabase.Object, "collection")); + var exception = Assert.Throws(() => new CosmosDocumentDBCollection(this._mockMongoDatabase.Object, "collection")); Assert.Contains("No key property found", exception.Message); } @@ -46,7 +46,7 @@ public void ConstructorForModelWithoutKeyThrowsException() public void ConstructorWithDeclarativeModelInitializesCollection() { // Act & Assert - using var collection = new CosmosMongoCollection( + using var collection = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -63,7 +63,7 @@ public void ConstructorWithImperativeModelInitializesCollection() }; // Act - using var collection = new CosmosMongoCollection( + using var collection = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection", new() { Definition = definition }); @@ -91,7 +91,7 @@ public async Task CollectionExistsReturnsValidResultAsync(List collectio .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, collectionName); @@ -141,7 +141,7 @@ public async Task EnsureCollectionExistsInvokesValidMethodsAsync() .Setup(l => l.Indexes) .Returns(mockMongoIndexManager.Object); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -165,7 +165,7 @@ public async Task DeleteInvokesValidMethodsAsync() // Arrange const string RecordKey = "key"; - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -189,7 +189,7 @@ public async Task DeleteBatchInvokesValidMethodsAsync() // Arrange List recordKeys = ["key1", "key2"]; - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -213,7 +213,7 @@ public async Task DeleteCollectionInvokesValidMethodsAsync() // Arrange const string CollectionName = "collection"; - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -250,7 +250,7 @@ public async Task GetReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -288,7 +288,7 @@ public async Task GetBatchReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -313,13 +313,13 @@ public async Task GetBatchReturnsValidRecordAsync() public async Task CanUpsertRecordAsync() { // Arrange - var hotel = new CosmosMongoHotelModel("key") { HotelName = "Test Name" }; + var hotel = new CosmosDocumentDBHotelModel("key") { HotelName = "Test Name" }; var serializerRegistry = BsonSerializer.SerializerRegistry; var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -341,11 +341,11 @@ public async Task CanUpsertRecordAsync() public async Task UpsertBatchReturnsRecordKeysAsync() { // Arrange - var hotel1 = new CosmosMongoHotelModel("key1") { HotelName = "Test Name 1" }; - var hotel2 = new CosmosMongoHotelModel("key2") { HotelName = "Test Name 2" }; - var hotel3 = new CosmosMongoHotelModel("key3") { HotelName = "Test Name 3" }; + var hotel1 = new CosmosDocumentDBHotelModel("key1") { HotelName = "Test Name 1" }; + var hotel2 = new CosmosDocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; + var hotel3 = new CosmosDocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -420,7 +420,7 @@ public async Task SearchThrowsExceptionWithInvalidVectorTypeAsync(object vector, // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -478,7 +478,7 @@ public async Task SearchUsesValidQueryAsync( this.MockCollectionForSearch(); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -511,11 +511,11 @@ public async Task SearchThrowsExceptionWithNonExistentVectorPropertyNameAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); - var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; + var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; // Act & Assert await Assert.ThrowsAsync(async () => await sut.SearchAsync(new ReadOnlyMemory([1f, 2f, 3f]), top: 3, options).FirstOrDefaultAsync()); @@ -527,7 +527,7 @@ public async Task SearchReturnsRecordWithScoreAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -610,11 +610,11 @@ private async Task TestUpsertWithModelAsync( var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - CosmosMongoCollectionOptions? options = definition != null ? + CosmosDocumentDBCollectionOptions? options = definition != null ? new() { Definition = definition } : null; - using var sut = new CosmosMongoCollection( + using var sut = new CosmosDocumentDBCollection( this._mockMongoDatabase.Object, "collection", options); diff --git a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoHotelModel.cs b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs similarity index 93% rename from MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoHotelModel.cs rename to MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs index 60e18f4..cf27dc8 100644 --- a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoHotelModel.cs +++ b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs @@ -6,9 +6,9 @@ using Microsoft.Extensions.VectorData; using MongoDB.Bson.Serialization.Attributes; -namespace CosmosMongoDB.UnitTests; +namespace CosmosDocumentDB.UnitTests; -public class CosmosMongoHotelModel(string hotelId) +public class CosmosDocumentDBHotelModel(string hotelId) { /// The key of the record. [VectorStoreKey] diff --git a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoVectorStoreTests.cs b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs similarity index 73% rename from MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoVectorStoreTests.cs rename to MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs index a6d8ce0..3e0fed6 100644 --- a/MEVD/test/CosmosMongoDB.UnitTests/CosmosMongoVectorStoreTests.cs +++ b/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs @@ -6,17 +6,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using CommunityToolkit.VectorData.CosmosMongoDB; +using CommunityToolkit.VectorData.CosmosDocumentDB; using MongoDB.Driver; using Moq; using Xunit; -namespace CosmosMongoDB.UnitTests; +namespace CosmosDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// -public sealed class CosmosMongoVectorStoreTests +public sealed class CosmosDocumentDBVectorStoreTests { private readonly Mock _mockMongoDatabase = new(); @@ -24,20 +24,20 @@ public sealed class CosmosMongoVectorStoreTests public void GetCollectionWithNotSupportedKeyThrowsException() { // Arrange - using var sut = new CosmosMongoVectorStore(this._mockMongoDatabase.Object); + using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act & Assert - Assert.Throws(() => sut.GetCollection("collection")); + Assert.Throws(() => sut.GetCollection("collection")); } [Fact] public void GetCollectionWithoutFactoryReturnsDefaultCollection() { // Arrange - using var sut = new CosmosMongoVectorStore(this._mockMongoDatabase.Object); + using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act - var collection = sut.GetCollection("collection"); + var collection = sut.GetCollection("collection"); // Assert Assert.NotNull(collection); @@ -63,7 +63,7 @@ public async Task ListCollectionNamesReturnsCollectionNamesAsync() .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosMongoVectorStore(this._mockMongoDatabase.Object); + using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act var actualCollectionNames = await sut.ListCollectionNamesAsync().ToListAsync(); diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoBasicModelTests.cs b/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoBasicModelTests.cs deleted file mode 100644 index 9ae768c..0000000 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoBasicModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosMongoDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosMongoDB.ConformanceTests.ModelTests; - -public class CosmosMongoBasicModelTests(CosmosMongoBasicModelTests.Fixture fixture) - : BasicModelTests(fixture), IClassFixture -{ - public new class Fixture : BasicModelTests.Fixture - { - public override TestStore TestStore => CosmosMongoTestStore.Instance; - } -} diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoDataModelTests.cs b/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoDataModelTests.cs deleted file mode 100644 index f3923e5..0000000 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoDataModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosMongoDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosMongoDB.ConformanceTests.ModelTests; - -public class CosmosMongoNoDataModelTests(CosmosMongoNoDataModelTests.Fixture fixture) - : NoDataModelTests(fixture), IClassFixture -{ - public new class Fixture : NoDataModelTests.Fixture - { - public override TestStore TestStore => CosmosMongoTestStore.Instance; - } -} diff --git a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoVectorModelTests.cs b/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoVectorModelTests.cs deleted file mode 100644 index edd73c8..0000000 --- a/MEVD/test/CosmosMongoDB.ConformanceTests/ModelTests/CosmosMongoNoVectorModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosMongoDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosMongoDB.ConformanceTests.ModelTests; - -public class CosmosMongoNoVectorModelTests(CosmosMongoNoVectorModelTests.Fixture fixture) - : NoVectorModelTests(fixture), IClassFixture -{ - public new class Fixture : NoVectorModelTests.Fixture - { - public override TestStore TestStore => CosmosMongoTestStore.Instance; - } -} diff --git a/README.md b/README.md index 56b33d2..11f6280 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The following NuGet packages have been published: | Package | Version | Downloads | |---------|---------|-----------| | [CommunityToolkit.VectorData.AzureAISearch] | ![AzureAISearch Version][v-azureaisearch] | ![AzureAISearch Downloads][d-azureaisearch] | -| [CommunityToolkit.VectorData.CosmosMongoDB] | ![CosmosMongoDB Version][v-cosmosmongodb] | ![CosmosMongoDB Downloads][d-cosmosmongodb] | +| [CommunityToolkit.VectorData.CosmosDocumentDB] | ![CosmosDocumentDB Version][v-cosmosdocumentdb] | ![CosmosDocumentDB Downloads][d-cosmosdocumentdb] | | [CommunityToolkit.VectorData.CosmosNoSql] | ![CosmosNoSql Version][v-cosmosnosql] | ![CosmosNoSql Downloads][d-cosmosnosql] | | [CommunityToolkit.VectorData.InMemory] | ![InMemory Version][v-inmemory] | ![InMemory Downloads][d-inmemory] | | [CommunityToolkit.VectorData.PgVector] | ![PgVector Version][v-pgvector] | ![PgVector Downloads][d-pgvector] | @@ -29,7 +29,7 @@ The following NuGet packages have been published: The majority of tests in the test suite use [Testcontainers](https://testcontainers.com/) so that conformance tests are run against real servers running inside Docker containers. Docker must be running on your machine for this to work. -Some providers (AzureAISearch, CosmosMongoDB) require a cloud-hosted service and cannot be tested with containers. For those, first create the required cloud service, then configure the required settings (e.g., endpoint and API key) using environment variables or the `testsettings.development.json` file in the relevant test project directory. +Some providers (AzureAISearch, CosmosDocumentDB) require a cloud-hosted service and cannot be tested with containers. For those, first create the required cloud service, then configure the required settings (e.g., endpoint and API key) using environment variables or the `testsettings.development.json` file in the relevant test project directory. > **NOTE**: The `testsettings.development.json` file contains secrets and is git-ignored. It should not be checked in. @@ -52,7 +52,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [CommunityToolkit.VectorData.AzureAISearch]: https://www.nuget.org/packages/CommunityToolkit.VectorData.AzureAISearch -[CommunityToolkit.VectorData.CosmosMongoDB]: https://www.nuget.org/packages/CommunityToolkit.VectorData.CosmosMongoDB +[CommunityToolkit.VectorData.CosmosDocumentDB]: https://www.nuget.org/packages/CommunityToolkit.VectorData.CosmosDocumentDB [CommunityToolkit.VectorData.CosmosNoSql]: https://www.nuget.org/packages/CommunityToolkit.VectorData.CosmosNoSql [CommunityToolkit.VectorData.InMemory]: https://www.nuget.org/packages/CommunityToolkit.VectorData.InMemory [CommunityToolkit.VectorData.PgVector]: https://www.nuget.org/packages/CommunityToolkit.VectorData.PgVector @@ -64,7 +64,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [v-azureaisearch]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.AzureAISearch -[v-cosmosmongodb]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.CosmosMongoDB +[v-cosmosdocumentdb]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.CosmosDocumentDB [v-cosmosnosql]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.CosmosNoSql [v-inmemory]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.InMemory [v-pgvector]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.PgVector @@ -76,7 +76,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [d-azureaisearch]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.AzureAISearch -[d-cosmosmongodb]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.CosmosMongoDB +[d-cosmosdocumentdb]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.CosmosDocumentDB [d-cosmosnosql]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.CosmosNoSql [d-inmemory]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.InMemory [d-pgvector]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.PgVector From ec0817b8487556ec65c3e053e8865e291d389b30 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Aug 2026 10:33:29 +0000 Subject: [PATCH 2/7] Address CosmosDocumentDB review feedback Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs | 4 ++-- MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs | 2 +- .../CosmosDocumentDBIndexKindTests.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs index 6df8fbd..bba281b 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs @@ -63,7 +63,7 @@ private BsonDocument GenerateEqualityComparison(PropertyModel property, object? { if (value is null) { - throw new NotSupportedException("MongogDB does not support null checks in vector search pre-filters"); + throw new NotSupportedException("MongoDB does not support null checks in vector search pre-filters"); } // Short form of equality (instead of $eq) @@ -142,7 +142,7 @@ private BsonDocument TranslateNot(UnaryExpression not) return new BsonDocument { [fieldName] = new BsonDocument { ["$nin"] = values } }; } - throw new NotSupportedException("MongogDB does not support the NOT operator in vector search pre-filters"); + throw new NotSupportedException("MongoDB does not support the NOT operator in vector search pre-filters"); } private BsonDocument TranslateMethodCall(MethodCallExpression methodCall) diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs index 375ce2a..27f41b8 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs @@ -53,7 +53,7 @@ public CosmosDocumentDBVectorStore(IMongoDatabase mongoDatabase, CosmosDocumentD #pragma warning disable IDE0090 // Use 'new(...)' /// [RequiresDynamicCode("This overload of GetCollection() is incompatible with NativeAOT. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] - [RequiresUnreferencedCode("This overload of GetCollecttion() is incompatible with trimming. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] + [RequiresUnreferencedCode("This overload of GetCollection() is incompatible with trimming. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] #if NET public override CosmosDocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #else diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs index c344d53..c1d278c 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs +++ b/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs @@ -12,7 +12,7 @@ namespace CosmosDocumentDB.ConformanceTests; public class CosmosDocumentDBIndexKindTests(CosmosDocumentDBIndexKindTests.Fixture fixture) : IndexKindTests(fixture), IClassFixture { - // Note: Cosmos Mongo support HNSW, but only in a specific tier. + // Note: Cosmos DocumentDB supports HNSW, but only in a specific tier. // [Fact] // public virtual Task Hnsw() // => this.Test(IndexKind.Hnsw); @@ -21,7 +21,7 @@ public class CosmosDocumentDBIndexKindTests(CosmosDocumentDBIndexKindTests.Fixtu public virtual Task IvfFlat() => this.Test(IndexKind.IvfFlat); - // Cosmos Mongo does not support index-less searching + // Cosmos DocumentDB does not support index-less searching public override Task Flat() => Assert.ThrowsAsync(base.Flat); public new class Fixture() : IndexKindTests.Fixture From 46d8e612a4478fc46559e700f5aa66bd2fcf423f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Aug 2026 11:30:59 +0000 Subject: [PATCH 3/7] Address CosmosDocumentDB review feedback Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj | 5 +++-- .../CosmosDocumentDBCollectionCreateMapping.cs | 4 ++-- .../src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs | 4 ++-- MEVD/src/CosmosDocumentDB/MongoShared/README.md | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj b/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj index 75bcecc..c5cd4a6 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj @@ -7,8 +7,9 @@ net10.0;net8.0;netstandard2.1;net472 true - Azure DocumentDB vCore provider for Microsoft.Extensions.VectorData - Azure DocumentDB vCore provider for Microsoft.Extensions.VectorData by the .NET Community Toolkit + Azure DocumentDB (with MongoDB compatibility) provider for Microsoft.Extensions.VectorData + Azure DocumentDB (with MongoDB compatibility) provider for Microsoft.Extensions.VectorData by the .NET Community Toolkit + AzureDocumentDB;AzureMongoDB;VectorData diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs index 2070f1d..fad0894 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs @@ -104,7 +104,7 @@ public static BsonArray GetFilterableDataIndexes( } /// - /// More information about Azure DocumentDB index kinds here: . + /// More information about Azure DocumentDB index kinds here: . /// private static string GetIndexKind(string? indexKind, string vectorPropertyName) => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch @@ -115,7 +115,7 @@ private static string GetIndexKind(string? indexKind, string vectorPropertyName) }; /// - /// More information about Azure DocumentDB distance functions here: . + /// More information about Azure DocumentDB distance functions here: . /// private static string GetDistanceFunction(string? distanceFunction, string vectorPropertyName) => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs index bba281b..6d8a2ef 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs +++ b/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs @@ -63,7 +63,7 @@ private BsonDocument GenerateEqualityComparison(PropertyModel property, object? { if (value is null) { - throw new NotSupportedException("MongoDB does not support null checks in vector search pre-filters"); + throw new NotSupportedException("Azure DocumentDB does not support null checks in vector search pre-filters"); } // Short form of equality (instead of $eq) @@ -142,7 +142,7 @@ private BsonDocument TranslateNot(UnaryExpression not) return new BsonDocument { [fieldName] = new BsonDocument { ["$nin"] = values } }; } - throw new NotSupportedException("MongoDB does not support the NOT operator in vector search pre-filters"); + throw new NotSupportedException("Azure DocumentDB does not support the NOT operator in vector search pre-filters"); } private BsonDocument TranslateMethodCall(MethodCallExpression methodCall) diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/README.md b/MEVD/src/CosmosDocumentDB/MongoShared/README.md index e61c0e0..08c0da8 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/README.md +++ b/MEVD/src/CosmosDocumentDB/MongoShared/README.md @@ -1,5 +1,5 @@ # MongoShared -These files are shared utilities that are identical across the Cosmos DocumentDB and the regular MongoDB vector store providers. +These files are derived from the MongoDB vector store provider utilities. -If a regular MongoDB provider is added in the future, these files should be extracted to a shared location and linked into both projects. +MongoDB now maintains its provider separately at https://github.com/mongodb/mongo-mevd-provider/tree/main/src/MongoDB. Periodically compare these files with that repository and sync relevant changes when needed. From e91bad22c85063716281cad67b34d9bc5501c7c9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 18 Aug 2026 12:54:36 +0000 Subject: [PATCH 4/7] Rename CosmosDocumentDB to AzureDocumentDB Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- .github/workflows/mevd.yml | 4 +- CommunityToolkit.AI.slnx | 6 +- MEVD/MEVD.slnf | 6 +- .../AssemblyInfo.cs | 0 .../AzureDocumentDB.csproj} | 4 +- .../AzureDocumentDBCollection.cs} | 42 +++--- ...AzureDocumentDBCollectionCreateMapping.cs} | 8 +- .../AzureDocumentDBCollectionOptions.cs} | 14 +- ...AzureDocumentDBCollectionSearchMapping.cs} | 6 +- .../AzureDocumentDBConstants.cs} | 4 +- .../AzureDocumentDBDynamicCollection.cs} | 8 +- .../AzureDocumentDBFilterTranslator.cs} | 4 +- ...eDocumentDBServiceCollectionExtensions.cs} | 132 +++++++++--------- .../AzureDocumentDBVectorStore.cs} | 18 +-- .../AzureDocumentDBVectorStoreOptions.cs} | 12 +- .../MongoShared/BsonValueFactory.cs | 2 +- .../MongoShared/ErrorHandlingAsyncCursor.cs | 2 +- .../MongoShared/IMongoMapper.cs | 2 +- .../MongoShared/MongoConstants.cs | 2 +- .../MongoShared/MongoDynamicMapper.cs | 2 +- .../MongoShared/MongoMapper.cs | 2 +- .../MongoShared/MongoModelBuilder.cs | 2 +- .../MongoShared/README.md | 0 .../README.md | 4 +- .../AzureDocumentDB.ConformanceTests.csproj} | 4 +- .../AzureDocumentDBBsonMappingTests.cs} | 24 ++-- ...ureDocumentDBCollectionManagementTests.cs} | 8 +- ...zureDocumentDBDependencyInjectionTests.cs} | 72 +++++----- .../AzureDocumentDBDistanceFunctionTests.cs} | 12 +- ...zureDocumentDBEmbeddingGenerationTests.cs} | 32 ++--- .../AzureDocumentDBFilterTests.cs} | 12 +- .../AzureDocumentDBIndexKindTests.cs} | 14 +- ...DocumentDBTestSuiteImplementationTests.cs} | 4 +- .../AzureDocumentDBBasicModelTests.cs | 18 +++ .../AzureDocumentDBMultiVectorModelTests.cs | 18 +++ .../AzureDocumentDBNoDataModelTests.cs | 18 +++ .../AzureDocumentDBNoVectorModelTests.cs | 18 +++ .../Properties/AssemblyAttributes.cs | 0 .../Support/AzureDocumentDBFixture.cs} | 6 +- .../AzureDocumentDBTestEnvironment.cs} | 10 +- .../Support/AzureDocumentDBTestStore.cs} | 20 +-- .../AzureDocumentDBDataTypeTests.cs} | 10 +- .../AzureDocumentDBEmbeddingTypeTests.cs} | 10 +- .../TypeTests/AzureDocumentDBKeyTypeTests.cs} | 10 +- .../.editorconfig | 0 .../AzureDocumentDB.UnitTests.csproj} | 6 +- .../AzureDocumentDBCollectionTests.cs} | 56 ++++---- .../AzureDocumentDBHotelModel.cs} | 4 +- .../AzureDocumentDBVectorStoreTests.cs} | 18 +-- .../CosmosDocumentDBBasicModelTests.cs | 18 --- .../CosmosDocumentDBMultiVectorModelTests.cs | 18 --- .../CosmosDocumentDBNoDataModelTests.cs | 18 --- .../CosmosDocumentDBNoVectorModelTests.cs | 18 --- README.md | 10 +- 54 files changed, 386 insertions(+), 386 deletions(-) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/AssemblyInfo.cs (100%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDB.csproj => AzureDocumentDB/AzureDocumentDB.csproj} (86%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBCollection.cs => AzureDocumentDB/AzureDocumentDBCollection.cs} (93%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs => AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs} (94%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs => AzureDocumentDB/AzureDocumentDBCollectionOptions.cs} (74%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs => AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs} (94%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBConstants.cs => AzureDocumentDB/AzureDocumentDBConstants.cs} (67%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs => AzureDocumentDB/AzureDocumentDBDynamicCollection.cs} (74%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs => AzureDocumentDB/AzureDocumentDBFilterTranslator.cs} (98%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs => AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs} (64%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBVectorStore.cs => AzureDocumentDB/AzureDocumentDBVectorStore.cs} (86%) rename MEVD/src/{CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs => AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs} (56%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/BsonValueFactory.cs (95%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/ErrorHandlingAsyncCursor.cs (97%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/IMongoMapper.cs (92%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/MongoConstants.cs (97%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/MongoDynamicMapper.cs (99%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/MongoMapper.cs (99%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/MongoModelBuilder.cs (98%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/MongoShared/README.md (100%) rename MEVD/src/{CosmosDocumentDB => AzureDocumentDB}/README.md (86%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj => AzureDocumentDB.ConformanceTests/AzureDocumentDB.ConformanceTests.csproj} (88%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs} (79%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs} (55%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs} (67%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs} (71%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs} (51%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs} (89%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs} (55%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs => AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs} (75%) create mode 100644 MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs create mode 100644 MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs create mode 100644 MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs create mode 100644 MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs rename MEVD/test/{CosmosDocumentDB.ConformanceTests => AzureDocumentDB.ConformanceTests}/Properties/AssemblyAttributes.cs (100%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs => AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs} (50%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs => AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs} (70%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs => AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs} (60%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs => AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs} (86%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs => AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs} (50%) rename MEVD/test/{CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs => AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs} (65%) rename MEVD/test/{CosmosDocumentDB.UnitTests => AzureDocumentDB.UnitTests}/.editorconfig (100%) rename MEVD/test/{CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj => AzureDocumentDB.UnitTests/AzureDocumentDB.UnitTests.csproj} (73%) rename MEVD/test/{CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs => AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs} (90%) rename MEVD/test/{CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs => AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs} (93%) rename MEVD/test/{CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs => AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs} (73%) delete mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs delete mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs delete mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs delete mode 100644 MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs diff --git a/.github/workflows/mevd.yml b/.github/workflows/mevd.yml index 7456fa4..5fb7471 100644 --- a/.github/workflows/mevd.yml +++ b/.github/workflows/mevd.yml @@ -155,10 +155,10 @@ jobs: fail-fast: false matrix: provider: ${{ fromJson(needs.discover.outputs.all_providers) }} - # AzureAISearch and CosmosDocumentDB require cloud instances and can't run in CI. + # AzureAISearch and AzureDocumentDB require cloud instances and can't run in CI. exclude: - provider: AzureAISearch - - provider: CosmosDocumentDB + - provider: AzureDocumentDB steps: - uses: actions/checkout@v6 diff --git a/CommunityToolkit.AI.slnx b/CommunityToolkit.AI.slnx index ce0171a..31f6e90 100644 --- a/CommunityToolkit.AI.slnx +++ b/CommunityToolkit.AI.slnx @@ -10,7 +10,7 @@ - + @@ -25,8 +25,8 @@ - - + + diff --git a/MEVD/MEVD.slnf b/MEVD/MEVD.slnf index 8277058..c8feb37 100644 --- a/MEVD/MEVD.slnf +++ b/MEVD/MEVD.slnf @@ -5,7 +5,7 @@ [ "MEVD/src/AzureAISearch/AzureAISearch.csproj", "MEVD/src/CosmosNoSql/CosmosNoSql.csproj", - "MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj", + "MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj", "MEVD/src/InMemory/InMemory.csproj", "MEVD/src/PgVector/PgVector.csproj", "MEVD/src/Qdrant/Qdrant.csproj", @@ -18,8 +18,8 @@ "MEVD/test/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj", "MEVD/test/CosmosNoSql.UnitTests/CosmosNoSql.UnitTests.csproj", "MEVD/test/CosmosNoSql.ConformanceTests/CosmosNoSql.ConformanceTests.csproj", - "MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj", - "MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj", + "MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDB.UnitTests.csproj", + "MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDB.ConformanceTests.csproj", "MEVD/test/InMemory.UnitTests/InMemory.UnitTests.csproj", "MEVD/test/InMemory.ConformanceTests/InMemory.ConformanceTests.csproj", "MEVD/test/PgVector.UnitTests/PgVector.UnitTests.csproj", diff --git a/MEVD/src/CosmosDocumentDB/AssemblyInfo.cs b/MEVD/src/AzureDocumentDB/AssemblyInfo.cs similarity index 100% rename from MEVD/src/CosmosDocumentDB/AssemblyInfo.cs rename to MEVD/src/AzureDocumentDB/AssemblyInfo.cs diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj b/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj similarity index 86% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj rename to MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj index c5cd4a6..b2c471b 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDB.csproj +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj @@ -2,7 +2,7 @@ 1.0.0 - CommunityToolkit.VectorData.CosmosDocumentDB + CommunityToolkit.VectorData.AzureDocumentDB $(AssemblyName) net10.0;net8.0;netstandard2.1;net472 true @@ -13,7 +13,7 @@ - + diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs similarity index 93% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs index 6f83af0..7a2dcee 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollection.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs @@ -15,7 +15,7 @@ using MEVD = Microsoft.Extensions.VectorData; using Microsoft.Shared.Diagnostics; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Service for storing and retrieving vector records, that uses Azure DocumentDB as the underlying storage. @@ -23,7 +23,7 @@ namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// The data type of the record key. Must be either . /// The data model to use for adding, updating and retrieving data from storage. #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public class CosmosDocumentDBCollection : VectorStoreCollection +public class AzureDocumentDBCollection : VectorStoreCollection where TKey : notnull where TRecord : class #pragma warning restore CA1711 // Identifiers should not have incorrect suffix @@ -70,28 +70,28 @@ public class CosmosDocumentDBCollection : VectorStoreCollection - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in Azure DocumentDB. - /// The name of the collection that this will access. + /// The name of the collection that this will access. /// Optional configuration options for this class. - [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate CosmosDocumentDBDynamicCollection instead.")] - [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate CosmosDocumentDBDynamicCollection instead.")] - public CosmosDocumentDBCollection( + [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate AzureDocumentDBDynamicCollection instead.")] + [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate AzureDocumentDBDynamicCollection instead.")] + public AzureDocumentDBCollection( IMongoDatabase mongoDatabase, string name, - CosmosDocumentDBCollectionOptions? options = default) + AzureDocumentDBCollectionOptions? options = default) : this( mongoDatabase, name, static options => typeof(TRecord) == typeof(Dictionary) - ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(CosmosDocumentDBDynamicCollection))) + ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(AzureDocumentDBDynamicCollection))) : new MongoModelBuilder().Build(typeof(TRecord), typeof(TKey), options.Definition, options.EmbeddingGenerator), options) { } - internal CosmosDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, CosmosDocumentDBCollectionOptions? options) + internal AzureDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, AzureDocumentDBCollectionOptions? options) { // Verify. Throw.IfNull(mongoDatabase); @@ -102,7 +102,7 @@ internal CosmosDocumentDBCollection(IMongoDatabase mongoDatabase, string name, F throw new NotSupportedException("Only ObjectID, string, Guid, int and long keys are supported."); } - options ??= CosmosDocumentDBCollectionOptions.Default; + options ??= AzureDocumentDBCollectionOptions.Default; // Assign. _mongoDatabase = mongoDatabase; @@ -119,7 +119,7 @@ internal CosmosDocumentDBCollection(IMongoDatabase mongoDatabase, string name, F _collectionMetadata = new() { - VectorStoreSystemName = CosmosDocumentDBConstants.VectorStoreSystemName, + VectorStoreSystemName = AzureDocumentDBConstants.VectorStoreSystemName, VectorStoreName = mongoDatabase.DatabaseNamespace?.DatabaseName, CollectionName = name }; @@ -370,24 +370,24 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null }; var filter = options.Filter is not null - ? new CosmosDocumentDBFilterTranslator().Translate(options.Filter, _model) + ? new AzureDocumentDBFilterTranslator().Translate(options.Filter, _model) : null; // Constructing a query to fetch "skip + top" total items // to perform skip logic locally, since skip option is not part of API. var itemsAmount = options.Skip + top; - var vectorPropertyIndexKind = CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(vectorProperty.IndexKind); + var vectorPropertyIndexKind = AzureDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(vectorProperty.IndexKind); var searchQuery = vectorPropertyIndexKind switch { - IndexKind.Hnsw => CosmosDocumentDBCollectionSearchMapping.GetSearchQueryForHnswIndex( + IndexKind.Hnsw => AzureDocumentDBCollectionSearchMapping.GetSearchQueryForHnswIndex( vector, vectorProperty.StorageName, itemsAmount, _efSearch, filter), - IndexKind.IvfFlat => CosmosDocumentDBCollectionSearchMapping.GetSearchQueryForIvfIndex( + IndexKind.IvfFlat => AzureDocumentDBCollectionSearchMapping.GetSearchQueryForIvfIndex( vector, vectorProperty.StorageName, itemsAmount, @@ -397,7 +397,7 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null $"Supported index kinds are: {string.Join(", ", [IndexKind.Hnsw, IndexKind.IvfFlat])}") }; - var projectionQuery = CosmosDocumentDBCollectionSearchMapping.GetProjectionQuery( + var projectionQuery = AzureDocumentDBCollectionSearchMapping.GetProjectionQuery( ScorePropertyName, DocumentPropertyName); @@ -406,7 +406,7 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null // Add score threshold filter as a $match stage if specified if (options.ScoreThreshold.HasValue) { - pipeline.Add(CosmosDocumentDBCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); + pipeline.Add(AzureDocumentDBCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); } const string OperationName = "Aggregate"; @@ -455,7 +455,7 @@ public override async IAsyncEnumerable GetAsync( options ??= new(); // Translate the filter now, so if it fails, we throw immediately. - var translatedFilter = new CosmosDocumentDBFilterTranslator().Translate(filter, _model); + var translatedFilter = new AzureDocumentDBFilterTranslator().Translate(filter, _model); SortDefinition? sortDefinition = null; var orderBy = options.OrderBy?.Invoke(new()).Values; @@ -503,13 +503,13 @@ private async Task CreateIndexesAsync(string collectionName, CancellationToken c var indexArray = new BsonArray(); - indexArray.AddRange(CosmosDocumentDBCollectionCreateMapping.GetVectorIndexes( + indexArray.AddRange(AzureDocumentDBCollectionCreateMapping.GetVectorIndexes( _model.VectorProperties, uniqueIndexes, _numLists, _efConstruction)); - indexArray.AddRange(CosmosDocumentDBCollectionCreateMapping.GetFilterableDataIndexes( + indexArray.AddRange(AzureDocumentDBCollectionCreateMapping.GetFilterableDataIndexes( _model.DataProperties, uniqueIndexes)); diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs similarity index 94% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs index fad0894..b2b18e9 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionCreateMapping.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs @@ -5,12 +5,12 @@ using Microsoft.Extensions.VectorData.ProviderServices; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Contains mapping helpers to use when creating a collection in Azure DocumentDB. /// -internal static class CosmosDocumentDBCollectionCreateMapping +internal static class AzureDocumentDBCollectionCreateMapping { /// /// Returns an array of indexes to create for vector properties. @@ -107,7 +107,7 @@ public static BsonArray GetFilterableDataIndexes( /// More information about Azure DocumentDB index kinds here: . /// private static string GetIndexKind(string? indexKind, string vectorPropertyName) - => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch + => AzureDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch { IndexKind.Hnsw => "vector-hnsw", IndexKind.IvfFlat => "vector-ivf", @@ -118,7 +118,7 @@ private static string GetIndexKind(string? indexKind, string vectorPropertyName) /// More information about Azure DocumentDB distance functions here: . /// private static string GetDistanceFunction(string? distanceFunction, string vectorPropertyName) - => CosmosDocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch + => AzureDocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch { DistanceFunction.CosineDistance => "COS", DistanceFunction.DotProductSimilarity => "IP", diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs similarity index 74% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs index 9944e3e..aa904c8 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionOptions.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs @@ -3,23 +3,23 @@ using Microsoft.Extensions.VectorData; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// -/// Options when creating a . +/// Options when creating a . /// -public sealed class CosmosDocumentDBCollectionOptions : VectorStoreCollectionOptions +public sealed class AzureDocumentDBCollectionOptions : VectorStoreCollectionOptions { - internal static readonly CosmosDocumentDBCollectionOptions Default = new(); + internal static readonly AzureDocumentDBCollectionOptions Default = new(); /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public CosmosDocumentDBCollectionOptions() + public AzureDocumentDBCollectionOptions() { } - internal CosmosDocumentDBCollectionOptions(CosmosDocumentDBCollectionOptions? source) : base(source) + internal AzureDocumentDBCollectionOptions(AzureDocumentDBCollectionOptions? source) : base(source) { NumLists = source?.NumLists ?? Default.NumLists; EfConstruction = source?.EfConstruction ?? Default.EfConstruction; diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs similarity index 94% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs index cd6d78d..769ce82 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBCollectionSearchMapping.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs @@ -5,12 +5,12 @@ using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Contains mapping helpers to use when searching for documents using Azure DocumentDB. /// -internal static class CosmosDocumentDBCollectionSearchMapping +internal static class AzureDocumentDBCollectionSearchMapping { /// Returns index kind specified on vector property or default . public static string GetVectorPropertyIndexKind(string? indexKind) => !string.IsNullOrWhiteSpace(indexKind) ? indexKind! : MongoConstants.DefaultIndexKind; @@ -98,7 +98,7 @@ public static BsonDocument GetProjectionQuery(string scorePropertyName, string d /// Returns a $match stage to filter results by score threshold. /// - /// Cosmos DocumentDB returns a similarity score where higher values mean more similar, + /// Azure DocumentDB returns a similarity score where higher values mean more similar, /// so we filter with $gte to keep results at or above the threshold. /// public static BsonDocument GetScoreThresholdMatchQuery(string scorePropertyName, double scoreThreshold) diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs similarity index 67% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs index ca68c87..ee981ec 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBConstants.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; -internal static class CosmosDocumentDBConstants +internal static class AzureDocumentDBConstants { public const string VectorStoreSystemName = "azure.cosmosdbmongodb"; } diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs similarity index 74% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs index 0404675..59bb6d9 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBDynamicCollection.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs @@ -4,22 +4,22 @@ using MongoDB.Driver; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Represents a collection of vector store records in a Mongo database, mapped to a dynamic Dictionary<string, object?>. /// #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public sealed class CosmosDocumentDBDynamicCollection : CosmosDocumentDBCollection> +public sealed class AzureDocumentDBDynamicCollection : AzureDocumentDBCollection> #pragma warning restore CA1711 // Identifiers should not have incorrect suffix { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in MongoDB. /// The name of the collection. /// Optional configuration options for this class. - public CosmosDocumentDBDynamicCollection(IMongoDatabase mongoDatabase, string name, CosmosDocumentDBCollectionOptions options) + public AzureDocumentDBDynamicCollection(IMongoDatabase mongoDatabase, string name, AzureDocumentDBCollectionOptions options) : base( mongoDatabase, name, diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs similarity index 98% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs index 6d8a2ef..4bf5178 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBFilterTranslator.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs @@ -8,11 +8,11 @@ using Microsoft.Extensions.VectorData.ProviderServices.Filter; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; // MongoDB query reference: https://www.mongodb.com/docs/manual/reference/operator/query // Information specific to vector search pre-filter: https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-stage/#atlas-vector-search-pre-filter -internal class CosmosDocumentDBFilterTranslator : FilterTranslatorBase +internal class AzureDocumentDBFilterTranslator : FilterTranslatorBase { internal BsonDocument Translate(LambdaExpression lambdaExpression, CollectionModel model) { diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs similarity index 64% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs index cb1e03b..e161e5f 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBServiceCollectionExtensions.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.AI; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Driver; using Microsoft.Shared.Diagnostics; @@ -13,158 +13,158 @@ namespace Microsoft.Extensions.DependencyInjection; /// /// Extension methods to register Azure DocumentDB instances on an . /// -public static class CosmosDocumentDBServiceCollectionExtensions +public static class AzureDocumentDBServiceCollectionExtensions { private const string DynamicCodeMessage = "This method is incompatible with NativeAOT, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string UnreferencedCodeMessage = "This method is incompatible with trimming, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string ApplicationId = "CommunityToolkit.MEVD"; /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosDocumentDBVectorStore( + public static IServiceCollection AddAzureDocumentDBVectorStore( this IServiceCollection services, - CosmosDocumentDBVectorStoreOptions? options = default, + AzureDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedCosmosDocumentDBVectorStore(services, serviceKey: null, options, lifetime); + => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosDocumentDBVectorStore( + public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, - CosmosDocumentDBVectorStoreOptions? options = default, + AzureDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); - services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(AzureDocumentDBVectorStore), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetStoreOptions(sp, _ => options); - return new CosmosDocumentDBVectorStore(database, options); + return new AzureDocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosDocumentDBVectorStore( + public static IServiceCollection AddAzureDocumentDBVectorStore( this IServiceCollection services, string connectionString, string databaseName, - CosmosDocumentDBVectorStoreOptions? options = default, + AzureDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedCosmosDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); + => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. /// Connection string required to connect to Azure DocumentDB. /// Database name for Azure DocumentDB. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosDocumentDBVectorStore( + public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, string connectionString, string databaseName, - CosmosDocumentDBVectorStoreOptions? options = default, + AzureDocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(AzureDocumentDBVectorStore), serviceKey, (sp, _) => { options = GetStoreOptions(sp, _ => options); MongoClient mongoClient = new(CreateClientSettings(connectionString)); var database = mongoClient.GetDatabase(databaseName); - return new CosmosDocumentDBVectorStore(database, options); + return new AzureDocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddCosmosDocumentDBCollection( + public static IServiceCollection AddAzureDocumentDBCollection( this IServiceCollection services, string name, - CosmosDocumentDBCollectionOptions? options = default, + AzureDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, options, lifetime); + => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedCosmosDocumentDBCollection( + public static IServiceCollection AddKeyedAzureDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, - CosmosDocumentDBCollectionOptions? options = default, + AzureDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { Throw.IfNull(services); Throw.IfNullOrWhitespace(name); - services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(AzureDocumentDBCollection), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetCollectionOptions(sp, _ => options); - return new CosmosDocumentDBCollection(database, name, options); + return new AzureDocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -173,72 +173,72 @@ public static IServiceCollection AddKeyedCosmosDocumentDBCollection( } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddCosmosDocumentDBCollection( + public static IServiceCollection AddAzureDocumentDBCollection( this IServiceCollection services, string name, string connectionString, string databaseName, - CosmosDocumentDBCollectionOptions? options = default, + AzureDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); + => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. /// Connection string required to connect to Azure DocumentDB. /// Database name for Azure DocumentDB. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedCosmosDocumentDBCollection( + public static IServiceCollection AddKeyedAzureDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, string connectionString, string databaseName, - CosmosDocumentDBCollectionOptions? options = default, + AzureDocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - return AddKeyedCosmosDocumentDBCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); + return AddKeyedAzureDocumentDBCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddCosmosDocumentDBCollection( + public static IServiceCollection AddAzureDocumentDBCollection( this IServiceCollection services, string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedCosmosDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); + => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. @@ -252,13 +252,13 @@ public static IServiceCollection AddCosmosDocumentDBCollection( /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedCosmosDocumentDBCollection( + public static IServiceCollection AddKeyedAzureDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { @@ -267,13 +267,13 @@ public static IServiceCollection AddKeyedCosmosDocumentDBCollection( Throw.IfNull(connectionStringProvider); Throw.IfNull(databaseNameProvider); - services.Add(new ServiceDescriptor(typeof(CosmosDocumentDBCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(AzureDocumentDBCollection), serviceKey, (sp, _) => { var options = GetCollectionOptions(sp, optionsProvider); MongoClient mongoClient = new(CreateClientSettings(connectionStringProvider(sp))); var database = mongoClient.GetDatabase(databaseNameProvider(sp)); - return new CosmosDocumentDBCollection(database, name, options); + return new AzureDocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -286,16 +286,16 @@ private static void AddAbstractions(IServiceCollection services, where TRecord : class { services.Add(new ServiceDescriptor(typeof(VectorStoreCollection), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); services.Add(new ServiceDescriptor(typeof(IVectorSearchable), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); - // Once HybridSearch supports get implemented by CosmosDocumentDBCollection, + // Once HybridSearch supports get implemented by AzureDocumentDBCollection, // we need to add IKeywordHybridSearchable abstraction here as well. } - private static CosmosDocumentDBVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) + private static AzureDocumentDBVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) @@ -309,7 +309,7 @@ private static void AddAbstractions(IServiceCollection services, : new(options) { EmbeddingGenerator = embeddingGenerator }; // Create a brand new copy in order to avoid modifying the original options. } - private static CosmosDocumentDBCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) + private static AzureDocumentDBCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs similarity index 86% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs index 27f41b8..6bc6d35 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStore.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs @@ -10,7 +10,7 @@ using Microsoft.Shared.Diagnostics; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Class for accessing the list of collections in a Azure DocumentDB vector store. @@ -18,7 +18,7 @@ namespace CommunityToolkit.VectorData.CosmosDocumentDB; /// /// This class can be used with collections of any schema type, but requires you to provide schema information when getting a collection. /// -public sealed class CosmosDocumentDBVectorStore : VectorStore +public sealed class AzureDocumentDBVectorStore : VectorStore { /// Metadata about vector store. private readonly VectorStoreMetadata _metadata; @@ -32,11 +32,11 @@ public sealed class CosmosDocumentDBVectorStore : VectorStore private readonly IEmbeddingGenerator? _embeddingGenerator; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in Azure DocumentDB. /// Optional configuration options for this class. - public CosmosDocumentDBVectorStore(IMongoDatabase mongoDatabase, CosmosDocumentDBVectorStoreOptions? options = default) + public AzureDocumentDBVectorStore(IMongoDatabase mongoDatabase, AzureDocumentDBVectorStoreOptions? options = default) { Throw.IfNull(mongoDatabase); @@ -45,7 +45,7 @@ public CosmosDocumentDBVectorStore(IMongoDatabase mongoDatabase, CosmosDocumentD _metadata = new() { - VectorStoreSystemName = CosmosDocumentDBConstants.VectorStoreSystemName, + VectorStoreSystemName = AzureDocumentDBConstants.VectorStoreSystemName, VectorStoreName = mongoDatabase.DatabaseNamespace?.DatabaseName }; } @@ -55,13 +55,13 @@ public CosmosDocumentDBVectorStore(IMongoDatabase mongoDatabase, CosmosDocumentD [RequiresDynamicCode("This overload of GetCollection() is incompatible with NativeAOT. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] [RequiresUnreferencedCode("This overload of GetCollection() is incompatible with trimming. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] #if NET - public override CosmosDocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) + public override AzureDocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #else public override VectorStoreCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #endif => typeof(TRecord) == typeof(Dictionary) ? throw new ArgumentException(VectorDataStrings.GetCollectionWithDictionaryNotSupported) - : new CosmosDocumentDBCollection( + : new AzureDocumentDBCollection( _mongoDatabase, name, new() @@ -72,11 +72,11 @@ public override VectorStoreCollection GetCollection #if NET - public override CosmosDocumentDBDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) + public override AzureDocumentDBDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #else public override VectorStoreCollection> GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #endif - => new CosmosDocumentDBDynamicCollection( + => new AzureDocumentDBDynamicCollection( _mongoDatabase, name, new() diff --git a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs b/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs similarity index 56% rename from MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs rename to MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs index d86d52c..b1d6277 100644 --- a/MEVD/src/CosmosDocumentDB/CosmosDocumentDBVectorStoreOptions.cs +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs @@ -3,21 +3,21 @@ using Microsoft.Extensions.AI; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// -/// Options when creating a +/// Options when creating a /// -public sealed class CosmosDocumentDBVectorStoreOptions +public sealed class AzureDocumentDBVectorStoreOptions { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public CosmosDocumentDBVectorStoreOptions() + public AzureDocumentDBVectorStoreOptions() { } - internal CosmosDocumentDBVectorStoreOptions(CosmosDocumentDBVectorStoreOptions? source) + internal AzureDocumentDBVectorStoreOptions(AzureDocumentDBVectorStoreOptions? source) { EmbeddingGenerator = source?.EmbeddingGenerator; } diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs b/MEVD/src/AzureDocumentDB/MongoShared/BsonValueFactory.cs similarity index 95% rename from MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs rename to MEVD/src/AzureDocumentDB/MongoShared/BsonValueFactory.cs index fa9eff9..b6e3d2a 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/BsonValueFactory.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/BsonValueFactory.cs @@ -6,7 +6,7 @@ using System.Linq; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// A class that constructs the correct BsonValue for a given CLR type. diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs b/MEVD/src/AzureDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs similarity index 97% rename from MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs rename to MEVD/src/AzureDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs index febc211..38590c2 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/ErrorHandlingAsyncCursor.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.VectorData; using MongoDB.Driver; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// A decorator for that handles errors on move next. diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs b/MEVD/src/AzureDocumentDB/MongoShared/IMongoMapper.cs similarity index 92% rename from MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs rename to MEVD/src/AzureDocumentDB/MongoShared/IMongoMapper.cs index cc162bf..31e23fc 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/IMongoMapper.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/IMongoMapper.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.AI; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; internal interface IMongoMapper { diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs b/MEVD/src/AzureDocumentDB/MongoShared/MongoConstants.cs similarity index 97% rename from MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs rename to MEVD/src/AzureDocumentDB/MongoShared/MongoConstants.cs index 4581850..88f5d86 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/MongoConstants.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/MongoConstants.cs @@ -6,7 +6,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.VectorData; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Constants for MongoDB vector store implementation. diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs b/MEVD/src/AzureDocumentDB/MongoShared/MongoDynamicMapper.cs similarity index 99% rename from MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs rename to MEVD/src/AzureDocumentDB/MongoShared/MongoDynamicMapper.cs index 2524002..d86faba 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/MongoDynamicMapper.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/MongoDynamicMapper.cs @@ -12,7 +12,7 @@ using Microsoft.Shared.Diagnostics; using MongoDB.Bson; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// A mapper that maps between the dynamic data model and the model that the data is stored under, within MongoDB. diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs b/MEVD/src/AzureDocumentDB/MongoShared/MongoMapper.cs similarity index 99% rename from MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs rename to MEVD/src/AzureDocumentDB/MongoShared/MongoMapper.cs index 6558093..1afe8bf 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/MongoMapper.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/MongoMapper.cs @@ -14,7 +14,7 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Bson.Serialization.Serializers; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; internal sealed class MongoMapper : IMongoMapper where TRecord : class diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs b/MEVD/src/AzureDocumentDB/MongoShared/MongoModelBuilder.cs similarity index 98% rename from MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs rename to MEVD/src/AzureDocumentDB/MongoShared/MongoModelBuilder.cs index 206a05f..a690e64 100644 --- a/MEVD/src/CosmosDocumentDB/MongoShared/MongoModelBuilder.cs +++ b/MEVD/src/AzureDocumentDB/MongoShared/MongoModelBuilder.cs @@ -11,7 +11,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace CommunityToolkit.VectorData.CosmosDocumentDB; +namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Customized MongoDB model builder that adds specialized configuration of property storage names diff --git a/MEVD/src/CosmosDocumentDB/MongoShared/README.md b/MEVD/src/AzureDocumentDB/MongoShared/README.md similarity index 100% rename from MEVD/src/CosmosDocumentDB/MongoShared/README.md rename to MEVD/src/AzureDocumentDB/MongoShared/README.md diff --git a/MEVD/src/CosmosDocumentDB/README.md b/MEVD/src/AzureDocumentDB/README.md similarity index 86% rename from MEVD/src/CosmosDocumentDB/README.md rename to MEVD/src/AzureDocumentDB/README.md index da51c8e..b4dc388 100644 --- a/MEVD/src/CosmosDocumentDB/README.md +++ b/MEVD/src/AzureDocumentDB/README.md @@ -1,4 +1,4 @@ -# CommunityToolkit.VectorData.CosmosDocumentDB +# CommunityToolkit.VectorData.AzureDocumentDB Azure DocumentDB (with MongoDB compatibility) provider for [Microsoft.Extensions.VectorData](https://learn.microsoft.com/dotnet/ai/vector-stores/overview), by the .NET Community Toolkit. @@ -11,7 +11,7 @@ Azure DocumentDB (with MongoDB compatibility) provider for [Microsoft.Extensions 2. Install the NuGet package: ```bash -dotnet add package CommunityToolkit.VectorData.CosmosDocumentDB +dotnet add package CommunityToolkit.VectorData.AzureDocumentDB ``` For more information, see the [Microsoft.Extensions.VectorData documentation](https://learn.microsoft.com/dotnet/ai/vector-stores/overview). diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDB.ConformanceTests.csproj similarity index 88% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDB.ConformanceTests.csproj index f2e64fa..03ee156 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDB.ConformanceTests.csproj +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDB.ConformanceTests.csproj @@ -6,7 +6,7 @@ enable true false - CosmosDocumentDB.ConformanceTests + AzureDocumentDB.ConformanceTests b7762d10-e29b-4bb1-8b74-b6d69a667dd4 @@ -18,7 +18,7 @@ - + diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs similarity index 79% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs index 9ea31f3..29af25b 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBBsonMappingTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs @@ -1,22 +1,22 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Bson.Serialization.Attributes; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public sealed class CosmosDocumentDBBsonMappingTests(CosmosDocumentDBBsonMappingTests.Fixture fixture) - : IClassFixture +public sealed class AzureDocumentDBBsonMappingTests(AzureDocumentDBBsonMappingTests.Fixture fixture) + : IClassFixture { [Fact] public async Task Upsert_with_bson_model_works() { - var store = (CosmosDocumentDBTestStore)fixture.TestStore; + var store = (AzureDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonModel"); var definition = new VectorStoreCollectionDefinition @@ -30,7 +30,7 @@ public async Task Upsert_with_bson_model_works() var model = new BsonTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new CosmosDocumentDBCollection( + using var collection = new AzureDocumentDBCollection( store.Database, collectionName, new() { Definition = definition }); @@ -55,12 +55,12 @@ public async Task Upsert_with_bson_model_works() [Fact] public async Task Upsert_with_bson_vector_store_model_works() { - var store = (CosmosDocumentDBTestStore)fixture.TestStore; + var store = (AzureDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreModel"); var model = new BsonVectorStoreTestModel { HotelId = "key", HotelName = "Test Name" }; - using var collection = new CosmosDocumentDBCollection(store.Database, collectionName); + using var collection = new AzureDocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); @@ -82,12 +82,12 @@ public async Task Upsert_with_bson_vector_store_model_works() [Fact] public async Task Upsert_with_bson_vector_store_with_name_model_works() { - var store = (CosmosDocumentDBTestStore)fixture.TestStore; + var store = (AzureDocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreWithNameModel"); var model = new BsonVectorStoreWithNameTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new CosmosDocumentDBCollection(store.Database, collectionName); + using var collection = new AzureDocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); @@ -108,7 +108,7 @@ public async Task Upsert_with_bson_vector_store_with_name_model_works() public sealed class Fixture : VectorStoreFixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; } private sealed class BsonTestModel diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs similarity index 55% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs index 64276b3..51a4e68 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBCollectionManagementTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBCollectionManagementTests(CosmosDocumentDBFixture fixture) - : CollectionManagementTests(fixture), IClassFixture +public class AzureDocumentDBCollectionManagementTests(AzureDocumentDBFixture fixture) + : CollectionManagementTests(fixture), IClassFixture { } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs similarity index 67% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs index 340aeb4..f4cd597 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDependencyInjectionTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs @@ -3,15 +3,15 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Driver; using VectorData.ConformanceTests; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBDependencyInjectionTests - : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> +public class AzureDocumentDBDependencyInjectionTests + : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> { protected const string ConnectionString = "mongodb://localhost:27017"; protected const string DatabaseName = "dbName"; @@ -19,21 +19,21 @@ public class CosmosDocumentDBDependencyInjectionTests protected override void PopulateConfiguration(ConfigurationManager configuration, object? serviceKey = null) => configuration.AddInMemoryCollection( [ - new(CreateConfigKey("CosmosDocumentDB", serviceKey, "ConnectionString"), ConnectionString), - new(CreateConfigKey("CosmosDocumentDB", serviceKey, "DatabaseName"), DatabaseName), + new(CreateConfigKey("AzureDocumentDB", serviceKey, "ConnectionString"), ConnectionString), + new(CreateConfigKey("AzureDocumentDB", serviceKey, "DatabaseName"), DatabaseName), ]); private static string ConnectionStringProvider(IServiceProvider sp) - => sp.GetRequiredService().GetRequiredSection("CosmosDocumentDB:ConnectionString").Value!; + => sp.GetRequiredService().GetRequiredSection("AzureDocumentDB:ConnectionString").Value!; private static string ConnectionStringProvider(IServiceProvider sp, object serviceKey) - => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosDocumentDB", serviceKey, "ConnectionString")).Value!; + => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("AzureDocumentDB", serviceKey, "ConnectionString")).Value!; private static string DatabaseNameProvider(IServiceProvider sp) - => sp.GetRequiredService().GetRequiredSection("CosmosDocumentDB:DatabaseName").Value!; + => sp.GetRequiredService().GetRequiredSection("AzureDocumentDB:DatabaseName").Value!; private static string DatabaseNameProvider(IServiceProvider sp, object serviceKey) - => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("CosmosDocumentDB", serviceKey, "DatabaseName")).Value!; + => sp.GetRequiredService().GetRequiredSection(CreateConfigKey("AzureDocumentDB", serviceKey, "DatabaseName")).Value!; public override IEnumerable> CollectionDelegates { @@ -43,22 +43,22 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddCosmosDocumentDBCollection(name, lifetime: lifetime) + .AddAzureDocumentDBCollection(name, lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedCosmosDocumentDBCollection(serviceKey, name, lifetime: lifetime); + .AddKeyedAzureDocumentDBCollection(serviceKey, name, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddCosmosDocumentDBCollection( + ? services.AddAzureDocumentDBCollection( name, ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedCosmosDocumentDBCollection( + : services.AddKeyedAzureDocumentDBCollection( serviceKey, name, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddCosmosDocumentDBCollection( + ? services.AddAzureDocumentDBCollection( name, ConnectionStringProvider, DatabaseNameProvider, lifetime: lifetime) - : services.AddKeyedCosmosDocumentDBCollection( + : services.AddKeyedAzureDocumentDBCollection( serviceKey, name, sp => ConnectionStringProvider(sp, serviceKey), sp => DatabaseNameProvider(sp, serviceKey), lifetime: lifetime); } } @@ -68,20 +68,20 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe get { yield return (services, serviceKey, lifetime) => serviceKey is null - ? services.AddCosmosDocumentDBVectorStore( + ? services.AddAzureDocumentDBVectorStore( ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedCosmosDocumentDBVectorStore( + : services.AddKeyedAzureDocumentDBVectorStore( serviceKey, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, lifetime) => serviceKey is null ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddCosmosDocumentDBVectorStore(lifetime: lifetime) + .AddAzureDocumentDBVectorStore(lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedCosmosDocumentDBVectorStore(serviceKey, lifetime: lifetime); + .AddKeyedAzureDocumentDBVectorStore(serviceKey, lifetime: lifetime); } } @@ -90,9 +90,9 @@ public void ConnectionStringProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); } @@ -101,9 +101,9 @@ public void DatabaseNameProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); } @@ -112,15 +112,15 @@ public void ConnectionStringCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosDocumentDBVectorStore(connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBVectorStore(connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddKeyedAzureDocumentDBVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", connectionString: "", DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: "", DatabaseName)); } @@ -129,15 +129,15 @@ public void DatabaseNameCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddCosmosDocumentDBVectorStore(ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBVectorStore(ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddKeyedAzureDocumentDBVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddCosmosDocumentDBCollection( + Assert.Throws(() => services.AddAzureDocumentDBCollection( name: "notNull", ConnectionString, databaseName: "")); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedCosmosDocumentDBCollection( + Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: "")); } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs similarity index 71% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs index fa4f252..ee0142a 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBDistanceFunctionTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBDistanceFunctionTests(CosmosDocumentDBDistanceFunctionTests.Fixture fixture) - : DistanceFunctionTests(fixture), IClassFixture +public class AzureDocumentDBDistanceFunctionTests(AzureDocumentDBDistanceFunctionTests.Fixture fixture) + : DistanceFunctionTests(fixture), IClassFixture { public override Task CosineSimilarity() => Assert.ThrowsAsync(base.CosineSimilarity); public override Task EuclideanSquaredDistance() => Assert.ThrowsAsync(base.EuclideanSquaredDistance); @@ -18,14 +18,14 @@ public class CosmosDocumentDBDistanceFunctionTests(CosmosDocumentDBDistanceFunct public override Task HammingDistance() => Assert.ThrowsAsync(base.HammingDistance); public override Task ManhattanDistance() => Assert.ThrowsAsync(base.ManhattanDistance); - // CosmosDocumentDB EuclideanDistance doesn't correctly filter by score threshold (returns all results). + // AzureDocumentDB EuclideanDistance doesn't correctly filter by score threshold (returns all results). // See https://github.com/CommunityToolkit/AI/issues/6. protected override Task TestScoreThreshold(VectorStoreCollection.SearchRecord> collection) => Task.CompletedTask; public new class Fixture() : DistanceFunctionTests.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; public override bool AssertScores { get; } = false; } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs similarity index 51% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs index 8330039..3747b51 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBEmbeddingGenerationTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.AI; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.VectorData; @@ -9,52 +9,52 @@ using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBEmbeddingGenerationTests(CosmosDocumentDBEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, CosmosDocumentDBEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) - : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture +public class AzureDocumentDBEmbeddingGenerationTests(AzureDocumentDBEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, AzureDocumentDBEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) + : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture { public new class StringVectorFixture : EmbeddingGenerationTests.StringVectorFixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => CosmosDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => AzureDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) - .AddCosmosDocumentDBVectorStore() + .AddSingleton(AzureDocumentDBTestStore.Instance.Database) + .AddAzureDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) - .AddCosmosDocumentDBCollection(this.CollectionName) + .AddSingleton(AzureDocumentDBTestStore.Instance.Database) + .AddAzureDocumentDBCollection(this.CollectionName) ]; } public new class RomOfFloatVectorFixture : EmbeddingGenerationTests.RomOfFloatVectorFixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => CosmosDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => AzureDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) - .AddCosmosDocumentDBVectorStore() + .AddSingleton(AzureDocumentDBTestStore.Instance.Database) + .AddAzureDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(CosmosDocumentDBTestStore.Instance.Database) - .AddCosmosDocumentDBCollection(this.CollectionName) + .AddSingleton(AzureDocumentDBTestStore.Instance.Database) + .AddAzureDocumentDBCollection(this.CollectionName) ]; } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs similarity index 89% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs index 51afcbd..110e36f 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBFilterTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBFilterTests(CosmosDocumentDBFilterTests.Fixture fixture) - : FilterTests(fixture), IClassFixture +public class AzureDocumentDBFilterTests(AzureDocumentDBFilterTests.Fixture fixture) + : FilterTests(fixture), IClassFixture { // Specialized MongoDB syntax for NOT over Contains ($nin) [Fact] @@ -58,7 +58,7 @@ public override Task Contains_over_field_string_List() #region Enumerable.Any / Contains - // CosmosDocumentDB filter translator doesn't support Enumerable.Any or Enumerable.Contains/MemoryExtensions.Contains + // AzureDocumentDB filter translator doesn't support Enumerable.Any or Enumerable.Contains/MemoryExtensions.Contains public override Task Any_with_Contains_over_inline_string_array() => Assert.ThrowsAsync(() => base.Any_with_Contains_over_inline_string_array()); @@ -86,7 +86,7 @@ public override Task Contains_with_MemoryExtensions_Contains_with_null_comparer( public new class Fixture : FilterTests.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; protected override string IndexKind => Microsoft.Extensions.VectorData.IndexKind.IvfFlat; protected override string DistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs similarity index 55% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs index c1d278c..245df4c 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBIndexKindTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs @@ -1,18 +1,18 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using Microsoft.Extensions.VectorData; using VectorData.ConformanceTests; using VectorData.ConformanceTests.Support; using Xunit; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBIndexKindTests(CosmosDocumentDBIndexKindTests.Fixture fixture) - : IndexKindTests(fixture), IClassFixture +public class AzureDocumentDBIndexKindTests(AzureDocumentDBIndexKindTests.Fixture fixture) + : IndexKindTests(fixture), IClassFixture { - // Note: Cosmos DocumentDB supports HNSW, but only in a specific tier. + // Note: Azure DocumentDB supports HNSW, but only in a specific tier. // [Fact] // public virtual Task Hnsw() // => this.Test(IndexKind.Hnsw); @@ -21,11 +21,11 @@ public class CosmosDocumentDBIndexKindTests(CosmosDocumentDBIndexKindTests.Fixtu public virtual Task IvfFlat() => this.Test(IndexKind.IvfFlat); - // Cosmos DocumentDB does not support index-less searching + // Azure DocumentDB does not support index-less searching public override Task Flat() => Assert.ThrowsAsync(base.Flat); public new class Fixture() : IndexKindTests.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs similarity index 75% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs index ab392f4..2bedf6b 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/CosmosDocumentDBTestSuiteImplementationTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs @@ -4,9 +4,9 @@ using VectorData.ConformanceTests; using VectorData.ConformanceTests.ModelTests; -namespace CosmosDocumentDB.ConformanceTests; +namespace AzureDocumentDB.ConformanceTests; -public class CosmosDocumentDBTestSuiteImplementationTests : TestSuiteImplementationTests +public class AzureDocumentDBTestSuiteImplementationTests : TestSuiteImplementationTests { protected override ICollection IgnoredTestBases { get; } = [ diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs new file mode 100644 index 0000000..0b8b123 --- /dev/null +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using AzureDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace AzureDocumentDB.ConformanceTests.ModelTests; + +public class AzureDocumentDBBasicModelTests(AzureDocumentDBBasicModelTests.Fixture fixture) + : BasicModelTests(fixture), IClassFixture +{ + public new class Fixture : BasicModelTests.Fixture + { + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs new file mode 100644 index 0000000..7952d76 --- /dev/null +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using AzureDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace AzureDocumentDB.ConformanceTests.ModelTests; + +public class AzureDocumentDBMultiVectorModelTests(AzureDocumentDBMultiVectorModelTests.Fixture fixture) + : MultiVectorModelTests(fixture), IClassFixture +{ + public new class Fixture : MultiVectorModelTests.Fixture + { + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs new file mode 100644 index 0000000..5f4884c --- /dev/null +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using AzureDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace AzureDocumentDB.ConformanceTests.ModelTests; + +public class AzureDocumentDBNoDataModelTests(AzureDocumentDBNoDataModelTests.Fixture fixture) + : NoDataModelTests(fixture), IClassFixture +{ + public new class Fixture : NoDataModelTests.Fixture + { + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs new file mode 100644 index 0000000..e8d8c7f --- /dev/null +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using AzureDocumentDB.ConformanceTests.Support; +using VectorData.ConformanceTests.ModelTests; +using VectorData.ConformanceTests.Support; +using Xunit; + +namespace AzureDocumentDB.ConformanceTests.ModelTests; + +public class AzureDocumentDBNoVectorModelTests(AzureDocumentDBNoVectorModelTests.Fixture fixture) + : NoVectorModelTests(fixture), IClassFixture +{ + public new class Fixture : NoVectorModelTests.Fixture + { + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + } +} diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs similarity index 100% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Properties/AssemblyAttributes.cs diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs similarity index 50% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs index 3ddf034..a749072 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBFixture.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs @@ -3,9 +3,9 @@ using VectorData.ConformanceTests.Support; -namespace CosmosDocumentDB.ConformanceTests.Support; +namespace AzureDocumentDB.ConformanceTests.Support; -public class CosmosDocumentDBFixture : VectorStoreFixture +public class AzureDocumentDBFixture : VectorStoreFixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs similarity index 70% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs index 905e9be..9dd2e4e 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestEnvironment.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs @@ -3,25 +3,25 @@ using Microsoft.Extensions.Configuration; -namespace CosmosDocumentDB.ConformanceTests.Support; +namespace AzureDocumentDB.ConformanceTests.Support; #pragma warning disable CA1810 // Initialize all static fields when those fields are declared -public static class CosmosDocumentDBTestEnvironment +public static class AzureDocumentDBTestEnvironment { public static readonly string? ConnectionString; public static bool IsConnectionStringDefined => ConnectionString is not null; - static CosmosDocumentDBTestEnvironment() + static AzureDocumentDBTestEnvironment() { var configuration = new ConfigurationBuilder() .AddJsonFile(path: "testsettings.json", optional: true) .AddJsonFile(path: "testsettings.development.json", optional: true) .AddEnvironmentVariables() - .AddUserSecrets() + .AddUserSecrets() .Build(); - ConnectionString = configuration["CosmosDocumentDB:ConnectionString"]; + ConnectionString = configuration["AzureDocumentDB:ConnectionString"]; } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs similarity index 60% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs index c4602a0..c3ed047 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/Support/CosmosDocumentDBTestStore.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs @@ -1,17 +1,17 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Driver; using VectorData.ConformanceTests.Support; -namespace CosmosDocumentDB.ConformanceTests.Support; +namespace AzureDocumentDB.ConformanceTests.Support; #pragma warning disable CA1001 -public sealed class CosmosDocumentDBTestStore : TestStore +public sealed class AzureDocumentDBTestStore : TestStore #pragma warning restore CA1001 { - public static CosmosDocumentDBTestStore Instance { get; } = new(); + public static AzureDocumentDBTestStore Instance { get; } = new(); private MongoClient? _client; private IMongoDatabase? _database; @@ -23,23 +23,23 @@ public sealed class CosmosDocumentDBTestStore : TestStore public override string DefaultDistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; - public CosmosDocumentDBVectorStore GetVectorStore(CosmosDocumentDBVectorStoreOptions options) + public AzureDocumentDBVectorStore GetVectorStore(AzureDocumentDBVectorStoreOptions options) => new(this.Database, options); - private CosmosDocumentDBTestStore() + private AzureDocumentDBTestStore() { } protected override Task StartAsync() { - if (string.IsNullOrWhiteSpace(CosmosDocumentDBTestEnvironment.ConnectionString)) + if (string.IsNullOrWhiteSpace(AzureDocumentDBTestEnvironment.ConnectionString)) { - throw new InvalidOperationException("Connection string is not configured, set the CosmosDocumentDB:ConnectionString environment variable"); + throw new InvalidOperationException("Connection string is not configured, set the AzureDocumentDB:ConnectionString environment variable"); } - this._client = new MongoClient(CosmosDocumentDBTestEnvironment.ConnectionString); + this._client = new MongoClient(AzureDocumentDBTestEnvironment.ConnectionString); this._database = this._client.GetDatabase("VectorSearchTests"); - this.DefaultVectorStore = new CosmosDocumentDBVectorStore(this._database); + this.DefaultVectorStore = new AzureDocumentDBVectorStore(this._database); return Task.CompletedTask; } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs similarity index 86% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs index d061278..6e46499 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBDataTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; -namespace CosmosDocumentDB.ConformanceTests.TypeTests; +namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class CosmosDocumentDBDataTypeTests(CosmosDocumentDBDataTypeTests.Fixture fixture) - : DataTypeTests.DefaultRecord>(fixture), IClassFixture +public class AzureDocumentDBDataTypeTests(AzureDocumentDBDataTypeTests.Fixture fixture) + : DataTypeTests.DefaultRecord>(fixture), IClassFixture { public override Task Decimal() => this.Test( @@ -37,7 +37,7 @@ public override Task DateTimeOffset() public new class Fixture : DataTypeTests.DefaultRecord>.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; // MongoDB does not support null checks in vector search pre-filters public override bool IsNullFilteringSupported => false; diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs similarity index 50% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs index e63cb0d..6321084 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBEmbeddingTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs @@ -1,20 +1,20 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; #pragma warning disable CA2000 // Dispose objects before losing scope -namespace CosmosDocumentDB.ConformanceTests.TypeTests; +namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class CosmosDocumentDBEmbeddingTypeTests(CosmosDocumentDBEmbeddingTypeTests.Fixture fixture) - : EmbeddingTypeTests(fixture), IClassFixture +public class AzureDocumentDBEmbeddingTypeTests(AzureDocumentDBEmbeddingTypeTests.Fixture fixture) + : EmbeddingTypeTests(fixture), IClassFixture { public new class Fixture : EmbeddingTypeTests.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs similarity index 65% rename from MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs index 3092a18..84e7829 100644 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/TypeTests/CosmosDocumentDBKeyTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using CosmosDocumentDB.ConformanceTests.Support; +using AzureDocumentDB.ConformanceTests.Support; using MongoDB.Bson; using VectorData.ConformanceTests.Support; using VectorData.ConformanceTests.TypeTests; using Xunit; -namespace CosmosDocumentDB.ConformanceTests.TypeTests; +namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class CosmosDocumentDBKeyTypeTests(CosmosDocumentDBKeyTypeTests.Fixture fixture) - : KeyTypeTests(fixture), IClassFixture +public class AzureDocumentDBKeyTypeTests(AzureDocumentDBKeyTypeTests.Fixture fixture) + : KeyTypeTests(fixture), IClassFixture { [Fact] public virtual Task ObjectId() => this.Test(new("652f8c3e8f9b2c1a4d3e6a7b"), supportsAutoGeneration: true); @@ -26,6 +26,6 @@ public class CosmosDocumentDBKeyTypeTests(CosmosDocumentDBKeyTypeTests.Fixture f public new class Fixture : KeyTypeTests.Fixture { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; + public override TestStore TestStore => AzureDocumentDBTestStore.Instance; } } diff --git a/MEVD/test/CosmosDocumentDB.UnitTests/.editorconfig b/MEVD/test/AzureDocumentDB.UnitTests/.editorconfig similarity index 100% rename from MEVD/test/CosmosDocumentDB.UnitTests/.editorconfig rename to MEVD/test/AzureDocumentDB.UnitTests/.editorconfig diff --git a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDB.UnitTests.csproj similarity index 73% rename from MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj rename to MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDB.UnitTests.csproj index 0e98a37..bd59fc3 100644 --- a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDB.UnitTests.csproj +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDB.UnitTests.csproj @@ -1,8 +1,8 @@  - CommunityToolkit.VectorData.CosmosDocumentDB.UnitTests - CommunityToolkit.VectorData.CosmosDocumentDB.UnitTests + CommunityToolkit.VectorData.AzureDocumentDB.UnitTests + CommunityToolkit.VectorData.AzureDocumentDB.UnitTests net10.0 true enable @@ -21,7 +21,7 @@ - + diff --git a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs similarity index 90% rename from MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs rename to MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs index 4bb0293..cfb901e 100644 --- a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBCollectionTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.VectorData; -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; @@ -17,17 +17,17 @@ using Xunit; using MEVD = Microsoft.Extensions.VectorData; -namespace CosmosDocumentDB.UnitTests; +namespace AzureDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// -public sealed class CosmosDocumentDBCollectionTests +public sealed class AzureDocumentDBCollectionTests { private readonly Mock _mockMongoDatabase = new(); private readonly Mock> _mockMongoCollection = new(); - public CosmosDocumentDBCollectionTests() + public AzureDocumentDBCollectionTests() { this._mockMongoDatabase .Setup(l => l.GetCollection(It.IsAny(), It.IsAny())) @@ -38,7 +38,7 @@ public CosmosDocumentDBCollectionTests() public void ConstructorForModelWithoutKeyThrowsException() { // Act & Assert - var exception = Assert.Throws(() => new CosmosDocumentDBCollection(this._mockMongoDatabase.Object, "collection")); + var exception = Assert.Throws(() => new AzureDocumentDBCollection(this._mockMongoDatabase.Object, "collection")); Assert.Contains("No key property found", exception.Message); } @@ -46,7 +46,7 @@ public void ConstructorForModelWithoutKeyThrowsException() public void ConstructorWithDeclarativeModelInitializesCollection() { // Act & Assert - using var collection = new CosmosDocumentDBCollection( + using var collection = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -63,7 +63,7 @@ public void ConstructorWithImperativeModelInitializesCollection() }; // Act - using var collection = new CosmosDocumentDBCollection( + using var collection = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection", new() { Definition = definition }); @@ -91,7 +91,7 @@ public async Task CollectionExistsReturnsValidResultAsync(List collectio .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, collectionName); @@ -141,7 +141,7 @@ public async Task EnsureCollectionExistsInvokesValidMethodsAsync() .Setup(l => l.Indexes) .Returns(mockMongoIndexManager.Object); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -165,7 +165,7 @@ public async Task DeleteInvokesValidMethodsAsync() // Arrange const string RecordKey = "key"; - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -189,7 +189,7 @@ public async Task DeleteBatchInvokesValidMethodsAsync() // Arrange List recordKeys = ["key1", "key2"]; - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -213,7 +213,7 @@ public async Task DeleteCollectionInvokesValidMethodsAsync() // Arrange const string CollectionName = "collection"; - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -250,7 +250,7 @@ public async Task GetReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -288,7 +288,7 @@ public async Task GetBatchReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -313,13 +313,13 @@ public async Task GetBatchReturnsValidRecordAsync() public async Task CanUpsertRecordAsync() { // Arrange - var hotel = new CosmosDocumentDBHotelModel("key") { HotelName = "Test Name" }; + var hotel = new AzureDocumentDBHotelModel("key") { HotelName = "Test Name" }; var serializerRegistry = BsonSerializer.SerializerRegistry; var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -341,11 +341,11 @@ public async Task CanUpsertRecordAsync() public async Task UpsertBatchReturnsRecordKeysAsync() { // Arrange - var hotel1 = new CosmosDocumentDBHotelModel("key1") { HotelName = "Test Name 1" }; - var hotel2 = new CosmosDocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; - var hotel3 = new CosmosDocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; + var hotel1 = new AzureDocumentDBHotelModel("key1") { HotelName = "Test Name 1" }; + var hotel2 = new AzureDocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; + var hotel3 = new AzureDocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -420,7 +420,7 @@ public async Task SearchThrowsExceptionWithInvalidVectorTypeAsync(object vector, // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -478,7 +478,7 @@ public async Task SearchUsesValidQueryAsync( this.MockCollectionForSearch(); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -511,11 +511,11 @@ public async Task SearchThrowsExceptionWithNonExistentVectorPropertyNameAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); - var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; + var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; // Act & Assert await Assert.ThrowsAsync(async () => await sut.SearchAsync(new ReadOnlyMemory([1f, 2f, 3f]), top: 3, options).FirstOrDefaultAsync()); @@ -527,7 +527,7 @@ public async Task SearchReturnsRecordWithScoreAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -610,11 +610,11 @@ private async Task TestUpsertWithModelAsync( var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - CosmosDocumentDBCollectionOptions? options = definition != null ? + AzureDocumentDBCollectionOptions? options = definition != null ? new() { Definition = definition } : null; - using var sut = new CosmosDocumentDBCollection( + using var sut = new AzureDocumentDBCollection( this._mockMongoDatabase.Object, "collection", options); diff --git a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs similarity index 93% rename from MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs rename to MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs index cf27dc8..b51785f 100644 --- a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBHotelModel.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs @@ -6,9 +6,9 @@ using Microsoft.Extensions.VectorData; using MongoDB.Bson.Serialization.Attributes; -namespace CosmosDocumentDB.UnitTests; +namespace AzureDocumentDB.UnitTests; -public class CosmosDocumentDBHotelModel(string hotelId) +public class AzureDocumentDBHotelModel(string hotelId) { /// The key of the record. [VectorStoreKey] diff --git a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs similarity index 73% rename from MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs rename to MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs index 3e0fed6..26da256 100644 --- a/MEVD/test/CosmosDocumentDB.UnitTests/CosmosDocumentDBVectorStoreTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs @@ -6,17 +6,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using CommunityToolkit.VectorData.CosmosDocumentDB; +using CommunityToolkit.VectorData.AzureDocumentDB; using MongoDB.Driver; using Moq; using Xunit; -namespace CosmosDocumentDB.UnitTests; +namespace AzureDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// -public sealed class CosmosDocumentDBVectorStoreTests +public sealed class AzureDocumentDBVectorStoreTests { private readonly Mock _mockMongoDatabase = new(); @@ -24,20 +24,20 @@ public sealed class CosmosDocumentDBVectorStoreTests public void GetCollectionWithNotSupportedKeyThrowsException() { // Arrange - using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act & Assert - Assert.Throws(() => sut.GetCollection("collection")); + Assert.Throws(() => sut.GetCollection("collection")); } [Fact] public void GetCollectionWithoutFactoryReturnsDefaultCollection() { // Arrange - using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act - var collection = sut.GetCollection("collection"); + var collection = sut.GetCollection("collection"); // Assert Assert.NotNull(collection); @@ -63,7 +63,7 @@ public async Task ListCollectionNamesReturnsCollectionNamesAsync() .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new CosmosDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); // Act var actualCollectionNames = await sut.ListCollectionNamesAsync().ToListAsync(); diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs deleted file mode 100644 index 89581d8..0000000 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBBasicModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosDocumentDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosDocumentDB.ConformanceTests.ModelTests; - -public class CosmosDocumentDBBasicModelTests(CosmosDocumentDBBasicModelTests.Fixture fixture) - : BasicModelTests(fixture), IClassFixture -{ - public new class Fixture : BasicModelTests.Fixture - { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; - } -} diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs deleted file mode 100644 index 9f829da..0000000 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBMultiVectorModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosDocumentDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosDocumentDB.ConformanceTests.ModelTests; - -public class CosmosDocumentDBMultiVectorModelTests(CosmosDocumentDBMultiVectorModelTests.Fixture fixture) - : MultiVectorModelTests(fixture), IClassFixture -{ - public new class Fixture : MultiVectorModelTests.Fixture - { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; - } -} diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs deleted file mode 100644 index eeb3937..0000000 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoDataModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosDocumentDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosDocumentDB.ConformanceTests.ModelTests; - -public class CosmosDocumentDBNoDataModelTests(CosmosDocumentDBNoDataModelTests.Fixture fixture) - : NoDataModelTests(fixture), IClassFixture -{ - public new class Fixture : NoDataModelTests.Fixture - { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; - } -} diff --git a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs b/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs deleted file mode 100644 index af63935..0000000 --- a/MEVD/test/CosmosDocumentDB.ConformanceTests/ModelTests/CosmosDocumentDBNoVectorModelTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CosmosDocumentDB.ConformanceTests.Support; -using VectorData.ConformanceTests.ModelTests; -using VectorData.ConformanceTests.Support; -using Xunit; - -namespace CosmosDocumentDB.ConformanceTests.ModelTests; - -public class CosmosDocumentDBNoVectorModelTests(CosmosDocumentDBNoVectorModelTests.Fixture fixture) - : NoVectorModelTests(fixture), IClassFixture -{ - public new class Fixture : NoVectorModelTests.Fixture - { - public override TestStore TestStore => CosmosDocumentDBTestStore.Instance; - } -} diff --git a/README.md b/README.md index 11f6280..10c9f03 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The following NuGet packages have been published: | Package | Version | Downloads | |---------|---------|-----------| | [CommunityToolkit.VectorData.AzureAISearch] | ![AzureAISearch Version][v-azureaisearch] | ![AzureAISearch Downloads][d-azureaisearch] | -| [CommunityToolkit.VectorData.CosmosDocumentDB] | ![CosmosDocumentDB Version][v-cosmosdocumentdb] | ![CosmosDocumentDB Downloads][d-cosmosdocumentdb] | +| [CommunityToolkit.VectorData.AzureDocumentDB] | ![AzureDocumentDB Version][v-azuredocumentdb] | ![AzureDocumentDB Downloads][d-azuredocumentdb] | | [CommunityToolkit.VectorData.CosmosNoSql] | ![CosmosNoSql Version][v-cosmosnosql] | ![CosmosNoSql Downloads][d-cosmosnosql] | | [CommunityToolkit.VectorData.InMemory] | ![InMemory Version][v-inmemory] | ![InMemory Downloads][d-inmemory] | | [CommunityToolkit.VectorData.PgVector] | ![PgVector Version][v-pgvector] | ![PgVector Downloads][d-pgvector] | @@ -29,7 +29,7 @@ The following NuGet packages have been published: The majority of tests in the test suite use [Testcontainers](https://testcontainers.com/) so that conformance tests are run against real servers running inside Docker containers. Docker must be running on your machine for this to work. -Some providers (AzureAISearch, CosmosDocumentDB) require a cloud-hosted service and cannot be tested with containers. For those, first create the required cloud service, then configure the required settings (e.g., endpoint and API key) using environment variables or the `testsettings.development.json` file in the relevant test project directory. +Some providers (AzureAISearch, AzureDocumentDB) require a cloud-hosted service and cannot be tested with containers. For those, first create the required cloud service, then configure the required settings (e.g., endpoint and API key) using environment variables or the `testsettings.development.json` file in the relevant test project directory. > **NOTE**: The `testsettings.development.json` file contains secrets and is git-ignored. It should not be checked in. @@ -52,7 +52,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [CommunityToolkit.VectorData.AzureAISearch]: https://www.nuget.org/packages/CommunityToolkit.VectorData.AzureAISearch -[CommunityToolkit.VectorData.CosmosDocumentDB]: https://www.nuget.org/packages/CommunityToolkit.VectorData.CosmosDocumentDB +[CommunityToolkit.VectorData.AzureDocumentDB]: https://www.nuget.org/packages/CommunityToolkit.VectorData.AzureDocumentDB [CommunityToolkit.VectorData.CosmosNoSql]: https://www.nuget.org/packages/CommunityToolkit.VectorData.CosmosNoSql [CommunityToolkit.VectorData.InMemory]: https://www.nuget.org/packages/CommunityToolkit.VectorData.InMemory [CommunityToolkit.VectorData.PgVector]: https://www.nuget.org/packages/CommunityToolkit.VectorData.PgVector @@ -64,7 +64,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [v-azureaisearch]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.AzureAISearch -[v-cosmosdocumentdb]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.CosmosDocumentDB +[v-azuredocumentdb]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.AzureDocumentDB [v-cosmosnosql]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.CosmosNoSql [v-inmemory]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.InMemory [v-pgvector]: https://badgen.net/nuget/v/CommunityToolkit.VectorData.PgVector @@ -76,7 +76,7 @@ The Vector Data connectors in this toolkit were initially part of the [Semantic [d-azureaisearch]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.AzureAISearch -[d-cosmosdocumentdb]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.CosmosDocumentDB +[d-azuredocumentdb]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.AzureDocumentDB [d-cosmosnosql]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.CosmosNoSql [d-inmemory]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.InMemory [d-pgvector]: https://badgen.net/nuget/dt/CommunityToolkit.VectorData.PgVector From b287877ed4266a84a35808d208da0058cc6fb70d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 18 Aug 2026 14:30:26 +0000 Subject: [PATCH 5/7] Address AzureDocumentDB review feedback Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- .../AzureDocumentDB/AzureDocumentDB.csproj | 2 +- ...BCollection.cs => DocumentDBCollection.cs} | 40 ++++---- ...s => DocumentDBCollectionCreateMapping.cs} | 6 +- ...ions.cs => DocumentDBCollectionOptions.cs} | 12 +-- ...s => DocumentDBCollectionSearchMapping.cs} | 2 +- ...tDBConstants.cs => DocumentDBConstants.cs} | 2 +- ...tion.cs => DocumentDBDynamicCollection.cs} | 6 +- ...lator.cs => DocumentDBFilterTranslator.cs} | 2 +- ... DocumentDBServiceCollectionExtensions.cs} | 98 +++++++++---------- ...ectorStore.cs => DocumentDBVectorStore.cs} | 16 +-- ...ons.cs => DocumentDBVectorStoreOptions.cs} | 10 +- .../AzureDocumentDBBsonMappingTests.cs | 6 +- ...AzureDocumentDBDependencyInjectionTests.cs | 2 +- .../Support/AzureDocumentDBTestStore.cs | 4 +- .../AzureDocumentDBCollectionTests.cs | 38 +++---- .../AzureDocumentDBVectorStoreTests.cs | 8 +- 16 files changed, 127 insertions(+), 127 deletions(-) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBCollection.cs => DocumentDBCollection.cs} (93%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBCollectionCreateMapping.cs => DocumentDBCollectionCreateMapping.cs} (95%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBCollectionOptions.cs => DocumentDBCollectionOptions.cs} (77%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBCollectionSearchMapping.cs => DocumentDBCollectionSearchMapping.cs} (98%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBConstants.cs => DocumentDBConstants.cs} (85%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBDynamicCollection.cs => DocumentDBDynamicCollection.cs} (77%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBFilterTranslator.cs => DocumentDBFilterTranslator.cs} (99%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBServiceCollectionExtensions.cs => DocumentDBServiceCollectionExtensions.cs} (75%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBVectorStore.cs => DocumentDBVectorStore.cs} (87%) rename MEVD/src/AzureDocumentDB/{AzureDocumentDBVectorStoreOptions.cs => DocumentDBVectorStoreOptions.cs} (62%) diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj b/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj index b2c471b..cbad69e 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj +++ b/MEVD/src/AzureDocumentDB/AzureDocumentDB.csproj @@ -9,7 +9,7 @@ Azure DocumentDB (with MongoDB compatibility) provider for Microsoft.Extensions.VectorData Azure DocumentDB (with MongoDB compatibility) provider for Microsoft.Extensions.VectorData by the .NET Community Toolkit - AzureDocumentDB;AzureMongoDB;VectorData + AzureDocumentDB;AzureMongoDB;CosmosMongoDB;VectorData diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs b/MEVD/src/AzureDocumentDB/DocumentDBCollection.cs similarity index 93% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs rename to MEVD/src/AzureDocumentDB/DocumentDBCollection.cs index 7a2dcee..797a8da 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollection.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBCollection.cs @@ -23,7 +23,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// The data type of the record key. Must be either . /// The data model to use for adding, updating and retrieving data from storage. #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public class AzureDocumentDBCollection : VectorStoreCollection +public class DocumentDBCollection : VectorStoreCollection where TKey : notnull where TRecord : class #pragma warning restore CA1711 // Identifiers should not have incorrect suffix @@ -70,28 +70,28 @@ public class AzureDocumentDBCollection : VectorStoreCollection - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in Azure DocumentDB. - /// The name of the collection that this will access. + /// The name of the collection that this will access. /// Optional configuration options for this class. - [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate AzureDocumentDBDynamicCollection instead.")] - [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate AzureDocumentDBDynamicCollection instead.")] - public AzureDocumentDBCollection( + [RequiresDynamicCode("This constructor is incompatible with NativeAOT. For dynamic mapping via Dictionary, instantiate DocumentDBDynamicCollection instead.")] + [RequiresUnreferencedCode("This constructor is incompatible with trimming. For dynamic mapping via Dictionary, instantiate DocumentDBDynamicCollection instead.")] + public DocumentDBCollection( IMongoDatabase mongoDatabase, string name, - AzureDocumentDBCollectionOptions? options = default) + DocumentDBCollectionOptions? options = default) : this( mongoDatabase, name, static options => typeof(TRecord) == typeof(Dictionary) - ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(AzureDocumentDBDynamicCollection))) + ? throw new NotSupportedException(VectorDataStrings.NonDynamicCollectionWithDictionaryNotSupported(typeof(DocumentDBDynamicCollection))) : new MongoModelBuilder().Build(typeof(TRecord), typeof(TKey), options.Definition, options.EmbeddingGenerator), options) { } - internal AzureDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, AzureDocumentDBCollectionOptions? options) + internal DocumentDBCollection(IMongoDatabase mongoDatabase, string name, Func modelFactory, DocumentDBCollectionOptions? options) { // Verify. Throw.IfNull(mongoDatabase); @@ -102,7 +102,7 @@ internal AzureDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Fu throw new NotSupportedException("Only ObjectID, string, Guid, int and long keys are supported."); } - options ??= AzureDocumentDBCollectionOptions.Default; + options ??= DocumentDBCollectionOptions.Default; // Assign. _mongoDatabase = mongoDatabase; @@ -119,7 +119,7 @@ internal AzureDocumentDBCollection(IMongoDatabase mongoDatabase, string name, Fu _collectionMetadata = new() { - VectorStoreSystemName = AzureDocumentDBConstants.VectorStoreSystemName, + VectorStoreSystemName = DocumentDBConstants.VectorStoreSystemName, VectorStoreName = mongoDatabase.DatabaseNamespace?.DatabaseName, CollectionName = name }; @@ -370,24 +370,24 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null }; var filter = options.Filter is not null - ? new AzureDocumentDBFilterTranslator().Translate(options.Filter, _model) + ? new DocumentDBFilterTranslator().Translate(options.Filter, _model) : null; // Constructing a query to fetch "skip + top" total items // to perform skip logic locally, since skip option is not part of API. var itemsAmount = options.Skip + top; - var vectorPropertyIndexKind = AzureDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(vectorProperty.IndexKind); + var vectorPropertyIndexKind = DocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(vectorProperty.IndexKind); var searchQuery = vectorPropertyIndexKind switch { - IndexKind.Hnsw => AzureDocumentDBCollectionSearchMapping.GetSearchQueryForHnswIndex( + IndexKind.Hnsw => DocumentDBCollectionSearchMapping.GetSearchQueryForHnswIndex( vector, vectorProperty.StorageName, itemsAmount, _efSearch, filter), - IndexKind.IvfFlat => AzureDocumentDBCollectionSearchMapping.GetSearchQueryForIvfIndex( + IndexKind.IvfFlat => DocumentDBCollectionSearchMapping.GetSearchQueryForIvfIndex( vector, vectorProperty.StorageName, itemsAmount, @@ -397,7 +397,7 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null $"Supported index kinds are: {string.Join(", ", [IndexKind.Hnsw, IndexKind.IvfFlat])}") }; - var projectionQuery = AzureDocumentDBCollectionSearchMapping.GetProjectionQuery( + var projectionQuery = DocumentDBCollectionSearchMapping.GetProjectionQuery( ScorePropertyName, DocumentPropertyName); @@ -406,7 +406,7 @@ _ when vectorProperty.EmbeddingGenerationDispatcher is not null // Add score threshold filter as a $match stage if specified if (options.ScoreThreshold.HasValue) { - pipeline.Add(AzureDocumentDBCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); + pipeline.Add(DocumentDBCollectionSearchMapping.GetScoreThresholdMatchQuery(ScorePropertyName, options.ScoreThreshold.Value)); } const string OperationName = "Aggregate"; @@ -455,7 +455,7 @@ public override async IAsyncEnumerable GetAsync( options ??= new(); // Translate the filter now, so if it fails, we throw immediately. - var translatedFilter = new AzureDocumentDBFilterTranslator().Translate(filter, _model); + var translatedFilter = new DocumentDBFilterTranslator().Translate(filter, _model); SortDefinition? sortDefinition = null; var orderBy = options.OrderBy?.Invoke(new()).Values; @@ -503,13 +503,13 @@ private async Task CreateIndexesAsync(string collectionName, CancellationToken c var indexArray = new BsonArray(); - indexArray.AddRange(AzureDocumentDBCollectionCreateMapping.GetVectorIndexes( + indexArray.AddRange(DocumentDBCollectionCreateMapping.GetVectorIndexes( _model.VectorProperties, uniqueIndexes, _numLists, _efConstruction)); - indexArray.AddRange(AzureDocumentDBCollectionCreateMapping.GetFilterableDataIndexes( + indexArray.AddRange(DocumentDBCollectionCreateMapping.GetFilterableDataIndexes( _model.DataProperties, uniqueIndexes)); diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs b/MEVD/src/AzureDocumentDB/DocumentDBCollectionCreateMapping.cs similarity index 95% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs rename to MEVD/src/AzureDocumentDB/DocumentDBCollectionCreateMapping.cs index b2b18e9..467368b 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionCreateMapping.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBCollectionCreateMapping.cs @@ -10,7 +10,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Contains mapping helpers to use when creating a collection in Azure DocumentDB. /// -internal static class AzureDocumentDBCollectionCreateMapping +internal static class DocumentDBCollectionCreateMapping { /// /// Returns an array of indexes to create for vector properties. @@ -107,7 +107,7 @@ public static BsonArray GetFilterableDataIndexes( /// More information about Azure DocumentDB index kinds here: . /// private static string GetIndexKind(string? indexKind, string vectorPropertyName) - => AzureDocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch + => DocumentDBCollectionSearchMapping.GetVectorPropertyIndexKind(indexKind) switch { IndexKind.Hnsw => "vector-hnsw", IndexKind.IvfFlat => "vector-ivf", @@ -118,7 +118,7 @@ private static string GetIndexKind(string? indexKind, string vectorPropertyName) /// More information about Azure DocumentDB distance functions here: . /// private static string GetDistanceFunction(string? distanceFunction, string vectorPropertyName) - => AzureDocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch + => DocumentDBCollectionSearchMapping.GetVectorPropertyDistanceFunction(distanceFunction) switch { DistanceFunction.CosineDistance => "COS", DistanceFunction.DotProductSimilarity => "IP", diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs b/MEVD/src/AzureDocumentDB/DocumentDBCollectionOptions.cs similarity index 77% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs rename to MEVD/src/AzureDocumentDB/DocumentDBCollectionOptions.cs index aa904c8..c35d202 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionOptions.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBCollectionOptions.cs @@ -6,20 +6,20 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// -/// Options when creating a . +/// Options when creating a . /// -public sealed class AzureDocumentDBCollectionOptions : VectorStoreCollectionOptions +public sealed class DocumentDBCollectionOptions : VectorStoreCollectionOptions { - internal static readonly AzureDocumentDBCollectionOptions Default = new(); + internal static readonly DocumentDBCollectionOptions Default = new(); /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public AzureDocumentDBCollectionOptions() + public DocumentDBCollectionOptions() { } - internal AzureDocumentDBCollectionOptions(AzureDocumentDBCollectionOptions? source) : base(source) + internal DocumentDBCollectionOptions(DocumentDBCollectionOptions? source) : base(source) { NumLists = source?.NumLists ?? Default.NumLists; EfConstruction = source?.EfConstruction ?? Default.EfConstruction; diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs b/MEVD/src/AzureDocumentDB/DocumentDBCollectionSearchMapping.cs similarity index 98% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs rename to MEVD/src/AzureDocumentDB/DocumentDBCollectionSearchMapping.cs index 769ce82..0e76f7a 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBCollectionSearchMapping.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBCollectionSearchMapping.cs @@ -10,7 +10,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// Contains mapping helpers to use when searching for documents using Azure DocumentDB. /// -internal static class AzureDocumentDBCollectionSearchMapping +internal static class DocumentDBCollectionSearchMapping { /// Returns index kind specified on vector property or default . public static string GetVectorPropertyIndexKind(string? indexKind) => !string.IsNullOrWhiteSpace(indexKind) ? indexKind! : MongoConstants.DefaultIndexKind; diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs b/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs similarity index 85% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs rename to MEVD/src/AzureDocumentDB/DocumentDBConstants.cs index ee981ec..4dea2fe 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBConstants.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs @@ -4,7 +4,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; -internal static class AzureDocumentDBConstants +internal static class DocumentDBConstants { public const string VectorStoreSystemName = "azure.cosmosdbmongodb"; } diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs b/MEVD/src/AzureDocumentDB/DocumentDBDynamicCollection.cs similarity index 77% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs rename to MEVD/src/AzureDocumentDB/DocumentDBDynamicCollection.cs index 59bb6d9..2bb1d7c 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBDynamicCollection.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBDynamicCollection.cs @@ -10,16 +10,16 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// Represents a collection of vector store records in a Mongo database, mapped to a dynamic Dictionary<string, object?>. /// #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public sealed class AzureDocumentDBDynamicCollection : AzureDocumentDBCollection> +public sealed class DocumentDBDynamicCollection : DocumentDBCollection> #pragma warning restore CA1711 // Identifiers should not have incorrect suffix { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in MongoDB. /// The name of the collection. /// Optional configuration options for this class. - public AzureDocumentDBDynamicCollection(IMongoDatabase mongoDatabase, string name, AzureDocumentDBCollectionOptions options) + public DocumentDBDynamicCollection(IMongoDatabase mongoDatabase, string name, DocumentDBCollectionOptions options) : base( mongoDatabase, name, diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs b/MEVD/src/AzureDocumentDB/DocumentDBFilterTranslator.cs similarity index 99% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs rename to MEVD/src/AzureDocumentDB/DocumentDBFilterTranslator.cs index 4bf5178..c648f32 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBFilterTranslator.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBFilterTranslator.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; // MongoDB query reference: https://www.mongodb.com/docs/manual/reference/operator/query // Information specific to vector search pre-filter: https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-stage/#atlas-vector-search-pre-filter -internal class AzureDocumentDBFilterTranslator : FilterTranslatorBase +internal class DocumentDBFilterTranslator : FilterTranslatorBase { internal BsonDocument Translate(LambdaExpression lambdaExpression, CollectionModel model) { diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs b/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs similarity index 75% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs rename to MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs index e161e5f..8621795 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBServiceCollectionExtensions.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs @@ -13,32 +13,32 @@ namespace Microsoft.Extensions.DependencyInjection; /// /// Extension methods to register Azure DocumentDB instances on an . /// -public static class AzureDocumentDBServiceCollectionExtensions +public static class DocumentDBServiceCollectionExtensions { private const string DynamicCodeMessage = "This method is incompatible with NativeAOT, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string UnreferencedCodeMessage = "This method is incompatible with trimming, consult the documentation for adding collections in a way that's compatible with NativeAOT."; private const string ApplicationId = "CommunityToolkit.MEVD"; /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] public static IServiceCollection AddAzureDocumentDBVectorStore( this IServiceCollection services, - AzureDocumentDBVectorStoreOptions? options = default, + DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] @@ -46,49 +46,49 @@ public static IServiceCollection AddAzureDocumentDBVectorStore( public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, - AzureDocumentDBVectorStoreOptions? options = default, + DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); - services.Add(new ServiceDescriptor(typeof(AzureDocumentDBVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(DocumentDBVectorStore), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetStoreOptions(sp, _ => options); - return new AzureDocumentDBVectorStore(database, options); + return new DocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] public static IServiceCollection AddAzureDocumentDBVectorStore( this IServiceCollection services, string connectionString, string databaseName, - AzureDocumentDBVectorStoreOptions? options = default, + DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// - /// The to register the on. + /// The to register the on. /// The key with which to associate the vector store. /// Connection string required to connect to Azure DocumentDB. /// Database name for Azure DocumentDB. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] @@ -98,52 +98,52 @@ public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( object? serviceKey, string connectionString, string databaseName, - AzureDocumentDBVectorStoreOptions? options = default, + DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) { Throw.IfNull(services); Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - services.Add(new ServiceDescriptor(typeof(AzureDocumentDBVectorStore), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(DocumentDBVectorStore), serviceKey, (sp, _) => { options = GetStoreOptions(sp, _ => options); MongoClient mongoClient = new(CreateClientSettings(connectionString)); var database = mongoClient.GetDatabase(databaseName); - return new AzureDocumentDBVectorStore(database, options); + return new DocumentDBVectorStore(database, options); }, lifetime)); services.Add(new ServiceDescriptor(typeof(VectorStore), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService(key), lifetime)); return services; } /// - /// Registers a as + /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] public static IServiceCollection AddAzureDocumentDBCollection( this IServiceCollection services, string name, - AzureDocumentDBCollectionOptions? options = default, + DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// with retrieved from the dependency injection container. /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] @@ -152,19 +152,19 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, - AzureDocumentDBCollectionOptions? options = default, + DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { Throw.IfNull(services); Throw.IfNullOrWhitespace(name); - services.Add(new ServiceDescriptor(typeof(AzureDocumentDBCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(DocumentDBCollection), serviceKey, (sp, _) => { var database = sp.GetRequiredService(); options = GetCollectionOptions(sp, _ => options); - return new AzureDocumentDBCollection(database, name, options); + return new DocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -173,10 +173,10 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] public static IServiceCollection AddAzureDocumentDBCollection( @@ -184,22 +184,22 @@ public static IServiceCollection AddAzureDocumentDBCollection( string name, string connectionString, string databaseName, - AzureDocumentDBCollectionOptions? options = default, + DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. - /// The to register the on. + /// The to register the on. /// The key with which to associate the collection. /// The name of the collection. /// Connection string required to connect to Azure DocumentDB. /// Database name for Azure DocumentDB. - /// Optional options to further configure the . + /// Optional options to further configure the . /// The service lifetime for the store. Defaults to . /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] @@ -210,7 +210,7 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( string name, string connectionString, string databaseName, - AzureDocumentDBCollectionOptions? options = default, + DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { @@ -221,10 +221,10 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( } /// - /// Registers a as + /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] public static IServiceCollection AddAzureDocumentDBCollection( @@ -232,13 +232,13 @@ public static IServiceCollection AddAzureDocumentDBCollection( string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); /// - /// Registers a keyed as + /// Registers a keyed as /// using the provided and . /// /// The type of the record. @@ -258,7 +258,7 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( string name, Func connectionStringProvider, Func databaseNameProvider, - Func? optionsProvider = default, + Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class { @@ -267,13 +267,13 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( Throw.IfNull(connectionStringProvider); Throw.IfNull(databaseNameProvider); - services.Add(new ServiceDescriptor(typeof(AzureDocumentDBCollection), serviceKey, (sp, _) => + services.Add(new ServiceDescriptor(typeof(DocumentDBCollection), serviceKey, (sp, _) => { var options = GetCollectionOptions(sp, optionsProvider); MongoClient mongoClient = new(CreateClientSettings(connectionStringProvider(sp))); var database = mongoClient.GetDatabase(databaseNameProvider(sp)); - return new AzureDocumentDBCollection(database, name, options); + return new DocumentDBCollection(database, name, options); }, lifetime)); AddAbstractions(services, serviceKey, lifetime); @@ -286,16 +286,16 @@ private static void AddAbstractions(IServiceCollection services, where TRecord : class { services.Add(new ServiceDescriptor(typeof(VectorStoreCollection), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); services.Add(new ServiceDescriptor(typeof(IVectorSearchable), serviceKey, - static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); + static (sp, key) => sp.GetRequiredKeyedService>(key), lifetime)); - // Once HybridSearch supports get implemented by AzureDocumentDBCollection, + // Once HybridSearch supports get implemented by DocumentDBCollection, // we need to add IKeywordHybridSearchable abstraction here as well. } - private static AzureDocumentDBVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) + private static DocumentDBVectorStoreOptions? GetStoreOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) @@ -309,7 +309,7 @@ private static void AddAbstractions(IServiceCollection services, : new(options) { EmbeddingGenerator = embeddingGenerator }; // Create a brand new copy in order to avoid modifying the original options. } - private static AzureDocumentDBCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) + private static DocumentDBCollectionOptions? GetCollectionOptions(IServiceProvider sp, Func? optionsProvider) { var options = optionsProvider?.Invoke(sp); if (options?.EmbeddingGenerator is not null) diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs b/MEVD/src/AzureDocumentDB/DocumentDBVectorStore.cs similarity index 87% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs rename to MEVD/src/AzureDocumentDB/DocumentDBVectorStore.cs index 6bc6d35..a92609e 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStore.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBVectorStore.cs @@ -18,7 +18,7 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// /// This class can be used with collections of any schema type, but requires you to provide schema information when getting a collection. /// -public sealed class AzureDocumentDBVectorStore : VectorStore +public sealed class DocumentDBVectorStore : VectorStore { /// Metadata about vector store. private readonly VectorStoreMetadata _metadata; @@ -32,11 +32,11 @@ public sealed class AzureDocumentDBVectorStore : VectorStore private readonly IEmbeddingGenerator? _embeddingGenerator; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// that can be used to manage the collections in Azure DocumentDB. /// Optional configuration options for this class. - public AzureDocumentDBVectorStore(IMongoDatabase mongoDatabase, AzureDocumentDBVectorStoreOptions? options = default) + public DocumentDBVectorStore(IMongoDatabase mongoDatabase, DocumentDBVectorStoreOptions? options = default) { Throw.IfNull(mongoDatabase); @@ -45,7 +45,7 @@ public AzureDocumentDBVectorStore(IMongoDatabase mongoDatabase, AzureDocumentDBV _metadata = new() { - VectorStoreSystemName = AzureDocumentDBConstants.VectorStoreSystemName, + VectorStoreSystemName = DocumentDBConstants.VectorStoreSystemName, VectorStoreName = mongoDatabase.DatabaseNamespace?.DatabaseName }; } @@ -55,13 +55,13 @@ public AzureDocumentDBVectorStore(IMongoDatabase mongoDatabase, AzureDocumentDBV [RequiresDynamicCode("This overload of GetCollection() is incompatible with NativeAOT. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] [RequiresUnreferencedCode("This overload of GetCollection() is incompatible with trimming. For dynamic mapping via Dictionary, call GetDynamicCollection() instead.")] #if NET - public override AzureDocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) + public override DocumentDBCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #else public override VectorStoreCollection GetCollection(string name, VectorStoreCollectionDefinition? definition = null) #endif => typeof(TRecord) == typeof(Dictionary) ? throw new ArgumentException(VectorDataStrings.GetCollectionWithDictionaryNotSupported) - : new AzureDocumentDBCollection( + : new DocumentDBCollection( _mongoDatabase, name, new() @@ -72,11 +72,11 @@ public override VectorStoreCollection GetCollection #if NET - public override AzureDocumentDBDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) + public override DocumentDBDynamicCollection GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #else public override VectorStoreCollection> GetDynamicCollection(string name, VectorStoreCollectionDefinition definition) #endif - => new AzureDocumentDBDynamicCollection( + => new DocumentDBDynamicCollection( _mongoDatabase, name, new() diff --git a/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs b/MEVD/src/AzureDocumentDB/DocumentDBVectorStoreOptions.cs similarity index 62% rename from MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs rename to MEVD/src/AzureDocumentDB/DocumentDBVectorStoreOptions.cs index b1d6277..6c86ad7 100644 --- a/MEVD/src/AzureDocumentDB/AzureDocumentDBVectorStoreOptions.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBVectorStoreOptions.cs @@ -6,18 +6,18 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; /// -/// Options when creating a +/// Options when creating a /// -public sealed class AzureDocumentDBVectorStoreOptions +public sealed class DocumentDBVectorStoreOptions { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public AzureDocumentDBVectorStoreOptions() + public DocumentDBVectorStoreOptions() { } - internal AzureDocumentDBVectorStoreOptions(AzureDocumentDBVectorStoreOptions? source) + internal DocumentDBVectorStoreOptions(DocumentDBVectorStoreOptions? source) { EmbeddingGenerator = source?.EmbeddingGenerator; } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs index 29af25b..bd04064 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs @@ -30,7 +30,7 @@ public async Task Upsert_with_bson_model_works() var model = new BsonTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new AzureDocumentDBCollection( + using var collection = new DocumentDBCollection( store.Database, collectionName, new() { Definition = definition }); @@ -60,7 +60,7 @@ public async Task Upsert_with_bson_vector_store_model_works() var model = new BsonVectorStoreTestModel { HotelId = "key", HotelName = "Test Name" }; - using var collection = new AzureDocumentDBCollection(store.Database, collectionName); + using var collection = new DocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); @@ -87,7 +87,7 @@ public async Task Upsert_with_bson_vector_store_with_name_model_works() var model = new BsonVectorStoreWithNameTestModel { Id = "key", HotelName = "Test Name" }; - using var collection = new AzureDocumentDBCollection(store.Database, collectionName); + using var collection = new DocumentDBCollection(store.Database, collectionName); await collection.EnsureCollectionExistsAsync(); diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs index f4cd597..182fcd8 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs @@ -11,7 +11,7 @@ namespace AzureDocumentDB.ConformanceTests; public class AzureDocumentDBDependencyInjectionTests - : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> + : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> { protected const string ConnectionString = "mongodb://localhost:27017"; protected const string DatabaseName = "dbName"; diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs index c3ed047..7f0924b 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs @@ -23,7 +23,7 @@ public sealed class AzureDocumentDBTestStore : TestStore public override string DefaultDistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; - public AzureDocumentDBVectorStore GetVectorStore(AzureDocumentDBVectorStoreOptions options) + public DocumentDBVectorStore GetVectorStore(DocumentDBVectorStoreOptions options) => new(this.Database, options); private AzureDocumentDBTestStore() @@ -39,7 +39,7 @@ protected override Task StartAsync() this._client = new MongoClient(AzureDocumentDBTestEnvironment.ConnectionString); this._database = this._client.GetDatabase("VectorSearchTests"); - this.DefaultVectorStore = new AzureDocumentDBVectorStore(this._database); + this.DefaultVectorStore = new DocumentDBVectorStore(this._database); return Task.CompletedTask; } diff --git a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs index cfb901e..6bdb2b7 100644 --- a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs @@ -20,7 +20,7 @@ namespace AzureDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// public sealed class AzureDocumentDBCollectionTests { @@ -38,7 +38,7 @@ public AzureDocumentDBCollectionTests() public void ConstructorForModelWithoutKeyThrowsException() { // Act & Assert - var exception = Assert.Throws(() => new AzureDocumentDBCollection(this._mockMongoDatabase.Object, "collection")); + var exception = Assert.Throws(() => new DocumentDBCollection(this._mockMongoDatabase.Object, "collection")); Assert.Contains("No key property found", exception.Message); } @@ -46,7 +46,7 @@ public void ConstructorForModelWithoutKeyThrowsException() public void ConstructorWithDeclarativeModelInitializesCollection() { // Act & Assert - using var collection = new AzureDocumentDBCollection( + using var collection = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -63,7 +63,7 @@ public void ConstructorWithImperativeModelInitializesCollection() }; // Act - using var collection = new AzureDocumentDBCollection( + using var collection = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection", new() { Definition = definition }); @@ -91,7 +91,7 @@ public async Task CollectionExistsReturnsValidResultAsync(List collectio .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, collectionName); @@ -141,7 +141,7 @@ public async Task EnsureCollectionExistsInvokesValidMethodsAsync() .Setup(l => l.Indexes) .Returns(mockMongoIndexManager.Object); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -165,7 +165,7 @@ public async Task DeleteInvokesValidMethodsAsync() // Arrange const string RecordKey = "key"; - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -189,7 +189,7 @@ public async Task DeleteBatchInvokesValidMethodsAsync() // Arrange List recordKeys = ["key1", "key2"]; - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -213,7 +213,7 @@ public async Task DeleteCollectionInvokesValidMethodsAsync() // Arrange const string CollectionName = "collection"; - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -250,7 +250,7 @@ public async Task GetReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -288,7 +288,7 @@ public async Task GetBatchReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -319,7 +319,7 @@ public async Task CanUpsertRecordAsync() var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -345,7 +345,7 @@ public async Task UpsertBatchReturnsRecordKeysAsync() var hotel2 = new AzureDocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; var hotel3 = new AzureDocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -420,7 +420,7 @@ public async Task SearchThrowsExceptionWithInvalidVectorTypeAsync(object vector, // Arrange this.MockCollectionForSearch(); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -478,7 +478,7 @@ public async Task SearchUsesValidQueryAsync( this.MockCollectionForSearch(); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -511,7 +511,7 @@ public async Task SearchThrowsExceptionWithNonExistentVectorPropertyNameAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -527,7 +527,7 @@ public async Task SearchReturnsRecordWithScoreAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -610,11 +610,11 @@ private async Task TestUpsertWithModelAsync( var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - AzureDocumentDBCollectionOptions? options = definition != null ? + DocumentDBCollectionOptions? options = definition != null ? new() { Definition = definition } : null; - using var sut = new AzureDocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection", options); diff --git a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs index 26da256..2f09389 100644 --- a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs @@ -14,7 +14,7 @@ namespace AzureDocumentDB.UnitTests; /// -/// Unit tests for class. +/// Unit tests for class. /// public sealed class AzureDocumentDBVectorStoreTests { @@ -24,7 +24,7 @@ public sealed class AzureDocumentDBVectorStoreTests public void GetCollectionWithNotSupportedKeyThrowsException() { // Arrange - using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new DocumentDBVectorStore(this._mockMongoDatabase.Object); // Act & Assert Assert.Throws(() => sut.GetCollection("collection")); @@ -34,7 +34,7 @@ public void GetCollectionWithNotSupportedKeyThrowsException() public void GetCollectionWithoutFactoryReturnsDefaultCollection() { // Arrange - using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new DocumentDBVectorStore(this._mockMongoDatabase.Object); // Act var collection = sut.GetCollection("collection"); @@ -63,7 +63,7 @@ public async Task ListCollectionNamesReturnsCollectionNamesAsync() .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new AzureDocumentDBVectorStore(this._mockMongoDatabase.Object); + using var sut = new DocumentDBVectorStore(this._mockMongoDatabase.Object); // Act var actualCollectionNames = await sut.ListCollectionNamesAsync().ToListAsync(); From c47511c17be5415c91c8308fdbe65bc55dacb192 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 18 Aug 2026 14:50:08 +0000 Subject: [PATCH 6/7] Remove Azure prefix from DocumentDB APIs Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- .../DocumentDBServiceCollectionExtensions.cs | 42 +++++++-------- ...Tests.cs => DocumentDBBsonMappingTests.cs} | 12 ++--- ...=> DocumentDBCollectionManagementTests.cs} | 4 +- ... => DocumentDBDependencyInjectionTests.cs} | 54 +++++++++---------- ....cs => DocumentDBDistanceFunctionTests.cs} | 6 +-- ... => DocumentDBEmbeddingGenerationTests.cs} | 28 +++++----- ...ilterTests.cs => DocumentDBFilterTests.cs} | 6 +-- ...ndTests.cs => DocumentDBIndexKindTests.cs} | 6 +-- ...DocumentDBTestSuiteImplementationTests.cs} | 2 +- ...lTests.cs => DocumentDBBasicModelTests.cs} | 6 +-- ....cs => DocumentDBMultiVectorModelTests.cs} | 6 +-- ...Tests.cs => DocumentDBNoDataModelTests.cs} | 6 +-- ...sts.cs => DocumentDBNoVectorModelTests.cs} | 6 +-- ...umentDBFixture.cs => DocumentDBFixture.cs} | 4 +- ...onment.cs => DocumentDBTestEnvironment.cs} | 6 +-- ...tDBTestStore.cs => DocumentDBTestStore.cs} | 10 ++-- ...ypeTests.cs => DocumentDBDataTypeTests.cs} | 6 +-- ...sts.cs => DocumentDBEmbeddingTypeTests.cs} | 6 +-- ...TypeTests.cs => DocumentDBKeyTypeTests.cs} | 6 +-- ...nTests.cs => DocumentDBCollectionTests.cs} | 40 +++++++------- ...BHotelModel.cs => DocumentDBHotelModel.cs} | 2 +- ...Tests.cs => DocumentDBVectorStoreTests.cs} | 6 +-- 22 files changed, 135 insertions(+), 135 deletions(-) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBBsonMappingTests.cs => DocumentDBBsonMappingTests.cs} (90%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBCollectionManagementTests.cs => DocumentDBCollectionManagementTests.cs} (76%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBDependencyInjectionTests.cs => DocumentDBDependencyInjectionTests.cs} (76%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBDistanceFunctionTests.cs => DocumentDBDistanceFunctionTests.cs} (83%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBEmbeddingGenerationTests.cs => DocumentDBEmbeddingGenerationTests.cs} (54%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBFilterTests.cs => DocumentDBFilterTests.cs} (94%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBIndexKindTests.cs => DocumentDBIndexKindTests.cs} (76%) rename MEVD/test/AzureDocumentDB.ConformanceTests/{AzureDocumentDBTestSuiteImplementationTests.cs => DocumentDBTestSuiteImplementationTests.cs} (84%) rename MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/{AzureDocumentDBBasicModelTests.cs => DocumentDBBasicModelTests.cs} (61%) rename MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/{AzureDocumentDBMultiVectorModelTests.cs => DocumentDBMultiVectorModelTests.cs} (59%) rename MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/{AzureDocumentDBNoDataModelTests.cs => DocumentDBNoDataModelTests.cs} (61%) rename MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/{AzureDocumentDBNoVectorModelTests.cs => DocumentDBNoVectorModelTests.cs} (60%) rename MEVD/test/AzureDocumentDB.ConformanceTests/Support/{AzureDocumentDBFixture.cs => DocumentDBFixture.cs} (64%) rename MEVD/test/AzureDocumentDB.ConformanceTests/Support/{AzureDocumentDBTestEnvironment.cs => DocumentDBTestEnvironment.cs} (84%) rename MEVD/test/AzureDocumentDB.ConformanceTests/Support/{AzureDocumentDBTestStore.cs => DocumentDBTestStore.cs} (80%) rename MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/{AzureDocumentDBDataTypeTests.cs => DocumentDBDataTypeTests.cs} (90%) rename MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/{AzureDocumentDBEmbeddingTypeTests.cs => DocumentDBEmbeddingTypeTests.cs} (64%) rename MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/{AzureDocumentDBKeyTypeTests.cs => DocumentDBKeyTypeTests.cs} (75%) rename MEVD/test/AzureDocumentDB.UnitTests/{AzureDocumentDBCollectionTests.cs => DocumentDBCollectionTests.cs} (93%) rename MEVD/test/AzureDocumentDB.UnitTests/{AzureDocumentDBHotelModel.cs => DocumentDBHotelModel.cs} (96%) rename MEVD/test/AzureDocumentDB.UnitTests/{AzureDocumentDBVectorStoreTests.cs => DocumentDBVectorStoreTests.cs} (91%) diff --git a/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs b/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs index 8621795..dee80ba 100644 --- a/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBServiceCollectionExtensions.cs @@ -23,14 +23,14 @@ public static class DocumentDBServiceCollectionExtensions /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddAzureDocumentDBVectorStore( + public static IServiceCollection AddDocumentDBVectorStore( this IServiceCollection services, DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, options, lifetime); + => AddKeyedDocumentDBVectorStore(services, serviceKey: null, options, lifetime); /// /// Registers a keyed as @@ -43,7 +43,7 @@ public static IServiceCollection AddAzureDocumentDBVectorStore( /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( + public static IServiceCollection AddKeyedDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, DocumentDBVectorStoreOptions? options = default, @@ -69,16 +69,16 @@ public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddAzureDocumentDBVectorStore( + public static IServiceCollection AddDocumentDBVectorStore( this IServiceCollection services, string connectionString, string databaseName, DocumentDBVectorStoreOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) - => AddKeyedAzureDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); + => AddKeyedDocumentDBVectorStore(services, serviceKey: null, connectionString, databaseName, options, lifetime); /// /// Registers a keyed as @@ -93,7 +93,7 @@ public static IServiceCollection AddAzureDocumentDBVectorStore( /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( + public static IServiceCollection AddKeyedDocumentDBVectorStore( this IServiceCollection services, object? serviceKey, string connectionString, @@ -124,16 +124,16 @@ public static IServiceCollection AddKeyedAzureDocumentDBVectorStore( /// Registers a as /// with retrieved from the dependency injection container. /// - /// + /// [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddAzureDocumentDBCollection( + public static IServiceCollection AddDocumentDBCollection( this IServiceCollection services, string name, DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, options, lifetime); + => AddKeyedDocumentDBCollection(services, serviceKey: null, name, options, lifetime); /// /// Registers a keyed as @@ -148,7 +148,7 @@ public static IServiceCollection AddAzureDocumentDBCollection( /// Service collection. [RequiresUnreferencedCode(DynamicCodeMessage)] [RequiresDynamicCode(UnreferencedCodeMessage)] - public static IServiceCollection AddKeyedAzureDocumentDBCollection( + public static IServiceCollection AddKeyedDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, @@ -176,10 +176,10 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddAzureDocumentDBCollection( + public static IServiceCollection AddDocumentDBCollection( this IServiceCollection services, string name, string connectionString, @@ -187,7 +187,7 @@ public static IServiceCollection AddAzureDocumentDBCollection( DocumentDBCollectionOptions? options = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); + => AddKeyedDocumentDBCollection(services, serviceKey: null, name, connectionString, databaseName, options, lifetime); /// /// Registers a keyed as @@ -204,7 +204,7 @@ public static IServiceCollection AddAzureDocumentDBCollection( /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedAzureDocumentDBCollection( + public static IServiceCollection AddKeyedDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, @@ -217,17 +217,17 @@ public static IServiceCollection AddKeyedAzureDocumentDBCollection( Throw.IfNullOrWhitespace(connectionString); Throw.IfNullOrWhitespace(databaseName); - return AddKeyedAzureDocumentDBCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); + return AddKeyedDocumentDBCollection(services, serviceKey, name, _ => connectionString, _ => databaseName, _ => options!, lifetime); } /// /// Registers a as /// using the provided and . /// - /// + /// [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddAzureDocumentDBCollection( + public static IServiceCollection AddDocumentDBCollection( this IServiceCollection services, string name, Func connectionStringProvider, @@ -235,7 +235,7 @@ public static IServiceCollection AddAzureDocumentDBCollection( Func? optionsProvider = default, ServiceLifetime lifetime = ServiceLifetime.Singleton) where TRecord : class - => AddKeyedAzureDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); + => AddKeyedDocumentDBCollection(services, serviceKey: null, name, connectionStringProvider, databaseNameProvider, optionsProvider, lifetime); /// /// Registers a keyed as @@ -252,7 +252,7 @@ public static IServiceCollection AddAzureDocumentDBCollection( /// Service collection. [RequiresUnreferencedCode(UnreferencedCodeMessage)] [RequiresDynamicCode(DynamicCodeMessage)] - public static IServiceCollection AddKeyedAzureDocumentDBCollection( + public static IServiceCollection AddKeyedDocumentDBCollection( this IServiceCollection services, object? serviceKey, string name, diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBBsonMappingTests.cs similarity index 90% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBBsonMappingTests.cs index bd04064..d85f399 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBBsonMappingTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBBsonMappingTests.cs @@ -10,13 +10,13 @@ namespace AzureDocumentDB.ConformanceTests; -public sealed class AzureDocumentDBBsonMappingTests(AzureDocumentDBBsonMappingTests.Fixture fixture) - : IClassFixture +public sealed class DocumentDBBsonMappingTests(DocumentDBBsonMappingTests.Fixture fixture) + : IClassFixture { [Fact] public async Task Upsert_with_bson_model_works() { - var store = (AzureDocumentDBTestStore)fixture.TestStore; + var store = (DocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonModel"); var definition = new VectorStoreCollectionDefinition @@ -55,7 +55,7 @@ public async Task Upsert_with_bson_model_works() [Fact] public async Task Upsert_with_bson_vector_store_model_works() { - var store = (AzureDocumentDBTestStore)fixture.TestStore; + var store = (DocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreModel"); var model = new BsonVectorStoreTestModel { HotelId = "key", HotelName = "Test Name" }; @@ -82,7 +82,7 @@ public async Task Upsert_with_bson_vector_store_model_works() [Fact] public async Task Upsert_with_bson_vector_store_with_name_model_works() { - var store = (AzureDocumentDBTestStore)fixture.TestStore; + var store = (DocumentDBTestStore)fixture.TestStore; var collectionName = fixture.TestStore.AdjustCollectionName("BsonVectorStoreWithNameModel"); var model = new BsonVectorStoreWithNameTestModel { Id = "key", HotelName = "Test Name" }; @@ -108,7 +108,7 @@ public async Task Upsert_with_bson_vector_store_with_name_model_works() public sealed class Fixture : VectorStoreFixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } private sealed class BsonTestModel diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBCollectionManagementTests.cs similarity index 76% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBCollectionManagementTests.cs index 51a4e68..226d961 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBCollectionManagementTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBCollectionManagementTests.cs @@ -7,7 +7,7 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBCollectionManagementTests(AzureDocumentDBFixture fixture) - : CollectionManagementTests(fixture), IClassFixture +public class DocumentDBCollectionManagementTests(DocumentDBFixture fixture) + : CollectionManagementTests(fixture), IClassFixture { } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDependencyInjectionTests.cs similarity index 76% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDependencyInjectionTests.cs index 182fcd8..f5694f9 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDependencyInjectionTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDependencyInjectionTests.cs @@ -10,7 +10,7 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBDependencyInjectionTests +public class DocumentDBDependencyInjectionTests : DependencyInjectionTests.Record>, string, DependencyInjectionTests.Record> { protected const string ConnectionString = "mongodb://localhost:27017"; @@ -43,22 +43,22 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddAzureDocumentDBCollection(name, lifetime: lifetime) + .AddDocumentDBCollection(name, lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedAzureDocumentDBCollection(serviceKey, name, lifetime: lifetime); + .AddKeyedDocumentDBCollection(serviceKey, name, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddAzureDocumentDBCollection( + ? services.AddDocumentDBCollection( name, ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedAzureDocumentDBCollection( + : services.AddKeyedDocumentDBCollection( serviceKey, name, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, name, lifetime) => serviceKey is null - ? services.AddAzureDocumentDBCollection( + ? services.AddDocumentDBCollection( name, ConnectionStringProvider, DatabaseNameProvider, lifetime: lifetime) - : services.AddKeyedAzureDocumentDBCollection( + : services.AddKeyedDocumentDBCollection( serviceKey, name, sp => ConnectionStringProvider(sp, serviceKey), sp => DatabaseNameProvider(sp, serviceKey), lifetime: lifetime); } } @@ -68,20 +68,20 @@ private static string DatabaseNameProvider(IServiceProvider sp, object serviceKe get { yield return (services, serviceKey, lifetime) => serviceKey is null - ? services.AddAzureDocumentDBVectorStore( + ? services.AddDocumentDBVectorStore( ConnectionString, DatabaseName, lifetime: lifetime) - : services.AddKeyedAzureDocumentDBVectorStore( + : services.AddKeyedDocumentDBVectorStore( serviceKey, ConnectionString, DatabaseName, lifetime: lifetime); yield return (services, serviceKey, lifetime) => serviceKey is null ? services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddAzureDocumentDBVectorStore(lifetime: lifetime) + .AddDocumentDBVectorStore(lifetime: lifetime) : services .AddSingleton(sp => new MongoClient(MongoClientSettings.FromConnectionString(ConnectionString))) .AddSingleton(sp => sp.GetRequiredService().GetDatabase(DatabaseName)) - .AddKeyedAzureDocumentDBVectorStore(serviceKey, lifetime: lifetime); + .AddKeyedDocumentDBVectorStore(serviceKey, lifetime: lifetime); } } @@ -90,9 +90,9 @@ public void ConnectionStringProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: null!, databaseNameProvider: DatabaseNameProvider)); } @@ -101,9 +101,9 @@ public void DatabaseNameProviderCantBeNull() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionStringProvider: ConnectionStringProvider, databaseNameProvider: null!)); } @@ -112,15 +112,15 @@ public void ConnectionStringCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddAzureDocumentDBVectorStore(connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBVectorStore(connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddKeyedDocumentDBVectorStore(serviceKey: "notNull", connectionString: null!, DatabaseName)); + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", connectionString: "", DatabaseName)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: null!, DatabaseName)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", connectionString: "", DatabaseName)); } @@ -129,15 +129,15 @@ public void DatabaseNameCantBeNullOrEmpty() { IServiceCollection services = new ServiceCollection(); - Assert.Throws(() => services.AddAzureDocumentDBVectorStore(ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBVectorStore(ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddKeyedDocumentDBVectorStore(serviceKey: "notNull", ConnectionString, databaseName: null!)); + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddAzureDocumentDBCollection( + Assert.Throws(() => services.AddDocumentDBCollection( name: "notNull", ConnectionString, databaseName: "")); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: null!)); - Assert.Throws(() => services.AddKeyedAzureDocumentDBCollection( + Assert.Throws(() => services.AddKeyedDocumentDBCollection( serviceKey: "notNull", name: "notNull", ConnectionString, databaseName: "")); } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDistanceFunctionTests.cs similarity index 83% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDistanceFunctionTests.cs index ee0142a..ac8d25f 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBDistanceFunctionTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBDistanceFunctionTests.cs @@ -9,8 +9,8 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBDistanceFunctionTests(AzureDocumentDBDistanceFunctionTests.Fixture fixture) - : DistanceFunctionTests(fixture), IClassFixture +public class DocumentDBDistanceFunctionTests(DocumentDBDistanceFunctionTests.Fixture fixture) + : DistanceFunctionTests(fixture), IClassFixture { public override Task CosineSimilarity() => Assert.ThrowsAsync(base.CosineSimilarity); public override Task EuclideanSquaredDistance() => Assert.ThrowsAsync(base.EuclideanSquaredDistance); @@ -25,7 +25,7 @@ protected override Task TestScoreThreshold(VectorStoreCollection.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; public override bool AssertScores { get; } = false; } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBEmbeddingGenerationTests.cs similarity index 54% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBEmbeddingGenerationTests.cs index 3747b51..e3ba8ec 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBEmbeddingGenerationTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBEmbeddingGenerationTests.cs @@ -11,50 +11,50 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBEmbeddingGenerationTests(AzureDocumentDBEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, AzureDocumentDBEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) - : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture +public class DocumentDBEmbeddingGenerationTests(DocumentDBEmbeddingGenerationTests.StringVectorFixture stringVectorFixture, DocumentDBEmbeddingGenerationTests.RomOfFloatVectorFixture romOfFloatVectorFixture) + : EmbeddingGenerationTests(stringVectorFixture, romOfFloatVectorFixture), IClassFixture, IClassFixture { public new class StringVectorFixture : EmbeddingGenerationTests.StringVectorFixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => AzureDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => DocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(AzureDocumentDBTestStore.Instance.Database) - .AddAzureDocumentDBVectorStore() + .AddSingleton(DocumentDBTestStore.Instance.Database) + .AddDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(AzureDocumentDBTestStore.Instance.Database) - .AddAzureDocumentDBCollection(this.CollectionName) + .AddSingleton(DocumentDBTestStore.Instance.Database) + .AddDocumentDBCollection(this.CollectionName) ]; } public new class RomOfFloatVectorFixture : EmbeddingGenerationTests.RomOfFloatVectorFixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator) - => AzureDocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); + => DocumentDBTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator }); public override Func[] DependencyInjectionStoreRegistrationDelegates => [ services => services - .AddSingleton(AzureDocumentDBTestStore.Instance.Database) - .AddAzureDocumentDBVectorStore() + .AddSingleton(DocumentDBTestStore.Instance.Database) + .AddDocumentDBVectorStore() ]; public override Func[] DependencyInjectionCollectionRegistrationDelegates => [ services => services - .AddSingleton(AzureDocumentDBTestStore.Instance.Database) - .AddAzureDocumentDBCollection(this.CollectionName) + .AddSingleton(DocumentDBTestStore.Instance.Database) + .AddDocumentDBCollection(this.CollectionName) ]; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBFilterTests.cs similarity index 94% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBFilterTests.cs index 110e36f..7206a68 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBFilterTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBFilterTests.cs @@ -8,8 +8,8 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBFilterTests(AzureDocumentDBFilterTests.Fixture fixture) - : FilterTests(fixture), IClassFixture +public class DocumentDBFilterTests(DocumentDBFilterTests.Fixture fixture) + : FilterTests(fixture), IClassFixture { // Specialized MongoDB syntax for NOT over Contains ($nin) [Fact] @@ -86,7 +86,7 @@ public override Task Contains_with_MemoryExtensions_Contains_with_null_comparer( public new class Fixture : FilterTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; protected override string IndexKind => Microsoft.Extensions.VectorData.IndexKind.IvfFlat; protected override string DistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance; diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBIndexKindTests.cs similarity index 76% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBIndexKindTests.cs index 245df4c..bda2267 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBIndexKindTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBIndexKindTests.cs @@ -9,8 +9,8 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBIndexKindTests(AzureDocumentDBIndexKindTests.Fixture fixture) - : IndexKindTests(fixture), IClassFixture +public class DocumentDBIndexKindTests(DocumentDBIndexKindTests.Fixture fixture) + : IndexKindTests(fixture), IClassFixture { // Note: Azure DocumentDB supports HNSW, but only in a specific tier. // [Fact] @@ -26,6 +26,6 @@ public virtual Task IvfFlat() public new class Fixture() : IndexKindTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBTestSuiteImplementationTests.cs similarity index 84% rename from MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBTestSuiteImplementationTests.cs index 2bedf6b..9e051c0 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/AzureDocumentDBTestSuiteImplementationTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/DocumentDBTestSuiteImplementationTests.cs @@ -6,7 +6,7 @@ namespace AzureDocumentDB.ConformanceTests; -public class AzureDocumentDBTestSuiteImplementationTests : TestSuiteImplementationTests +public class DocumentDBTestSuiteImplementationTests : TestSuiteImplementationTests { protected override ICollection IgnoredTestBases { get; } = [ diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBBasicModelTests.cs similarity index 61% rename from MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBBasicModelTests.cs index 0b8b123..9d0cd5e 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBBasicModelTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBBasicModelTests.cs @@ -8,11 +8,11 @@ namespace AzureDocumentDB.ConformanceTests.ModelTests; -public class AzureDocumentDBBasicModelTests(AzureDocumentDBBasicModelTests.Fixture fixture) - : BasicModelTests(fixture), IClassFixture +public class DocumentDBBasicModelTests(DocumentDBBasicModelTests.Fixture fixture) + : BasicModelTests(fixture), IClassFixture { public new class Fixture : BasicModelTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBMultiVectorModelTests.cs similarity index 59% rename from MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBMultiVectorModelTests.cs index 7952d76..bc5822c 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBMultiVectorModelTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBMultiVectorModelTests.cs @@ -8,11 +8,11 @@ namespace AzureDocumentDB.ConformanceTests.ModelTests; -public class AzureDocumentDBMultiVectorModelTests(AzureDocumentDBMultiVectorModelTests.Fixture fixture) - : MultiVectorModelTests(fixture), IClassFixture +public class DocumentDBMultiVectorModelTests(DocumentDBMultiVectorModelTests.Fixture fixture) + : MultiVectorModelTests(fixture), IClassFixture { public new class Fixture : MultiVectorModelTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoDataModelTests.cs similarity index 61% rename from MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoDataModelTests.cs index 5f4884c..d7a9a41 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoDataModelTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoDataModelTests.cs @@ -8,11 +8,11 @@ namespace AzureDocumentDB.ConformanceTests.ModelTests; -public class AzureDocumentDBNoDataModelTests(AzureDocumentDBNoDataModelTests.Fixture fixture) - : NoDataModelTests(fixture), IClassFixture +public class DocumentDBNoDataModelTests(DocumentDBNoDataModelTests.Fixture fixture) + : NoDataModelTests(fixture), IClassFixture { public new class Fixture : NoDataModelTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoVectorModelTests.cs similarity index 60% rename from MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoVectorModelTests.cs index e8d8c7f..22c837b 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/AzureDocumentDBNoVectorModelTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/ModelTests/DocumentDBNoVectorModelTests.cs @@ -8,11 +8,11 @@ namespace AzureDocumentDB.ConformanceTests.ModelTests; -public class AzureDocumentDBNoVectorModelTests(AzureDocumentDBNoVectorModelTests.Fixture fixture) - : NoVectorModelTests(fixture), IClassFixture +public class DocumentDBNoVectorModelTests(DocumentDBNoVectorModelTests.Fixture fixture) + : NoVectorModelTests(fixture), IClassFixture { public new class Fixture : NoVectorModelTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBFixture.cs similarity index 64% rename from MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBFixture.cs index a749072..aee72ef 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBFixture.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBFixture.cs @@ -5,7 +5,7 @@ namespace AzureDocumentDB.ConformanceTests.Support; -public class AzureDocumentDBFixture : VectorStoreFixture +public class DocumentDBFixture : VectorStoreFixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestEnvironment.cs similarity index 84% rename from MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestEnvironment.cs index 9dd2e4e..404c7d1 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestEnvironment.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestEnvironment.cs @@ -7,19 +7,19 @@ namespace AzureDocumentDB.ConformanceTests.Support; #pragma warning disable CA1810 // Initialize all static fields when those fields are declared -public static class AzureDocumentDBTestEnvironment +public static class DocumentDBTestEnvironment { public static readonly string? ConnectionString; public static bool IsConnectionStringDefined => ConnectionString is not null; - static AzureDocumentDBTestEnvironment() + static DocumentDBTestEnvironment() { var configuration = new ConfigurationBuilder() .AddJsonFile(path: "testsettings.json", optional: true) .AddJsonFile(path: "testsettings.development.json", optional: true) .AddEnvironmentVariables() - .AddUserSecrets() + .AddUserSecrets() .Build(); ConnectionString = configuration["AzureDocumentDB:ConnectionString"]; diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestStore.cs similarity index 80% rename from MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestStore.cs index 7f0924b..8983043 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/Support/AzureDocumentDBTestStore.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/Support/DocumentDBTestStore.cs @@ -8,10 +8,10 @@ namespace AzureDocumentDB.ConformanceTests.Support; #pragma warning disable CA1001 -public sealed class AzureDocumentDBTestStore : TestStore +public sealed class DocumentDBTestStore : TestStore #pragma warning restore CA1001 { - public static AzureDocumentDBTestStore Instance { get; } = new(); + public static DocumentDBTestStore Instance { get; } = new(); private MongoClient? _client; private IMongoDatabase? _database; @@ -26,18 +26,18 @@ public sealed class AzureDocumentDBTestStore : TestStore public DocumentDBVectorStore GetVectorStore(DocumentDBVectorStoreOptions options) => new(this.Database, options); - private AzureDocumentDBTestStore() + private DocumentDBTestStore() { } protected override Task StartAsync() { - if (string.IsNullOrWhiteSpace(AzureDocumentDBTestEnvironment.ConnectionString)) + if (string.IsNullOrWhiteSpace(DocumentDBTestEnvironment.ConnectionString)) { throw new InvalidOperationException("Connection string is not configured, set the AzureDocumentDB:ConnectionString environment variable"); } - this._client = new MongoClient(AzureDocumentDBTestEnvironment.ConnectionString); + this._client = new MongoClient(DocumentDBTestEnvironment.ConnectionString); this._database = this._client.GetDatabase("VectorSearchTests"); this.DefaultVectorStore = new DocumentDBVectorStore(this._database); diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBDataTypeTests.cs similarity index 90% rename from MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBDataTypeTests.cs index 6e46499..c341351 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBDataTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBDataTypeTests.cs @@ -8,8 +8,8 @@ namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class AzureDocumentDBDataTypeTests(AzureDocumentDBDataTypeTests.Fixture fixture) - : DataTypeTests.DefaultRecord>(fixture), IClassFixture +public class DocumentDBDataTypeTests(DocumentDBDataTypeTests.Fixture fixture) + : DataTypeTests.DefaultRecord>(fixture), IClassFixture { public override Task Decimal() => this.Test( @@ -37,7 +37,7 @@ public override Task DateTimeOffset() public new class Fixture : DataTypeTests.DefaultRecord>.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; // MongoDB does not support null checks in vector search pre-filters public override bool IsNullFilteringSupported => false; diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBEmbeddingTypeTests.cs similarity index 64% rename from MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBEmbeddingTypeTests.cs index 6321084..be121e2 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBEmbeddingTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBEmbeddingTypeTests.cs @@ -10,11 +10,11 @@ namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class AzureDocumentDBEmbeddingTypeTests(AzureDocumentDBEmbeddingTypeTests.Fixture fixture) - : EmbeddingTypeTests(fixture), IClassFixture +public class DocumentDBEmbeddingTypeTests(DocumentDBEmbeddingTypeTests.Fixture fixture) + : EmbeddingTypeTests(fixture), IClassFixture { public new class Fixture : EmbeddingTypeTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBKeyTypeTests.cs similarity index 75% rename from MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs rename to MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBKeyTypeTests.cs index 84e7829..980d4d8 100644 --- a/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/AzureDocumentDBKeyTypeTests.cs +++ b/MEVD/test/AzureDocumentDB.ConformanceTests/TypeTests/DocumentDBKeyTypeTests.cs @@ -9,8 +9,8 @@ namespace AzureDocumentDB.ConformanceTests.TypeTests; -public class AzureDocumentDBKeyTypeTests(AzureDocumentDBKeyTypeTests.Fixture fixture) - : KeyTypeTests(fixture), IClassFixture +public class DocumentDBKeyTypeTests(DocumentDBKeyTypeTests.Fixture fixture) + : KeyTypeTests(fixture), IClassFixture { [Fact] public virtual Task ObjectId() => this.Test(new("652f8c3e8f9b2c1a4d3e6a7b"), supportsAutoGeneration: true); @@ -26,6 +26,6 @@ public class AzureDocumentDBKeyTypeTests(AzureDocumentDBKeyTypeTests.Fixture fix public new class Fixture : KeyTypeTests.Fixture { - public override TestStore TestStore => AzureDocumentDBTestStore.Instance; + public override TestStore TestStore => DocumentDBTestStore.Instance; } } diff --git a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBCollectionTests.cs similarity index 93% rename from MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs rename to MEVD/test/AzureDocumentDB.UnitTests/DocumentDBCollectionTests.cs index 6bdb2b7..954d11a 100644 --- a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBCollectionTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBCollectionTests.cs @@ -22,12 +22,12 @@ namespace AzureDocumentDB.UnitTests; /// /// Unit tests for class. /// -public sealed class AzureDocumentDBCollectionTests +public sealed class DocumentDBCollectionTests { private readonly Mock _mockMongoDatabase = new(); private readonly Mock> _mockMongoCollection = new(); - public AzureDocumentDBCollectionTests() + public DocumentDBCollectionTests() { this._mockMongoDatabase .Setup(l => l.GetCollection(It.IsAny(), It.IsAny())) @@ -46,7 +46,7 @@ public void ConstructorForModelWithoutKeyThrowsException() public void ConstructorWithDeclarativeModelInitializesCollection() { // Act & Assert - using var collection = new DocumentDBCollection( + using var collection = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -91,7 +91,7 @@ public async Task CollectionExistsReturnsValidResultAsync(List collectio .Setup(l => l.ListCollectionNamesAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, collectionName); @@ -141,7 +141,7 @@ public async Task EnsureCollectionExistsInvokesValidMethodsAsync() .Setup(l => l.Indexes) .Returns(mockMongoIndexManager.Object); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -165,7 +165,7 @@ public async Task DeleteInvokesValidMethodsAsync() // Arrange const string RecordKey = "key"; - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -189,7 +189,7 @@ public async Task DeleteBatchInvokesValidMethodsAsync() // Arrange List recordKeys = ["key1", "key2"]; - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -213,7 +213,7 @@ public async Task DeleteCollectionInvokesValidMethodsAsync() // Arrange const string CollectionName = "collection"; - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, CollectionName); @@ -250,7 +250,7 @@ public async Task GetReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -288,7 +288,7 @@ public async Task GetBatchReturnsValidRecordAsync() It.IsAny())) .ReturnsAsync(mockCursor.Object); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -313,13 +313,13 @@ public async Task GetBatchReturnsValidRecordAsync() public async Task CanUpsertRecordAsync() { // Arrange - var hotel = new AzureDocumentDBHotelModel("key") { HotelName = "Test Name" }; + var hotel = new DocumentDBHotelModel("key") { HotelName = "Test Name" }; var serializerRegistry = BsonSerializer.SerializerRegistry; var documentSerializer = serializerRegistry.GetSerializer(); var expectedDefinition = Builders.Filter.Eq(document => document["_id"], "key"); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -341,11 +341,11 @@ public async Task CanUpsertRecordAsync() public async Task UpsertBatchReturnsRecordKeysAsync() { // Arrange - var hotel1 = new AzureDocumentDBHotelModel("key1") { HotelName = "Test Name 1" }; - var hotel2 = new AzureDocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; - var hotel3 = new AzureDocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; + var hotel1 = new DocumentDBHotelModel("key1") { HotelName = "Test Name 1" }; + var hotel2 = new DocumentDBHotelModel("key2") { HotelName = "Test Name 2" }; + var hotel3 = new DocumentDBHotelModel("key3") { HotelName = "Test Name 3" }; - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -420,7 +420,7 @@ public async Task SearchThrowsExceptionWithInvalidVectorTypeAsync(object vector, // Arrange this.MockCollectionForSearch(); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); @@ -511,11 +511,11 @@ public async Task SearchThrowsExceptionWithNonExistentVectorPropertyNameAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); - var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; + var options = new MEVD.VectorSearchOptions { VectorProperty = r => "non-existent-property" }; // Act & Assert await Assert.ThrowsAsync(async () => await sut.SearchAsync(new ReadOnlyMemory([1f, 2f, 3f]), top: 3, options).FirstOrDefaultAsync()); @@ -527,7 +527,7 @@ public async Task SearchReturnsRecordWithScoreAsync() // Arrange this.MockCollectionForSearch(); - using var sut = new DocumentDBCollection( + using var sut = new DocumentDBCollection( this._mockMongoDatabase.Object, "collection"); diff --git a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBHotelModel.cs similarity index 96% rename from MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs rename to MEVD/test/AzureDocumentDB.UnitTests/DocumentDBHotelModel.cs index b51785f..84361e1 100644 --- a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBHotelModel.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBHotelModel.cs @@ -8,7 +8,7 @@ namespace AzureDocumentDB.UnitTests; -public class AzureDocumentDBHotelModel(string hotelId) +public class DocumentDBHotelModel(string hotelId) { /// The key of the record. [VectorStoreKey] diff --git a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBVectorStoreTests.cs similarity index 91% rename from MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs rename to MEVD/test/AzureDocumentDB.UnitTests/DocumentDBVectorStoreTests.cs index 2f09389..5d34d3a 100644 --- a/MEVD/test/AzureDocumentDB.UnitTests/AzureDocumentDBVectorStoreTests.cs +++ b/MEVD/test/AzureDocumentDB.UnitTests/DocumentDBVectorStoreTests.cs @@ -16,7 +16,7 @@ namespace AzureDocumentDB.UnitTests; /// /// Unit tests for class. /// -public sealed class AzureDocumentDBVectorStoreTests +public sealed class DocumentDBVectorStoreTests { private readonly Mock _mockMongoDatabase = new(); @@ -27,7 +27,7 @@ public void GetCollectionWithNotSupportedKeyThrowsException() using var sut = new DocumentDBVectorStore(this._mockMongoDatabase.Object); // Act & Assert - Assert.Throws(() => sut.GetCollection("collection")); + Assert.Throws(() => sut.GetCollection("collection")); } [Fact] @@ -37,7 +37,7 @@ public void GetCollectionWithoutFactoryReturnsDefaultCollection() using var sut = new DocumentDBVectorStore(this._mockMongoDatabase.Object); // Act - var collection = sut.GetCollection("collection"); + var collection = sut.GetCollection("collection"); // Assert Assert.NotNull(collection); From 801697c2248fb7a0bb262a9fd3bbf183bb109044 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 18 Aug 2026 15:42:12 +0000 Subject: [PATCH 7/7] Update AzureDocumentDB system name Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> --- MEVD/src/AzureDocumentDB/DocumentDBConstants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs b/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs index 4dea2fe..1373e9e 100644 --- a/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs +++ b/MEVD/src/AzureDocumentDB/DocumentDBConstants.cs @@ -6,5 +6,5 @@ namespace CommunityToolkit.VectorData.AzureDocumentDB; internal static class DocumentDBConstants { - public const string VectorStoreSystemName = "azure.cosmosdbmongodb"; + public const string VectorStoreSystemName = "azure.documentdb"; }