SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1058 from yileicn/master

Browse source 
optimize hook
This commit is contained in:
易磊 2025-05-16 10:55:05 +08:00 committed by GitHub
parent a2fdc769a9 d10f0a635a
commit c6125f4c90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 98 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookProvider.cs
View file

@ -1,20 +0,0 @@
namespace BotSharp.Abstraction.Conversations;
public class ConversationHookProvider
{
public IEnumerable<IConversationHook> Hooks { get; }
private readonly Lazy<IEnumerable<IConversationHook>> _hooksOrderByPriority;
public IEnumerable<IConversationHook> HooksOrderByPriority
=> _hooksOrderByPriority.Value;
public ConversationHookProvider(IEnumerable<IConversationHook> conversationHooks)
{
Hooks = conversationHooks;
_hooksOrderByPriority = new Lazy<IEnumerable<IConversationHook>>(() =>
{
return conversationHooks.OrderBy(hook => hook.Priority).ToArray();
});
}
}

25
src/Infrastructure/BotSharp.Abstraction/Hooks/HookProvider.cs Normal file
View file

@ -0,0 +1,25 @@
using BotSharp.Abstraction.Conversations;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BotSharp.Abstraction.Hooks
{
public static class HookProvider
{
public static List<T> GetHooks<T>(this IServiceProvider services, string agentId) where T : IHookBase
{
var hooks = services.GetServices<T>().Where(p => p.IsMatch(agentId));
return hooks.ToList();
}
public static List<T> GetHooksOrderByPriority<T>(this IServiceProvider services, string agentId) where T: IConversationHook
{
var hooks = services.GetServices<T>().Where(p => p.IsMatch(agentId));
return hooks.OrderBy(p => p.Priority).ToList();
}
}
}

2
src/Infrastructure/BotSharp.Abstraction/Hooks/IHookBase.cs
View file

@ -12,6 +12,6 @@ namespace BotSharp.Abstraction.Hooks
/// Agent Id
/// </summary>
string SelfId => string.Empty;
bool IsMatch(string id) => string.IsNullOrEmpty(SelfId) || SelfId == id;
bool IsMatch(string agentId) => string.IsNullOrEmpty(SelfId) || SelfId == agentId;
}
}

8
src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Options;
using BotSharp.Core.Infrastructures;
@ -23,7 +24,6 @@ public class RealtimeHub : IRealtimeHub
public async Task ConnectToModel(Func<string, Task>? responseToUser = null, Func<string, Task>? init = null)
{
var hookProvider = _services.GetService<ConversationHookProvider>();
var convService = _services.GetRequiredService<IConversationService>();
convService.SetConversationId(_conn.ConversationId, []);
var conversation = await convService.GetConversation(_conn.ConversationId);
@ -105,7 +105,8 @@ public class RealtimeHub : IRealtimeHub
dialogs.Add(message);
storage.Append(_conn.ConversationId, message);
foreach (var hook in hookProvider?.HooksOrderByPriority ?? [])
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(_conn.CurrentAgentId);
foreach (var hook in hooks)
{
hook.SetAgent(agent)
.SetConversation(conversation);
@ -126,7 +127,8 @@ public class RealtimeHub : IRealtimeHub
storage.Append(_conn.ConversationId, message);
routing.Context.SetMessageId(_conn.ConversationId, message.MessageId);
foreach (var hook in hookProvider?.HooksOrderByPriority ?? [])
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(_conn.CurrentAgentId);
foreach (var hook in hooks)
{
hook.SetAgent(agent)
.SetConversation(conversation);

5
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Infrastructures.Enums;
using BotSharp.Abstraction.Messaging;
using BotSharp.Abstraction.Messaging.Models.RichContent;
@ -29,7 +30,6 @@ public partial class ConversationService
var dialogs = conv.GetDialogHistory();
var statistics = _services.GetRequiredService<ITokenStatistics>();
var hookProvider = _services.GetRequiredService<ConversationHookProvider>();
RoleDialogModel response = message;
bool stopCompletion = false;
@ -44,7 +44,8 @@ public partial class ConversationService
message.Payload = replyMessage.Payload;
}
foreach (var hook in hookProvider.HooksOrderByPriority)
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(message.CurrentAgentId);
foreach (var hook in hooks)
{
hook.SetAgent(agent)
.SetConversation(conversation);

5
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.UpdateBreakpoint.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Infrastructures.Enums;
namespace BotSharp.Core.Conversations.Services;
@ -31,9 +32,7 @@ public partial class ConversationService
states.CleanStates(excludedStates);
}
var hooks = _services
.GetRequiredService<ConversationHookProvider>()
.HooksOrderByPriority;
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(routingCtx.GetCurrentAgentId());
// Before executing functions
foreach (var hook in hooks)

3
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Conversations.Enums;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Models;
namespace BotSharp.Core.Conversations.Services;
@ -116,7 +117,7 @@ public partial class ConversationService : IConversationService
db.CreateNewConversation(record);
var hooks = _services.GetServices<IConversationHook>();
var hooks = _services.GetHooks<IConversationHook>(record.AgentId);
foreach (var hook in hooks)
{

26
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
View file

@ -15,6 +15,7 @@
******************************************************************************/
using BotSharp.Abstraction.Conversations.Enums;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Options;
using BotSharp.Abstraction.SideCar;
@ -28,6 +29,7 @@ public class ConversationStateService : IConversationStateService
private readonly ILogger _logger;
private readonly IServiceProvider _services;
private readonly IBotSharpRepository _db;
private readonly IRoutingContext _routingContext;
private readonly IConversationSideCar? _sidecar;
private string _conversationId;
/// <summary>
@ -42,10 +44,12 @@ public class ConversationStateService : IConversationStateService
public ConversationStateService(
IServiceProvider services,
IBotSharpRepository db,
IRoutingContext routingContext,
ILogger<ConversationStateService> logger)
{
_services = services;
_db = db;
_routingContext = routingContext;
_logger = logger;
_curStates = new ConversationState();
_historyStates = new ConversationState();
@ -87,7 +91,6 @@ public class ConversationStateService : IConversationStateService
}
_logger.LogDebug($"[STATE] {name} = {value}");
var routingCtx = _services.GetRequiredService<IRoutingContext>();
var isNoChange = ContainsState(name)
&& preValue == currentValue
@ -98,7 +101,7 @@ public class ConversationStateService : IConversationStateService
&& prevLeafNode?.Active == curActive
&& pair?.Readonly == readOnly;
var hooks = _services.GetServices<IConversationHook>();
var hooks = _services.GetHooks<IConversationHook>(_routingContext.GetCurrentAgentId());
if (!ContainsState(name) || preValue != currentValue || prevLeafNode?.ActiveRounds != curActiveRounds)
{
foreach (var hook in hooks)
@ -106,7 +109,7 @@ public class ConversationStateService : IConversationStateService
hook.OnStateChanged(new StateChangeModel
{
ConversationId = _conversationId,
MessageId = routingCtx.MessageId,
MessageId = _routingContext.MessageId,
Name = name,
BeforeValue = preValue,
BeforeActiveRounds = prevLeafNode?.ActiveRounds,
@ -129,7 +132,7 @@ public class ConversationStateService : IConversationStateService
var newValue = new StateValue
{
Data = currentValue,
MessageId = routingCtx.MessageId,
MessageId = _routingContext.MessageId,
Active = curActive,
ActiveRounds = curActiveRounds,
DataType = valueType,
@ -171,8 +174,7 @@ public class ConversationStateService : IConversationStateService
return endNodes;
}
var routingCtx = _services.GetRequiredService<IRoutingContext>();
var curMsgId = routingCtx.MessageId;
var curMsgId = _routingContext.MessageId;
var dialogs = _db.GetConversationDialogs(conversationId);
var userDialogs = dialogs.Where(x => x.MetaData?.Role == AgentRole.User)
.GroupBy(x => x.MetaData?.MessageId)
@ -225,7 +227,7 @@ public class ConversationStateService : IConversationStateService
}
_logger.LogInformation($"Loaded conversation states: {conversationId}");
var hooks = _services.GetServices<IConversationHook>();
var hooks = _services.GetHooks<IConversationHook>(_routingContext.GetCurrentAgentId());
foreach (var hook in hooks)
{
hook.OnStateLoaded(_curStates).Wait();
@ -277,7 +279,6 @@ public class ConversationStateService : IConversationStateService
{
if (!ContainsState(name)) return false;
var routingCtx = _services.GetRequiredService<IRoutingContext>();
var value = _curStates[name];
var leafNode = value?.Values?.LastOrDefault();
if (value == null || !value.Versioning || leafNode == null) return false;
@ -285,7 +286,7 @@ public class ConversationStateService : IConversationStateService
_curStates[name].Values.Add(new StateValue
{
Data = leafNode.Data,
MessageId = routingCtx.MessageId,
MessageId = _routingContext.MessageId,
Active = false,
ActiveRounds = leafNode.ActiveRounds,
DataType = leafNode.DataType,
@ -293,13 +294,13 @@ public class ConversationStateService : IConversationStateService
UpdateTime = DateTime.UtcNow
});
var hooks = _services.GetServices<IConversationHook>();
var hooks = _services.GetHooks<IConversationHook>(_routingContext.GetCurrentAgentId());
foreach (var hook in hooks)
{
hook.OnStateChanged(new StateChangeModel
{
ConversationId = _conversationId,
MessageId = routingCtx.MessageId,
MessageId = _routingContext.MessageId,
Name = name,
BeforeValue = leafNode.Data,
BeforeActiveRounds = leafNode.ActiveRounds,
@ -316,8 +317,7 @@ public class ConversationStateService : IConversationStateService
public void CleanStates(params string[] excludedStates)
{
var routingCtx = _services.GetRequiredService<IRoutingContext>();
var curMsgId = routingCtx.MessageId;
var curMsgId = _routingContext.MessageId;
var utcNow = DateTime.UtcNow;
foreach (var key in _curStates.Keys)

4
src/Infrastructure/BotSharp.Core/Infrastructures/HookEmitter.cs
View file

@ -9,7 +9,7 @@ public static class HookEmitter
{
var logger = services.GetRequiredService<ILogger<T>>();
var result = new HookEmittedResult();
var hooks = services.GetServices<T>().Where(p => p.IsMatch(agentId));
var hooks = services.GetHooks<T>(agentId);
option = option ?? new();
foreach (var hook in hooks)
@ -40,7 +40,7 @@ public static class HookEmitter
{
var logger = services.GetRequiredService<ILogger<T>>();
var result = new HookEmittedResult();
var hooks = services.GetServices<T>().Where(p => p.IsMatch(agentId));
var hooks = services.GetHooks<T>(agentId);
option = option ?? new();
foreach (var hook in hooks)

3
src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Instructs;
using BotSharp.Abstraction.Instructs.Models;
using BotSharp.Abstraction.MLTasks;
@ -23,7 +24,7 @@ public partial class InstructService
}
// Trigger before completion hooks
var hooks = _services.GetServices<IInstructHook>().Where(p => p.IsMatch(agentId));
var hooks = _services.GetHooks<IInstructHook>(agentId);
foreach (var hook in hooks)
{
await hook.BeforeCompletion(agent, message);

5
src/Infrastructure/BotSharp.Core/Routing/Functions/HumanInterventionNeededFn.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Functions;
using BotSharp.Abstraction.Hooks;
namespace BotSharp.Core.Routing.Functions;
@ -15,9 +16,7 @@ public class HumanInterventionNeededFn : IFunctionCallback
public async Task<bool> Execute(RoleDialogModel message)
{
var hooks = _services
.GetRequiredService<ConversationHookProvider>()
.HooksOrderByPriority;
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(message.CurrentAgentId);
foreach (var hook in hooks)
{

8
src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeFunction.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Functions;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Templating;
using BotSharp.Core.Routing.Executor;
@ -29,10 +30,6 @@ public partial class RoutingService
var clonedMessage = RoleDialogModel.From(message);
clonedMessage.FunctionName = name;
var hooks = _services
.GetRequiredService<ConversationHookProvider>()
.HooksOrderByPriority;
var progressService = _services.GetService<IConversationProgressService>();
clonedMessage.Indication = await funcExecutor.GetIndicatorAsync(message);
@ -41,7 +38,8 @@ public partial class RoutingService
{
await progressService.OnFunctionExecuting(clonedMessage);
}
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(clonedMessage.CurrentAgentId);
foreach (var hook in hooks)
{
hook.SetAgent(agent);

3
src/Plugins/BotSharp.Plugin.AnthropicAI/Providers/ChatCompletionProvider.cs
View file

@ -1,5 +1,6 @@
using Anthropic.SDK.Common;
using BotSharp.Abstraction.Conversations;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.MLTasks.Settings;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
@ -29,7 +30,7 @@ public class ChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)

5
src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -1,5 +1,6 @@
using Azure;
using BotSharp.Abstraction.Files.Utilities;
using BotSharp.Abstraction.Hooks;
using OpenAI.Chat;
using System.ClientModel;
@ -29,7 +30,7 @@ public class ChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)
@ -128,7 +129,7 @@ public class ChatCompletionProvider : IChatCompletion
Func<RoleDialogModel, Task> onMessageReceived,
Func<RoleDialogModel, Task> onFunctionExecuting)
{
var hooks = _services.GetServices<IContentGeneratingHook>().ToList();
var hooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in hooks)

3
src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Text/TextCompletionProvider.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.MLTasks.Settings;
using System.Net.Http;
using System.Net.Mime;
@ -36,7 +37,7 @@ public class TextCompletionProvider : ITextCompletion
public async Task<string> GetCompletion(string text, string agentId, string messageId)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agentId);
// Before chat completion hook
var agent = new Agent()

1
src/Plugins/BotSharp.Plugin.ChatHub/ChatHubPlugin.cs
View file

@ -24,7 +24,6 @@ public class ChatHubPlugin : IBotSharpPlugin
services.AddScoped<IConversationHook, ChatHubConversationHook>();
services.AddScoped<IConversationHook, StreamingLogHook>();
services.AddScoped<IConversationHook, WelcomeHook>();
services.AddScoped<ConversationHookProvider>();
services.AddScoped<IRoutingHook, StreamingLogHook>();
services.AddScoped<IContentGeneratingHook, StreamingLogHook>();
services.AddScoped<ICrontabHook, ChatHubCrontabHook>();

3
src/Plugins/BotSharp.Plugin.ChatHub/SignalRHub.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.SignalR;
@ -26,7 +27,6 @@ public class SignalRHub : Hub
{
_logger.LogInformation($"SignalR Hub: {_user.FirstName} {_user.LastName} ({Context.User.Identity.Name}) connected in {Context.ConnectionId}");
var hooks = _services.GetServices<IConversationHook>();
var convService = _services.GetRequiredService<IConversationService>();
_context.HttpContext.Request.Query.TryGetValue("conversationId", out var conversationId);
@ -38,6 +38,7 @@ public class SignalRHub : Hub
var conv = await convService.GetConversation(conversationId);
if (conv != null)
{
var hooks = _services.GetHooks<IConversationHook>(conv.AgentId);
foreach (var hook in hooks)
{
// Check if user connected with agent is the first time.

5
src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -2,6 +2,7 @@ using Microsoft.Extensions.Logging;
using OpenAI.Chat;
using BotSharp.Abstraction.Files;
using BotSharp.Plugin.DeepSeek.Providers;
using BotSharp.Abstraction.Hooks;
namespace BotSharp.Plugin.DeepSeekAI.Providers.Chat;
@ -25,7 +26,7 @@ public class ChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)
@ -95,7 +96,7 @@ public class ChatCompletionProvider : IChatCompletion
public async Task<bool> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived, Func<RoleDialogModel, Task> onFunctionExecuting)
{
var hooks = _services.GetServices<IContentGeneratingHook>().ToList();
var hooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in hooks)

3
src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Text/TextCompletionProvider.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using Microsoft.Extensions.Logging;
using OpenAI.Chat;
@ -22,7 +23,7 @@ public class TextCompletionProvider : ITextCompletion
public async Task<string> GetCompletion(string text, string agentId, string messageId)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agentId);
var state = _services.GetRequiredService<IConversationStateService>();
// Before chat completion hook

5
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
View file

@ -2,6 +2,7 @@ using System.Text.Json.Nodes;
using BotSharp.Abstraction.Agents;
using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.Conversations;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Loggers;
using GenerativeAI;
using GenerativeAI.Core;
@ -33,7 +34,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)
@ -91,7 +92,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
public async Task<bool> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived, Func<RoleDialogModel, Task> onFunctionExecuting)
{
var hooks = _services.GetServices<IContentGeneratingHook>().ToList();
var hooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in hooks)

3
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/PalmChatCompletionProvider.cs
View file

@ -5,6 +5,7 @@ using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Routing;
using LLMSharp.Google.Palm;
using LLMSharp.Google.Palm.DiscussService;
using BotSharp.Abstraction.Hooks;
namespace BotSharp.Plugin.GoogleAi.Providers.Chat;
@ -29,7 +30,7 @@ public class PalmChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)

3
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using GenerativeAI;
using GenerativeAI.Core;
using GenerativeAI.Live;
@ -216,7 +217,7 @@ public class GoogleRealTimeProvider : IRealTimeCompletion
}
}
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(conn.CurrentAgentId);
// After chat completion hook
foreach (var hook in contentHooks)
{

3
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Text/GeminiTextCompletionProvider.cs
View file

@ -1,5 +1,6 @@
using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.Conversations;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Loggers;
using GenerativeAI;
using GenerativeAI.Core;
@ -32,7 +33,7 @@ public class GeminiTextCompletionProvider : ITextCompletion
public async Task<string> GetCompletion(string text, string agentId, string messageId)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agentId);
// Before completion hook
var agent = new Agent()

3
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Text/PalmTextCompletionProvider.cs
View file

@ -1,5 +1,6 @@
using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.Conversations;
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.Loggers;
namespace BotSharp.Plugin.GoogleAi.Providers.Text;
@ -27,7 +28,7 @@ public class PalmTextCompletionProvider : ITextCompletion
public async Task<string> GetCompletion(string text, string agentId, string messageId)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agentId);
// Before completion hook
var agent = new Agent() { Id = agentId };

5
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Abstraction.Hooks;
using OpenAI.Chat;
namespace BotSharp.Plugin.OpenAI.Providers.Chat;
@ -32,7 +33,7 @@ public class ChatCompletionProvider : IChatCompletion
public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in contentHooks)
@ -105,7 +106,7 @@ public class ChatCompletionProvider : IChatCompletion
Func<RoleDialogModel, Task> onMessageReceived,
Func<RoleDialogModel, Task> onFunctionExecuting)
{
var hooks = _services.GetServices<IContentGeneratingHook>().ToList();
var hooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
// Before chat completion hook
foreach (var hook in hooks)

3
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Plugin.OpenAI.Models.Realtime;
using OpenAI.Chat;
@ -609,7 +610,7 @@ public class RealTimeCompletionProvider : IRealTimeCompletion
return [];
}
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(conn.CurrentAgentId);
var prompts = new List<string>();
var inputTokenDetails = data.Usage?.InputTokenDetails;

3
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Text/TextCompletionProvider.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using System.Net.Http;
using System.Net.Mime;
@ -25,7 +26,7 @@ public class TextCompletionProvider : ITextCompletion
public async Task<string> GetCompletion(string text, string agentId, string messageId)
{
var contentHooks = _services.GetServices<IContentGeneratingHook>().ToList();
var contentHooks = _services.GetHooks<IContentGeneratingHook>(agentId);
// Before chat completion hook
var agent = new Agent()

3
src/Plugins/BotSharp.Plugin.Twilio/Hooks/TwilioConversationHook.cs
View file

@ -3,6 +3,7 @@ using Task = System.Threading.Tasks.Task;
using Twilio.Rest.Api.V2010.Account;
using BotSharp.Plugin.Twilio.Interfaces;
using BotSharp.Plugin.Twilio.Models;
using BotSharp.Abstraction.Hooks;
namespace BotSharp.Plugin.Twilio.Hooks;
@ -23,7 +24,7 @@ public class TwilioConversationHook : ConversationHookBase, IConversationHook
public override async Task OnFunctionExecuted(RoleDialogModel message)
{
var hooks = _services.GetServices<ITwilioSessionHook>();
var hooks = _services.GetHooks<ITwilioSessionHook>(message.CurrentAgentId);
var routing = _services.GetRequiredService<IRoutingService>();
var conversationId = routing.Context.ConversationId;

7
src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Hooks;
using BotSharp.Abstraction.MLTasks;
using BotSharp.Abstraction.Realtime;
using BotSharp.Abstraction.Realtime.Models;
@ -63,7 +64,7 @@ public class TwilioStreamMiddleware
// load conversation and state
var convService = services.GetRequiredService<IConversationService>();
convService.SetConversationId(conversationId, []);
var hooks = services.GetServices<ITwilioSessionHook>();
var hooks = services.GetHooks<ITwilioSessionHook>(agentId);
foreach (var hook in hooks)
{
await hook.OnStreamingStarted(conn);
@ -229,7 +230,6 @@ public class TwilioStreamMiddleware
private async Task HandleUserDtmfReceived(IServiceProvider _services, RealtimeHubConnection conn, IRealTimeCompletion completer, string data)
{
var routing = _services.GetRequiredService<IRoutingService>();
var hookProvider = _services.GetRequiredService<ConversationHookProvider>();
var agentService = _services.GetRequiredService<IAgentService>();
var agent = await agentService.GetAgent(conn.CurrentAgentId);
var dialogs = routing.Context.GetDialogs();
@ -245,7 +245,8 @@ public class TwilioStreamMiddleware
var storage = _services.GetRequiredService<IConversationStorage>();
storage.Append(conn.ConversationId, message);
foreach (var hook in hookProvider.HooksOrderByPriority)
var hooks = _services.GetHooksOrderByPriority<IConversationHook>(conn.CurrentAgentId);
foreach (var hook in hooks)
{
hook.SetAgent(agent)
.SetConversation(conversation);