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

refine agent rule

Browse source
This commit is contained in:
Jicheng Lu 2025-01-07 13:50:50 -06:00
parent b8344a9c5d
commit b681b18ac2
16 changed files with 51 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs
View file

@ -19,7 +19,7 @@ public enum AgentField
LlmConfig,
Utility,
KnowledgeBase,
EventRule,
Rule,
MaxMessageCount
}

6
src/Infrastructure/BotSharp.Abstraction/Agents/IAgentRuleHook.cs Normal file
View file

@ -0,0 +1,6 @@
namespace BotSharp.Abstraction.Agents;
public interface IAgentRuleHook
{
void AddRules(List<AgentRule> rules);
}

8
src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
View file

@ -102,7 +102,7 @@ public class Agent
/// <summary>
/// Agent rules
/// </summary>
public List<AgentEventRule> EventRules { get; set; } = new();
public List<AgentRule> Rules { get; set; } = new();
/// <summary>
/// Agent knowledge bases
@ -159,7 +159,7 @@ public class Agent
MaxMessageCount = agent.MaxMessageCount,
Profiles = agent.Profiles,
RoutingRules = agent.RoutingRules,
EventRules = agent.EventRules,
Rules = agent.Rules,
LlmConfig = agent.LlmConfig,
KnowledgeBases = agent.KnowledgeBases,
CreatedDateTime = agent.CreatedDateTime,
@ -275,9 +275,9 @@ public class Agent
return this;
}
public Agent SetEventRules(List<AgentEventRule> rules)
public Agent SetRules(List<AgentRule> rules)
{
EventRules = rules ?? [];
Rules = rules ?? [];
return this;
}

2
src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentEventRule.cs → src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentRule.cs
View file

@ -1,6 +1,6 @@
namespace BotSharp.Abstraction.Agents.Models;
public class AgentEventRule
public class AgentRule
{
public string Name { get; set; }
public bool Disabled { get; set; }

8
src/Infrastructure/BotSharp.Core.Rules/Hooks/IEventRuleHook.cs
View file

@ -1,8 +0,0 @@
using BotSharp.Abstraction.Agents.Models;
namespace BotSharp.Core.Rules.Hooks;
public interface IEventRuleHook
{
void AddRules(List<AgentEventRule> rules);
}

4
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
View file

@ -40,7 +40,7 @@ public partial class AgentService
record.Samples = agent.Samples ?? [];
record.Utilities = agent.Utilities ?? [];
record.KnowledgeBases = agent.KnowledgeBases ?? [];
record.EventRules = agent.EventRules ?? [];
record.Rules = agent.Rules ?? [];
if (agent.LlmConfig != null && !agent.LlmConfig.IsInherit)
{
record.LlmConfig = agent.LlmConfig;
@ -105,7 +105,7 @@ public partial class AgentService
.SetSamples(foundAgent.Samples)
.SetUtilities(foundAgent.Utilities)
.SetKnowledgeBases(foundAgent.KnowledgeBases)
.SetEventRules(foundAgent.EventRules)
.SetRules(foundAgent.Rules)
.SetLlmConfig(foundAgent.LlmConfig);
_db.UpdateAgent(clonedAgent, AgentField.All);

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

@ -60,8 +60,8 @@ namespace BotSharp.Core.Repository
case AgentField.KnowledgeBase:
UpdateAgentKnowledgeBases(agent.Id, agent.KnowledgeBases);
break;
case AgentField.EventRule:
UpdateAgentEventRules(agent.Id, agent.EventRules);
case AgentField.Rule:
UpdateAgentRules(agent.Id, agent.Rules);
break;
case AgentField.MaxMessageCount:
UpdateAgentMaxMessageCount(agent.Id, agent.MaxMessageCount);
@ -187,14 +187,14 @@ namespace BotSharp.Core.Repository
File.WriteAllText(agentFile, json);
}
private void UpdateAgentEventRules(string agentId, List<AgentEventRule> rules)
private void UpdateAgentRules(string agentId, List<AgentRule> rules)
{
if (rules == null) return;
var (agent, agentFile) = GetAgentFromFile(agentId);
if (agent == null) return;
agent.EventRules = rules;
agent.Rules = rules;
agent.UpdatedDateTime = DateTime.UtcNow;
var json = JsonSerializer.Serialize(agent, _options);
File.WriteAllText(agentFile, json);
@ -344,7 +344,7 @@ namespace BotSharp.Core.Repository
agent.Utilities = inputAgent.Utilities;
agent.KnowledgeBases = inputAgent.KnowledgeBases;
agent.RoutingRules = inputAgent.RoutingRules;
agent.EventRules = inputAgent.EventRules;
agent.Rules = inputAgent.Rules;
agent.LlmConfig = inputAgent.LlmConfig;
agent.MaxMessageCount = inputAgent.MaxMessageCount;
agent.UpdatedDateTime = DateTime.UtcNow;

1
src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
View file

@ -48,7 +48,6 @@
<ItemGroup>
<ProjectReference Include="..\BotSharp.Core\BotSharp.Core.csproj" />
<ProjectReference Include="..\BotSharp.Core.Rules\BotSharp.Core.Rules.csproj" />
</ItemGroup>
<ItemGroup>

10
src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
View file

@ -1,6 +1,4 @@
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Core.Infrastructures;
using BotSharp.Core.Rules.Hooks;
namespace BotSharp.OpenAPI.Controllers;
@ -163,11 +161,11 @@ public class AgentController : ControllerBase
return utilities.Where(x => !string.IsNullOrWhiteSpace(x.Name)).OrderBy(x => x.Name).ToList();
}
[HttpGet("/agent/event-rule/options")]
public IEnumerable<AgentEventRule> GetAgentEventRuleOptions()
[HttpGet("/agent/rule/options")]
public IEnumerable<AgentRule> GetAgentRuleOptions()
{
var rules = new List<AgentEventRule>();
var hooks = _services.GetServices<IEventRuleHook>();
var rules = new List<AgentRule>();
var hooks = _services.GetServices<IAgentRuleHook>();
foreach (var hook in hooks)
{
hook.AddRules(rules);

4
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs
View file

@ -55,7 +55,7 @@ public class AgentCreationModel
public List<AgentUtility> Utilities { get; set; } = new();
public List<RoutingRuleUpdateModel> RoutingRules { get; set; } = new();
public List<AgentKnowledgeBase> KnowledgeBases { get; set; } = new();
public List<AgentEventRule> EventRules { get; set; } = new();
public List<AgentRule> Rules { get; set; } = new();
public AgentLlmConfig? LlmConfig { get; set; }
public Agent ToAgent()
@ -79,7 +79,7 @@ public class AgentCreationModel
Profiles = Profiles,
LlmConfig = LlmConfig,
KnowledgeBases = KnowledgeBases,
EventRules = EventRules,
Rules = Rules,
RoutingRules = RoutingRules?.Select(x => RoutingRuleUpdateModel.ToDomainElement(x))?.ToList() ?? [],
};
}

6
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs
View file

@ -75,8 +75,8 @@ public class AgentUpdateModel
[JsonPropertyName("routing_rules")]
public List<RoutingRuleUpdateModel>? RoutingRules { get; set; }
[JsonPropertyName("event_rules")]
public List<AgentEventRule>? EventRules { get; set; }
[JsonPropertyName("rules")]
public List<AgentRule>? Rules { get; set; }
[JsonPropertyName("llm_config")]
public AgentLlmConfig? LlmConfig { get; set; }
@ -101,7 +101,7 @@ public class AgentUpdateModel
Responses = Responses ?? [],
Utilities = Utilities ?? [],
KnowledgeBases = KnowledgeBases ?? [],
EventRules = EventRules ?? [],
Rules = Rules ?? [],
LlmConfig = LlmConfig
};

6
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
View file

@ -28,8 +28,8 @@ public class AgentViewModel
[JsonPropertyName("knowledge_bases")]
public List<AgentKnowledgeBase> KnowledgeBases { get; set; }
[JsonPropertyName("event_rules")]
public List<AgentEventRule> EventRules { get; set; }
[JsonPropertyName("rules")]
public List<AgentRule> Rules { get; set; }
[JsonPropertyName("is_public")]
public bool IsPublic { get; set; }
@ -89,7 +89,7 @@ public class AgentViewModel
MaxMessageCount = agent.MaxMessageCount,
Profiles = agent.Profiles ?? [],
RoutingRules = agent.RoutingRules ?? [],
EventRules = agent.EventRules ?? [],
Rules = agent.Rules ?? [],
LlmConfig = agent.LlmConfig,
Plugin = agent.Plugin,
CreatedDateTime = agent.CreatedDateTime,

9
src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs
View file

@ -46,7 +46,7 @@ public class HandleHttpRequestFn : IFunctionCallback
catch (Exception ex)
{
var msg = $"Fail when sending http request. Url: {url}, method: {method}, content: {content}";
_logger.LogWarning($"{msg}\n(Error: {ex.Message})");
_logger.LogError($"{msg}\n(Error: {ex.Message}\r\n{ex.InnerException})");
message.Content = msg;
return false;
}
@ -71,10 +71,13 @@ public class HandleHttpRequestFn : IFunctionCallback
private void AddRequestHeaders(HttpClient client)
{
client.DefaultRequestHeaders.Add("Authorization", $"{_context.HttpContext.Request.Headers["Authorization"]}");
var auth = $"{_context.HttpContext.Request.Headers["Authorization"]}";
var origin = $"{_context.HttpContext.Request.Headers["Origin"]}";
client.DefaultRequestHeaders.Add("Authorization", auth);
var settings = _services.GetRequiredService<HttpHandlerSettings>();
var origin = !string.IsNullOrEmpty(settings.Origin) ? settings.Origin : $"{_context.HttpContext.Request.Headers["Origin"]}";
origin = !string.IsNullOrEmpty(origin) ? origin : settings.Origin;
if (!string.IsNullOrEmpty(origin))
{
client.DefaultRequestHeaders.Add("Origin", origin);

2
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentDocument.cs
View file

@ -21,7 +21,7 @@ public class AgentDocument : MongoBase
public List<AgentKnowledgeBaseMongoElement> KnowledgeBases { get; set; }
public List<string> Profiles { get; set; }
public List<RoutingRuleMongoElement> RoutingRules { get; set; }
public List<AgentEventRuleMongoElement> EventRules { get; set; }
public List<AgentRuleMongoElement> Rules { get; set; }
public AgentLlmConfigMongoElement? LlmConfig { get; set; }
public DateTime CreatedTime { get; set; }

10
src/Plugins/BotSharp.Plugin.MongoStorage/Models/AgentEventRuleMongoElement.cs → src/Plugins/BotSharp.Plugin.MongoStorage/Models/AgentRuleMongoElement.cs
View file

@ -2,16 +2,16 @@ using BotSharp.Abstraction.Agents.Models;
namespace BotSharp.Plugin.MongoStorage.Models;
public class AgentEventRuleMongoElement
public class AgentRuleMongoElement
{
public string Name { get; set; }
public bool Disabled { get; set; }
public string EventName { get; set; }
public string EntityType { get; set; }
public static AgentEventRuleMongoElement ToMongoElement(AgentEventRule rule)
public static AgentRuleMongoElement ToMongoElement(AgentRule rule)
{
return new AgentEventRuleMongoElement
return new AgentRuleMongoElement
{
Name = rule.Name,
Disabled = rule.Disabled,
@ -20,9 +20,9 @@ public class AgentEventRuleMongoElement
};
}
public static AgentEventRule ToDomainElement(AgentEventRuleMongoElement rule)
public static AgentRule ToDomainElement(AgentRuleMongoElement rule)
{
return new AgentEventRule
return new AgentRule
{
Name = rule.Name,
Disabled = rule.Disabled,

16
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
View file

@ -61,8 +61,8 @@ public partial class MongoRepository
case AgentField.KnowledgeBase:
UpdateAgentKnowledgeBases(agent.Id, agent.KnowledgeBases);
break;
case AgentField.EventRule:
UpdateAgentEventRules(agent.Id, agent.EventRules);
case AgentField.Rule:
UpdateAgentRules(agent.Id, agent.Rules);
break;
case AgentField.MaxMessageCount:
UpdateAgentMaxMessageCount(agent.Id, agent.MaxMessageCount);
@ -259,15 +259,15 @@ public partial class MongoRepository
_dc.Agents.UpdateOne(filter, update);
}
private void UpdateAgentEventRules(string agentId, List<AgentEventRule> rules)
private void UpdateAgentRules(string agentId, List<AgentRule> rules)
{
if (rules == null) return;
var elements = rules?.Select(x => AgentEventRuleMongoElement.ToMongoElement(x))?.ToList() ?? [];
var elements = rules?.Select(x => AgentRuleMongoElement.ToMongoElement(x))?.ToList() ?? [];
var filter = Builders<AgentDocument>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentDocument>.Update
.Set(x => x.EventRules, elements)
.Set(x => x.Rules, elements)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
_dc.Agents.UpdateOne(filter, update);
@ -314,7 +314,7 @@ public partial class MongoRepository
.Set(x => x.Samples, agent.Samples)
.Set(x => x.Utilities, agent.Utilities.Select(u => AgentUtilityMongoElement.ToMongoElement(u)).ToList())
.Set(x => x.KnowledgeBases, agent.KnowledgeBases.Select(u => AgentKnowledgeBaseMongoElement.ToMongoElement(u)).ToList())
.Set(x => x.EventRules, agent.EventRules.Select(e => AgentEventRuleMongoElement.ToMongoElement(e)).ToList())
.Set(x => x.Rules, agent.Rules.Select(e => AgentRuleMongoElement.ToMongoElement(e)).ToList())
.Set(x => x.LlmConfig, AgentLlmConfigMongoElement.ToMongoElement(agent.LlmConfig))
.Set(x => x.IsPublic, agent.IsPublic)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -472,7 +472,7 @@ public partial class MongoRepository
RoutingRules = x.RoutingRules?.Select(r => RoutingRuleMongoElement.ToMongoElement(r))?.ToList() ?? [],
Utilities = x.Utilities?.Select(u => AgentUtilityMongoElement.ToMongoElement(u))?.ToList() ?? [],
KnowledgeBases = x.KnowledgeBases?.Select(k => AgentKnowledgeBaseMongoElement.ToMongoElement(k))?.ToList() ?? [],
EventRules = x.EventRules?.Select(e => AgentEventRuleMongoElement.ToMongoElement(e))?.ToList() ?? [],
Rules = x.Rules?.Select(e => AgentRuleMongoElement.ToMongoElement(e))?.ToList() ?? [],
CreatedTime = x.CreatedDateTime,
UpdatedTime = x.UpdatedDateTime
}).ToList();
@ -565,7 +565,7 @@ public partial class MongoRepository
RoutingRules = agentDoc.RoutingRules?.Select(r => RoutingRuleMongoElement.ToDomainElement(agentDoc.Id, agentDoc.Name, r))?.ToList() ?? [],
Utilities = agentDoc.Utilities?.Select(u => AgentUtilityMongoElement.ToDomainElement(u))?.ToList() ?? [],
KnowledgeBases = agentDoc.KnowledgeBases?.Select(x => AgentKnowledgeBaseMongoElement.ToDomainElement(x))?.ToList() ?? [],
EventRules = agentDoc.EventRules?.Select(e => AgentEventRuleMongoElement.ToDomainElement(e))?.ToList() ?? []
Rules = agentDoc.Rules?.Select(e => AgentRuleMongoElement.ToDomainElement(e))?.ToList() ?? []
};
}
}