merge latest

Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
- <PropertyGroup>
-   <TargetFramework>net8.0</TargetFramework>
-   <LangVersion>10.0</LangVersion>
-   <BotSharpVersion>0.22.0</BotSharpVersion>
-   <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-   <GenerateDocumentationFile>false</GenerateDocumentationFile>
- </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>10.0</LangVersion>
+        <BotSharpVersion>0.22.0</BotSharpVersion>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    </PropertyGroup>
 </Project>

README.md

@@ -102,6 +102,7 @@ BotSharp uses component design, the kernel is kept to a minimum, and business fu
 - BotSharp.Plugin.PaddleSharp
 
 #### Tools
+- BotSharp.Plugin.Dashboard
 - BotSharp.Plugin.RoutingSpeeder
 - BotSharp.Plugin.WebDriver
 - BotSharp.Plugin.PizzaBot

docs/conf.py

@@ -56,17 +56,17 @@
 
 # General information about the project.
 project = 'BotSharp'
-copyright = 'Since 2018, Haiping Chen'
+copyright = 'Since 2018, SciSharp STACK'
 author = 'Haiping Chen'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.21'
+version = '0.23'
 # The full version, including alpha/beta/rc tags.
-release = '0.21.0'
+release = '0.23.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

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

@@ -18,3 +18,13 @@ public enum AgentField
     Sample,
     LlmConfig
 }
+
+public enum AgentTaskField
+{
+    All = 1,
+    Name,
+    Description,
+    Enabled,
+    Content,
+    DirectAgentId
+}

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

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Routing.Models;
+using BotSharp.Abstraction.Tasks.Models;
 
 namespace BotSharp.Abstraction.Agents.Models;
 
@@ -36,6 +37,13 @@ public class Agent
     public List<AgentTemplate> Templates { get; set; }
         = new List<AgentTemplate>();
 
+    /// <summary>
+    /// Agent tasks
+    /// </summary>
+    [JsonIgnore]
+    public List<AgentTask> Tasks { get; set; }
+        = new List<AgentTask>();
+
     /// <summary>
     /// Samples
     /// </summary>
@@ -136,6 +144,12 @@ public Agent SetTemplates(List<AgentTemplate> templates)
         return this;
     }
 
+    public Agent SetTasks(List<AgentTask> tasks)
+    {
+        Tasks = tasks ?? new List<AgentTask>();
+        return this;
+    }
+
     public Agent SetFunctions(List<FunctionDef> functions)
     {
         Functions = functions ?? new List<FunctionDef>();

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

@@ -36,6 +36,11 @@ public virtual Task OnStateChanged(string name, string preValue, string currentV
         return Task.CompletedTask;
     }
 
+    public virtual Task OnDialogRecordLoaded(RoleDialogModel dialog)
+    {
+        return Task.CompletedTask;
+    }
+
     public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
     {
         _dialogs = dialogs;

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

@@ -32,6 +32,14 @@ public interface IConversationHook
     /// <returns></returns>
     Task OnDialogsLoaded(List<RoleDialogModel> dialogs);
 
+    /// <summary>
+    /// Triggered when every dialog record is loaded
+    /// It can be used to populate extra data point before presenting to user.
+    /// </summary>
+    /// <param name="dialog"></param>
+    /// <returns></returns>
+    Task OnDialogRecordLoaded(RoleDialogModel dialog);
+
     Task OnStateLoaded(ConversationState state);
     Task OnStateChanged(string name, string preValue, string currentValue);
 

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

@@ -15,6 +15,9 @@ public class FunctionCallFromLlm : RoutingArgs
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool ExecutingDirectly { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public bool HideDialogContext { get; set; }
+
     /// <summary>
     /// Router routed to a wrong agent.
     /// Set this flag as True will force router to re-route current request to a new agent.

src/Infrastructure/BotSharp.Abstraction/MLTasks/ILlmProviderService.cs

@@ -6,5 +6,6 @@ public interface ILlmProviderService
 {
     LlmModelSetting GetSetting(string provider, string model);
     List<string> GetProviders();
+    LlmModelSetting GetProviderModel(string provider, string id);
     List<LlmModelSetting> GetProviderModels(string provider);
 }

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

@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.Repositories.Filters;
+
+public class AgentTaskFilter
+{
+    public Pagination Pager { get; set; } = new Pagination();
+    public string? AgentId { get; set; }
+    public bool? Enabled { get; set; }
+}

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

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Repositories.Models;
+using BotSharp.Abstraction.Tasks.Models;
 using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.Abstraction.Repositories;
@@ -34,6 +35,16 @@ public interface IBotSharpRepository
     string GetAgentTemplate(string agentId, string templateName);
     #endregion
 
+    #region Agent Task
+    PagedItems<AgentTask> GetAgentTasks(AgentTaskFilter filter);
+    AgentTask? GetAgentTask(string agentId, string taskId);
+    void InsertAgentTask(AgentTask task);
+    void BulkInsertAgentTasks(List<AgentTask> tasks);
+    void UpdateAgentTask(AgentTask task, AgentTaskField field);
+    bool DeleteAgentTask(string agentId, string taskId);
+    bool DeleteAgentTasks();
+    #endregion
+
     #region Conversation
     void CreateNewConversation(Conversation conversation);
     bool DeleteConversation(string conversationId);
@@ -49,9 +60,7 @@ public interface IBotSharpRepository
     List<Conversation> GetLastConversations();
     bool TruncateConversation(string conversationId, string messageId);
     #endregion
-    #region Statistics
-    void IncrementConversationCount();
-    #endregion
+
     #region Execution Log
     void AddExecutionLogs(string conversationId, List<string> logs);
     List<string> GetExecutionLogs(string conversationId);
@@ -60,4 +69,8 @@ public interface IBotSharpRepository
     #region LLM Completion Log
     void SaveLlmCompletionLog(LlmCompletionLog log);
     #endregion
+
+    #region Statistics
+    void IncrementConversationCount();
+    #endregion
 }

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingService.cs

@@ -40,4 +40,6 @@ public interface IRoutingService
     /// <param name="message"></param>
     /// <returns></returns>
     Task<RoleDialogModel> InstructDirect(Agent agent, RoleDialogModel message);
+
+    Task<string> GetConversationContent(List<RoleDialogModel> dialogs, int maxDialogCount = 50);
 }

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

@@ -0,0 +1,15 @@
+namespace BotSharp.Abstraction.Routing.Models;
+
+public class DecomposedStep
+{
+    public string Description { get; set; }
+
+    [JsonPropertyName("total_remaining_steps")]
+    public int TotalRemainingSteps { get; set; }
+
+    [JsonPropertyName("should_stop")]
+    public bool ShouldStop { get; set; }
+
+    [JsonPropertyName("stop_reason")]
+    public string? StopReason { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Routing/Planning/IPlaner.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Routing.Models;
 
 namespace BotSharp.Abstraction.Routing.Planning;
 
@@ -8,7 +9,8 @@ namespace BotSharp.Abstraction.Routing.Planning;
 /// </summary>
 public interface IPlaner
 {
-    Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string messageId);
+    Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string messageId, List<RoleDialogModel> dialogs);
     Task<bool> AgentExecuting(Agent router, FunctionCallFromLlm inst, RoleDialogModel message);
     Task<bool> AgentExecuted(Agent router, FunctionCallFromLlm inst, RoleDialogModel message);
+    int MaxLoopCount => 5;
 }

src/Infrastructure/BotSharp.Abstraction/Tasks/Enums/TaskExecutionStatus.cs

@@ -0,0 +1,7 @@
+public class TaskExecutionStatus
+{
+    public const string New = "new";
+    public const string Running = "running";
+    public const string Success = "success";
+    public const string Failed = "failed";
+}

src/Infrastructure/BotSharp.Abstraction/Tasks/IAgentTaskService.cs

@@ -0,0 +1,17 @@
+using BotSharp.Abstraction.Repositories.Filters;
+using BotSharp.Abstraction.Tasks.Models;
+
+namespace BotSharp.Abstraction.Tasks;
+
+public interface IAgentTaskService
+{
+    Task<PagedItems<AgentTask>> GetTasks(AgentTaskFilter filter);
+
+    Task<AgentTask?> GetTask(string agentId, string taskId);
+
+    Task CreateTask(AgentTask task);
+
+    Task UpdateTask(AgentTask task, AgentTaskField field);
+
+    Task<bool> DeleteTask(string agentId, string taskId);
+}

src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs

@@ -0,0 +1,35 @@
+namespace BotSharp.Abstraction.Tasks.Models;
+
+public class AgentTask : AgentTaskMetaData
+{
+    public string Id { get; set; }
+    public string Content { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public string AgentId { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public Agent Agent { get; set; }
+
+    public AgentTask()
+    {
+
+    }
+
+    public AgentTask(string id, string name, string? description = null)
+    {
+        Id = id;
+        Name = name;
+        Description = description;
+    }
+}
+
+public class AgentTaskMetaData
+{
+    public string Name { get; set; }
+    public string? Description { get; set; }
+    public bool Enabled { get; set; }
+    public string? DirectAgentId { get; set; }
+    public DateTime CreatedDateTime { get; set; }
+    public DateTime UpdatedDateTime { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs

@@ -7,4 +7,5 @@ public interface IAuthenticationHook
 {
     Task<User> Authenticate(string id, string password);
     void AddClaims(List<Claim> claims);
+    void BeforeSending(Token token);
 }

src/Infrastructure/BotSharp.Abstraction/Utilities/Pagination.cs

@@ -2,16 +2,38 @@ namespace BotSharp.Abstraction.Utilities;
 
 public class Pagination
 {
-    public int Page { get; set; } = 1;
-    /// <summary>
-    /// Use -1 for all records
-    /// </summary>
-    public int Size { get; set; } = 20;
-    public int Offset => (Page - 1) * Size;
+    private int _page;
+    private int _size;
+
+    public int Page
+    { 
+        get { return _page > 0 ? _page : 1; }
+        set { _page = value; } 
+    }
+
+    public int Size
+    {
+        get 
+        {
+            if (_size <= 0) return 20;
+            if (_size > 100) return 100;
+
+            return _size;
+        } 
+        set 
+        {
+            _size = value;
+        } 
+    }
+
+    public int Offset
+    {
+        get { return (Page - 1) * Size; }
+    }
 }
 
 public class PagedItems<T>
 {
     public int Count { get; set; }
-    public IEnumerable<T> Items { get; set; }
+    public IEnumerable<T> Items { get; set; } = new List<T>();
 }