Fix bug and return chosen plugin name.

Author: westey-m

dotnet/src/SemanticKernel.Core/Memory/AIContextExtensions.cs

@@ -19,7 +19,8 @@ public static class AIContextExtensions
     /// <param name="plugins">The plugins collection to register the <see cref="AIFunction"/> objects on.</param>
     /// <param name="aiContext">The <see cref="AIContext"/> to get plugins from.</param>
     /// <param name="pluginName">The name to give to the plugin. This will be appended with _x where x is an ascending number, until a unique plugin name is found.</param>
-    public static void AddFromAIContext(this ICollection<KernelPlugin> plugins, AIContext aiContext, string pluginName)
+    /// <returns>The chosen plugin name.</returns>
+    public static string AddFromAIContext(this ICollection<KernelPlugin> plugins, AIContext aiContext, string pluginName)
     {
         if (aiContext.AIFunctions is { Count: > 0 })
         {
@@ -29,10 +30,12 @@ public static void AddFromAIContext(this ICollection<KernelPlugin> plugins, AICo
             // Find a unique plugin name by appending a counter if necessary.
             while (plugins.Any(x => x.Name == pluginName))
             {
-                pluginName = $"{originalPluginName}_{counter}";
+                pluginName = $"{originalPluginName}_{counter++}";
             }
 
             plugins.AddFromFunctions(pluginName, aiContext.AIFunctions.Select(x => x.AsKernelFunction()));
         }
+
+        return pluginName;
     }
 }

dotnet/src/SemanticKernel.UnitTests/Memory/AIContextProviderTests.cs

@@ -80,11 +80,13 @@ public void ExtensionCanAddPluginsFromAIContextProvider()
             }
         };
 
-        plugins.AddFromAIContext(aiContext, "TestPlugin");
-        plugins.AddFromAIContext(aiContext, "TestPlugin");
+        Assert.Equal("TestPlugin", plugins.AddFromAIContext(aiContext, "TestPlugin"));
+        Assert.Equal("TestPlugin_1", plugins.AddFromAIContext(aiContext, "TestPlugin"));
+        Assert.Equal("TestPlugin_2", plugins.AddFromAIContext(aiContext, "TestPlugin"));
 
-        Assert.Equal(2, plugins.Count);
+        Assert.Equal(3, plugins.Count);
         Assert.Contains(plugins, p => p.Name == "TestPlugin");
         Assert.Contains(plugins, p => p.Name == "TestPlugin_1");
+        Assert.Contains(plugins, p => p.Name == "TestPlugin_2");
     }
 }