.Net MEVD: Dependency Injection (#12097)

Fixes #10549

Author: adamsitnik

dotnet/samples/Demos/AgentFrameworkWithAspire/ChatWithAgent.ApiService/Program.cs

@@ -175,7 +175,7 @@ private static void AddVectorStore(WebApplicationBuilder builder, HostConfig con
                         ? new DefaultAzureCredential()
                         : new AzureCliCredential()
                 );
-                builder.Services.AddAzureAISearchVectorStoreRecordCollection<TextSnippet<string>>(config.Rag.CollectionName);
+                builder.Services.AddAzureAISearchCollection<TextSnippet<string>>(config.Rag.CollectionName);
                 builder.Services.AddVectorStoreTextSearch<TextSnippet<string>>();
                 break;
             }

dotnet/samples/Demos/VectorStoreRAG/Program.cs

@@ -71,7 +71,7 @@
 switch (appConfig.RagConfig.VectorStoreType)
 {
     case "AzureAISearch":
-        kernelBuilder.Services.AddAzureAISearchVectorStoreRecordCollection<TextSnippet<string>>(
+        kernelBuilder.Services.AddAzureAISearchCollection<TextSnippet<string>>(
             appConfig.RagConfig.CollectionName,
             new Uri(appConfig.AzureAISearchConfig.Endpoint),
             new AzureKeyCredential(appConfig.AzureAISearchConfig.ApiKey));
@@ -93,24 +93,24 @@
             appConfig.RagConfig.CollectionName);
         break;
     case "Qdrant":
-        kernelBuilder.Services.AddQdrantVectorStoreRecordCollection<Guid, TextSnippet<Guid>>(
+        kernelBuilder.Services.AddQdrantCollection<Guid, TextSnippet<Guid>>(
             appConfig.RagConfig.CollectionName,
             appConfig.QdrantConfig.Host,
             appConfig.QdrantConfig.Port,
             appConfig.QdrantConfig.Https,
             appConfig.QdrantConfig.ApiKey);
         break;
     case "Redis":
-        kernelBuilder.Services.AddRedisJsonVectorStoreRecordCollection<TextSnippet<string>>(
+        kernelBuilder.Services.AddRedisJsonCollection<TextSnippet<string>>(
             appConfig.RagConfig.CollectionName,
             appConfig.RedisConfig.ConnectionConfiguration);
         break;
     case "Weaviate":
-        kernelBuilder.Services.AddWeaviateVectorStoreRecordCollection<TextSnippet<Guid>>(
+        kernelBuilder.Services.AddWeaviateCollection<TextSnippet<Guid>>(
             // Weaviate collection names must start with an upper case letter.
             char.ToUpper(appConfig.RagConfig.CollectionName[0], CultureInfo.InvariantCulture) + appConfig.RagConfig.CollectionName.Substring(1),
-            null,
-            new() { Endpoint = new Uri(appConfig.WeaviateConfig.Endpoint) });
+            endpoint: new Uri(appConfig.WeaviateConfig.Endpoint),
+            apiKey: null);
         break;
     default:
         throw new NotSupportedException($"Vector store type '{appConfig.RagConfig.VectorStoreType}' is not supported.");

dotnet/src/Connectors/Connectors.AzureAISearch.UnitTests/AzureAISearchServiceCollectionExtensionsTests.cs

@@ -13,6 +13,18 @@ public sealed class AzureAISearchCollectionOptions : VectorStoreCollectionOption
 {
     internal static readonly AzureAISearchCollectionOptions Default = new();
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AzureAISearchCollectionOptions"/> class.
+    /// </summary>
+    public AzureAISearchCollectionOptions()
+    {
+    }
+
+    internal AzureAISearchCollectionOptions(AzureAISearchCollectionOptions? source) : base(source)
+    {
+        this.JsonSerializerOptions = source?.JsonSerializerOptions;
+    }
+
     /// <summary>
     /// Gets or sets the JSON serializer options to use when converting between the data model and the Azure AI Search record.
     /// Note that when using the default mapper and you are constructing your own <see cref="SearchIndexClient"/>, you will need