Merge branch 'master' of https://github.com/Joannall/BotSharp

Author: Joannall

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs

@@ -17,7 +17,8 @@ public enum AgentField
     Response,
     Sample,
     LlmConfig,
-    Utility
+    Utility,
+    MaxMessageCount
 }
 
 public enum AgentTaskField

src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs

@@ -104,6 +104,12 @@ public class Agent
     /// </summary>
     public string? InheritAgentId { get; set; }
 
+    /// <summary>
+    /// Maximum message count when load conversation
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public int? MaxMessageCount { get; set; }
+
     public List<RoutingRule> RoutingRules { get; set; } = new();
 
     /// <summary>
@@ -133,6 +139,8 @@ public static Agent Clone(Agent agent)
             Knowledges = agent.Knowledges,
             IsPublic = agent.IsPublic,
             Disabled = agent.Disabled,
+            MergeUtility = agent.MergeUtility,
+            MaxMessageCount = agent.MaxMessageCount,
             Profiles = agent.Profiles,
             RoutingRules = agent.RoutingRules,
             LlmConfig = agent.LlmConfig,

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

@@ -2,27 +2,23 @@ namespace BotSharp.Abstraction.Conversations;
 
 public abstract class ConversationHookBase : IConversationHook
 {
-    protected Agent _agent;
-    public Agent Agent => _agent;
+    public Agent Agent { get; private set; }
 
-    protected Conversation _conversation;
-    public Conversation Conversation => _conversation;
+    public Conversation Conversation { get; private set; }
 
-    protected List<RoleDialogModel> _dialogs;
-    public List<RoleDialogModel> Dialogs => _dialogs;
+    public List<RoleDialogModel> Dialogs { get; private set; }
 
-    protected int _priority = 0;
-    public int Priority => _priority;
+    public int Priority { get; protected set; } = 0;
 
     public IConversationHook SetAgent(Agent agent)
     {
-        _agent = agent;
+        Agent = agent;
         return this;
     }
 
     public IConversationHook SetConversation(Conversation conversation)
     {
-        _conversation = conversation;
+        Conversation = conversation;
         return this;
     }
 
@@ -37,7 +33,7 @@ public virtual Task OnDialogRecordLoaded(RoleDialogModel dialog)
 
     public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
     {
-        _dialogs = dialogs;
+        Dialogs = dialogs;
         return Task.CompletedTask;
     }
 

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

@@ -0,0 +1,20 @@
+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();
+        });
+    }
+}

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

@@ -12,6 +12,7 @@ public interface IConversationService
     Task<Conversation> GetConversation(string id);
     Task<PagedItems<Conversation>> GetConversations(ConversationFilter filter);
     Task<Conversation> UpdateConversationTitle(string id, string title);
+    Task<Conversation> UpdateConversationTitleAlias(string id, string titleAlias);
     Task<bool> UpdateConversationTags(string conversationId, List<string> tags);
     Task<bool> UpdateConversationMessage(string conversationId, UpdateMessageRequest request);
     Task<List<Conversation>> GetLastConversations();

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs

@@ -13,6 +13,7 @@ public class Conversation
     /// </summary>
     public string? TaskId { get; set; }
     public string Title { get; set; } = string.Empty;
+    public string TitleAlias { get; set; } = string.Empty;
 
     [JsonIgnore]
     public List<DialogElement> Dialogs { get; set; } = new();

src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs

@@ -14,6 +14,15 @@ public class CrontabItem : ScheduleTaskArgs
     [JsonPropertyName("execution_result")]
     public string ExecutionResult { get; set; } = null!;
 
+    [JsonPropertyName("execution_count")]
+    public int ExecutionCount { get; set; }
+
+    [JsonPropertyName("max_execution_count")]
+    public int MaxExecutionCount { get; set; }
+
+    [JsonPropertyName("expire_seconds")]
+    public int ExpireSeconds { get; set; } = 60;
+
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs

@@ -8,6 +8,7 @@ public class ConversationFilter
     /// </summary>
     public string? Id { get; set; }
     public string? Title { get; set; }
+    public string? TitleAlias { get; set; }
     public string? AgentId { get; set; }
     public string? Status { get; set; }
     public string? Channel { get; set; }

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -53,7 +53,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
 
     #region Agent
     void UpdateAgent(Agent agent, AgentField field);
-    Agent? GetAgent(string agentId);
+    Agent? GetAgent(string agentId, bool basicsOnly = false);
     List<Agent> GetAgents(AgentFilter filter);
     List<UserAgent> GetUserAgents(string userId);
     void BulkInsertAgents(List<Agent> agents);
@@ -86,6 +86,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
     Conversation GetConversation(string conversationId);
     PagedItems<Conversation> GetConversations(ConversationFilter filter);
     void UpdateConversationTitle(string conversationId, string title);
+    void UpdateConversationTitleAlias(string conversationId, string titleAlias);
     bool UpdateConversationTags(string conversationId, List<string> tags);
     bool UpdateConversationMessage(string conversationId, UpdateMessageRequest request);
     void UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint);

src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs

@@ -47,7 +47,7 @@ public override void OnAgentUtilityLoaded(Agent agent)
             var entryAgentId = routing.EntryAgentId;
             if (!string.IsNullOrEmpty(entryAgentId))
             {
-                var entryAgent = db.GetAgent(entryAgentId);
+                var entryAgent = db.GetAgent(entryAgentId, basicsOnly: true);
                 var (fns, tps) = GetUniqueContent(entryAgent?.Utilities);
                 functionNames = functionNames.Concat(fns).Distinct().ToList();
                 templateNames = templateNames.Concat(tps).Distinct().ToList();