Merge pull request #1056 from yileicn/master

optimize Hook

Author: yileicn

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs

@@ -1,13 +1,10 @@
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Hooks;
 
 namespace BotSharp.Abstraction.Agents;
 
-public interface IAgentHook
+public interface IAgentHook : IHookBase
 {
-    /// <summary>
-    /// Agent Id
-    /// </summary>
-    string SelfId { get; }
     Agent Agent { get; }
     void SetAgent(Agent agent);
 

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationHook.cs

@@ -1,6 +1,8 @@
+using BotSharp.Abstraction.Hooks;
+
 namespace BotSharp.Abstraction.Conversations;
 
-public interface IConversationHook
+public interface IConversationHook : IHookBase
 {
     int Priority { get; }
     Agent Agent { get; }

src/Infrastructure/BotSharp.Abstraction/Crontab/ICrontabHook.cs

@@ -1,6 +1,8 @@
+using BotSharp.Abstraction.Hooks;
+
 namespace BotSharp.Abstraction.Crontab;
 
-public interface ICrontabHook
+public interface ICrontabHook : IHookBase
 {
     string[]? Triggers
         => null;

src/Infrastructure/BotSharp.Abstraction/Hooks/IHookBase.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BotSharp.Abstraction.Hooks
+{
+    public interface IHookBase
+    {
+        /// <summary>
+        /// Agent Id
+        /// </summary>
+        string SelfId => string.Empty;
+        bool IsMatch(string id) => string.IsNullOrEmpty(SelfId) || SelfId == id;
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructHook.cs

@@ -1,10 +1,10 @@
+using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.Instructs.Models;
 
 namespace BotSharp.Abstraction.Instructs;
 
-public interface IInstructHook
+public interface IInstructHook : IHookBase
 {
-    string SelfId { get; }
     Task BeforeCompletion(Agent agent, RoleDialogModel message);
     Task AfterCompletion(Agent agent, InstructResult result);
     Task OnResponseGenerated(InstructResponseModel response);

src/Infrastructure/BotSharp.Abstraction/Loggers/IContentGeneratingHook.cs

@@ -1,11 +1,12 @@
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Hooks;
 
 namespace BotSharp.Abstraction.Loggers;
 
 /// <summary>
 /// Model content generating hook, it can be used for logging, metrics and tracing.
 /// </summary>
-public interface IContentGeneratingHook
+public interface IContentGeneratingHook : IHookBase
 {
     /// <summary>
     /// Before content generating.

src/Infrastructure/BotSharp.Abstraction/Planning/IPlanningHook.cs

@@ -1,6 +1,8 @@
+using BotSharp.Abstraction.Hooks;
+
 namespace BotSharp.Abstraction.Planning;
 
-public interface IPlanningHook
+public interface IPlanningHook : IHookBase
 {
     Task<string> GetSummaryAdditionalRequirements(string planner, RoleDialogModel message)
         => Task.FromResult(string.Empty);

src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHook.cs

@@ -1,8 +1,9 @@
+using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.MLTasks;
 
 namespace BotSharp.Abstraction.Realtime;
 
-public interface IRealtimeHook
+public interface IRealtimeHook : IHookBase
 {
     Task OnModelReady(Agent agent, IRealTimeCompletion completer);
     string[] OnModelTranscriptPrompt(Agent agent);

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingHook.cs

@@ -1,8 +1,9 @@
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Hooks;
 
 namespace BotSharp.Abstraction.Routing;
 
-public interface IRoutingHook
+public interface IRoutingHook : IHookBase
 {
     /// <summary>
     /// Routing instruction is received from Router

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs

@@ -125,6 +125,6 @@ await HookEmitter.Emit<ICrontabHook>(_services, async hook =>
                 await hook.OnCronTriggered(item);
                 await hook.OnTaskExecuted(item);
             }
-        });
+        }, item.AgentId);
     }
 }