Add support for multiple native function arguments of many types

dotnet/SK-dotnet.sln

@@ -99,16 +99,51 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.AI.HuggingFace", "src\Connectors\Connectors.AI.HuggingFace\Connectors.AI.HuggingFace.csproj", "{136823BE-8665-4D57-87E0-EF41535539E2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InternalUtilities", "InternalUtilities", "{4D3DAE63-41C6-4E1C-A35A-E77BDFC40675}"
-	ProjectSection(SolutionItems) = preProject
-		src\InternalUtilities\InternalUtilities.props = src\InternalUtilities\InternalUtilities.props
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.Memory.Weaviate", "src\Connectors\Connectors.Memory.Weaviate\Connectors.Memory.Weaviate.csproj", "{6AAB0620-33A1-4A98-A63B-6560B9BA47A4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiSkillsExample", "..\samples\dotnet\openapi-skills\OpenApiSkillsExample.csproj", "{4D91A3E0-C404-495B-AD4A-411C4E83CF54}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.Memory.DuckDB", "src\Connectors\Connectors.Memory.DuckDB\Connectors.Memory.DuckDB.csproj", "{50FAE231-6F24-4779-9D02-12ABBC9A49E2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5C246969-D794-4EC3-8E8F-F90D4D166420}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\test\AssertExtensions.cs = src\InternalUtilities\test\AssertExtensions.cs
+		src\InternalUtilities\test\FunctionHelpers.cs = src\InternalUtilities\test\FunctionHelpers.cs
+		src\InternalUtilities\test\TestInternalUtilities.props = src\InternalUtilities\test\TestInternalUtilities.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{958AD708-F048-4FAF-94ED-D2F2B92748B9}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\src\InternalUtilities.props = src\InternalUtilities\src\InternalUtilities.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagnostics", "Diagnostics", "{29E7D971-1308-4171-9872-E8E4669A1134}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\src\Diagnostics\CompilerServicesAttributes.cs = src\InternalUtilities\src\Diagnostics\CompilerServicesAttributes.cs
+		src\InternalUtilities\src\Diagnostics\ExceptionExtensions.cs = src\InternalUtilities\src\Diagnostics\ExceptionExtensions.cs
+		src\InternalUtilities\src\Diagnostics\HttpStatusCodeType.cs = src\InternalUtilities\src\Diagnostics\HttpStatusCodeType.cs
+		src\InternalUtilities\src\Diagnostics\NullableAttributes.cs = src\InternalUtilities\src\Diagnostics\NullableAttributes.cs
+		src\InternalUtilities\src\Diagnostics\Verify.cs = src\InternalUtilities\src\Diagnostics\Verify.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linq", "Linq", "{B00AD427-0047-4850-BEF9-BA8237EA9D8B}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\src\Linq\AsyncEnumerable.cs = src\InternalUtilities\src\Linq\AsyncEnumerable.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Text", "Text", "{DB950192-30F1-48B1-88D7-F43FECCA1A1C}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\src\Text\Json.cs = src\InternalUtilities\src\Text\Json.cs
+		src\InternalUtilities\src\Text\StringExtensions.cs = src\InternalUtilities\src\Text\StringExtensions.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{1C19D805-3573-4477-BF07-40180FCDE1BD}"
+	ProjectSection(SolutionItems) = preProject
+		src\InternalUtilities\src\Http\HttpClientProvider.cs = src\InternalUtilities\src\Http\HttpClientProvider.cs
+		src\InternalUtilities\src\Http\NonDisposableHttpClientHandler.cs = src\InternalUtilities\src\Http\NonDisposableHttpClientHandler.cs
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -363,6 +398,12 @@ Global
 		{6AAB0620-33A1-4A98-A63B-6560B9BA47A4} = {0247C2C9-86C3-45BA-8873-28B0948EDC0C}
 		{4D91A3E0-C404-495B-AD4A-411C4E83CF54} = {FA3720F1-C99A-49B2-9577-A940257098BF}
 		{50FAE231-6F24-4779-9D02-12ABBC9A49E2} = {0247C2C9-86C3-45BA-8873-28B0948EDC0C}
+		{5C246969-D794-4EC3-8E8F-F90D4D166420} = {4D3DAE63-41C6-4E1C-A35A-E77BDFC40675}
+		{958AD708-F048-4FAF-94ED-D2F2B92748B9} = {4D3DAE63-41C6-4E1C-A35A-E77BDFC40675}
+		{29E7D971-1308-4171-9872-E8E4669A1134} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
+		{B00AD427-0047-4850-BEF9-BA8237EA9D8B} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
+		{DB950192-30F1-48B1-88D7-F43FECCA1A1C} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
+		{1C19D805-3573-4477-BF07-40180FCDE1BD} = {958AD708-F048-4FAF-94ED-D2F2B92748B9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

dotnet/nuget/nuget-package.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <Version>0.16</Version>
+    <Version>0.17</Version>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>

dotnet/src/Connectors/Connectors.AI.HuggingFace/Connectors.AI.HuggingFace.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.AI.OpenAI/Connectors.AI.OpenAI.csproj

@@ -11,7 +11,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.AzureCognitiveSearch/Connectors.Memory.AzureCognitiveSearch.csproj

@@ -11,7 +11,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.CosmosDB/Connectors.Memory.CosmosDB.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <!--<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />-->
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.DuckDB/Connectors.Memory.DuckDB.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Pinecone/Connectors.Memory.Pinecone.csproj

@@ -9,7 +9,7 @@
 
     <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
     <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-    <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+    <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
     <PropertyGroup>
         <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Postgres/Connectors.Memory.Postgres.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Qdrant/Connectors.Memory.Qdrant.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Redis/Connectors.Memory.Redis.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Sqlite/Connectors.Memory.Sqlite.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.Memory.Weaviate/Connectors.Memory.Weaviate.csproj

@@ -9,7 +9,7 @@
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Connectors/Connectors.UnitTests/Connectors.UnitTests.csproj

@@ -22,7 +22,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\SemanticKernel\SemanticKernel.csproj" />

dotnet/src/Extensions/Planning.ActionPlanner/ActionPlanner.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -140,10 +141,10 @@ public async Task<Plan> CreatePlanAsync(string goal)
     /// <param name="goal">Currently unused. Will be used to handle long lists of functions.</param>
     /// <param name="context">Function execution context</param>
     /// <returns>List of functions, formatted accordingly to the prompt</returns>
-    [SKFunction("List all functions available in the kernel")]
-    [SKFunctionName("ListOfFunctions")]
-    [SKFunctionInput(Description = "The current goal processed by the planner", DefaultValue = "")]
-    public string ListOfFunctions(string goal, SKContext context)
+    [SKFunction, Description("List all functions available in the kernel")]
+    public string ListOfFunctions(
+        [Description("The current goal processed by the planner")] string goal,
+        SKContext context)
     {
         Verify.NotNull(context.Skills);
         var functionsAvailable = context.Skills.GetFunctionsView();
@@ -158,10 +159,10 @@ public string ListOfFunctions(string goal, SKContext context)
 
     // TODO: generate string programmatically
     // TODO: use goal to find relevant examples
-    [SKFunction("List a few good examples of plans to generate")]
-    [SKFunctionName("GoodExamples")]
-    [SKFunctionInput(Description = "The current goal processed by the planner", DefaultValue = "")]
-    public string GoodExamples(string goal, SKContext context)
+    [SKFunction, Description("List a few good examples of plans to generate")]
+    public string GoodExamples(
+        [Description("The current goal processed by the planner")] string goal,
+        SKContext context)
     {
         return @"
 [EXAMPLE]
@@ -193,10 +194,10 @@ No parameters.
     }
 
     // TODO: generate string programmatically
-    [SKFunction("List a few edge case examples of plans to handle")]
-    [SKFunctionName("EdgeCaseExamples")]
-    [SKFunctionInput(Description = "The current goal processed by the planner", DefaultValue = "")]
-    public string EdgeCaseExamples(string goal, SKContext context)
+    [SKFunction, Description("List a few edge case examples of plans to handle")]
+    public string EdgeCaseExamples(
+        [Description("The current goal processed by the planner")] string goal,
+        SKContext context)
     {
         return @"
 [EXAMPLE]

dotnet/src/Extensions/Planning.ActionPlanner/Planning.ActionPlanner.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/Extensions/Planning.SequentialPlanner/Planning.SequentialPlanner.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/InternalUtilities.props" />
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
 
   <PropertyGroup>
     <!-- NuGet Package Settings -->

dotnet/src/IntegrationTests/Fakes/EmailSkillFake.cs

@@ -1,47 +1,42 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.SemanticKernel.Orchestration;
 using Microsoft.SemanticKernel.SkillDefinition;
 
 namespace SemanticKernel.IntegrationTests.Fakes;
 
 internal sealed class EmailSkillFake
 {
-    [SKFunction("Given an email address and message body, send an email")]
-    [SKFunctionInput(Description = "The body of the email message to send.")]
-    [SKFunctionContextParameter(Name = "email_address", Description = "The email address to send email to.", DefaultValue = "default@email.com")]
-    public Task<SKContext> SendEmailAsync(string input, SKContext context)
+    [SKFunction, Description("Given an email address and message body, send an email")]
+    public Task<string> SendEmailAsync(
+        [Description("The body of the email message to send.")] string input,
+        [Description("The email address to send email to.")] string? email_address = "default@email.com")
     {
-        context.Variables.TryGetValue("email_address", out string? emailAddress);
-        context.Variables.Update($"Sent email to: {emailAddress}. Body: {input}");
-        return Task.FromResult(context);
+        email_address ??= string.Empty;
+        return Task.FromResult($"Sent email to: {email_address}. Body: {input}");
     }
 
-    [SKFunction("Lookup an email address for a person given a name")]
-    [SKFunctionInput(Description = "The name of the person to email.")]
-    public Task<SKContext> GetEmailAddressAsync(string input, SKContext context)
+    [SKFunction, Description("Lookup an email address for a person given a name")]
+    public Task<string> GetEmailAddressAsync(
+        [Description("The name of the person to email.")] string input,
+        ILogger logger)
     {
         if (string.IsNullOrEmpty(input))
         {
-            context.Log.LogDebug("Returning hard coded email for {0}", input);
-            context.Variables.Update("johndoe1234@example.com");
-        }
-        else
-        {
-            context.Log.LogDebug("Returning dynamic email for {0}", input);
-            context.Variables.Update($"{input}@example.com");
+            logger.LogDebug("Returning hard coded email for {0}", input);
+            return Task.FromResult("johndoe1234@example.com");
         }
 
-        return Task.FromResult(context);
+        logger.LogDebug("Returning dynamic email for {0}", input);
+        return Task.FromResult($"{input}@example.com");
     }
 
-    [SKFunction("Write a short poem for an e-mail")]
-    [SKFunctionInput(Description = "The topic of the poem.")]
-    public Task<SKContext> WritePoemAsync(string input, SKContext context)
+    [SKFunction, Description("Write a short poem for an e-mail")]
+    public Task<string> WritePoemAsync(
+        [Description("The topic of the poem.")] string input)
     {
-        context.Variables.Update($"Roses are red, violets are blue, {input} is hard, so is this test.");
-        return Task.FromResult(context);
+        return Task.FromResult($"Roses are red, violets are blue, {input} is hard, so is this test.");
     }
 }