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

Merge pull request #784 from iceljc/master

Browse source 
rename
This commit is contained in:
iceljc 2024-12-06 01:28:56 -06:00 committed by GitHub
parent d758e4b5f3 e1e56b596a
commit f600f3d869
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentUtility.cs
View file

@ -21,6 +21,11 @@ public class AgentUtility
Functions = functions ?? [];
Templates = templates ?? [];
}
public override string ToString()
{
return Name;
}
}

2
src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
View file

@ -31,7 +31,7 @@ public class AgentPlugin : IBotSharpPlugin
{
services.AddScoped<ILlmProviderService, LlmProviderService>();
services.AddScoped<IAgentService, AgentService>();
services.AddScoped<IAgentHook, CommonAgentHook>();
services.AddScoped<IAgentHook, BasicAgentHook>();
services.AddScoped(provider =>
{

4
src/Infrastructure/BotSharp.Core/Agents/Hooks/CommonAgentHook.cs → src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs
View file

@ -1,10 +1,10 @@
namespace BotSharp.Core.Agents.Hooks;
public class CommonAgentHook : AgentHookBase
public class BasicAgentHook : AgentHookBase
{
public override string SelfId => string.Empty;
public CommonAgentHook(IServiceProvider services, AgentSettings settings)
public BasicAgentHook(IServiceProvider services, AgentSettings settings)
: base(services, settings)
{
}

20
src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs
View file

@ -2,7 +2,6 @@ using BotSharp.Abstraction.Infrastructures.Enums;
using BotSharp.Abstraction.Planning;
using BotSharp.Abstraction.Routing.Enums;
using BotSharp.Abstraction.Routing.Reasoning;
using BotSharp.Core.Routing.Reasoning;
namespace BotSharp.Core.Routing;
@ -21,7 +20,7 @@ public partial class RoutingService
var states = _services.GetRequiredService<IConversationStateService>();
var executor = _services.GetRequiredService<IExecutor>();
var planner = GetReasoner(_router);
var reasoner = GetReasoner(_router);
_context.Push(_router.Id);
@ -46,7 +45,7 @@ public partial class RoutingService
// Get first instruction
_router.TemplateDict["conversation"] = await GetConversationContent(dialogs);
var inst = await planner.GetNextInstruction(_router, message.MessageId, dialogs);
var inst = await reasoner.GetNextInstruction(_router, message.MessageId, dialogs);
int loopCount = 1;
while (true)
@ -63,30 +62,30 @@ public partial class RoutingService
#else
_logger.LogInformation($"*** Next Instruction *** {inst}");
#endif
await planner.AgentExecuting(_router, inst, message, dialogs);
await reasoner.AgentExecuting(_router, inst, message, dialogs);
// Handover to Task Agent
if (inst.HandleDialogsByPlanner)
{
var dialogWithoutContext = planner.BeforeHandleContext(inst, message, dialogs);
var dialogWithoutContext = reasoner.BeforeHandleContext(inst, message, dialogs);
response = await executor.Execute(this, inst, message, dialogWithoutContext);
planner.AfterHandleContext(dialogs, dialogWithoutContext);
reasoner.AfterHandleContext(dialogs, dialogWithoutContext);
}
else
{
response = await executor.Execute(this, inst, message, dialogs);
}
await planner.AgentExecuted(_router, inst, response, dialogs);
await reasoner.AgentExecuted(_router, inst, response, dialogs);
if (loopCount >= planner.MaxLoopCount || _context.IsEmpty)
if (loopCount >= reasoner.MaxLoopCount || _context.IsEmpty)
{
break;
}
// Get next instruction from Planner
_router.TemplateDict["conversation"] = await GetConversationContent(dialogs);
inst = await planner.GetNextInstruction(_router, message.MessageId, dialogs);
inst = await reasoner.GetNextInstruction(_router, message.MessageId, dialogs);
loopCount++;
}
@ -103,8 +102,7 @@ public partial class RoutingService
return _services.GetServices<IRoutingReasoner>().First(x => x.Name == "Naive Reasoner");
}
var reasoner = _services.GetServices<IRoutingReasoner>().
FirstOrDefault(x => x.GetType().Name.EndsWith(rule.Field));
var reasoner = _services.GetServices<IRoutingReasoner>().FirstOrDefault(x => x.GetType().Name.EndsWith(rule.Field));
if (reasoner == null)
{