fix: Functions without parameters (#31)

* fix: Functions without parameters

Co-authored-by: Gunpal Jain <[email protected]>

Author: gunpal5

src/libs/CSharpToJsonSchema/SchemaSubsetHelper.cs

@@ -9,9 +9,10 @@ namespace CSharpToJsonSchema;
 
 public static class SchemaBuilder
 {
-   
-    public static OpenApiSchema ConvertToSchema(JsonTypeInfo type, string descriptionString)
+    public static OpenApiSchema? ConvertToSchema(JsonTypeInfo type, string descriptionString)
     {
+        if (type.Properties.Count == 0)
+            return null;
         var typeInfo = type;
 
         var dics = JsonSerializer.Deserialize(descriptionString,
@@ -26,33 +27,35 @@ public static OpenApiSchema ConvertToSchema(JsonTypeInfo type, string descriptio
                     {
                         schema["type"] = "string";
                     }
-                
+
                     ExtractDescription(context, schema, dics);
                     if (context.PropertyInfo == null)
                         return schema;
-               
+
                     return schema;
                 },
             });
-        
+
         var schema = JsonSerializer.Deserialize(x.ToJsonString(), OpenApiSchemaJsonContext.Default.OpenApiSchema);
 
         foreach (var re in schema.Properties)
         {
             required.Add(re.Key);
         }
-       
+
         var mainDescription = schema.Description ?? (dics.TryGetValue("mainFunction_Desc", out var desc) ? desc : "");
-        return new OpenApiSchema()
-        {
-            Description = mainDescription,
-            Properties = schema.Properties,
-            Required = required,
-            Type = "object"
-        };
+        return
+            new OpenApiSchema()
+            {
+                Description = mainDescription,
+                Properties = schema.Properties,
+                Required = required,
+                Type = "object"
+            };
     }
-    
-    private static void ExtractDescription(JsonSchemaExporterContext context, JsonNode schema, IDictionary<string, string> dics)
+
+    private static void ExtractDescription(JsonSchemaExporterContext context, JsonNode schema,
+        IDictionary<string, string> dics)
     {
         // Determine if a type or property and extract the relevant attribute provider.
         ICustomAttributeProvider? attributeProvider = context.PropertyInfo is not null
@@ -76,22 +79,22 @@ private static void ExtractDescription(JsonSchemaExporterContext context, JsonNo
         }
 
         FixType(schema);
-        
+
         // Apply description attribute to the generated schema.
         if (description is not null)
         {
             if (schema is not JsonObject jObj)
             {
                 // Handle the case where the schema is a Boolean.
                 JsonValueKind valueKind = schema.GetValueKind();
-                
+
                 schema = jObj = new JsonObject();
                 if (valueKind is JsonValueKind.False)
                 {
                     jObj.Add("not", true);
                 }
             }
-            
+
             jObj.Insert(0, "description", description);
         }
     }
@@ -100,7 +103,7 @@ private static void FixType(JsonNode schema)
     {
         // If "type" is an array, remove "null" and collapse if it leaves only one type
         var typeValue = schema["type"];
-        if (typeValue!= null && typeValue is JsonArray array)
+        if (typeValue != null && typeValue is JsonArray array)
         {
             if (array.Count == 2)
             {
@@ -123,6 +126,7 @@ private static void FixType(JsonNode schema)
             }
         }
     }
+
     public static string ToCamelCase(string str)
     {
         if (!string.IsNullOrEmpty(str) && str.Length > 1)

src/tests/CSharpToJsonSchema.AotTests/MethodFunctionTools_Tests.cs

@@ -10,7 +10,6 @@ public async Task Should_SampleFunctionTool_StringAsync()
         var value = await tools.CallAsync(nameof(mf.SampleFunctionTool_StringAsync), "{\"input\":\"test\"}");
 
         Assert.Equal(value, "\"Hello world\"");
-        
     }
 
     [Fact]
@@ -72,7 +71,20 @@ public async Task Should_SampleFunctionTool_Static_Void()
     {
         var tools = new Tools([MethodFunctionTools.SampleFunctionTool_Static_Void]);
         await tools.CallAsync(nameof(MethodFunctionTools.SampleFunctionTool_Static_Void), "{\"input\":\"test\"}");
-       
+    }
+    
+    [Fact]
+    public async Task Should_SampleFunctionTool_Static_No_Parameters()
+    {
+        var tools = new Tools([MethodFunctionTools.SampleFunctionTool_Static_No_Parameters]);
+        await tools.CallAsync(nameof(MethodFunctionTools.SampleFunctionTool_Static_No_Parameters), "{}");
+    }
+    
+    [Fact]
+    public async Task Should_SampleFunctionTool_No_Parameters()
+    {
+        var tools = new Tools([MethodFunctionTools.SampleFunctionTool_No_Parameters]);
+        await tools.CallAsync(nameof(MethodFunctionTools.SampleFunctionTool_No_Parameters), "{}");
     }
 
 }

src/tests/CSharpToJsonSchema.AotTests/Services/MethodFunctionTools.cs

@@ -52,4 +52,15 @@ public static string SampleFunctionTool_Static_String(string input)
     {
         return "Hello world from string return";
     }
+    
+    [FunctionTool]
+    public static string SampleFunctionTool_Static_No_Parameters()
+    {
+        return "Hello world from string return";
+    }
+    [FunctionTool]
+    public static string SampleFunctionTool_No_Parameters()
+    {
+        return "Hello world from string return";
+    }
 }

src/tests/CSharpToJsonSchema.IntegrationTests/MethodFunctionTools.cs

@@ -53,6 +53,8 @@ public string SampleFunctionTool_Static_String(string input)
     {
         return "Hello world from string return";
     }
+    
+    
 
 
 

src/tests/CSharpToJsonSchema.MeaiTests/Meai_Tests.cs

@@ -37,6 +37,60 @@ public async Task ShouldInvokeTheFunctions()
         Console.WriteLine(response.Text);
     }
 
+   // [TestMethod]
+    public async Task ShouldInvokeTheFunctions_NoParameters()
+    {
+        var key = Environment.GetEnvironmentVariable("OPEN_AI_APIKEY",EnvironmentVariableTarget.User);
+        if (string.IsNullOrWhiteSpace(key))
+            return;
+        
+        var client = new OpenAIClient(new ApiKeyCredential(key));
+
+        Microsoft.Extensions.AI.OpenAIChatClient openAiClient = new OpenAIChatClient(client.GetChatClient("gpt-4o-mini"));
+
+        var chatClient = new Microsoft.Extensions.AI.FunctionInvokingChatClient(openAiClient);
+        var chatOptions = new ChatOptions();
+
+        var service = new StudentRecordService();
+        var tools = new Tools([service.GetStudentsListAsync]);
+        chatOptions.Tools = tools.AsMeaiTools();
+        
+        var message = new ChatMessage(ChatRole.User, "Get all students records");
+        var response = await chatClient.GetResponseAsync(message,options:chatOptions).ConfigureAwait(false);
+
+        response.Text.Contains("John", StringComparison.InvariantCultureIgnoreCase).Should()
+            .Be(true);
+        
+        Console.WriteLine(response.Text);
+    }
+    
+    //[TestMethod]
+    public async Task ShouldInvokeTheFunctions_NoParameters2()
+    {
+        var key = Environment.GetEnvironmentVariable("OPEN_AI_APIKEY",EnvironmentVariableTarget.User);
+        if (string.IsNullOrWhiteSpace(key))
+            return;
+        
+        var client = new OpenAIClient(new ApiKeyCredential(key));
+
+        Microsoft.Extensions.AI.OpenAIChatClient openAiClient = new OpenAIChatClient(client.GetChatClient("gpt-4o-mini"));
+
+        var chatClient = new Microsoft.Extensions.AI.FunctionInvokingChatClient(openAiClient);
+        var chatOptions = new ChatOptions();
+
+        var service = new StudentRecordService();
+        var tools = new Tools([service.GetStudentsList2]);
+        chatOptions.Tools = tools.AsMeaiTools();
+        
+        var message = new ChatMessage(ChatRole.User, "Get all students records");
+        var response = await chatClient.GetResponseAsync(message,options:chatOptions).ConfigureAwait(false);
+
+        response.Text.Contains("John", StringComparison.InvariantCultureIgnoreCase).Should()
+            .Be(true);
+        
+        Console.WriteLine(response.Text);
+    }
+    
     //[TestMethod]
     public async Task ShouldInvokeTheBookService()
     {
@@ -63,6 +117,34 @@ public async Task ShouldInvokeTheBookService()
         response.Text.Contains("damdamadum", StringComparison.InvariantCultureIgnoreCase).Should()
             .Be(true);
 
+        Console.WriteLine(response.Text);
+    }
+   // [TestMethod]
+    public async Task ShouldInvokeTheBookService_NoParameters()
+    {
+        var key = Environment.GetEnvironmentVariable("OPEN_AI_APIKEY",EnvironmentVariableTarget.User);
+        if (string.IsNullOrWhiteSpace(key))
+            return;
+        var prompt = "Get list of available books";
+        
+        var chatClient = new OpenAIClient(new ApiKeyCredential(key)).AsChatClient("gpt-4o-mini").AsBuilder().UseFunctionInvocation().Build();
+
+        //Microsoft.Extensions.AI.OpenAIChatClient openAiClient = new OpenAIChatClient(client.GetChatClient("gpt-4o-mini"));
+
+        //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();
+        
+        chatOptions.Tools = service.AsMeaiTools();
+        
+        var message = new ChatMessage(ChatRole.User, prompt);
+        var response = await chatClient.GetResponseAsync(message,options:chatOptions).ConfigureAwait(false);
+
+        response.Text.Contains("Five point someone", StringComparison.InvariantCultureIgnoreCase).Should()
+            .Be(true);
+        
         Console.WriteLine(response.Text);
     }
 }

src/tests/CSharpToJsonSchema.MeaiTests/Services/BookService.cs

@@ -17,6 +17,8 @@ public interface IBookStoreService
 
     [Description("Get book page content")]
     public Task<string> GetBookPageContentAsync([Description("Book Name")] string bookName, [Description("Book Page Number")] int bookPageNumber, CancellationToken cancellationToken = default);
+    [Description("Get List of Books")]
+    public Task<List<GetAuthorBook>> GetBooksAsync(CancellationToken cancellationToken = default);
 
 }
 public class BookStoreService : IBookStoreService
@@ -35,4 +37,9 @@ public Task<string> GetBookPageContentAsync(string bookName, int bookPageNumber,
     {
         return Task.FromResult("this is a cool weather out there, and I am stuck at home.");
     }
+
+    public Task<List<GetAuthorBook>> GetBooksAsync(CancellationToken cancellationToken = default)
+    {
+        return Task.FromResult(new List<GetAuthorBook>(){new GetAuthorBook(){Title = "Five point someone", Description = "This book is about 3 college friends"},new GetAuthorBook(){Title = "Two States", Description = "This book is about intercast marriage in India"}});
+    }
 }