fix: MeaiFunction Type handling, added more robust codes.

Author: Gunpal Jain

CSharpToJsonSchema.sln

@@ -1,7 +1,6 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E793AF18-4371-4EBD-96FC-195EB1798855}"
 	ProjectSection(SolutionItems) = preProject
@@ -25,9 +24,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{2D8B78DE-7269-417B-9D0B-8981FA513ACB}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml
+		.github\dependabot.yml = .github\dependabot.yml
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		.github\workflows\pull-request.yml = .github\workflows\pull-request.yml
-		.github\dependabot.yml = .github\dependabot.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpToJsonSchema", "src\libs\CSharpToJsonSchema\CSharpToJsonSchema.csproj", "{93367DED-6C55-4267-923A-4412D03376FB}"
@@ -80,10 +79,14 @@ Global
 		{6167F915-83EB-42F9-929B-AD4719A55811}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6167F915-83EB-42F9-929B-AD4719A55811}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6167F915-83EB-42F9-929B-AD4719A55811}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC07C90E-A58C-44B3-82D2-E2EB8F777B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC07C90E-A58C-44B3-82D2-E2EB8F777B92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC07C90E-A58C-44B3-82D2-E2EB8F777B92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC07C90E-A58C-44B3-82D2-E2EB8F777B92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1942E3E5-F151-4C90-BECE-140AAD8C66DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/libs/CSharpToJsonSchema.Generators/Conversion/ToModels.cs

@@ -136,6 +136,7 @@ public static InterfaceData PrepareMethodData(
 
         return string.Join(".", commonParts);
     }
+    
     private static OpenApiSchema ToParameterData(ITypeSymbol typeSymbol, string? name = null,
         string? description = null, bool isRequired = true)
     {

src/libs/CSharpToJsonSchema.Generators/Sources.Method.MeaiTools.cs

@@ -30,7 +30,7 @@ public partial class {extensionsClassName}
             foreach (var tool in tools)
             {{
                 var call = calls[tool.Name];
-                lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call));
+                lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call, global::{@interface.Namespace}.{extensionsClassName}JsonSerializerContext.Default.Options));
             }}
             return lst;
         }}
@@ -59,7 +59,7 @@ public partial class {extensionsClassName}
             foreach (var tool in tools)
             {{
                 var call = calls[tool.Name];
-                lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call));
+                lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call, global::{@interface.Namespace}.{extensionsClassName}JsonSerializerContext.Default.Options));
             }}
             return lst;
         }}

src/libs/CSharpToJsonSchema/MeaiFunction.cs

@@ -1,6 +1,8 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using Microsoft.Extensions.AI;
 
 namespace CSharpToJsonSchema;
@@ -29,6 +31,8 @@ public partial class MeaiFunction : AIFunction
     /// Gets the description of the tool.
     /// </summary>
     public override string Description => _tool.Description;
+    
+    private JsonSerializerOptions? _options;
 
     /// <summary>
     /// Gets additional properties associated with the tool.
@@ -40,7 +44,7 @@ public partial class MeaiFunction : AIFunction
     /// </summary>
     /// <param name="tool">The tool associated with this function.</param>
     /// <param name="call">The function to execute the tool with input arguments.</param>
-    public MeaiFunction(Tool tool, Func<string, CancellationToken, Task<string>> call)
+    public MeaiFunction(Tool tool, Func<string, CancellationToken, Task<string>> call, JsonSerializerOptions? options = null)
     {
         this._tool = tool;
         this._call = call;
@@ -53,7 +57,28 @@ public MeaiFunction(Tool tool, Func<string, CancellationToken, Task<string>> cal
         {
             tool.AdditionalProperties.Add("Strict", true);
         }
+
+        _options = options;
+    }
+
+    
+    #pragma warning disable IL2026, IL3050 // Reflection is used only when enabled
+    private JsonSerializerOptions InitializeReflectionOptions()
+    {
+        if(!JsonSerializer.IsReflectionEnabledByDefault)
+            throw new InvalidOperationException("JsonSerializer.IsReflectionEnabledByDefault is false, please pass in a JsonSerializerOptions instance.");
+       
+        _options = new JsonSerializerOptions()
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            PropertyNameCaseInsensitive = true,
+            Converters = { new JsonStringEnumConverter() },
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver()
+        };
+        return _options;
     }
+    #pragma warning restore IL2026, IL3050 // Reflection is used only when enabled
 
     /// <summary>
     /// Invokes the tool with the given arguments asynchronously.
@@ -76,7 +101,7 @@ public MeaiFunction(Tool tool, Func<string, CancellationToken, Task<string>> cal
     /// </summary>
     /// <param name="arguments">The arguments to be converted into a JSON string.</param>
     /// <returns>A JSON string representation of the arguments.</returns>
-    private string GetArgsString(IEnumerable<KeyValuePair<string, object?>> arguments)
+    protected virtual string GetArgsString(IEnumerable<KeyValuePair<string, object?>> arguments)
     {
         var jsonObject = new JsonObject();
 
@@ -93,6 +118,41 @@ private string GetArgsString(IEnumerable<KeyValuePair<string, object?>> argument
             }
             else if (args.Value is JsonNode node)
             {
+                jsonObject[args.Key] = node;
+            }
+            else if (args.Value is JsonValue val)
+            {
+                jsonObject[args.Key] = val;
+            }
+            else if( args.Value is JsonObject obj)
+            {
+                jsonObject[args.Key] = obj;
+            }
+            else if (args.Value is JsonArray arr)
+            {
+                jsonObject[args.Key] = arr;
+            }
+            else
+            {
+                var type = args.Value?.GetType();
+                if(type.IsPrimitive)
+                {
+                    jsonObject[args.Key] = JsonValue.Create(args.Value);
+                }
+                else
+                {
+                    if (_options == null)
+                    {  
+                        //Fallback to Reflection
+                        //This will break the AOT, Hoping for the best, IChatClient implementation only send JSON classes
+                        //Or Developer is using the code generator
+                        _options = InitializeReflectionOptions();
+                    }
+                    var typeInfo = _options.GetTypeInfo(type);
+
+                    var str = JsonSerializer.Serialize(args.Value, typeInfo);
+                    jsonObject[args.Key] = JsonNode.Parse(str);
+                }
             }
         }
 

src/tests/CSharpToJsonSchema.MeaiTests/CSharpToJsonSchema.MeaiTests.csproj

@@ -9,6 +9,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Google_GenerativeAI.Microsoft" Version="2.4.1" />
         <PackageReference Include="H.Generators.Tests.Extensions" Version="1.24.2" />
         <PackageReference Include="H.Resources.Generator" Version="1.8.0">
             <PrivateAssets>all</PrivateAssets>

src/tests/CSharpToJsonSchema.MeaiTests/Meai_Tests.cs

@@ -1,5 +1,6 @@
 using System.ClientModel;
 using CSharpToJsonSchema.MeaiTests.Services;
+using GenerativeAI.Microsoft;
 using Microsoft.Extensions.AI;
 using OpenAI;
 using OpenAI.Models;
@@ -34,7 +35,6 @@ public async Task ShouldInvokeTheFunctions()
             .Be(true);
 
         Console.WriteLine(response.Text);
-
     }
 
     //[TestMethod]
@@ -47,9 +47,10 @@ public async Task ShouldInvokeTheBookService()
 
         var client = new OpenAIClient(new ApiKeyCredential(key));
 
-        Microsoft.Extensions.AI.OpenAIChatClient openAiClient = new OpenAIChatClient(client.GetChatClient("gpt-4o-mini"));
+        //Microsoft.Extensions.AI.OpenAIChatClient openAiClient = new OpenAIChatClient(client.GetChatClient("gpt-4o-mini"));
 
-        var chatClient = new Microsoft.Extensions.AI.FunctionInvokingChatClient(openAiClient);
+        var chatClient = new GenerativeAIChatClient(Environment.GetEnvironmentVariable("GOOGLE_API_KEY",EnvironmentVariableTarget.User));
+        //var chatClient = new Microsoft.Extensions.AI.FunctionInvokingChatClient(openAiClient);
         var chatOptions = new ChatOptions();
 
         var service = new BookStoreService();
@@ -63,6 +64,5 @@ public async Task ShouldInvokeTheBookService()
             .Be(true);
 
         Console.WriteLine(response.Text);
-
     }
 }

src/tests/CSharpToJsonSchema.SnapshotTests/SnapshotTests.cs

@@ -3,11 +3,11 @@ namespace CSharpToJsonSchema.SnapshotTests;
 [TestClass]
 public class ToolTests : VerifyBase
 {
-    // [TestMethod]
-    // public Task MethodFunction()
-    // {
-    //     return this.CheckSourceAsync(H.Resources.MethodFunctionTools_cs.AsString());
-    // }
+    [TestMethod]
+    public Task MethodFunction()
+    {
+        return this.CheckSourceAsync(H.Resources.MethodFunctionTools_cs.AsString());
+    }
 
     [TestMethod]
     public Task Weather()