Merge pull request #399 from hchen2020/master

ConversationBreakpoint.Reason

Author: Oceania2018

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

@@ -44,6 +44,9 @@ public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
     public virtual Task OnConversationEnding(RoleDialogModel message)
         => Task.CompletedTask;
 
+    public virtual Task OnNewTaskDetected(RoleDialogModel message, string reason)
+        => Task.CompletedTask;
+
     public virtual Task OnTaskCompleted(RoleDialogModel message)
         => Task.CompletedTask;
 

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

@@ -64,6 +64,13 @@ public interface IConversationHook
 
     Task OnResponseGenerated(RoleDialogModel message);
 
+    /// <summary>
+    /// LLM detected user requested a new task different from previous topic.
+    /// </summary>
+    /// <param name="message"></param>
+    /// <returns></returns>
+    Task OnNewTaskDetected(RoleDialogModel message, string reason);
+
     /// <summary>
     /// LLM detected the current task is completed.
     /// It's useful for the situation of multiple tasks in the same conversation.

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

@@ -42,6 +42,7 @@ Task<bool> SendMessage(string agentId,
     /// Use this feature when you want to hide some context from LLM.
     /// </summary>
     /// <param name="resetStates">Whether to reset all states</param>
+    /// <param name="reason">Append user init words</param>
     /// <returns></returns>
-    Task UpdateBreakpoint(bool resetStates = false);
+    Task UpdateBreakpoint(bool resetStates = false, string? reason = null);
 }

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

@@ -10,4 +10,7 @@ public class ConversationBreakpoint
 
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
+
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Functions/Models/FunctionCallFromLlm.cs

@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Routing.Models;
 using System.Text.Json;
 
 namespace BotSharp.Abstraction.Functions.Models;

src/Infrastructure/BotSharp.Abstraction/Functions/Models/ParameterPropertyDef.cs

@@ -2,10 +2,11 @@ namespace BotSharp.Abstraction.Functions.Models;
 
 public class ParameterPropertyDef : NameDesc
 {
-    public ParameterPropertyDef(string name, string description, string type = "string") 
+    public ParameterPropertyDef(string name, string description, string type = "string", bool required = false) 
         : base(name, description)
     {
         Type = type;
+        Required = required;
     }
 
     [JsonPropertyName("required")]

src/Infrastructure/BotSharp.Abstraction/Infrastructures/Enums/StateConst.cs

@@ -5,5 +5,6 @@ public class StateConst
     public const string EXPECTED_ACTION_AGENT = "expected_next_action_agent";
     public const string EXPECTED_GOAL_AGENT = "expected_user_goal_agent";
     public const string NEXT_ACTION_AGENT = "next_action_agent";
+    public const string NEXT_ACTION_REASON = "next_action_reason";
     public const string USER_GOAL_AGENT = "user_goal_agent";
 }

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

@@ -58,8 +58,8 @@ public interface IBotSharpRepository
     Conversation GetConversation(string conversationId);
     PagedItems<Conversation> GetConversations(ConversationFilter filter);
     void UpdateConversationTitle(string conversationId, string title);
-    void UpdateConversationBreakpoint(string conversationId, string messageId, DateTime breakpoint);
-    DateTime GetConversationBreakpoint(string conversationId);
+    void UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint);
+    ConversationBreakpoint? GetConversationBreakpoint(string conversationId);
     List<Conversation> GetLastConversations();
     List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours);
     bool TruncateConversation(string conversationId, string messageId, bool cleanLog = false);

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingArgs.cs

@@ -19,6 +19,12 @@ public class RoutingArgs
     [JsonPropertyName("conversation_end")]
     public bool ConversationEnd { get; set; }
 
+    [JsonPropertyName("task_completed")]
+    public bool TaskCompleted { get; set; }
+
+    [JsonPropertyName("is_new_task")]
+    public bool IsNewTask { get; set; }
+
     /// <summary>
     /// The content of replying to user
     /// </summary>

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs

@@ -156,27 +156,31 @@ response.RichContent is RichContent<IRichMessage> template &&
             response.FunctionName = response.PostbackFunctionName;
         }
 
-        var hooks = _services.GetServices<IConversationHook>().ToList();
-
         if (response.Instruction != null)
         {
             var conversation = _services.GetRequiredService<IConversationService>();
             var updatedConversation = await conversation.UpdateConversationTitle(_conversationId, response.Instruction.NextActionReason);
 
+            // Emit conversation task completed hook
+            if (response.Instruction.TaskCompleted)
+            {
+                await HookEmitter.Emit<IConversationHook>(_services, async hook =>
+                    await hook.OnTaskCompleted(response)
+                );
+            }
+
             // Emit conversation ending hook
             if (response.Instruction.ConversationEnd)
             {
-                foreach (var hook in hooks)
-                {
-                    await hook.OnConversationEnding(response);
-                }
+                await HookEmitter.Emit<IConversationHook>(_services, async hook =>
+                    await hook.OnConversationEnding(response)
+                );
             }
         }
 
-        foreach (var hook in hooks)
-        {
-            await hook.OnResponseGenerated(response);
-        }
+        await HookEmitter.Emit<IConversationHook>(_services, async hook =>
+            await hook.OnResponseGenerated(response)
+        );
 
         await onResponseReceived(response);