Merge pull request #1010 from iceljc/test/realtime-test

Test/realtime test

Author: Oceania2018

Directory.Packages.props

@@ -111,10 +111,10 @@
     <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />  
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.5" /> 
-    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.1.0-preview.5" />
+    <PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.8" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.1.0-preview.8" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="BotSharp.Core" Version="$(BotSharpVersion)" />

src/Infrastructure/BotSharp.Abstraction/Functions/IFunctionCallback.cs

@@ -2,6 +2,7 @@ namespace BotSharp.Abstraction.Functions;
 
 public interface IFunctionCallback
 {
+    string Provider => "Botsharp";
     string Name { get; }
 
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/MCP/Models/McpServerConfigModel.cs

@@ -12,22 +12,21 @@ public class McpServerConfigModel
     /// </summary>
     public string Name { get; set; } = null!;
 
-    /// <summary>
-    /// The type of transport to use.
-    /// </summary>
-    [JsonPropertyName("transport_type")]
-    public string TransportType { get; set; } = null!;
-
-    /// <summary>
-    /// For stdio transport: path to the executable
-    /// For HTTP transport: base URL of the server
-    /// </summary>
-    public string? Location { get; set; }
+    public McpSseServerConfig? SseConfig { get; set; }
+    public McpStdioServerConfig? StdioConfig { get; set; }
+}
 
-    /// <summary>
-    /// Additional transport-specific configuration.
-    /// </summary>
-    [JsonPropertyName("transport_options")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public Dictionary<string, string>? TransportOptions { get; set; }
+public class McpSseServerConfig
+{
+    public string EndPoint { get; set; } = null!;
+    public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);
+    public Dictionary<string, string>? AdditionalHeaders { get; set; }
 }
+
+public class McpStdioServerConfig
+{
+    public string Command { get; set; } = null!;
+    public IList<string>? Arguments { get; set; }
+    public Dictionary<string, string>? EnvironmentVariables { get; set; }
+    public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(5);
+}

src/Infrastructure/BotSharp.Abstraction/MCP/Models/McpServerOptionModel.cs

@@ -0,0 +1,19 @@
+namespace BotSharp.Abstraction.MCP.Models;
+
+public class McpServerOptionModel : IdName
+{
+    public IEnumerable<string> Tools { get; set; } = [];
+
+    public McpServerOptionModel() : base()
+    {
+        
+    }
+
+    public McpServerOptionModel(
+        string id,
+        string name,
+        IEnumerable<string> tools) : base(id, name)
+    {
+        Tools = tools ?? [];
+    }
+}

src/Infrastructure/BotSharp.Abstraction/MCP/Services/IMcpService.cs

@@ -2,5 +2,5 @@ namespace BotSharp.Abstraction.MCP.Services;
 
 public interface IMcpService
 {
-    IEnumerable<McpServerConfigModel> GetServerConfigs() => [];
+    IEnumerable<McpServerOptionModel> GetServerConfigs() => [];
 }

src/Infrastructure/BotSharp.Abstraction/Models/IdName.cs

@@ -8,6 +8,11 @@ public class IdName
     [JsonPropertyName("name")]
     public string Name { get; set; } = default!;
 
+    public IdName()
+    {
+        
+    }
+
     public IdName(string id, string name)
     {
         Id = id;

src/Infrastructure/BotSharp.Abstraction/Models/MessageState.cs

@@ -3,7 +3,7 @@ namespace BotSharp.Abstraction.Models;
 public class MessageState
 {
     public string Key { get; set; }
-    public string Value { get; set; }
+    public object Value { get; set; }
 
     [JsonPropertyName("active_rounds")]
     public int ActiveRounds { get; set; } = -1;
@@ -13,7 +13,7 @@ public MessageState()
 
     }
 
-    public MessageState(string key, string value, int activeRounds = -1)
+    public MessageState(string key, object value, int activeRounds = -1)
     {
         Key = key;
         Value = value;

src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeHubConnection.cs

@@ -13,6 +13,7 @@ public class RealtimeHubConnection
     public Func<string, string> OnModelMessageReceived { get; set; } = null!;
     public Func<string> OnModelAudioResponseDone { get; set; } = null!;
     public Func<string> OnModelUserInterrupted { get; set; } = null!;
+    public Func<string> OnUserSpeechDetected { get; set; } = () => string.Empty;
 
     public void ResetResponseState()
     {

src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs

@@ -108,4 +108,27 @@ public static bool IsPrimitiveValue(this string value)
                uint.TryParse(value, out _) ||
                ulong.TryParse(value, out _);
     }
+
+
+    public static string ConvertToString<T>(this T? value, JsonSerializerOptions? jsonOptions = null)
+    {
+        if (value == null)
+        {
+            return string.Empty;
+        }
+
+        if (value is string s)
+        {
+            return s;
+        }
+
+        if (value is JsonElement elem
+            && elem.ValueKind == JsonValueKind.String)
+        {
+            return elem.ToString();
+        }
+
+        var str = JsonSerializer.Serialize(value, jsonOptions);
+        return str;
+    }
 }

src/Infrastructure/BotSharp.Core.MCP/BotSharpMCPExtensions.cs

@@ -4,7 +4,6 @@
 using BotSharp.Core.MCP.Services;
 using BotSharp.Core.MCP.Settings;
 using Microsoft.Extensions.Configuration;
-using ModelContextProtocol;
 using ModelContextProtocol.Client;
 
 namespace BotSharp.Core.MCP;
@@ -21,7 +20,7 @@ public static IServiceCollection AddBotSharpMCP(this IServiceCollection services
     {
         services.AddScoped<IMcpService, McpService>();
         var settings = config.GetSection("MCP").Get<McpSettings>();
-        services.AddScoped(provider => { return settings; });
+        services.AddScoped(provider => settings);
 
         if (settings != null && settings.Enabled && !settings.McpServerConfigs.IsNullOrEmpty())
         {
@@ -42,18 +41,18 @@ public static IServiceCollection AddBotSharpMCP(this IServiceCollection services
         return services;
     }
 
-    private static async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server, McpClientManager clientManager)
+    private static async Task RegisterFunctionCall(IServiceCollection services, McpServerConfigModel server, McpClientManager clientManager)
     {
         var client = await clientManager.GetMcpClientAsync(server.Id);
         var tools = await client.ListToolsAsync();
 
         foreach (var tool in tools)
         {
-            services.AddScoped(provider => { return tool; });
+            services.AddScoped(provider => tool);
 
             services.AddScoped<IFunctionCallback>(provider =>
             {
-                var funcTool = new McpToolAdapter(provider, tool, clientManager);
+                var funcTool = new McpToolAdapter(provider, server.Name, tool, clientManager);
                 return funcTool;
             });
         }