Plugin IconUrl.

Oceania2018 · Oceania2018 · commit 4c6c035b0797 · 2023-12-25T21:16:41.000-06:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
  <PropertyGroup>
+   <TargetFramework>net6.0</TargetFramework>
    <LangVersion>10.0</LangVersion>
    <OutputPath>..\..\..\packages</OutputPath>
    <BotSharpVersion>0.20.0</BotSharpVersion>
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentLlmConfig.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentLlmConfig.cs
@@ -2,6 +2,12 @@ namespace BotSharp.Abstraction.Agents.Models;
 
 public class AgentLlmConfig
 {
+    /// <summary>
+    /// Is inherited from default Agent Settings
+    /// </summary>
+    [JsonPropertyName("is_inherit")]
+    public bool IsInherit { get; set; }
+
     /// <summary>
     /// Completion Provider
     /// </summary>
diff --git a/src/Infrastructure/BotSharp.Abstraction/Plugins/IBotSharpPlugin.cs b/src/Infrastructure/BotSharp.Abstraction/Plugins/IBotSharpPlugin.cs
@@ -7,5 +7,6 @@ public interface IBotSharpPlugin
 {
     string Name => "";
     string Description => "";
+    string IconUrl => "https://avatars.githubusercontent.com/u/44989469?s=200&v=4";
     void RegisterDI(IServiceCollection services, IConfiguration config);
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Plugins/Models/PluginDef.cs b/src/Infrastructure/BotSharp.Abstraction/Plugins/Models/PluginDef.cs
@@ -6,4 +6,6 @@ public class PluginDef
     public string Name { get; set; }
     public string Description { get; set; }
     public string Assembly { get; set; }
+    [JsonPropertyName("icon_url")]
+    public string IconUrl { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs
@@ -3,6 +3,10 @@ namespace BotSharp.Abstraction.Repositories.Filters;
 public class ConversationFilter
 {
     public Pagination Pager { get; set; } = new Pagination();
+    /// <summary>
+    /// Conversation Id
+    /// </summary>
+    public string? Id { get; set; }
     public string? AgentId { get; set; }
     public string? Status { get; set; }
     public string? Channel { get; set; }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
@@ -26,7 +26,15 @@ public async Task<Agent> GetAgent(string id)
         {
             _logger.LogError($"Can't find agent {id}");
             return null;
-        };
+        }
+
+        // Load llm config
+        var agentSetting = _services.GetRequiredService<AgentSettings>();
+        if (profile.LlmConfig == null)
+        {
+            profile.LlmConfig = agentSetting.LlmConfig;
+            profile.LlmConfig.IsInherit = true;
+        }
 
         return profile;
     }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -27,7 +27,10 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
         record.Templates = agent.Templates ?? new List<AgentTemplate>();
         record.Responses = agent.Responses ?? new List<AgentResponse>();
         record.Samples = agent.Samples ?? new List<string>();
-        record.LlmConfig = agent.LlmConfig;
+        if (!agent.LlmConfig.IsInherit)
+        {
+            record.LlmConfig = agent.LlmConfig;
+        }
 
         _db.UpdateAgent(record, updateField);
         await Task.CompletedTask;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
@@ -112,7 +112,6 @@ public List<RoleDialogModel> GetDialogHistory(int lastCount = 50)
 
         var dialogs = _storage.GetDialogs(_conversationId);
         return dialogs
-            .Where(x => x.CreatedAt > DateTime.UtcNow.AddHours(-24))
             .TakeLast(lastCount)
             .ToList();
     }
diff --git a/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs b/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs
@@ -54,7 +54,8 @@ public void Load(Action<Assembly> loaded)
                         Id = module.GetType().FullName,
                         Name = name,
                         Description = module.Description,
-                        Assembly = assemblyName
+                        Assembly = assemblyName,
+                        IconUrl = module.IconUrl
                     });
                     Console.Write($"Loaded plugin ");
                     Console.Write(name, Color.Green);
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -1,3 +1,6 @@
+using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Abstraction.Functions.Models;
+
 namespace BotSharp.OpenAPI.Controllers;
 
 [Authorize]
@@ -46,115 +49,19 @@ public async Task UpdateAgentFromFile([FromRoute] string agentId)
         await _agentService.UpdateAgentFromFile(agentId);
     }
 
-    [HttpPut("/agent/{agentId}/all")]
+    [HttpPut("/agent/{agentId}")]
     public async Task UpdateAgent([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
     {
         var model = agent.ToAgent();
         model.Id = agentId;
         await _agentService.UpdateAgent(model, AgentField.All);
     }
 
-    [HttpPut("/agent/{agentId}/name")]
-    public async Task UpdateAgentName([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Name);
-    }
-
-    [HttpPut("/agent/{agentId}/description")]
-    public async Task UpdateAgentDescription([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Description);
-    }
-
-    [HttpPut("/agent/{agentId}/is-public")]
-    public async Task UpdateAgentIsPublic([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.IsPublic);
-    }
-
-    [HttpPut("/agent/{agentId}/disabled")]
-    public async Task UpdateAgentDisabled([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Disabled);
-    }
-
-    [HttpPut("/agent/{agentId}/allow-routing")]
-    public async Task UpdateAgentAllowRouting([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.AllowRouting);
-    }
-
-    [HttpPut("/agent/{agentId}/profiles")]
-    public async Task UpdateAgentProfiles([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Profiles);
-    }
-
-    [HttpPut("/agent/{agentId}/routing-rules")]
-    public async Task UpdateAgentRoutingRules([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.RoutingRule);
-    }
-
-    [HttpPut("/agent/{agentId}/instruction")]
-    public async Task UpdateAgentInstruction([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Instruction);
-    }
-
-    [HttpPut("/agent/{agentId}/functions")]
-    public async Task UpdateAgentFunctions([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Function);
-    }
-
-    [HttpPut("/agent/{agentId}/templates")]
-    public async Task UpdateAgentTemplates([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Template);
-    }
-
-    [HttpPut("/agent/{agentId}/responses")]
-    public async Task UpdateAgentResponses([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Response);
-    }
-
-    [HttpPut("/agent/{agentId}/samples")]
-    public async Task UpdateAgentSamples([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
-    {
-        var model = agent.ToAgent();
-        model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.Sample);
-    }
-
-    [HttpPut("/agent/{agentId}/llm-config")]
-    public async Task UpdateAgentLlmConfig([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
+    [HttpPatch("/agent/{agentId}/{field}")]
+    public async Task PatchAgentByField([FromRoute] string agentId, AgentField field, [FromBody] AgentUpdateModel agent)
     {
         var model = agent.ToAgent();
         model.Id = agentId;
-        await _agentService.UpdateAgent(model, AgentField.LlmConfig);
+        await _agentService.UpdateAgent(model, field);
     }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -81,6 +81,24 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
         return dialogs;
     }
 
+    [HttpGet("/conversation/{conversationId}")]
+    public async Task<ConversationViewModel> GetConversation([FromRoute] string conversationId)
+    {
+        var service = _services.GetRequiredService<IConversationService>();
+        var conversations = await service.GetConversations(new ConversationFilter
+        {
+            Id = conversationId
+        });
+
+        var userService = _services.GetRequiredService<IUserService>();
+        var result = ConversationViewModel.FromSession(conversations.Items.First());
+
+        var user = await userService.GetUser(result.User.Id);
+        result.User = UserViewModel.FromUser(user);
+
+        return result;
+    }
+
     [HttpDelete("/conversation/{conversationId}")]
     public async Task<bool> DeleteConversation([FromRoute] string conversationId)
     {
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs
@@ -1,18 +1,19 @@
 using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Routing.Models;
+using System.Text.Json.Serialization;
 
 namespace BotSharp.OpenAPI.ViewModels.Agents;
 
 public class AgentUpdateModel
 {
-    public string? Name { get; set; } = string.Empty;
-    public string? Description { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
 
     /// <summary>
     /// Instruction
     /// </summary>
-    public string? Instruction { get; set; }
+    public string Instruction { get; set; } = string.Empty;
 
     /// <summary>
     /// Templates
@@ -22,7 +23,7 @@ public class AgentUpdateModel
     /// <summary>
     /// Samples
     /// </summary>
-    public string? Samples { get; set; }
+    public List<string>? Samples { get; set; }
 
     /// <summary>
     /// Functions
@@ -33,8 +34,10 @@ public class AgentUpdateModel
     /// Routes
     /// </summary>
     public List<AgentResponse>? Responses { get; set; }
+    [JsonPropertyName("is_public")]
 
     public bool IsPublic { get; set; }
+    [JsonPropertyName("allow_routing")]
 
     public bool AllowRouting { get; set; }
 
@@ -44,8 +47,10 @@ public class AgentUpdateModel
     /// Profile by channel
     /// </summary>
     public List<string>? Profiles { get; set; }
+    [JsonPropertyName("routing_rules")]
 
     public List<RoutingRuleUpdateModel>? RoutingRules { get; set; }
+    [JsonPropertyName("llm_config")]
 
     public AgentLlmConfig? LlmConfig { get; set; }
 
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
@@ -15,6 +15,7 @@ public class AgentViewModel
     public List<FunctionDef> Functions { get; set; }
     public List<AgentResponse> Responses { get; set; }
     public List<string> Samples { get; set; }
+    [JsonPropertyName("is_public")]
     public bool IsPublic { get; set; }
 
     [JsonPropertyName("allow_routing")]
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/AzureOpenAiPlugin.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/AzureOpenAiPlugin.cs
@@ -15,7 +15,8 @@ namespace BotSharp.Platform.AzureAi;
 public class AzureOpenAiPlugin : IBotSharpPlugin
 {
     public string Name => "Azure OpenAI";
-    public string Description => "Azure OpenAI Service";
+    public string Description => "Azure OpenAI Service (ChatGPT 3.5 Turbo / 4.0)";
+    public string IconUrl => "https://nanfor.com/cdn/shop/files/cursos-propios-Azure-openAI.jpg?v=1692877741";
 
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/ChatHubPlugin.cs b/src/Plugins/BotSharp.Plugin.ChatHub/ChatHubPlugin.cs
@@ -9,6 +9,7 @@ namespace BotSharp.Plugin.ChatHub;
 public class ChatHubPlugin : IBotSharpPlugin
 {
     public string Name => "Chat Hub";
+    public string Description => "A communication channel connects agents and users in real-time.";
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         // Register hooks
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/GoogleAiPlugin.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/GoogleAiPlugin.cs
@@ -6,6 +6,9 @@ namespace BotSharp.Plugin.GoogleAI;
 
 public class GoogleAiPlugin : IBotSharpPlugin
 {
+    public string Name => "Google AI";
+    public string Description => "Making AI helpful for everyone (PaLM 2, Gemini)";
+    public string IconUrl => "https://vectorseek.com/wp-content/uploads/2021/12/Google-AI-Logo-Vector.png";
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         var settings = new GoogleAiSettings();
diff --git a/src/Plugins/BotSharp.Plugin.HuggingFace/BotSharp.Plugin.HuggingFace.csproj b/src/Plugins/BotSharp.Plugin.HuggingFace/BotSharp.Plugin.HuggingFace.csproj
@@ -6,7 +6,7 @@
     <LangVersion>$(LangVersion)</LangVersion>
     <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GenerateDocumentationFile>$(GenerateDocumentationFile)</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Plugins/BotSharp.Plugin.HuggingFace/HuggingFacePlugin.cs b/src/Plugins/BotSharp.Plugin.HuggingFace/HuggingFacePlugin.cs
@@ -8,6 +8,9 @@ namespace BotSharp.Plugin.HuggingFace;
 
 public class HuggingFacePlugin : IBotSharpPlugin
 {
+    public string Name => "Hugging Face";
+    public string Description => "The Home of Machine Learning - Create, discover and collaborate on ML better.";
+    public string IconUrl => "https://upload.wikimedia.org/wikipedia/he/e/ee/Hugging_Face_logo.png";
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         var settings = new HuggingFaceSettings();
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs
@@ -4,6 +4,8 @@ namespace BotSharp.Plugin.KnowledgeBase;
 
 public class KnowledgeBasePlugin : IBotSharpPlugin
 {
+    public string Name => "Knowledge Base";
+    public string Description => "Embedding private data and feed them into LLM in the conversation.";
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         var settings = new KnowledgeBaseSettings();
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemVecDbPlugin.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemVecDbPlugin.cs
@@ -4,6 +4,8 @@ namespace BotSharp.Plugin.KnowledgeBase.MemVecDb;
 
 public class MemVecDbPlugin : IBotSharpPlugin
 {
+    public string Name => "Memory Vector DB";
+    public string Description => "Store text embedding, search similar text from memory.";
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         services.AddSingleton<IVectorDb, MemVectorDatabase>();
diff --git a/src/Plugins/BotSharp.Plugin.LLamaSharp/LLamaSharpPlugin.cs b/src/Plugins/BotSharp.Plugin.LLamaSharp/LLamaSharpPlugin.cs
@@ -1,14 +1,14 @@
-using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Plugins;
 using BotSharp.Plugin.LLamaSharp.Providers;
-using BotSharp.Plugin.LLamaSharp.Settings;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace BotSharp.Plugins.LLamaSharp;
 
 public class LLamaSharpPlugin : IBotSharpPlugin
 {
+    public string Name => "LLamaSharp";
+    public string Description => "The C#/.NET binding of llama.cpp. Run local LLaMA/GPT model easily and fast in C#!";
+    public string IconUrl => "https://raw.githubusercontent.com/SciSharp/LLamaSharp/master/Assets/LLamaSharpLogo.png";
+
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         var llamaSharpSettings = new LlamaSharpSettings();
diff --git a/src/Plugins/BotSharp.Plugin.LLamaSharp/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.LLamaSharp/Providers/ChatCompletionProvider.cs
@@ -55,7 +55,7 @@ public RoleDialogModel GetChatCompletions(Agent agent, List<RoleDialogModel> con
             _logger.LogInformation(prompt);
         }
 
-        foreach (var response in executor.InferAsync(prompt, inferenceParams).ToArrayAsync().Result)
+        foreach (var response in executor.InferAsync(prompt, inferenceParams).GetAsyncEnumerator().Current)
         {
             Console.Write(response);
             totalResponse += response;
diff --git a/src/Plugins/BotSharp.Plugin.MetaAI/MetaAiPlugin.cs b/src/Plugins/BotSharp.Plugin.MetaAI/MetaAiPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.MetaMessenger/MetaMessengerPlugin.cs b/src/Plugins/BotSharp.Plugin.MetaMessenger/MetaMessengerPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.PaddleSharp/PaddleSharpPlugin.cs b/src/Plugins/BotSharp.Plugin.PaddleSharp/PaddleSharpPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/QdrantPlugin.cs b/src/Plugins/BotSharp.Plugin.Qdrant/QdrantPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.WeChat/WeChatPlugin.cs b/src/Plugins/BotSharp.Plugin.WeChat/WeChatPlugin.cs
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ public interface IBotSharpPlugin`
`7`	`7`	`{`
`8`	`8`	`string Name => "";`
`9`	`9`	`string Description => "";`
	`10`	`+ string IconUrl => "https://avatars.githubusercontent.com/u/44989469?s=200&v=4";`
`10`	`11`	`void RegisterDI(IServiceCollection services, IConfiguration config);`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@ public class PluginDef`
`6`	`6`	`public string Name { get; set; }`
`7`	`7`	`public string Description { get; set; }`
`8`	`8`	`public string Assembly { get; set; }`
	`9`	`+ [JsonPropertyName("icon_url")]`
	`10`	`+ public string IconUrl { get; set; }`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ public List<RoleDialogModel> GetDialogHistory(int lastCount = 50)`
`112`	`112`
`113`	`113`	`var dialogs = _storage.GetDialogs(_conversationId);`
`114`	`114`	`return dialogs`
`115`		`- .Where(x => x.CreatedAt > DateTime.UtcNow.AddHours(-24))`
`116`	`115`	`.TakeLast(lastCount)`
`117`	`116`	`.ToList();`
`118`	`117`	`}`