Update libraries and fix bugs (#41)

Author: afrise

MCPSharp.Example.OllamaChatCLI/MCPSharp.Example.OllamaChatCLI.csproj

@@ -8,10 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.3.0-preview.1.25114.11" />
+    <PackageReference Include="OllamaSharp" Version="5.2.2" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\MCPSharp.Example\MCPSharp.Example.csproj" />
     <ProjectReference Include="..\MCPSharp\MCPSharp.csproj" />
   </ItemGroup>
 

MCPSharp.Example.OllamaChatCLI/Program.cs

@@ -26,18 +26,19 @@
     Tools = clients.GetAllAIFunctions(),
     ToolMode = ChatToolMode.Auto //let the assistant choose not to use a tool if it doesn't need to
 };
-var chatHistory = new List<ChatMessage>() { new(ChatRole.System, conf.Models["ollama"].SystemPrompt) }; 
-var chatClient = new OllamaChatClient(conf.Models["ollama"].Endpoint, conf.Models["ollama"].ModelId).AsBuilder().UseFunctionInvocation().Build();
+var chatHistory = new List<ChatMessage>() { new(ChatRole.System, conf.Models["ollama"].SystemPrompt) };
+var chatClient = new OllamaSharp.OllamaApiClient(conf.Models["ollama"].Endpoint, conf.Models["ollama"].ModelId); //.AsBuilder().UseFunctionInvocation().Build();
+
 
 while (true)
 {
     Console.Write("\n\n[User] >> ");
     var input = Console.ReadLine();
     if (input == "bye") break;
-    chatHistory.Add(new ChatMessage(ChatRole.User, input));
-    var response = await chatClient.GetResponseAsync(chatHistory, chatOptions);
+    if (string.IsNullOrWhiteSpace(input)) continue;
+    var response = await chatClient.GetResponseAsync(input, chatOptions);
     Console.WriteLine($"\n\n[Assistant] {DateTime.Now.ToShortTimeString()}: {response}");
-    chatHistory.Add(response.Message);
+    chatHistory.Add(response.Messages.First());
 }
 
 class McpServerConfiguration

MCPSharp.Example/MCPSharp.Example.csproj

@@ -29,6 +29,10 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1" Version="9.0.6" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MCPSharp.ExternalExample\MCPSharp.Example.Import.csproj" />
     <ProjectReference Include="..\MCPSharp\MCPSharp.csproj" />

MCPSharp.ExternalExample/ExternalTool.cs

@@ -4,11 +4,10 @@
 namespace MCPSharp.ExternalExample
 {
 
-    [McpTool("external_tools", "for testing accessing tool classes loaded from a library")]
     public class ExternalTool
     {
 
-        [McpFunction("dll-tool", "attempts to use a tool that is loaded from an external assembly dll. should return 'success'")]
+        [McpTool("dll-tool", "attempts to use a tool that is loaded from an external assembly dll. should return 'success'")]
         public static async Task<string> UseAsync() 
         {
             return await Task.Run(()=>"success");

MCPSharp.ExternalExample/MCPSharp.Example.Import.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

MCPSharp.Test/AIFunctionAbstractionTests.cs

@@ -37,7 +37,13 @@ public async Task TestInvokingAnAIFunctionWithParameters()
             var function = functions.First(f => f.Name == "Echo");
             var Schema = function.JsonSchema;
             Console.WriteLine(Schema);
-            CallToolResult result = (CallToolResult)(await function.InvokeAsync(new Dictionary<string, object?> { { "input", "hello there" } }))!;
+
+            AIFunctionArguments keyValuePairs = new()
+            {
+                { "input", "hello there" }
+            };
+
+            CallToolResult result = (CallToolResult)(await function.InvokeAsync(keyValuePairs))!;
 
             Assert.IsFalse(result.IsError);
 

MCPSharp.Test/MCPSharp.Test.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.8.2" />
+    <PackageReference Include="MSTest" Version="3.9.3" />
   </ItemGroup>
 
   <ItemGroup>

MCPSharp/Core/MCPFunction.cs

@@ -48,7 +48,7 @@ public class MCPFunction(Tool tool, MCPClient client) : AIFunction()
         public override JsonElement JsonSchema => JsonSerializer.SerializeToElement(new MCPFunctionInputSchema(_tool.Name, _tool.Description, _tool.InputSchema));
 
 
-        protected override async Task<object> InvokeCoreAsync(IEnumerable<KeyValuePair<string, object>> arguments, CancellationToken cancellationToken)
+        protected override async ValueTask<object> InvokeCoreAsync(AIFunctionArguments arguments, CancellationToken cancellationToken)
         {
             return await _client.CallToolAsync(_tool.Name, arguments.ToDictionary(p => p.Key, p => p.Value));
         }

MCPSharp/MCPSharp.csproj

@@ -79,14 +79,15 @@ await client.CallToolAsync("echo", new Dictionary<string, object>{{"input"
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.3.0-preview.1.25114.11" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
-    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.38.0" />
+    <PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.6.0" />
+    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.57.0" />
     <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StreamJsonRpc" Version="2.21.10" />
+    <PackageReference Include="StreamJsonRpc" Version="2.22.11" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

MCPSharp/Model/MetaData.cs

@@ -11,6 +11,6 @@ public class MetaData
         /// Gets or sets the progress token.
         /// </summary>
         [JsonPropertyName("progressToken")]
-        public int ProgressToken { get; set; } = 0;
+        public string ProgressToken { get; set; } = "";
     }
 }