fixes for function calling

KSemenenko · KSemenenko · commit fb631930a659 · 2025-02-24T11:56:08.000+01:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -28,10 +28,10 @@ jobs:
         run: dotnet restore
       
       - name: Build
-        run: dotnet build --no-restore
+        run: dotnet build --no-restore --configuration Release
       
       - name: Test and Collect Code Coverage
-        run: dotnet test -p:CollectCoverage=true -p:CoverletOutput=coverage/
+        run: dotnet test --configuration Release  -p:CollectCoverage=true -p:CoverletOutput=coverage/
 
       - name: Copy coverage files 
         run: |
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,8 +25,8 @@
         <RepositoryUrl>https://github.com/managedcode/together-dotnet</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/together-dotnet</PackageProjectUrl>
         <Product>Together.AI .NET/C# SDK</Product>
-        <Version>0.0.1</Version>
-        <PackageVersion>0.0.1</PackageVersion>
+        <Version>0.0.2</Version>
+        <PackageVersion>0.0.2</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/Together.SemanticKernel/Services/TogetherChatCompletionService.cs b/Together.SemanticKernel/Services/TogetherChatCompletionService.cs
@@ -60,7 +60,7 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
                     Stream = false
                 };
 
-                var toolConfig = GetToolConfiguration(kernel, executionSettings, requestIndex);
+                var toolConfig = GetToolConfiguration(kernel, chatHistory, executionSettings, requestIndex);
                 if (toolConfig.HasTools)
                 {
                     ConfigureTools(kernel, request);
@@ -81,13 +81,13 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
                 }
 
                 var result = response.Choices.First();
-                var messageContent = CreateChatMessageContent(new ChatCompletionMessage
+                var message = new ChatCompletionMessage
                 {
                     Role = result.Message.Role,
                     Content = result.Message.Content,
                     ToolCalls = result.Message
                         .ToolCalls
-                        .Select(t => new ToolCall
+                        ?.Select(t => new ToolCall
                         {
                             Id = t.Id,
                             Type = t.Type,
@@ -98,27 +98,34 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
                             }
                         })
                         .ToList()
-                });
-
+                };
+                
+                var messageContent = CreateChatMessageContent(message);
+                
                 // If no tool calls or no auto-invoke, return response
                 if (!toolConfig.AutoInvoke || result.Message.ToolCalls?.Any() != true)
                 {
-                    return new[] { messageContent };
+                    return [messageContent];
                 }
+                
+                //add history
+                chatHistory.Add(messageContent);
 
                 // Process tool calls asynchronously
                 foreach (var toolCall in result.Message.ToolCalls)
                 {
-                    if (!await ProcessToolCallAsync(new ToolCall
+                    var process = await ProcessToolCallAsync(new ToolCall
+                    {
+                        Id = toolCall.Id,
+                        Type = toolCall.Type,
+                        Function = new FunctionCall
                         {
-                            Id = toolCall.Id,
-                            Type = toolCall.Type,
-                            Function = new FunctionCall
-                            {
-                                Name = toolCall.Function.Name,
-                                Arguments = toolCall.Function.Arguments
-                            }
-                        }, kernel, chatHistory, cancellationToken))
+                            Name = toolCall.Function.Name,
+                            Arguments = toolCall.Function.Arguments
+                        }
+                    }, kernel, chatHistory, cancellationToken);
+                    
+                    if (!process)
                     {
                         _logger.LogWarning("Failed to process tool call: {ToolCall}", toolCall.Function?.Name);
                     }
@@ -221,7 +228,7 @@ private async Task<bool> ProcessToolCallAsync(ToolCall toolCall, Kernel? kernel,
             // Await asynchronous function invocation instead of using .Result
             var result = await function.InvokeAsync(kernel, args, cancellationToken);
 
-            chatHistory.Add(new ChatMessageContent(AuthorRole.Tool, result.GetValue<string>(),
+            chatHistory.Add(new ChatMessageContent(AuthorRole.Tool, result.ToString(),
                 metadata: new Dictionary<string, object?> { { "tool_call_id", toolCall.Id } }));
 
             return true;
@@ -247,7 +254,7 @@ private KernelArguments ParseArguments(string argumentJson)
         }
     }
 
-    private ToolConfiguration GetToolConfiguration(Kernel? kernel, PromptExecutionSettings? settings, int requestIndex)
+    private ToolConfiguration GetToolConfiguration(Kernel? kernel, ChatHistory chatHistory, PromptExecutionSettings? settings, int requestIndex)
     {
         if (kernel == null)
         {
@@ -262,6 +269,17 @@ private ToolConfiguration GetToolConfiguration(Kernel? kernel, PromptExecutionSe
         {
             return new ToolConfiguration(false, false, 0);
         }
+        
+        if(settings is TogetherPromptExecutionSettings togetherSettings)
+        {
+            var call = togetherSettings.FunctionChoiceBehavior?.GetConfiguration(new FunctionChoiceBehaviorConfigurationContext(chatHistory)
+            {
+                Kernel = kernel
+            });
+            return new ToolConfiguration(hasTools, call?.AutoInvoke ?? false, 1);
+        }
+        
+        //TODO: check type of settings
 
         // Check execution settings
         var autoInvoke = false;
@@ -353,10 +371,11 @@ private void ConfigureTools(Kernel kernel, ChatCompletionRequest request)
             })
             .ToList();
 
+        
         request.ToolChoice = new ToolChoice
         {
             Type = "auto",
-            Function = new FunctionToolChoice { Name = "auto" }
+            Function = new FunctionToolChoice { Name = "auto" },
         };
     }
 
diff --git a/Together.SemanticKernel/Together.SemanticKernel.csproj b/Together.SemanticKernel/Together.SemanticKernel.csproj
@@ -9,7 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.36.1"/>
+        <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.38.0" />
     </ItemGroup>
 
 
diff --git a/Together.Tests/SemanticKernelIntegraionTests.cs b/Together.Tests/SemanticKernelIntegraionTests.cs
@@ -16,6 +16,10 @@ public class SemanticKernelIntegraionTests
     private static readonly string API_KEY = "API_KEY";
 
 
+    private string TextModel = "mistralai/Mistral-7B-Instruct-v0.1";//"meta-llama/Llama-3.3-70B-Instruct-Turbo";
+    private string ImageModel = "black-forest-labs/FLUX.1-dev";
+    private string EmbeddedModel = "togethercomputer/m2-bert-80M-2k-retrieval";
+
     [Fact
 #if !API_TEST
             (Skip = "This test is skipped because it requires a valid API key")
@@ -25,7 +29,7 @@ public class SemanticKernelIntegraionTests
     public async Task InvokeOpenAiPromptAsyncTest()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddOpenAIChatCompletion("meta-llama/Meta-Llama-3-70B-Instruct-Turbo", new Uri("https://api.together.xyz/v1"), API_KEY)
+            .AddOpenAIChatCompletion(TextModel, new Uri("https://api.together.xyz/v1"), API_KEY)
             .Build();
 
         var answer = await kernel.InvokePromptAsync("Hi");
@@ -38,10 +42,10 @@ public async Task InvokeOpenAiPromptAsyncTest()
 #endif
     ]
     [Experimental("SKEXP0010")]
-    public async Task FunctionCallTest()
+    public async Task OpenAIFunctionCallTest()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddOpenAIChatCompletion("mistralai/Mistral-7B-Instruct-v0.1", new Uri("https://api.together.xyz/v1"), API_KEY)
+            .AddOpenAIChatCompletion(TextModel, new Uri("https://api.together.xyz/v1"), API_KEY)
             .Build();
 
         var call = false;
@@ -64,6 +68,39 @@ public async Task FunctionCallTest()
         answer.RenderedPrompt.ShouldNotBeEmpty();
         call.ShouldBeTrue();
     }
+    
+    [Fact
+#if !API_TEST
+            (Skip = "This test is skipped because it requires a valid API key")
+#endif
+    ]
+    [Experimental("SKEXP0010")]
+    public async Task FunctionCallTest()
+    {
+        var kernel = Kernel.CreateBuilder()
+            .AddTogetherChatCompletion(TextModel, API_KEY)
+            .Build();
+
+        var call = false;
+
+        kernel.Plugins.AddFromFunctions("time_plugin", [
+            KernelFunctionFactory.CreateFromMethod(() =>
+            {
+                call = true;
+                return DateTime.Now;
+            }, "get_time", "Get the current time")
+        ]);
+
+        var message = await kernel.GetRequiredService<IChatCompletionService>()
+            .GetChatMessageContentAsync("What is the current time?", new TogetherPromptExecutionSettings
+            {
+                FunctionChoiceBehavior = FunctionChoiceBehavior.Auto()
+            }, kernel);
+
+        var answer = await kernel.InvokePromptAsync("What is the current time?");
+        answer.RenderedPrompt.ShouldNotBeEmpty();
+        call.ShouldBeTrue();
+    }
 
     [Fact
 #if !API_TEST
@@ -73,7 +110,7 @@ public async Task FunctionCallTest()
     public async Task InvokePromptAsyncTest()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddTogetherChatCompletion("mistralai/Mistral-7B-Instruct-v0.1", API_KEY)
+            .AddTogetherChatCompletion(TextModel, API_KEY)
             .Build();
 
         var answer = await kernel.InvokePromptAsync("Hi");
@@ -88,28 +125,47 @@ public async Task InvokePromptAsyncTest()
     public async Task CompletionTest()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddTogetherChatCompletion("mistralai/Mistral-7B-Instruct-v0.1", API_KEY)
+            .AddTogetherChatCompletion(TextModel, API_KEY)
             .Build();
 
-        var call = false;
+        var call1 = false;
+        var call2 = false;
 
         kernel.Plugins.AddFromFunctions("time_plugin", [
             KernelFunctionFactory.CreateFromMethod(() =>
             {
-                call = true;
+                call1 = true;
                 return DateTime.Now;
             }, "get_time", "Get the current time")
         ]);
+        kernel.Plugins.AddFromFunctions("news_plugin", [
+            KernelFunctionFactory.CreateFromMethod((string day) =>
+            {
+                call2 = true;
+                return $"Today is {day}, and we have 5 news items.";
+            }, "get_news_for_day", "get news for specific day")
+        ]);
 
-        var message = await kernel.GetRequiredService<IChatCompletionService>()
-            .GetChatMessageContentAsync("What is the current time?", new OpenAIPromptExecutionSettings
+        var message1 = await kernel.GetRequiredService<IChatCompletionService>()
+            .GetChatMessageContentAsync("What is the current time?", new TogetherPromptExecutionSettings
+            {
+                FunctionChoiceBehavior = FunctionChoiceBehavior.Auto()
+            }, kernel);
+        
+        var message2 = await kernel.GetRequiredService<IChatCompletionService>()
+            .GetChatMessageContentAsync("how many news we have for monday?", new TogetherPromptExecutionSettings
             {
                 FunctionChoiceBehavior = FunctionChoiceBehavior.Auto()
             }, kernel);
 
-        var answer = await kernel.InvokePromptAsync("What is the current time?");
-        answer.RenderedPrompt.ShouldNotBeEmpty();
-        call.ShouldBeTrue();
+        var answer1 = await kernel.InvokePromptAsync("What is the current time?");
+        var answer2 = await kernel.InvokePromptAsync("how many news we have for monday?");
+        message1.Content.ShouldNotBeEmpty();
+        message2.Content.ShouldNotBeEmpty();
+        answer1.Metadata.Count.ShouldBePositive();
+        answer2.Metadata.Count.ShouldBePositive();
+        call1.ShouldBeTrue();
+        call2.ShouldBeTrue();
     }
 
     [Fact
@@ -121,7 +177,7 @@ public async Task CompletionTest()
     public async Task ImageTest()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddTogetherTextToImage("black-forest-labs/FLUX.1-dev", API_KEY)
+            .AddTogetherTextToImage(ImageModel, API_KEY)
             .Build();
 
 
@@ -152,7 +208,7 @@ public async Task ImageTest()
     public async Task Embedded()
     {
         var kernel = Kernel.CreateBuilder()
-            .AddTogetherTextEmbeddingGeneration("togethercomputer/m2-bert-80M-2k-retrieval", API_KEY)
+            .AddTogetherTextEmbeddingGeneration(EmbeddedModel, API_KEY)
             .Build();
 
 
diff --git a/Together.Tests/Together.Tests.csproj b/Together.Tests/Together.Tests.csproj
@@ -5,14 +5,18 @@
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <DefineConstants>TRACE; API_TEST</DefineConstants>
+    </PropertyGroup>
     
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
-        <PackageReference Include="Microsoft.SemanticKernel" Version="1.36.1"/>
+        <PackageReference Include="Microsoft.SemanticKernel" Version="1.38.0" />
         <PackageReference Include="Shouldly" Version="4.3.0"/>
         <PackageReference Include="System.Linq.Async" Version="6.0.1"/>
         <PackageReference Include="xunit" Version="2.9.3"/>
diff --git a/Together.Tests/TogetherClientIntegraionTests.cs b/Together.Tests/TogetherClientIntegraionTests.cs
@@ -11,6 +11,10 @@ public class TogetherClientIntegraionTests
 {
     private static readonly string API_KEY = "API_KEY";
 
+    private string TextModel = "meta-llama/Llama-3.3-70B-Instruct-Turbo";
+    private string ImageModel = "black-forest-labs/FLUX.1-dev";
+    private string EmbeddedModel = "togethercomputer/m2-bert-80M-2k-retrieval";
+    
     private TogetherClient CreateTogetherClient()
     {
         return new TogetherClient(API_KEY);
@@ -29,7 +33,7 @@ public async Task CompletionTest()
         var responseAsync = await client.Completions.CreateAsync(new CompletionRequest
         {
             Prompt = "Hi",
-            Model = "meta-llama/Meta-Llama-3-70B-Instruct-Turbo",
+            Model = TextModel,
             MaxTokens = 20
         });
 
@@ -56,7 +60,7 @@ public async Task ChatCompletionTest()
                     Content = "Hi"
                 }
             },
-            Model = "meta-llama/Meta-Llama-3-70B-Instruct-Turbo",
+            Model = TextModel,
             MaxTokens = 20
         });
 
@@ -84,7 +88,7 @@ public async Task StreamChatCompletionTest()
                         Content = "Hi"
                     }
                 },
-                Model = "meta-llama/Meta-Llama-3-70B-Instruct-Turbo",
+                Model = TextModel,
                 MaxTokens = 20,
                 Stream = true
             })
@@ -107,7 +111,7 @@ public async Task EmbeddingTest()
         var responseAsync = await client.Embeddings.CreateAsync(new EmbeddingRequest
         {
             Input = "Hi",
-            Model = "togethercomputer/m2-bert-80M-2k-retrieval"
+            Model = EmbeddedModel
         });
 
         Assert.NotNull(responseAsync.Data);
@@ -124,7 +128,7 @@ public async Task ImageTest()
 
         var responseAsync = await client.Images.GenerateAsync(new ImageRequest
         {
-            Model = "black-forest-labs/FLUX.1-dev",
+            Model = ImageModel,
             Prompt = "Cats eating popcorn",
             N = 1,
             Steps = 10,
diff --git a/Together/Clients/BaseClient.cs b/Together/Clients/BaseClient.cs
diff --git a/Together/Models/ChatCompletions/ChatCompletionMessage.cs b/Together/Models/ChatCompletions/ChatCompletionMessage.cs
