Update README.md

fix 修改聊天记录知识库保存bug

README.md

@@ -42,9 +42,11 @@ AntSK 适用于多种业务场景，例如：
 
 ## ✏️功能示例
 ### 在线演示
-```
-https://antsk.ai-dotnet.com/
-```
+
+[文档地址](http://antsk.cn/)
+
+[体验地址](https://antsk.ai-dotnet.com/)
+
 ```
 默认账号：test
 

src/AntSK.Domain/Domain/Model/Constant/KmsConstantcs.cs

@@ -9,7 +9,10 @@ namespace AntSK.Domain.Domain.Model.Constant
     public class KmsConstantcs
     {
         public const string KmsIdTag = "kmsid";
+        public const string FileIdTag = "fileid";
+        public const string AppIdTag = "appid";
         public const string KmsIndex = "kms";
+        public const string FileIndex = "kms";
         public const string KmsSearchNull="知识库未搜索到相关内容";
 
         public const string KmsPrompt = @"使用<data></data>标记的内容作为你的知识：

src/AntSK.Domain/Domain/Service/ChatService.cs

@@ -85,20 +85,39 @@ namespace AntSK.Domain.Domain.Service
             if (!string.IsNullOrWhiteSpace(filePath))
             {
                 var memory = _kMService.GetMemoryByApp(app);
-                var fileId = Guid.NewGuid().ToString();
-                var result = await memory.ImportDocumentAsync(new Microsoft.KernelMemory.Document(fileId).AddFile(filePath)
-                          .AddTag(KmsConstantcs.KmsIdTag, app.Id)
-                          , index: KmsConstantcs.KmsIndex);
 
-                var filters = new MemoryFilter().ByTag(KmsConstantcs.KmsIdTag, app.Id);
+                // 匹配GUID的正则表达式
+                string pattern = @"\b[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\b";
 
-                var searchResult = await memory.SearchAsync(questions, index: KmsConstantcs.KmsIndex, filters: [filters]);
-                relevantSourceList.AddRange(searchResult.Results.SelectMany(item => item.Partitions.Select(part => new RelevantSource()
+                // 使用正则表达式找到匹配
+                Match match = Regex.Match(filePath, pattern);
+                if (match.Success)
                 {
-                    SourceName = item.SourceName,
-                    Text = Markdown.ToHtml(part.Text),
-                    Relevance = part.Relevance
-                })));
+                    var fileId = match.Value;
+
+                    var status=await  memory.IsDocumentReadyAsync(fileId, index: KmsConstantcs.KmsIndex);
+                    if (!status)
+                    {
+                        var result = await memory.ImportDocumentAsync(new Document(fileId).AddFile(filePath)
+                                  .AddTag(KmsConstantcs.AppIdTag, app.Id)
+                                  .AddTag(KmsConstantcs.FileIdTag, fileId)
+                                  , index: KmsConstantcs.FileIndex);
+                    }
+
+                    var filters = new List<MemoryFilter>() {
+                        new MemoryFilter().ByTag(KmsConstantcs.AppIdTag, app.Id),
+                        new MemoryFilter().ByTag(KmsConstantcs.FileIdTag, fileId)
+                    };
+
+                    var searchResult = await memory.SearchAsync(questions, index: KmsConstantcs.FileIndex, filters: filters);
+                    relevantSourceList.AddRange(searchResult.Results.SelectMany(item => item.Partitions.Select(part => new RelevantSource()
+                    {
+                        SourceName = item.SourceName,
+                        Text = Markdown.ToHtml(part.Text),
+                        Relevance = part.Relevance
+                    })));
+                    app.Prompt = KmsConstantcs.KmsPrompt;
+                }
             }
 
 
@@ -155,11 +174,13 @@ namespace AntSK.Domain.Domain.Service
                     }
                     else
                     {
-                        string fileName = _kmsDetails_Repositories.GetFirst(p => p.FileGuidName == item.SourceName).FileName;
-                        fileDic.Add(item.SourceName, fileName);
-                        item.SourceName = fileName;
-
-
+                        var fileDetail = _kmsDetails_Repositories.GetFirst(p => p.FileGuidName == item.SourceName);
+                        if (fileDetail.IsNotNull())
+                        {
+                            string fileName = fileDetail.FileName;
+                            fileDic.Add(item.SourceName, fileName);
+                            item.SourceName = fileName;
+                        }       
                     }
                     item.Text = Markdown.ToHtml(item.Text);
                 }
@@ -169,7 +190,7 @@ namespace AntSK.Domain.Domain.Service
                     //KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask1");
                     var temperature = app.Temperature / 100;//存的是0~100需要缩小
                     OpenAIPromptExecutionSettings settings = new() { Temperature = temperature };
-                    var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
+                    var func = _kernel.CreateFunctionFromPrompt(app.Prompt , settings);
 
                     var chatResult = _kernel.InvokeStreamingAsync(function: func,
                         arguments: new KernelArguments() { ["doc"] = dataMsg.ToString(), ["history"] = string.Join("\n", history.Select(x => x.Role + ": " + x.Content)), ["input"] = questions });

src/AntSK/Pages/ChatPage/Components/ChatView.razor.cs

@@ -8,6 +8,7 @@ using AntSK.Domain.Utils;
 using AntSK.LLM.StableDiffusion;
 using AntSK.Models;
 using Blazored.LocalStorage;
+using DocumentFormat.OpenXml.InkML;
 using Markdig;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
@@ -85,7 +86,6 @@ namespace AntSK.Pages.ChatPage.Components
         /// <returns></returns>
         private async Task GetMsgList()
         {
-            MessageList.Clear();
             List<Chats> msgs = new List<Chats>();
             if (string.IsNullOrEmpty(_userName))
             {
@@ -122,7 +122,7 @@ namespace AntSK.Pages.ChatPage.Components
         /// 保存聊天记录
         /// </summary>
         /// <returns></returns>
-        private async Task SaveMsg()
+        private async Task SaveMsg(List<Chats> MessageList)
         {
             if (string.IsNullOrEmpty(_userName))
             {
@@ -130,7 +130,10 @@ namespace AntSK.Pages.ChatPage.Components
             }
             else 
             {
-                await _chats_Repositories.InsertAsync(MessageList.LastOrDefault());
+                if (MessageList.Count() > 0)
+                {
+                    await _chats_Repositories.InsertAsync(MessageList.LastOrDefault());
+                }
             }          
         }
 
@@ -246,7 +249,11 @@ namespace AntSK.Pages.ChatPage.Components
             //缓存消息记录
             if (app.Type != AppType.img.ToString())
             {
-                await SaveMsg();
+                await SaveMsg(MessageList);
+                if (OnRelevantSources.IsNotNull())
+                {
+                    await OnRelevantSources.InvokeAsync(_relevantSources);
+                }       
             }
 
 
@@ -287,29 +294,23 @@ namespace AntSK.Pages.ChatPage.Components
         /// <returns></returns>
         private async Task SendKms(string questions, ChatHistory history, Apps app, string? filePath)
         {
-            Chats info = null;
+            Chats info = new Chats()
+            {
+                Id = Guid.NewGuid().ToString(),
+                AppId = AppId,
+                UserName = _userName,
+                CreateTime = DateTime.Now,
+                Context=""
+            };
+            MessageList.Add(info);
             var chatResult = _chatService.SendKmsByAppAsync(app, questions, history, filePath, _relevantSources);
             await foreach (var content in chatResult)
             {
-                if (info == null)
-                {
-                    info = new Chats();
-                    info.Id = Guid.NewGuid().ToString();
-                    info.UserName = _userName;
-                    info.AppId = AppId;
-                    info.Context = content.ConvertToString();
-                    info.CreateTime = DateTime.Now;
 
-                    MessageList.Add(info);
-                }
-                else
-                {
-                    info.Context += content.ConvertToString();
-                    await Task.Delay(50);
-                }
+                info.Context += content.ConvertToString();
+                await Task.Delay(50);
                 await InvokeAsync(StateHasChanged);
             }
-            await OnRelevantSources.InvokeAsync(_relevantSources);
             //全部处理完后再处理一次Markdown
             await MarkDown(info);
         }

src/AntSK/Pages/Setting/ChatHistory/ChatHistory.razor

@@ -8,34 +8,42 @@
 @using AntSK.Domain.Repositories
 @using AntSK.Domain.Common.Map
 @attribute [Authorize(Roles = "AntSKAdmin")]
-<div>
-    <PageContainer Title="聊天记录">
-        <ChildContent>
-            <Table @ref="table"
-                   TItem="ChatsDto"
-                   DataSource="@chatDtoList"
-                   Total="_total"
-                   @bind-PageIndex="_pageIndex"
-                   @bind-PageSize="_pageSize"
-                   OnChange="OnChange"
-                   Size="TableSize.Small"
-                   RowKey="x=>x.Id">
-                <PropertyColumn Property="c=>c.Id"  />
-                <PropertyColumn Title="用户名" Property="c=>c.UserName"  />
-                <PropertyColumn Title="应用名称" Property="c=>c.AppName"  />
-                <PropertyColumn Title="发送/接收" Property="c=>c.SendReveice"  />
-                <ActionColumn Title="消息内容" Width="30%">
-                    <Space>
-                        <SpaceItem>
-                           @((MarkupString)(context.Context))
-                        </SpaceItem>
-                    </Space>
-                </ActionColumn>
-                <PropertyColumn Title="时间" Property="c=>c.CreateTime" Format="yyyy-MM-dd HH:mm:ss"  />
-            </Table>
-        </ChildContent>
-    </PageContainer>
-</div>
+
+<Table @ref="table"
+       TItem="ChatsDto"
+       DataSource="@chatDtoList"
+       Total="_total"
+       @bind-PageIndex="_pageIndex"
+       @bind-PageSize="_pageSize"
+       OnChange="OnChange"
+       Size="TableSize.Small"
+       RowKey="x=>x.Id">
+    <TitleTemplate>
+        <GridRow>
+            <GridCol Span="4">
+                <Title Level="3">聊天记录</Title>
+            </GridCol>
+            <GridCol Span="8" Offset="12">
+                <Search Placeholder="搜索" @bind-Value="searchString" OnSearch="Search" />
+            </GridCol>
+        </GridRow>
+    </TitleTemplate>
+    <ColumnDefinitions>
+        <PropertyColumn Property="c=>c.Id" />
+        <PropertyColumn Title="用户名" Property="c=>c.UserName" />
+        <PropertyColumn Title="应用名称" Property="c=>c.AppName" />
+        <PropertyColumn Title="发送/接收" Property="c=>c.SendReveice" />
+        <ActionColumn Title="消息内容" Width="30%">
+            <Space>
+                <SpaceItem>
+                    @((MarkupString)(context.Context))
+                </SpaceItem>
+            </Space>
+        </ActionColumn>
+        <PropertyColumn Title="时间" Property="c=>c.CreateTime" Format="yyyy-MM-dd HH:mm:ss" />
+    </ColumnDefinitions>
+</Table>
+
 @using System.Text.Json;
 @code {
     [Inject] IChats_Repositories _chats_Repositories { get; set; }
@@ -47,6 +55,7 @@
     int _pageIndex = 1;
     int _pageSize = 10;
     int _total = 0;
+    string searchString;
 
     protected override async Task OnInitializedAsync()
     {
@@ -60,21 +69,47 @@
 
     private async Task InitData()
     {
-        _total = _chats_Repositories.Count(p => true);
-        var chatList = _chats_Repositories.GetDB().Queryable<Chats, Apps>((c, a) => new object[] {
+        if (string.IsNullOrEmpty(searchString))
+        {
+            _total = _chats_Repositories.Count(p => true);
+            var chatList = _chats_Repositories.GetDB().Queryable<Chats, Apps>((c, a) => new object[] {
             SqlSugar.JoinType.Left,c.AppId==a.Id
     }).Select((c, a) => new ChatsDto
+        {
+            Id = c.Id,
+            UserName = c.UserName,
+            AppId = c.AppId,
+            IsSend = c.IsSend,
+            SendReveice = c.IsSend ? "发送" : "接收",
+            Context = c.Context,
+            CreateTime = c.CreateTime,
+            AppName = a.Name
+        }).ToPageList(_pageIndex, _pageSize);
+            chatDtoList = chatList.ToArray();
+        }
+        else
+        {
+            _total = _chats_Repositories.Count(p => p.UserName.Contains(searchString) || p.Context.Contains(searchString));
+            var chatList = _chats_Repositories.GetDB().Queryable<Chats, Apps>((c, a) => new object[] {
+            SqlSugar.JoinType.Left,c.AppId==a.Id
+        }).Select((c, a) => new ChatsDto
+            {
+                Id = c.Id,
+                UserName = c.UserName,
+                AppId = c.AppId,
+                IsSend = c.IsSend,
+                SendReveice = c.IsSend ? "发送" : "接收",
+                Context = c.Context,
+                CreateTime = c.CreateTime,
+                AppName = a.Name
+        }).Where(c => c.UserName.Contains(searchString) || c.Context.Contains(searchString)).ToPageList(_pageIndex, _pageSize);
+            chatDtoList = chatList.ToArray();
+        }
+    }
+
+    private async Task Search(string searchKey)
     {
-        Id = c.Id,
-        UserName = c.UserName,
-        AppId = c.AppId,
-        IsSend = c.IsSend,
-        SendReveice = c.IsSend ? "发送" : "接收",
-        Context=c.Context,
-        CreateTime = c.CreateTime,
-        AppName = a.Name
-    }).ToPageList(_pageIndex, _pageSize);
-        chatDtoList = chatList.ToArray();
+        await InitData();
     }
 
     public class ChatsDto : Chats

src/AntSK/Pages/Setting/DelKms/DelKms.razor

@@ -72,6 +72,7 @@
         }
 
         kmsDetails_Repositories.GetDB().Ado.ExecuteCommand("DROP TABLE IF EXISTS \"km-kms\"");    
+        kmsDetails_Repositories.GetDB().Ado.ExecuteCommand("DROP TABLE IF EXISTS \"km-file\"");    
         var kmsDetails = await kmsDetails_Repositories.GetListAsync();
         foreach (var detail in kmsDetails)
         {

src/AntSK/Program.cs

@@ -68,17 +68,17 @@ builder.Services.AddBackgroundTaskBroker().AddHandler<ImportKMSTaskReq, BackGrou
            .WithCuda(false)
            .WithLogCallback((level, message) => {
                Console.WriteLine($"[llama {level}]: {message.TrimEnd('\n')}");
-           });
+            });
     }
     else if (LLamaSharpOption.RunType.ToUpper() == "GPU")
     {
         NativeLibraryConfig
         .Instance
         .WithCuda(true)
-        .WithAvx(NativeLibraryConfig.AvxLevel.Avx)
         .WithLogCallback((level, message) => {
             Console.WriteLine($"[llama {level}]: {message.TrimEnd('\n')}");
-        });
+         })
+        .WithAvx(NativeLibraryConfig.AvxLevel.Avx);
     }
 }