refine message hub

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -120,7 +120,7 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsStreaming { get; set; }
 
-    private RoleDialogModel()
+    public RoleDialogModel()
     {
     }
 

src/Infrastructure/BotSharp.Abstraction/MessageHub/Models/HubObserveData.cs

@@ -1,7 +1,7 @@
 namespace BotSharp.Abstraction.MessageHub.Models;
 
-public class HubObserveData : ObserveDataBase
+public class HubObserveData<TData> : ObserveDataBase where TData : class, new()
 {
     public string EventName { get; set; } = null!;
-    public RoleDialogModel Data { get; set; } = null!;
+    public TData Data { get; set; } = null!;
 }

src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs

@@ -44,7 +44,7 @@ public class ConversationPlugin : IBotSharpPlugin, IBotSharpAppPlugin
             return settingService.Bind<GoogleApiSettings>("GoogleApi");
         });
 
-        services.AddSingleton<MessageHub<HubObserveData>>();
+        services.AddSingleton<MessageHub<HubObserveData<RoleDialogModel>>>();
 
         services.AddScoped<IConversationStorage, ConversationStorage>();
         services.AddScoped<IConversationService, ConversationService>();
@@ -72,8 +72,8 @@ public class ConversationPlugin : IBotSharpPlugin, IBotSharpAppPlugin
     public void Configure(IApplicationBuilder app)
     {
         var services = app.ApplicationServices;
-        var queue = services.GetRequiredService<MessageHub<HubObserveData>>();
-        var logger = services.GetRequiredService<ILogger<MessageHub<HubObserveData>>>();
+        var queue = services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
+        var logger = services.GetRequiredService<ILogger<MessageHub<HubObserveData<RoleDialogModel>>>>();
         queue.Events.Subscribe(new ConversationObserver(logger));
     }
 }

src/Infrastructure/BotSharp.Core/Demo/Functions/GetWeatherFn.cs

@@ -18,7 +18,7 @@ public class GetWeatherFn : IFunctionCallback
     public async Task<bool> Execute(RoleDialogModel message)
     {
         var conv = _services.GetRequiredService<IConversationService>();
-        var messageHub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var messageHub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
 
         await Task.Delay(1000);
 

src/Infrastructure/BotSharp.Core/MessageHub/MessageHub.cs

@@ -2,7 +2,7 @@ using System.Reactive.Subjects;
 
 namespace BotSharp.Core.MessageHub;
 
-public class MessageHub<T> where T : class
+public class MessageHub<T> where T : class, new()
 {
     private readonly ILogger<MessageHub<T>> _logger;
     private readonly ISubject<T> _observable = Subject.Synchronize(new Subject<T>());

src/Infrastructure/BotSharp.Core/MessageHub/Observers/ConversationObserver.cs

@@ -1,6 +1,6 @@
 namespace BotSharp.Core.MessageHub.Observers;
 
-public class ConversationObserver : IObserver<HubObserveData>
+public class ConversationObserver : IObserver<HubObserveData<RoleDialogModel>>
 {
     private readonly ILogger _logger;
     private IServiceProvider _services;
@@ -20,11 +20,11 @@ public class ConversationObserver : IObserver<HubObserveData>
         _logger.LogError(error, $"{nameof(ConversationObserver)} receives error notification: {error.Message}");
     }
 
-    public void OnNext(HubObserveData value)
+    public void OnNext(HubObserveData<RoleDialogModel> value)
     {
         _services = value.ServiceProvider;
-
         var progress = _services.GetRequiredService<IConversationProgressService>();
+
         if (value.EventName == ChatEvent.OnIndicationReceived
             && progress.OnFunctionExecuting != null)
         {

src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeFunction.cs

@@ -25,7 +25,7 @@ public partial class RoutingService
         clonedMessage.FunctionName = name;
         clonedMessage.Indication = await funcExecutor.GetIndicatorAsync(message);
 
-        var messageHub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var messageHub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
         messageHub.Push(new()
         {
             EventName = ChatEvent.OnIndicationReceived,

src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs

@@ -212,7 +212,7 @@ public class ChatCompletionProvider : IChatCompletion
         var chatClient = client.GetChatClient(_model);
         var (prompt, messages, options) = PrepareOptions(agent, conversations);
 
-        var hub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var hub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
         var messageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;
 
         var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);

src/Plugins/BotSharp.Plugin.ChatHub/ChatHubPlugin.cs

@@ -36,8 +36,8 @@ public class ChatHubPlugin : IBotSharpPlugin, IBotSharpAppPlugin
     public void Configure(IApplicationBuilder app)
     {
         var services = app.ApplicationServices;
-        var queue = services.GetRequiredService<MessageHub<HubObserveData>>();
-        var logger = services.GetRequiredService<ILogger<MessageHub<HubObserveData>>>();
+        var queue = services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
+        var logger = services.GetRequiredService<ILogger<MessageHub<HubObserveData<RoleDialogModel>>>>();
         queue.Events.Subscribe(new ChatHubObserver(logger));
     }
 }

src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 
 namespace BotSharp.Plugin.ChatHub.Observers;
 
-public class ChatHubObserver : IObserver<HubObserveData>
+public class ChatHubObserver : IObserver<HubObserveData<RoleDialogModel>>
 {
     private readonly ILogger _logger;
     private IServiceProvider _services;
@@ -26,7 +26,7 @@ public class ChatHubObserver : IObserver<HubObserveData>
         _logger.LogError(error, $"{nameof(ChatHubObserver)} receives error notification: {error.Message}");
     }
 
-    public void OnNext(HubObserveData value)
+    public void OnNext(HubObserveData<RoleDialogModel> value)
     {
         _services = value.ServiceProvider;
 

src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Chat/ChatCompletionProvider.cs

@@ -179,7 +179,7 @@ public class ChatCompletionProvider : IChatCompletion
         var chatClient = client.GetChatClient(_model);
         var (prompt, messages, options) = PrepareOptions(agent, conversations);
 
-        var hub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var hub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
         var messageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;
 
         var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);

src/Plugins/BotSharp.Plugin.LLamaSharp/Providers/ChatCompletionProvider.cs

@@ -183,7 +183,7 @@ public class ChatCompletionProvider : IChatCompletion
             _logger.LogInformation(agent.Instruction);
         }
 
-        var hub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var hub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
         var messageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;
 
         hub.Push(new()

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs

@@ -188,7 +188,7 @@ public class ChatCompletionProvider : IChatCompletion
         var chatClient = client.GetChatClient(_model);
         var (prompt, messages, options) = PrepareOptions(agent, conversations);
 
-        var hub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var hub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
         var messageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;
 
         var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);

src/Plugins/BotSharp.Plugin.SparkDesk/Providers/ChatCompletionProvider.cs

@@ -152,7 +152,7 @@ public class ChatCompletionProvider : IChatCompletion
         var client = new SparkDeskClient(appId: _settings.AppId, apiKey: _settings.ApiKey, apiSecret: _settings.ApiSecret);
         var (prompt, messages, funcall) = PrepareOptions(agent, conversations);
         var messageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;
-        var hub = _services.GetRequiredService<MessageHub<HubObserveData>>();
+        var hub = _services.GetRequiredService<MessageHub<HubObserveData<RoleDialogModel>>>();
 
         hub.Push(new()
         {