From 1e974441ff47ec43658492e15cb64549900b0dab Mon Sep 17 00:00:00 2001
From: Kerry Jiang <kerry-jiang@hotmail.com>
Date: Wed, 11 Dec 2024 17:16:59 -0800
Subject: [PATCH] ChatHubConversationHook priority

---
 .../Conversations/ConversationHookBase.cs      | 18 +++++++-----------
 .../ConversationService.SendMessage.cs         |  6 ++----
 .../Hooks/ChatHubConversationHook.cs           |  1 +
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookBase.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookBase.cs
index 9239b865..da87646e 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookBase.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookBase.cs
@@ -2,27 +2,23 @@ namespace BotSharp.Abstraction.Conversations;
 
 public abstract class ConversationHookBase : IConversationHook
 {
-    protected Agent _agent;
-    public Agent Agent => _agent;
+    public Agent Agent { get; private set; }
 
-    protected Conversation _conversation;
-    public Conversation Conversation => _conversation;
+    public Conversation Conversation { get; private set; }
 
-    protected List<RoleDialogModel> _dialogs;
-    public List<RoleDialogModel> Dialogs => _dialogs;
+    public List<RoleDialogModel> Dialogs { get; private set; }
 
-    protected int _priority = 0;
-    public int Priority => _priority;
+    public int Priority { get; protected set; } = 0;
 
     public IConversationHook SetAgent(Agent agent)
     {
-        _agent = agent;
+        Agent = agent;
         return this;
     }
 
     public IConversationHook SetConversation(Conversation conversation)
     {
-        _conversation = conversation;
+        Conversation = conversation;
         return this;
     }
 
@@ -37,7 +33,7 @@ public abstract class ConversationHookBase : IConversationHook
 
     public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
     {
-        _dialogs = dialogs;
+        Dialogs = dialogs;
         return Task.CompletedTask;
     }
 
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
index 375cf3e6..bdf43c8a 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -28,7 +28,7 @@ public partial class ConversationService
         var dialogs = conv.GetDialogHistory();
 
         var statistics = _services.GetRequiredService<ITokenStatistics>();
-        var hooks = _services.GetServices<IConversationHook>().ToList();
+        var hookProvider = _services.GetRequiredService<ConversationHookProvider>();
 
         RoleDialogModel response = message;
         bool stopCompletion = false;
@@ -44,9 +44,7 @@ public partial class ConversationService
             message.Payload = replyMessage.Payload;
         }
 
-        // Before chat completion hook
-        hooks = ReOrderConversationHooks(hooks);
-        foreach (var hook in hooks)
+        foreach (var hook in hookProvider.HooksOrderByPriority)
         {
             hook.SetAgent(agent)
                 .SetConversation(conversation);
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
index b282fa53..6b425b4b 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
@@ -29,6 +29,7 @@ public class ChatHubConversationHook : ConversationHookBase
         _chatHub = chatHub;
         _user = user;
         _options = options;
+        Priority = -1; // Make sure this hook is the top one.
     }
 
     public override async Task OnConversationInitialized(Conversation conversation)