Improvements/fixes for service registry (#857)

### Description
Series of improvements to align service registration extension methods
with the other kernel builder ones and remove the "default" suffix from
service provider Get*ServiceOrDefault method name to not expose
unnecessary details with code that may use it.

dotnet/src/Connectors/Connectors.AI.OpenAI/OpenAIKernelBuilderExtensions.cs

@@ -16,7 +16,7 @@
 namespace Microsoft.SemanticKernel;
 #pragma warning restore IDE0130
 
-public static class OpenAKernelBuilderExtensions
+public static class OpenAIKernelBuilderExtensions
 {
     #region Text Completion
 
@@ -33,7 +33,7 @@ public static class OpenAKernelBuilderExtensions
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureTextCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureTextCompletionService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         string apiKey,
@@ -67,7 +67,7 @@ public static KernelBuilder AddAzureTextCompletionService(this KernelBuilder bui
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureTextCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureTextCompletionService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         TokenCredential credentials,
@@ -101,7 +101,7 @@ public static KernelBuilder AddAzureTextCompletionService(this KernelBuilder bui
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddOpenAITextCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithOpenAITextCompletionService(this KernelBuilder builder,
         string modelId,
         string apiKey,
         string? orgId = null,
@@ -138,7 +138,7 @@ public static KernelBuilder AddOpenAITextCompletionService(this KernelBuilder bu
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureTextEmbeddingGenerationService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureTextEmbeddingGenerationService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         string apiKey,
@@ -171,7 +171,7 @@ public static KernelBuilder AddAzureTextEmbeddingGenerationService(this KernelBu
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureTextEmbeddingGenerationService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureTextEmbeddingGenerationService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         TokenCredential credential,
@@ -204,7 +204,7 @@ public static KernelBuilder AddAzureTextEmbeddingGenerationService(this KernelBu
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddOpenAITextEmbeddingGenerationService(this KernelBuilder builder,
+    public static KernelBuilder WithOpenAITextEmbeddingGenerationService(this KernelBuilder builder,
         string modelId,
         string apiKey,
         string? orgId = null,
@@ -242,7 +242,7 @@ public static KernelBuilder AddOpenAITextEmbeddingGenerationService(this KernelB
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureChatCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureChatCompletionService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         string apiKey,
@@ -284,7 +284,7 @@ public static KernelBuilder AddAzureChatCompletionService(this KernelBuilder bui
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddAzureChatCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithAzureChatCompletionService(this KernelBuilder builder,
         string deploymentName,
         string endpoint,
         TokenCredential credentials,
@@ -326,7 +326,7 @@ public static KernelBuilder AddAzureChatCompletionService(this KernelBuilder bui
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddOpenAIChatCompletionService(this KernelBuilder builder,
+    public static KernelBuilder WithOpenAIChatCompletionService(this KernelBuilder builder,
         string modelId,
         string apiKey,
         string? orgId = null,
@@ -369,7 +369,7 @@ public static KernelBuilder AddOpenAIChatCompletionService(this KernelBuilder bu
     /// <param name="httpClient">Custom <see cref="HttpClient"/> for HTTP requests.</param>
     /// <param name="logger">Application logger</param>
     /// <returns>Self instance</returns>
-    public static KernelBuilder AddOpenAIImageGenerationService(this KernelBuilder builder,
+    public static KernelBuilder WithOpenAIImageGenerationService(this KernelBuilder builder,
         string apiKey,
         string? orgId = null,
         string? serviceId = null,

dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AIServicesOpenAIExtensionsTests.cs

@@ -8,16 +8,16 @@
 namespace SemanticKernel.Connectors.UnitTests.OpenAI;
 
 /// <summary>
-/// Unit tests of <see cref="OpenAKernelBuilderExtensions"/>.
+/// Unit tests of <see cref="OpenAIKernelBuilderExtensions"/>.
 /// </summary>
 public class AIServicesOpenAIExtensionsTests
 {
     [Fact]
     public void ItSucceedsWhenAddingDifferentServiceTypeWithSameId()
     {
         KernelBuilder targetBuilder = Kernel.Builder;
-        targetBuilder.AddAzureTextCompletionService("depl", "https://url", "key", "azure");
-        targetBuilder.AddAzureTextEmbeddingGenerationService("depl2", "https://url", "key", "azure");
+        targetBuilder.WithAzureTextCompletionService("depl", "https://url", "key", "azure");
+        targetBuilder.WithAzureTextEmbeddingGenerationService("depl2", "https://url", "key", "azure");
 
         IKernel targetKernel = targetBuilder.Build();
         Assert.NotNull(targetKernel.GetService<ITextCompletion>("azure"));
@@ -28,10 +28,10 @@ public void ItSucceedsWhenAddingDifferentServiceTypeWithSameId()
     public void ItTellsIfAServiceIsAvailable()
     {
         KernelBuilder targetBuilder = Kernel.Builder;
-        targetBuilder.AddAzureTextCompletionService("depl", "https://url", "key", serviceId: "azure");
-        targetBuilder.AddOpenAITextCompletionService("model", "apikey", serviceId: "oai");
-        targetBuilder.AddAzureTextEmbeddingGenerationService("depl2", "https://url2", "key", serviceId: "azure");
-        targetBuilder.AddOpenAITextEmbeddingGenerationService("model2", "apikey2", serviceId: "oai2");
+        targetBuilder.WithAzureTextCompletionService("depl", "https://url", "key", serviceId: "azure");
+        targetBuilder.WithOpenAITextCompletionService("model", "apikey", serviceId: "oai");
+        targetBuilder.WithAzureTextEmbeddingGenerationService("depl2", "https://url2", "key", serviceId: "azure");
+        targetBuilder.WithOpenAITextEmbeddingGenerationService("model2", "apikey2", serviceId: "oai2");
 
         // Assert
         IKernel targetKernel = targetBuilder.Build();
@@ -48,13 +48,13 @@ public void ItCanOverwriteServices()
         KernelBuilder targetBuilder = Kernel.Builder;
 
         // Act - Assert no exception occurs
-        targetBuilder.AddAzureTextCompletionService("dep", "https://localhost", "key", serviceId: "one");
-        targetBuilder.AddAzureTextCompletionService("dep", "https://localhost", "key", serviceId: "one");
-        targetBuilder.AddOpenAITextCompletionService("model", "key, serviceId: \"one\"");
-        targetBuilder.AddOpenAITextCompletionService("model", "key", serviceId: "one");
-        targetBuilder.AddAzureTextEmbeddingGenerationService("dep", "https://localhost", "key", serviceId: "one");
-        targetBuilder.AddAzureTextEmbeddingGenerationService("dep", "https://localhost", "key", serviceId: "one");
-        targetBuilder.AddOpenAITextEmbeddingGenerationService("model", "key", serviceId: "one");
-        targetBuilder.AddOpenAITextEmbeddingGenerationService("model", "key", serviceId: "one");
+        targetBuilder.WithAzureTextCompletionService("dep", "https://localhost", "key", serviceId: "one");
+        targetBuilder.WithAzureTextCompletionService("dep", "https://localhost", "key", serviceId: "one");
+        targetBuilder.WithOpenAITextCompletionService("model", "key, serviceId: \"one\"");
+        targetBuilder.WithOpenAITextCompletionService("model", "key", serviceId: "one");
+        targetBuilder.WithAzureTextEmbeddingGenerationService("dep", "https://localhost", "key", serviceId: "one");
+        targetBuilder.WithAzureTextEmbeddingGenerationService("dep", "https://localhost", "key", serviceId: "one");
+        targetBuilder.WithOpenAITextEmbeddingGenerationService("model", "key", serviceId: "one");
+        targetBuilder.WithOpenAITextEmbeddingGenerationService("model", "key", serviceId: "one");
     }
 }

dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAICompletionTests.cs

@@ -44,7 +44,7 @@ public async Task OpenAITestAsync(string prompt, string expectedAnswerContains)
 
         IKernel target = Kernel.Builder
             .WithLogger(this._logger)
-            .AddOpenAITextCompletionService(
+            .WithOpenAITextCompletionService(
                 serviceId: openAIConfiguration.ServiceId,
                 modelId: openAIConfiguration.ModelId,
                 apiKey: openAIConfiguration.ApiKey,
@@ -70,7 +70,7 @@ public async Task AzureOpenAITestAsync(string prompt, string expectedAnswerConta
 
         IKernel target = Kernel.Builder
             .WithLogger(this._logger)
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 serviceId: azureOpenAIConfiguration.ServiceId,
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
@@ -99,7 +99,7 @@ public async Task OpenAIHttpRetryPolicyTestAsync(string prompt, string expectedO
         Assert.NotNull(openAIConfiguration);
 
         IKernel target = Kernel.Builder
-            .AddOpenAITextCompletionService(
+            .WithOpenAITextCompletionService(
                 serviceId: openAIConfiguration.ServiceId,
                 modelId: openAIConfiguration.ModelId,
                 apiKey: "INVALID_KEY") // Use an invalid API key to force a 401 Unauthorized response
@@ -123,7 +123,7 @@ public async Task OpenAIHttpInvalidKeyShouldReturnErrorDetailAsync()
 
         // Use an invalid API key to force a 401 Unauthorized response
         IKernel target = Kernel.Builder
-            .AddOpenAITextCompletionService(
+            .WithOpenAITextCompletionService(
                 modelId: openAIConfiguration.ModelId,
                 apiKey: "INVALID_KEY",
                 serviceId: openAIConfiguration.ServiceId)
@@ -149,7 +149,7 @@ public async Task AzureOpenAIHttpInvalidKeyShouldReturnErrorDetailAsync()
 
         IKernel target = Kernel.Builder
             .WithLogger(this._testOutputHelper)
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
                 apiKey: "INVALID_KEY",
@@ -176,7 +176,7 @@ public async Task AzureOpenAIHttpExceededMaxTokensShouldReturnErrorDetailAsync()
         // Arrange
         IKernel target = Kernel.Builder
             .WithLogger(this._testOutputHelper)
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
                 apiKey: azureOpenAIConfiguration.ApiKey,

dotnet/src/IntegrationTests/Planning/PlanTests.cs

@@ -458,7 +458,7 @@ private IKernel InitializeKernel(bool useEmbeddings = false)
 
         var builder = Kernel.Builder
             .WithLogger(this._logger)
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
                 apiKey: azureOpenAIConfiguration.ApiKey,
@@ -468,7 +468,7 @@ private IKernel InitializeKernel(bool useEmbeddings = false)
         if (useEmbeddings)
         {
             builder
-                .AddAzureTextEmbeddingGenerationService(
+                .WithAzureTextEmbeddingGenerationService(
                     deploymentName: azureOpenAIEmbeddingsConfiguration.DeploymentName,
                     endpoint: azureOpenAIEmbeddingsConfiguration.Endpoint,
                     apiKey: azureOpenAIEmbeddingsConfiguration.ApiKey)

dotnet/src/IntegrationTests/Planning/SequentialPlanner/SequentialPlanParserTests.cs

@@ -32,7 +32,7 @@ public void CanCallToPlanFromXml()
         Assert.NotNull(azureOpenAIConfiguration);
 
         IKernel kernel = Kernel.Builder
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
                 apiKey: azureOpenAIConfiguration.ApiKey,

dotnet/src/IntegrationTests/Planning/SequentialPlanner/SequentialPlannerTests.cs

@@ -108,15 +108,15 @@ private IKernel InitializeKernel(bool useEmbeddings = false)
 
         var builder = Kernel.Builder
             .WithLogger(this._logger)
-            .AddAzureTextCompletionService(
+            .WithAzureTextCompletionService(
                 deploymentName: azureOpenAIConfiguration.DeploymentName,
                 endpoint: azureOpenAIConfiguration.Endpoint,
                 apiKey: azureOpenAIConfiguration.ApiKey,
                 setAsDefault: true);
 
         if (useEmbeddings)
         {
-            builder.AddAzureTextEmbeddingGenerationService(
+            builder.WithAzureTextEmbeddingGenerationService(
                 deploymentName: azureOpenAIEmbeddingsConfiguration.DeploymentName,
                 endpoint: azureOpenAIEmbeddingsConfiguration.Endpoint,
                 apiKey: azureOpenAIEmbeddingsConfiguration.ApiKey);

dotnet/src/SemanticKernel.Abstractions/AI/ChatCompletion/ChatCompletionServiceExtensions.cs

@@ -16,9 +16,9 @@ public static class ChatCompletionServiceExtensions
     /// <param name="serviceId">Optional identifier of the desired service.</param>
     /// <returns>The completion service id matching the given id or the default.</returns>
     /// <exception cref="KernelException">Thrown when no suitable service is found.</exception>
-    public static IChatCompletion GetChatCompletionServiceOrDefault(
+    public static IChatCompletion GetChatCompletionService(
         this IAIServiceProvider services,
-        string? serviceId = null) => services.GetNamedServiceOrDefault<IChatCompletion>(serviceId)
+        string? serviceId = null) => services.GetService<IChatCompletion>(serviceId)
             ?? throw new KernelException(KernelException.ErrorCodes.ServiceNotFound, "Chat completion service not found");
 
     /// <summary>

dotnet/src/SemanticKernel.Abstractions/AI/Embeddings/TextEmbeddingServiceExtensions.cs

@@ -16,10 +16,10 @@ public static class TextEmbeddingServiceExtensions
     /// <param name="serviceId">Optional identifier of the desired service.</param>
     /// <returns>The embedding service matching the given id or the default service.</returns>
     /// <exception cref="KernelException">Thrown when no suitable service is found.</exception>
-    public static ITextEmbeddingGeneration GetTextEmbeddingServiceOrDefault(
+    public static ITextEmbeddingGeneration GetTextEmbeddingService(
         this IAIServiceProvider services,
         string? serviceId = null)
-            => services.GetNamedServiceOrDefault<ITextEmbeddingGeneration>(serviceId)
+            => services.GetService<ITextEmbeddingGeneration>(serviceId)
                 ?? throw new KernelException(KernelException.ErrorCodes.ServiceNotFound, "Text embedding service not available");
 
     /// <summary>

dotnet/src/SemanticKernel.Abstractions/AI/ImageGeneration/ImageGenerationServiceExtensions.cs

@@ -16,9 +16,9 @@ public static class ImageGenerationServiceExtensions
     /// <param name="serviceId">Optional identifier of the desired service.</param>
     /// <returns>The <see cref="IImageGeneration"/> id matching the given id or the default.</returns>
     /// <exception cref="KernelException">Thrown when no suitable service is found.</exception>
-    public static IImageGeneration GetImageGenerationServiceOrDefault(
+    public static IImageGeneration GetImageGenerationService(
         this IAIServiceProvider services,
-        string? serviceId = null) => services.GetNamedServiceOrDefault<IImageGeneration>(serviceId)
+        string? serviceId = null) => services.GetService<IImageGeneration>(serviceId)
             ?? throw new KernelException(KernelException.ErrorCodes.ServiceNotFound, "Image generation service not found");
 
     /// <summary>

dotnet/src/SemanticKernel.Abstractions/Services/ServiceExtensions.cs

@@ -5,27 +5,6 @@
 namespace Microsoft.SemanticKernel.Services;
 internal static class AIServiceProviderExtensions
 {
-    /// <summary>
-    /// Get the service matching the given id or the default if an id is not provided or not found.
-    /// </summary>
-    /// <typeparam name="T">The type of the service.</typeparam>
-    /// <param name="serviceProvider">The service provider.</param>
-    /// <param name="serviceId">Optional identifier of the desired service.</param>
-    /// <returns>The service matching the given id, the default service, or null.</returns>
-    public static T? GetNamedServiceOrDefault<T>(
-        this IAIServiceProvider serviceProvider,
-        string? serviceId = null) where T : IAIService
-    {
-        if ((serviceId != null)
-            && serviceProvider.TryGetService<T>(serviceId, out var namedService))
-        {
-            return namedService;
-        }
-
-        return serviceProvider.GetService<T>();
-    }
-
-
     /// <summary>
     /// Tries to get the service of the specified type and name, and returns a value indicating whether the operation succeeded.
     /// </summary>

dotnet/src/SemanticKernel/KernelBuilder.cs

@@ -146,10 +146,7 @@ public KernelBuilder Configure(Action<KernelConfig> configure)
     /// Adds a <typeparamref name="TService"/> instance to the services collection
     /// </summary>
     /// <param name="instance">The <typeparamref name="TService"/> instance.</param>
-    /// <param name="setAsDefault">Optional: set as the default AI service for type <typeparamref name="TService"/></param>
-    public KernelBuilder WithDefaultAIService<TService>(
-        TService instance,
-        bool setAsDefault = false) where TService : IAIService
+    public KernelBuilder WithDefaultAIService<TService>(TService instance) where TService : IAIService
     {
         this._aiServices.SetService<TService>(instance);
         return this;
@@ -174,10 +171,7 @@ public KernelBuilder WithAIService<TService>(
     /// Adds a <typeparamref name="TService"/> factory method to the services collection
     /// </summary>
     /// <param name="factory">The factory method that creates the AI service instances of type <typeparamref name="TService"/>.</param>
-    /// <param name="setAsDefault">Optional: set as the default AI service for type <typeparamref name="TService"/></param>
-    public KernelBuilder WithDefaultAIService<TService>(
-        Func<TService> factory,
-        bool setAsDefault = false) where TService : IAIService
+    public KernelBuilder WithDefaultAIService<TService>(Func<TService> factory) where TService : IAIService
     {
         this._aiServices.SetService<TService>(factory);
         return this;