Add support for non-string arguments

TypeDescriptors are used to both implicitly support a large number of types implicitly and also to support an extensibility mechanism.  It's the same mechanism used by UI frameworks like WinForms as well as ASP.NET MVC.

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/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/InternalUtilities/src/InternalUtilities.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)/dotnet/src/InternalUtilities/src/**/*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+</Project>

dotnet/src/InternalUtilities/test/AssertExtensions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System;
+using Xunit;
+
+namespace SemanticKernel.UnitTests;
+
+internal static class AssertExtensions
+{
+    /// <summary>Asserts that an exception is an <see cref="ArgumentOutOfRangeException"/> with the specified values.</summary>
+    public static void AssertIsArgumentOutOfRange(Exception? e, string expectedParamName, string expectedActualValue)
+    {
+        ArgumentOutOfRangeException aoore = Assert.IsType<ArgumentOutOfRangeException>(e);
+        Assert.Equal(expectedActualValue, aoore.ActualValue);
+        Assert.Equal(expectedParamName, aoore.ParamName);
+    }
+}

dotnet/src/InternalUtilities/test/FunctionHelpers.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.SemanticKernel.Orchestration;
+using Microsoft.SemanticKernel.SkillDefinition;
+using Microsoft.SemanticKernel;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace SemanticKernel.UnitTests;
+
+/// <summary>Test helpers for working with native functions.</summary>
+internal static class FunctionHelpers
+{
+    /// <summary>
+    /// Invokes a function on a skill instance via the kernel.
+    /// </summary>
+    public static Task<SKContext> CallViaKernel(
+        object skillInstance,
+        string methodName,
+        params (string Name, string Value)[] variables)
+    {
+        var kernel = Kernel.Builder.Build();
+
+        IDictionary<string, ISKFunction> funcs = kernel.ImportSkill(skillInstance);
+
+        SKContext context = kernel.CreateNewContext();
+        foreach ((string Name, string Value) pair in variables)
+        {
+            context.Variables.Set(pair.Name, pair.Value);
+        }
+
+        return funcs[methodName].InvokeAsync(context);
+    }
+}

dotnet/src/InternalUtilities/test/TestInternalUtilities.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)/dotnet/src/InternalUtilities/test/**/*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+</Project>

dotnet/src/SemanticKernel.Abstractions/SemanticKernel.Abstractions.csproj

@@ -7,7 +7,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/SemanticKernel.UnitTests/CoreSkills/MathSkillTests.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using System;
 using System.Threading.Tasks;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.CoreSkills;
@@ -36,16 +35,16 @@ public void ItCanBeImported()
     [InlineData("-10", "10", "0")]
     [InlineData("-192", "13", "-179")]
     [InlineData("-192", "-13", "-205")]
-    public async Task AddAsyncWhenValidParametersShouldSucceedAsync(string initialValue, string amount, string expectedResult)
+    public async Task AddWhenValidParametersShouldSucceedAsync(string initialValue, string amount, string expectedResult)
     {
         // Arrange
         var target = new MathSkill();
 
         // Act
-        string result = await target.AddAsync(initialValue, amount);
+        var context = await FunctionHelpers.CallViaKernel(target, "Add", ("input", initialValue), ("amount", amount));
 
         // Assert
-        Assert.Equal(expectedResult, result);
+        Assert.Equal(expectedResult, context.Variables.Input);
     }
 
     [Theory]
@@ -57,16 +56,16 @@ public async Task AddAsyncWhenValidParametersShouldSucceedAsync(string initialVa
     [InlineData("-1", "10", "-11")]
     [InlineData("-10", "10", "-20")]
     [InlineData("-192", "13", "-205")]
-    public async Task SubtractAsyncWhenValidParametersShouldSucceedAsync(string initialValue, string amount, string expectedResult)
+    public async Task SubtractWhenValidParametersShouldSucceedAsync(string initialValue, string amount, string expectedResult)
     {
         // Arrange
         var target = new MathSkill();
 
         // Act
-        string result = await target.SubtractAsync(initialValue, amount);
+        var context = await FunctionHelpers.CallViaKernel(target, "Subtract", ("input", initialValue), ("amount", amount));    // Assert
 
         // Assert
-        Assert.Equal(expectedResult, result);
+        Assert.Equal(expectedResult, context.Variables.Input);
     }
 
     [Theory]
@@ -81,21 +80,16 @@ public async Task SubtractAsyncWhenValidParametersShouldSucceedAsync(string init
     [InlineData("zero")]
     [InlineData("-100 units")]
     [InlineData("1 banana")]
-    public async Task AddAsyncWhenInvalidInitialValueShouldThrowAsync(string initialValue)
+    public async Task AddWhenInvalidInitialValueShouldThrowAsync(string initialValue)
     {
         // Arrange
         var target = new MathSkill();
 
         // Act
-        var exception = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
-        {
-            await target.AddAsync(initialValue, "1");
-        });
+        var context = await FunctionHelpers.CallViaKernel(target, "Add", ("input", initialValue), ("amount", "1"));
 
         // Assert
-        Assert.NotNull(exception);
-        Assert.Equal(initialValue, exception.ActualValue);
-        Assert.Equal("initialValueText", exception.ParamName);
+        AssertExtensions.AssertIsArgumentOutOfRange(context.LastException, "input", initialValue);
     }
 
     [Theory]
@@ -110,21 +104,16 @@ public async Task AddAsyncWhenInvalidInitialValueShouldThrowAsync(string initial
     [InlineData("zero")]
     [InlineData("-100 units")]
     [InlineData("1 banana")]
-    public async Task AddAsyncWhenInvalidAmountShouldThrowAsync(string amount)
+    public async Task AddWhenInvalidAmountShouldThrowAsync(string amount)
     {
         // Arrange
         var target = new MathSkill();
 
         // Act
-        var exception = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
-        {
-            await target.AddAsync("1", amount);
-        });
+        var context = await FunctionHelpers.CallViaKernel(target, "Add", ("input", "1"), ("amount", amount));
 
         // Assert
-        Assert.NotNull(exception);
-        Assert.Equal(amount, exception.ActualValue);
-        Assert.Equal("amount", exception.ParamName);
+        AssertExtensions.AssertIsArgumentOutOfRange(context.LastException, "amount", amount);
     }
 
     [Theory]
@@ -139,21 +128,16 @@ public async Task AddAsyncWhenInvalidAmountShouldThrowAsync(string amount)
     [InlineData("zero")]
     [InlineData("-100 units")]
     [InlineData("1 banana")]
-    public async Task SubtractAsyncWhenInvalidInitialValueShouldThrowAsync(string initialValue)
+    public async Task SubtractWhenInvalidInitialValueShouldThrowAsync(string initialValue)
     {
         // Arrange
         var target = new MathSkill();
 
         // Act
-        var exception = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
-        {
-            await target.SubtractAsync(initialValue, "1");
-        });
+        var context = await FunctionHelpers.CallViaKernel(target, "Subtract", ("input", initialValue), ("amount", "1"));
 
         // Assert
-        Assert.NotNull(exception);
-        Assert.Equal(initialValue, exception.ActualValue);
-        Assert.Equal("initialValueText", exception.ParamName);
+        AssertExtensions.AssertIsArgumentOutOfRange(context.LastException, "input", initialValue);
     }
 
     [Theory]
@@ -174,14 +158,9 @@ public async Task SubtractAsyncWhenInvalidAmountShouldThrowAsync(string amount)
         var target = new MathSkill();
 
         // Act
-        var exception = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
-        {
-            await target.SubtractAsync("1", amount);
-        });
+        var context = await FunctionHelpers.CallViaKernel(target, "Subtract", ("input", "1"), ("amount", amount));
 
         // Assert
-        Assert.NotNull(exception);
-        Assert.Equal(amount, exception.ActualValue);
-        Assert.Equal("amount", exception.ParamName);
+        AssertExtensions.AssertIsArgumentOutOfRange(context.LastException, "amount", amount);
     }
 }

dotnet/src/SemanticKernel.UnitTests/CoreSkills/WaitSkillTests.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using System;
 using System.Threading.Tasks;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.CoreSkills;
@@ -46,7 +45,7 @@ public async Task ItWaitSecondsWhenValidParametersSucceedAsync(string textSecond
         var target = new WaitSkill(waitProviderMock.Object);
 
         // Act
-        await target.SecondsAsync(textSeconds);
+        var context = await FunctionHelpers.CallViaKernel(target, "Seconds", ("input", textSeconds));
 
         // Assert
         waitProviderMock.Verify(w => w.DelayAsync(It.IsIn(expectedMilliseconds)), Times.Once);
@@ -71,14 +70,9 @@ public async Task ItWaitSecondsWhenInvalidParametersFailsAsync(string textSecond
         var target = new WaitSkill(waitProviderMock.Object);
 
         // Act
-        var exception = await Assert.ThrowsAsync<ArgumentException>(async () =>
-        {
-            await target.SecondsAsync(textSeconds);
-        });
+        var context = await FunctionHelpers.CallViaKernel(target, "Seconds", ("input", textSeconds));
 
         // Assert
-        Assert.NotNull(exception);
-        Assert.IsType<ArgumentException>(exception);
-        Assert.Equal("secondsText", exception.ParamName);
+        AssertExtensions.AssertIsArgumentOutOfRange(context.LastException, "input", textSeconds);
     }
 }

dotnet/src/SemanticKernel.UnitTests/SemanticKernel.UnitTests.csproj

@@ -10,6 +10,8 @@
     <NoWarn>CA2007,VSTHRD111</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/test/TestInternalUtilities.props" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />