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

allow using template across agents

Browse source
This commit is contained in:
Jicheng Lu 2025-07-21 23:01:53 -05:00
parent efe4d9fea7
commit 061ce95e35
2 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
View file

@ -475,7 +475,7 @@ namespace BotSharp.Core.Repository
if (!filter.AgentNames.IsNullOrEmpty())
{
query = query.Where(x => filter.AgentNames.Contains(x.Name));
query = query.Where(x => filter.AgentNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase));
}
if (!string.IsNullOrEmpty(filter.SimilarName))

46
src/Infrastructure/BotSharp.Core/Templating/TemplateRender.cs
View file

@ -8,6 +8,7 @@ using System.Collections;
using System.IO;
using System.Reflection;
using System.Text.Encodings.Web;
using System.Text.RegularExpressions;
namespace BotSharp.Core.Templating;
@ -36,9 +37,9 @@ public class TemplateRender : ITemplateRender
_options.MemberAccessStrategy.Register<UserIdentity>();
_options.MemberAccessStrategy.Register<TranslationInput>();
_parser.RegisterIdentifierTag("link", (string identifier, TextWriter writer, TextEncoder encoder, TemplateContext context) =>
_parser.RegisterExpressionTag("link", (Expression expression, TextWriter writer, TextEncoder encoder, TemplateContext context) =>
{
return RenderIdentifierTag("link", identifier, writer, encoder, context);
return RenderTag("link", expression, writer, encoder, context, services);
});
}
@ -82,20 +83,47 @@ public class TemplateRender : ITemplateRender
#region Private methods
private static async ValueTask<Completion> RenderIdentifierTag(string tag, string identifier, TextWriter writer, TextEncoder encoder, TemplateContext context)
private static async ValueTask<Completion> RenderTag(
string tag,
Expression expression,
TextWriter writer,
TextEncoder encoder,
TemplateContext context,
IServiceProvider services)
{
try
{
var value = await context.Model.GetValueAsync(TemplateRenderConstant.RENDER_AGENT, context);
var agent = value?.ToObjectValue() as Agent;
var found = agent?.Templates?.FirstOrDefault(x => x.Name.IsEqualTo(identifier));
var key = $"{agent?.Id} | {tag} | {identifier}";
var value = await expression.EvaluateAsync(context);
var expStr = value?.ToStringValue() ?? string.Empty;
if (found == null || (context.AmbientValues.TryGetValue(key, out var visited) && (bool)visited))
value = await context.Model.GetValueAsync(TemplateRenderConstant.RENDER_AGENT, context);
var agent = value?.ToObjectValue() as Agent;
var splited = Regex.Split(expStr, @"\s*from\s*", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)
.Where(x => !string.IsNullOrWhiteSpace(x))
.Select(x => x.Trim())
.ToArray();
var templateName = splited.ElementAtOrDefault(0);
var agentName = splited.ElementAtOrDefault(1);
if (splited.Length > 1 && !agentName.IsEqualTo(agent?.Name))
{
using var scope = services.CreateScope();
var agentService = scope.ServiceProvider.GetRequiredService<IAgentService>();
var result = await agentService.GetAgents(new() { SimilarName = agentName });
agent = result?.Items?.FirstOrDefault();
}
var template = agent?.Templates?.FirstOrDefault(x => x.Name.IsEqualTo(templateName));
var key = $"{tag} | {agent?.Id} | {templateName}";
if (template == null || (context.AmbientValues.TryGetValue(key, out var visited) && (bool)visited))
{
writer.Write(string.Empty);
}
else if (_parser.TryParse(found.Content, out var t, out _))
else if (_parser.TryParse(template.Content, out var t, out _))
{
context.AmbientValues[key] = true;
var rendered = t.Render(context);