Add RouterController.

Oceania2018 · Oceania2018 · commit 627f7fa771a3 · 2023-12-29T21:54:41.000-06:00
diff --git a/docs/assets/BotSharp.min.psd b/docs/assets/BotSharp.min.psd
diff --git a/docs/assets/BotSharp.psd b/docs/assets/BotSharp.psd
diff --git a/docs/assets/front-cover.psd b/docs/assets/front-cover.psd
diff --git a/docs/static/logos/BotSharp.min.png b/docs/static/logos/BotSharp.min.png
diff --git a/docs/static/logos/BotSharp.png b/docs/static/logos/BotSharp.png
diff --git a/docs/static/logos/favicon.ico b/docs/static/logos/favicon.ico
diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs
@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Knowledges;
 public interface IKnowledgeService
 {
     Task Feed(KnowledgeFeedModel knowledge);
+    Task EmbedKnowledge(KnowledgeCreationModel knowledge);
     Task<string> GetKnowledges(KnowledgeRetrievalModel retrievalModel);
     Task<List<RetrievedResult>> GetAnswer(KnowledgeRetrievalModel retrievalModel);
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/IPdf2TextConverter.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/IPdf2TextConverter.cs
@@ -7,6 +7,6 @@ namespace BotSharp.Abstraction.Knowledges
 {
     public interface IPdf2TextConverter
     {
-        Task<string> ConvertPdfToText(IFormFile formFile, int? startPageNum, int? endPageNum);
+        Task<string> ConvertPdfToText(string filePath, int? startPageNum, int? endPageNum);
     }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeCreationModel.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeCreationModel.cs
@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Knowledges.Models;
+
+public class KnowledgeCreationModel
+{
+    public string Content { get; set; } = string.Empty;
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs
@@ -7,5 +7,6 @@ public class AgentFilter
     public bool? AllowRouting { get; set; }
     public bool? IsPublic { get; set; }
     public bool? IsRouter { get; set; }
+    public bool? IsEvaluator { get; set; }
     public List<string>? AgentIds { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs
@@ -8,6 +8,7 @@
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Repositories.Models;
 using BotSharp.Abstraction.Routing.Settings;
+using BotSharp.Abstraction.Evaluations.Settings;
 
 namespace BotSharp.Core.Repository;
 
@@ -552,6 +553,14 @@ public List<Agent> GetAgents(AgentFilter filter)
                 query.Where(x => x.Id != route.AgentId);
         }
 
+        if (filter.IsEvaluator.HasValue)
+        {
+            var evaluate = _services.GetRequiredService<EvaluatorSetting>();
+            query = filter.IsEvaluator.Value ?
+                query.Where(x => x.Id == evaluate.AgentId) :
+                query.Where(x => x.Id != evaluate.AgentId);
+        }
+
         if (filter.AgentIds != null)
         {
             query = query.Where(x => filter.AgentIds.Contains(x.Id));
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Routing.Settings;
+
 namespace BotSharp.OpenAPI.Controllers;
 
 [Authorize]
@@ -13,6 +15,13 @@ public AgentController(IAgentService agentService, IServiceProvider services)
         _services = services;
     }
 
+    [HttpGet("/agent/settings")]
+    public AgentSettings GetSettings()
+    {
+        var settings = _services.GetRequiredService<AgentSettings>();
+        return settings;
+    }
+
     [HttpGet("/agent/{id}")]
     public async Task<AgentViewModel> GetAgent([FromRoute] string id)
     {
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ApplicationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ApplicationController.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Hosting;
+
+namespace BotSharp.OpenAPI.Controllers;
+
+[Authorize]
+[ApiController]
+public class ApplicationController : ControllerBase
+{
+    private readonly IServiceProvider _services;
+    public ApplicationController(IServiceProvider services)
+    {
+        _services = services;
+    }
+
+    [HttpGet("/app/shutdown")]
+    public IActionResult Restart()
+    {
+        var app = _services.GetRequiredService<IHostApplicationLifetime>();
+        app.StopApplication();
+        return Ok();
+    }
+}
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/EvaluatorController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/EvaluatorController.cs
@@ -5,29 +5,29 @@ namespace BotSharp.OpenAPI.Controllers;
 
 [Authorize]
 [ApiController]
-public class EvaluationController : ControllerBase
+public class EvaluatorController : ControllerBase
 {
     private readonly IServiceProvider _services;
-    public EvaluationController(IServiceProvider services)
+    public EvaluatorController(IServiceProvider services)
     {
         _services = services;
     }
 
-    [HttpPost("/evaluation/execute/{task}")]
+    [HttpPost("/evaluator/execute/{task}")]
     public async Task<Conversation> Execute([FromRoute] string task, [FromBody] EvaluationRequest request)
     {
         var eval = _services.GetRequiredService<IEvaluatingService>();
         return await eval.Execute(task, request);
     }
 
-    [HttpPost("/evaluation/review/{conversationId}")]
+    [HttpPost("/evaluator/review/{conversationId}")]
     public async Task<EvaluationResult> Review([FromRoute] string conversationId, [FromBody] EvaluationRequest request)
     {
         var eval = _services.GetRequiredService<IEvaluatingService>();
         return await eval.Review(conversationId, request);
     }
 
-    [HttpPost("/evaluation/evaluate/{conversationId}")]
+    [HttpPost("/evaluator/evaluate/{conversationId}")]
     public async Task<EvaluationResult> Evaluate([FromRoute] string conversationId, [FromBody] EvaluationRequest request)
     {
         var eval = _services.GetRequiredService<IEvaluatingService>();
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs
@@ -1,20 +1,22 @@
 using BotSharp.Abstraction.Knowledges.Models;
 using BotSharp.Abstraction.Knowledges.Settings;
+using Microsoft.AspNetCore.Http;
 
 namespace BotSharp.OpenAPI.Controllers;
 
 [Authorize]
 [ApiController]
-public class KnowledgeController : ControllerBase
+public class KnowledgeBaseController : ControllerBase
 {
     private readonly IKnowledgeService _knowledgeService;
     private readonly IServiceProvider _services;
 
-    public KnowledgeController(IKnowledgeService knowledgeService, IServiceProvider services)
+    public KnowledgeBaseController(IKnowledgeService knowledgeService, IServiceProvider services)
     {
         _knowledgeService = knowledgeService;
         _services = services;
     }
+
     [HttpGet("/knowledge/{agentId}")]
     public async Task<List<RetrievedResult>> RetrieveKnowledge([FromRoute] string agentId, [FromQuery(Name = "q")] string question)
     {
@@ -25,6 +27,33 @@ public async Task<List<RetrievedResult>> RetrieveKnowledge([FromRoute] string ag
         });
     }
 
+    [HttpPost("/knowledge-base/upload")]
+    public async Task<IActionResult> UploadKnowledge(IFormFile file, [FromQuery] int? startPageNum, [FromQuery] int? endPageNum)
+    {
+        var setttings = _services.GetRequiredService<KnowledgeBaseSettings>();
+        var textConverter = _services.GetServices<IPdf2TextConverter>()
+            .First(x => x.GetType().FullName.EndsWith(setttings.Pdf2TextConverter));
+
+        var filePath = Path.GetTempFileName();
+        using (var stream = System.IO.File.Create(filePath))
+        {
+            await file.CopyToAsync(stream);
+        }
+
+        var content = await textConverter.ConvertPdfToText(filePath, startPageNum, endPageNum);
+
+        // Process uploaded files
+        // Don't rely on or trust the FileName property without validation.
+
+        // Add FeedWithMetaData
+        await _knowledgeService.EmbedKnowledge(new KnowledgeCreationModel
+        {
+            Content = content
+        });
+
+        return Ok(new { count = 1, file.Length });
+    }
+
     [HttpPost("/knowledge/{agentId}")]
     public async Task<IActionResult> FeedKnowledge([FromRoute] string agentId, List<IFormFile> files, [FromQuery] int? startPageNum, [FromQuery] int? endPageNum, [FromQuery] bool? paddleModel)
     {
@@ -34,9 +63,11 @@ public async Task<IActionResult> FeedKnowledge([FromRoute] string agentId, List<
 
         foreach (var formFile in files)
         {
-            var content = "";
+            var filePath = Path.GetTempFileName();
+            using var stream = System.IO.File.Create(filePath);
+            await formFile.CopyToAsync(stream);
 
-            content = await textConverter.ConvertPdfToText(formFile, startPageNum, endPageNum);
+            var content = await textConverter.ConvertPdfToText(filePath, startPageNum, endPageNum);
 
             // Process uploaded files
             // Don't rely on or trust the FileName property without validation.
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/RouterController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/RouterController.cs
@@ -0,0 +1,21 @@
+using BotSharp.Abstraction.Routing.Settings;
+
+namespace BotSharp.OpenAPI.Controllers;
+
+[Authorize]
+[ApiController]
+public class RouterController : ControllerBase
+{
+    private readonly IServiceProvider _services;
+    public RouterController(IServiceProvider services)
+    {
+        _services = services;
+    }
+
+    [HttpGet("/router/settings")]
+    public RoutingSettings GetSettings()
+    {
+        var settings = _services.GetRequiredService<RoutingSettings>();
+        return settings;
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs
@@ -15,6 +15,29 @@ public KnowledgeService(IServiceProvider services,
         _textChopper = textChopper;
     }
 
+    public async Task EmbedKnowledge(KnowledgeCreationModel knowledge)
+    {
+        var idStart = 0;
+        var lines = _textChopper.Chop(knowledge.Content, new ChunkOption
+        {
+            Size = 1024,
+            Conjunction = 32,
+            SplitByWord = true,
+        });
+
+        var db = GetVectorDb();
+        var textEmbedding = GetTextEmbedding();
+
+        await db.CreateCollection("shared", textEmbedding.Dimension);
+        foreach (var line in lines)
+        {
+            var vec = await textEmbedding.GetVectorAsync(line);
+            await db.Upsert("shared", idStart, vec, line);
+            idStart++;
+            Console.WriteLine($"Saved vector {idStart}/{lines.Count}: {line}\n");
+        }
+    }
+
     public async Task Feed(KnowledgeFeedModel knowledge)
     {
         var idStart = 0;
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/PigPdf2TextConverter.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/PigPdf2TextConverter.cs
@@ -1,30 +1,17 @@
-using Microsoft.AspNetCore.Http;
 using UglyToad.PdfPig;
 using UglyToad.PdfPig.Content;
 
 namespace BotSharp.Plugin.KnowledgeBase.Services;
 
 public class PigPdf2TextConverter : IPdf2TextConverter
 {
-    public async Task<string> ConvertPdfToText(IFormFile formFile, int? startPageNum, int? endPageNum)
+    public async Task<string> ConvertPdfToText(string filePath, int? startPageNum, int? endPageNum)
     {
-        return await OpenPdfDocumentAsync(formFile, startPageNum, endPageNum);
+        return await OpenPdfDocumentAsync(filePath, startPageNum, endPageNum);
     }
 
-    private async Task<string> OpenPdfDocumentAsync(IFormFile formFile, int? startPageNum, int? endPageNum)
+    private async Task<string> OpenPdfDocumentAsync(string filePath, int? startPageNum, int? endPageNum)
     {
-        if (formFile.Length <= 0)
-        {
-            return await Task.FromResult(string.Empty);
-        }
-
-        var filePath = Path.GetTempFileName();
-
-        using (var stream = System.IO.File.Create(filePath))
-        {
-            await formFile.CopyToAsync(stream);
-        }
-
         var document = PdfDocument.Open(filePath);
         var content = "";
         foreach (Page page in document.GetPages())
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.Evaluations.Settings;
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Repositories.Models;
@@ -470,6 +471,14 @@ public List<Agent> GetAgents(AgentFilter filter)
                 query.Where(x => x.Id != route.AgentId);
         }
 
+        if (filter.IsEvaluator.HasValue)
+        {
+            var evaluate = _services.GetRequiredService<EvaluatorSetting>();
+            query = filter.IsEvaluator.Value ?
+                query.Where(x => x.Id == evaluate.AgentId) :
+                query.Where(x => x.Id != evaluate.AgentId);
+        }
+
         if (filter.AgentIds != null)
         {
             query = query.Where(x => filter.AgentIds.Contains(x.Id));
diff --git a/src/Plugins/BotSharp.Plugin.PaddleSharp/Providers/Pdf2TextConverter.cs b/src/Plugins/BotSharp.Plugin.PaddleSharp/Providers/Pdf2TextConverter.cs
@@ -12,10 +12,8 @@
 using System.Threading.Tasks;
 using BotSharp.Abstraction.Knowledges;
 using System.Linq;
-using Docnet;
 using Docnet.Core.Models;
 using Docnet.Core;
-using Docnet.Core.Converters;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
@@ -33,9 +31,9 @@ public Pdf2TextConverter(PaddleSharpSettings paddleSharpSettings)
         _paddleSharpSettings = paddleSharpSettings;
     }
 
-    public async Task<string> ConvertPdfToText(IFormFile formFile, int? startPageNum, int? endPageNum)
+    public async Task<string> ConvertPdfToText(string filePath, int? startPageNum, int? endPageNum)
     {
-        await ConvertPdfToLocalImagesAsync(formFile, startPageNum, endPageNum);
+        await ConvertPdfToLocalImagesAsync(filePath, startPageNum, endPageNum);
         return await LocalImageToTextsAsync();
     }
 
@@ -115,17 +113,10 @@ public void DocnetConverter(string filePath, int width = 1080, int height = 1920
         };
     }
 
-    private async Task ConvertPdfToLocalImagesAsync(IFormFile formFile, int? startPageNum, int? endPageNum)
+    private async Task ConvertPdfToLocalImagesAsync(string filePath, int? startPageNum, int? endPageNum)
     {
         string rootFileName;
 
-        var filePath = Path.GetTempFileName();
-
-        using (var stream = System.IO.File.Create(filePath))
-        {
-            await formFile.CopyToAsync(stream);
-        }
-
         using var images = new MagickImageCollection();
         // _magicReadSettings.Density = new Density((double)300);
         /*
diff --git a/src/WebStarter/Program.cs b/src/WebStarter/Program.cs
@@ -39,7 +39,8 @@
 builder.Services.AddCors(options =>
 {
     options.AddPolicy("MyCorsPolicy",
-        builder => builder.WithOrigins("http://localhost:5015")
+        builder => builder.WithOrigins("http://localhost:5015", 
+                        "https://botsharp.scisharpstack.org")
                    .AllowAnyMethod()
                    .AllowAnyHeader()
                    .AllowCredentials());
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
@@ -38,8 +38,8 @@
   </ItemGroup>
     
   <ItemGroup>
-    <PackageReference Include="LLamaSharp.Backend.Cuda11" Version="0.6.0" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.4" />
+    <PackageReference Include="LLamaSharp.Backend.Cuda11" Version="0.8.1" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.16.0" />
   </ItemGroup>
   
   <ItemGroup Condition="$(SolutionName)==BotSharp">
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
@@ -143,7 +143,8 @@
     // "TextEmbedding": "LLamaSharp.TextEmbeddingProvider",
     "TextCompletion": "AzureOpenAI.Providers.TextCompletionProvider",
     // "TextCompletion": "LLamaSharp.TextCompletionProvider",
-    "Pdf2TextConverter": "PaddleSharp.Providers.Pdf2TextConverter"
+    // "Pdf2TextConverter": "PaddleSharp.Providers.Pdf2TextConverter"
+    "Pdf2TextConverter": "PigPdf2TextConverter"
   },
 
   "PluginLoader": {
diff --git a/tests/Dishwasher-Whirlpool.pdf b/tests/Dishwasher-Whirlpool.pdf

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Knowledges;`
`5`	`5`	`public interface IKnowledgeService`
`6`	`6`	`{`
`7`	`7`	`Task Feed(KnowledgeFeedModel knowledge);`
	`8`	`+ Task EmbedKnowledge(KnowledgeCreationModel knowledge);`
`8`	`9`	`Task<string> GetKnowledges(KnowledgeRetrievalModel retrievalModel);`
`9`	`10`	`Task<List<RetrievedResult>> GetAnswer(KnowledgeRetrievalModel retrievalModel);`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ namespace BotSharp.Abstraction.Knowledges`
`7`	`7`	`{`
`8`	`8`	`public interface IPdf2TextConverter`
`9`	`9`	`{`
`10`		`- Task<string> ConvertPdfToText(IFormFile formFile, int? startPageNum, int? endPageNum);`
	`10`	`+ Task<string> ConvertPdfToText(string filePath, int? startPageNum, int? endPageNum);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ public class AgentFilter`
`7`	`7`	`public bool? AllowRouting { get; set; }`
`8`	`8`	`public bool? IsPublic { get; set; }`
`9`	`9`	`public bool? IsRouter { get; set; }`
	`10`	`+ public bool? IsEvaluator { get; set; }`
`10`	`11`	`public List<string>? AgentIds { get; set; }`
`11`	`12`	`}`