fix 样式修改

margin
update 升级SK KM版本
2026-02-18 06:20:11 +08:00 · 2024-05-23 12:07:37 +08:00 · 2024-05-23 11:33:15 +08:00 · 2024-05-23 11:29:23 +08:00 · 2024-05-14 22:20:32 +08:00 · 2024-05-14 20:32:11 +08:00
19 changed files with 76 additions and 59 deletions
--- a/README.en.md
+++ b/README.en.md
@@ -39,9 +39,10 @@ AntSK is suitable for various business scenarios, such as:

 ## ✏️Function Examples
 ### Online Demo
-```
-https://antsk.ai-dotnet.com/
-```
+[document](http://antsk.cn/)
+
+[demo](https://antsk.ai-dotnet.com/)
+
 ```
 Default account: test

@@ -198,12 +199,12 @@ This project exists thanks to all the people who contribute.
  <img src="https://contrib.rocks/image?repo=AIDotNet/AntSK&max=1000&columns=15&anon=1" />
 </a>

-## 🚨 Code of Conduct
-
-This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
-For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
-
-To learn more or get started with **AntSK**, follow my official WeChat account and join the discussion group.
+## 🚨  Use Protocol
+This warehouse follows the [Apache-2.0 License]（ https://github.com/AIDotNet/AntSK?tab=Apache -2.0-1-ov file) open source protocol.
+The Apache open source license allows the use of AntSK in commercial environments, provided that the license terms are followed. One of the main terms is to retain the copyright and license statements.
+If you plan to use AntSK in commercial projects, you need to ensure that you follow the following steps:
+1. Copyright statement containing Apache license. [Apache-2.0 License]（ https://github.com/AIDotNet/AntSK?tab=Apache -2.0-1-ov file).
+2. If you modify the software source code, you need to clearly indicate these modifications in the source code.

 ## ☎️Contact Me
 If you have any questions or suggestions, please contact me through my official WeChat account. We also have a discussion group where you can send a message to join, and then I will add you to the group.
--- a/README.md
+++ b/README.md
@@ -207,11 +207,17 @@ DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是
 <img src="https://contrib.rocks/image?repo=AIDotNet/AntSK&max=1000&columns=15&anon=1" />
 </a>

-## 🚨 行为准则
+## 🚨 使用协议

-该项目采用了贡献者公约定义的行为准则，以阐明我们社区的预期行为。有关更多信息，请参见 .NET Foundation 行为准则。 [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
+本仓库遵循  [Apache-2.0 License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 开源协议。
+Apache开源许可证允许在商业环境中使用AntSK，前提是需要遵守许可证的条款。主要条款之一是要保留版权声明和许可证声明。
+
+如果您打算在商业项目中使用AntSK，您需要确保遵守以下步骤：
+
+1、包含Apache许可证的版权声明。 [Apache-2.0 License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 。
+
+2、如果您修改了软件源代码，您需要在源代码中明确标明这些修改。

-想了解更多信息或开始使用 **AntSK**，可以关注我的公众号以及加入交流群。

 ## ☎️联系我
 如有任何问题或建议，请通过以下方式关注我的公众号《许泽宇的技术分享》，发消息与我联系，我们也有AIDotnet交流群，可以发送进群等消息，然后我会拉你进交流群
--- a/src/AntSK.Domain/AntSK.Domain.csproj
+++ b/src/AntSK.Domain/AntSK.Domain.csproj
@@ -5,11 +5,11 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <DocumentationFile>AntSK.Domain.xml</DocumentationFile>
-    <NoWarn>CA1050,CA1707,CA2007,VSTHRD111,CS1591,RCS1110,CA5394,SKEXP0001,SKEXP0002,SKEXP0003,SKEXP0004,SKEXP0010,SKEXP0011,,SKEXP0012,SKEXP0020,SKEXP0021,SKEXP0022,SKEXP0023,SKEXP0024,SKEXP0025,SKEXP0026,SKEXP0027,SKEXP0028,SKEXP0029,SKEXP0030,SKEXP0031,SKEXP0032,SKEXP0040,SKEXP0041,SKEXP0042,SKEXP0050,SKEXP0051,SKEXP0052,SKEXP0053,SKEXP0054,SKEXP0055,SKEXP0060,SKEXP0061,SKEXP0101,SKEXP0102</NoWarn>
+    <NoWarn>CA1050,CA1707,CA2007,VSTHRD111,CS1591,RCS1110,CA5394,SKEXP0001,SKEXP0002,SKEXP0003,SKEXP0004,SKEXP0010,SKEXP0011,,SKEXP0012,SKEXP0020,SKEXP0021,SKEXP0022,SKEXP0023,SKEXP0024,SKEXP0025,SKEXP0026,SKEXP0027,SKEXP0028,SKEXP0029,SKEXP0030,SKEXP0031,SKEXP0032,SKEXP0040,SKEXP0041,SKEXP0042,SKEXP0050,SKEXP0051,SKEXP0052,SKEXP0053,SKEXP0054,SKEXP0055,SKEXP0060,SKEXP0061,SKEXP0101,SKEXP0102,KMEXP00</NoWarn>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="AntDesign.Charts" Version="0.5.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.18.2" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.0" />
    <PackageReference Include="BlazorComponents.Terminal" Version="0.6.0" />
    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
  
@@ -21,14 +21,14 @@
    <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
    <PackageReference Include="Markdig" Version="0.37.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.152" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.154" />
    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
    <PackageReference Include="RestSharp" Version="110.2.0" />
    <PackageReference Include="NPOI" Version="2.7.0" />
    
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.8.0" />
-    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.8.0" />
-    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.8.0-alpha" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.11.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.11.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.11.1-alpha" />
    <PackageReference Include="Microsoft.KernelMemory.Core" Version="$(KMVersion)" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="$(KMVersion)" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Qdrant" Version="$(KMVersion)" />
--- a/src/AntSK.Domain/Directory.Build.props
+++ b/src/AntSK.Domain/Directory.Build.props
@@ -1,8 +1,7 @@
 <Project>
  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
  <PropertyGroup>
-
-    <KMVersion>0.37.240420.2</KMVersion>
-    <LLamaSharpVersion>0.11.2</LLamaSharpVersion>
+    <KMVersion>0.61.240519.2</KMVersion>
+    <LLamaSharpVersion>0.12.0</LLamaSharpVersion>
  </PropertyGroup>
 </Project>
--- a/src/AntSK.Domain/Domain/Other/Bge/BgeEmbeddingConfig.cs
+++ b/src/AntSK.Domain/Domain/Other/Bge/BgeEmbeddingConfig.cs
@@ -1,4 +1,5 @@
-using Microsoft.KernelMemory.AI.OpenAI.GPT3;
+using Microsoft.KernelMemory.AI.OpenAI;
+using Microsoft.KernelMemory.AI.OpenAI.GPT3;
 using Python.Runtime;
 using System;
 using System.Collections.Generic;
@@ -85,7 +86,7 @@ namespace AntSK.Domain.Domain.Other.Bge
            //    return len;

            //}
-            var tokenCount1 = GPT3Tokenizer.Encode(queryStr).Count;
+            var tokenCount1 = DefaultGPTTokenizer.StaticCountTokens(queryStr);
            return tokenCount1;
        }

--- a/src/AntSK.Domain/Domain/Other/KMExcelHandler.cs
+++ b/src/AntSK.Domain/Domain/Other/KMExcelHandler.cs
@@ -1,4 +1,5 @@
 using AntSK.Domain.Domain.Model.Constant;
+using AntSK.Domain.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.KernelMemory.AI.OpenAI;
 using Microsoft.KernelMemory.Configuration;
@@ -134,7 +135,7 @@ namespace AntSK.Domain.Domain.Other
                            PartitionNumber = partitionNumber,
                            SectionNumber = sectionNumber,
                            Tags = pipeline.Tags,
-                            ContentSHA256 = textData.CalculateSHA256(),
+                            ContentSHA256 = textData.AntSKCalculateSHA256(),
                        };
                        newFiles.Add(destFile, destFileDetails);
                        destFileDetails.MarkProcessedBy(this);
--- a/src/AntSK.Domain/Domain/Other/LLamaConfig.cs
+++ b/src/AntSK.Domain/Domain/Other/LLamaConfig.cs
@@ -32,7 +32,7 @@ namespace AntSK.Domain.Domain.Other
                        ContextSize = lsConfig?.ContextSize ?? 2048,
                        Seed = lsConfig?.Seed ?? 0,
                        GpuLayerCount = lsConfig?.GpuLayerCount ?? 20,
-                        EmbeddingMode = true
+                        Embeddings = true
                    };
                    var weights = LLamaWeights.LoadFromFile(parameters);
                    dicLLamaWeights.Add(modelPath, (weights, parameters));
--- a/src/AntSK.Domain/Domain/Other/QAHandler.cs
+++ b/src/AntSK.Domain/Domain/Other/QAHandler.cs
@@ -151,7 +151,7 @@ namespace AntSK.Domain.Domain.Other
                            PartitionNumber = partitionNumber,
                            SectionNumber = sectionNumber,
                            Tags = pipeline.Tags,
-                            ContentSHA256 = textData.CalculateSHA256(),
+                            ContentSHA256 = textData.AntSKCalculateSHA256(),
                        };
                        newFiles.Add(destFile, destFileDetails);
                        destFileDetails.MarkProcessedBy(this);
--- a/src/AntSK.Domain/Domain/Service/ChatService.cs
+++ b/src/AntSK.Domain/Domain/Service/ChatService.cs
@@ -330,22 +330,18 @@ namespace AntSK.Domain.Domain.Service

        public async Task<ChatHistory> GetChatHistory(List<Chats> MessageList, ChatHistory history)
        {
-            if (MessageList.Count > 1)
+            foreach (var item in MessageList)
            {
-
-                foreach (var item in MessageList)
+                if (item.IsSend)
                {
-                    if (item.IsSend)
-                    {
-                        history.AddUserMessage(item.Context);
-                    }
-                    else
-                    {
-                        history.AddAssistantMessage(item.Context);
-                    }
+                    history.AddUserMessage(item.Context);
+                }
+                else
+                {
+                    history.AddAssistantMessage(item.Context);
                }
            }
            return history;
        }
    }
-}
+}
--- a/src/AntSK.Domain/Domain/Service/KMService.cs
+++ b/src/AntSK.Domain/Domain/Service/KMService.cs
@@ -296,7 +296,7 @@ namespace AntSK.Domain.Domain.Service
                    {
                        DocumentId = item.GetDocumentId(),
                        Text = item.GetPartitionText(),
-                        Url = item.GetWebPageUrl(),
+                        Url = item.GetWebPageUrl(KmsConstantcs.KmsIndex),
                        LastUpdate = item.GetLastUpdate().LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        File = item.GetFileName()
                    }));
--- a/src/AntSK.Domain/Domain/Service/KernelService.cs
+++ b/src/AntSK.Domain/Domain/Service/KernelService.cs
@@ -178,7 +178,6 @@ namespace AntSK.Domain.Domain.Service

                            var getParametes = new List<KernelParameterMetadata>() {
                                     new KernelParameterMetadata("jsonbody"){
-                                      Name="json参数字符串",
                                      ParameterType=typeof(string),
                                      Description=$"背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.Query}"
                                    }
@@ -217,7 +216,6 @@ namespace AntSK.Domain.Domain.Service
                            //处理json body
                            var postParametes = new List<KernelParameterMetadata>() {
                                    new KernelParameterMetadata("jsonbody"){
-                                      Name="json参数字符串",
                                      ParameterType=typeof(string),
                                      Description=$"背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.JsonBody}"
                                    }
@@ -305,8 +303,8 @@ namespace AntSK.Domain.Domain.Service
            KernelFunction sunFun = _kernel.Plugins.GetFunction("ConversationSummaryPlugin", "SummarizeConversation");
            var summary = await _kernel.InvokeAsync(sunFun, new() { ["input"] = $"内容是：{history.ToString()} {Environment.NewLine} 请注意用中文总结" });
            string his = summary.GetValue<string>();
-            var msg = $"history：{Environment.NewLine}{history.ToString()}{Environment.NewLine} user：{questions}{Environment.NewLine}"; ;
+            var msg = $"history：{Environment.NewLine}{his}{Environment.NewLine} user：{questions}{Environment.NewLine}"; 
            return msg;
        }
    }
-}
+}
--- a/src/AntSK.Domain/Utils/ConvertUtils.cs
+++ b/src/AntSK.Domain/Utils/ConvertUtils.cs
@@ -1,4 +1,5 @@
-using System.Web;
+using System.Security.Cryptography;
+using System.Web;

 namespace AntSK.Domain.Utils
 {
@@ -261,5 +262,11 @@ namespace AntSK.Domain.Utils
        {
            return s.Equals(value, StringComparison.OrdinalIgnoreCase);
        }
+
+        public static string AntSKCalculateSHA256(this BinaryData binaryData)
+        {
+            byte[] byteArray = SHA256.HashData(binaryData.ToMemory().Span);
+            return Convert.ToHexString(byteArray).ToLowerInvariant();
+        }
    }
 }
--- a/src/AntSK.OCR/Directory.Build.props
+++ b/src/AntSK.OCR/Directory.Build.props
@@ -1,8 +1,7 @@
 <Project>
  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
  <PropertyGroup>
-
-    <KMVersion>0.36.240416.1</KMVersion>
-    <LLamaSharpVersion>0.11.2</LLamaSharpVersion>
+    <KMVersion>0.61.240519.2</KMVersion>
+    <LLamaSharpVersion>0.12.0</LLamaSharpVersion>
  </PropertyGroup>
 </Project>
--- a/src/AntSK/AntSK.csproj
+++ b/src/AntSK/AntSK.csproj
@@ -6,6 +6,7 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <DocumentationFile>AntSK.xml</DocumentationFile>
    <NoWarn>CA1050,CA1707,CA2007,VSTHRD111,CS1591,RCS1110,CA5394,SKEXP0001,SKEXP0002,SKEXP0003,SKEXP0004,SKEXP0010,SKEXP0011,,SKEXP0012,SKEXP0020,SKEXP0021,SKEXP0022,SKEXP0023,SKEXP0024,SKEXP0025,SKEXP0026,SKEXP0027,SKEXP0028,SKEXP0029,SKEXP0030,SKEXP0031,SKEXP0032,SKEXP0040,SKEXP0041,SKEXP0042,SKEXP0050,SKEXP0051,SKEXP0052,SKEXP0053,SKEXP0054,SKEXP0055,SKEXP0060,SKEXP0061,SKEXP0101,SKEXP0102</NoWarn>
+    <ApplicationIcon>AntSKlogo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
@@ -14,6 +15,10 @@
    <EmbeddedResource Remove="llamafactory\**" />
    <None Remove="llamafactory\**" />
  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="AntSKlogo.ico" />
+  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2" />
--- a/src/AntSK/AntSKlogo.ico
+++ b/src/AntSK/AntSKlogo.ico
--- a/src/AntSK/Pages/ChatPage/Chat.razor
+++ b/src/AntSK/Pages/ChatPage/Chat.razor
@@ -68,12 +68,10 @@
        flex-direction: column;
        overflow-x: hidden;
        overflow-y: auto;
-        font-family: Arial, sans-serif;
        margin: 0;
    }

    body {
-        font-family: Arial, sans-serif;
        margin: 0;
        justify-content: center;
        align-items: flex-start;
--- a/src/AntSK/Pages/ChatPage/Components/ChatView.razor.cs
+++ b/src/AntSK/Pages/ChatPage/Components/ChatView.razor.cs
@@ -186,9 +186,17 @@ namespace AntSK.Pages.ChatPage.Components
                }

                Sendding = true;
-                await SendAsync(_messageInput, filePath);
-                _messageInput = "";
-                Sendding = false;
+                Task.Run(async () =>
+                {
+                    await SendAsync(_messageInput, filePath);
+                }).ContinueWith(task => {
+
+                    _messageInput = "";
+                    Sendding = false;
+                    InvokeAsync(StateHasChanged);
+                });
+
+
            }
            catch (System.Exception ex)
            {
@@ -269,9 +277,7 @@ namespace AntSK.Pages.ChatPage.Components
                    await OnRelevantSources.InvokeAsync(_relevantSources);
                }
            }
-
-
-            return await Task.FromResult(true);
+            return true;
        }

        /// <summary>
--- a/src/AntSK/Pages/Setting/AIModel/AddModel.razor
+++ b/src/AntSK/Pages/Setting/AIModel/AddModel.razor
@@ -65,7 +65,7 @@
                        <Input Placeholder="请输入部署名" @bind-Value="@context.ModelName" />
                    </FormItem>
                    <FormItem Label="模型秘钥" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" Size="@InputSize.Large" />
+                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥"  />
                    </FormItem>
                }
                @if (context.AIType == AIType.OpenAI)
@@ -77,7 +77,7 @@
                        <Input Placeholder="请输入模型名称" @bind-Value="@context.ModelName" />
                    </FormItem>
                    <FormItem Label="模型秘钥" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" Size="@InputSize.Large" />
+                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" />
                    </FormItem>
                }
                @if (context.AIType == AIType.SparkDesk)
@@ -86,7 +86,7 @@
                        <Input Placeholder="请输入APPID" @bind-Value="@context.EndPoint" />
                    </FormItem>
                    <FormItem Label="APISecret" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="APISecret" Size="@InputSize.Large" />
+                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="APISecret"  />
                    </FormItem>
                    <FormItem Label="APIKey" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                        <Input Placeholder="请输入请输入APIKey" @bind-Value="@context.ModelName" />
--- a/src/AntSk.LLM/AntSK.LLM.csproj
+++ b/src/AntSk.LLM/AntSK.LLM.csproj
@@ -11,7 +11,7 @@
    <PackageReference Include="RestSharp" Version="110.2.0" />
    <PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.1.0" />
    <PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.3.2" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.3" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.10.0" />
    <PackageReference Include="Sdcb.SparkDesk" Version="3.0.0" />
    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
  </ItemGroup>
Author	SHA1	Message	Date
zyxucp	8315b6f37f	fix 样式修改	2024-05-23 12:07:37 +08:00
zyxucp	7bc708e6ae	margin	2024-05-23 11:33:15 +08:00
zyxucp	e6f2c5c2fe	update 升级SK KM版本	2024-05-23 11:29:23 +08:00
zyxucp	5cab781362	Merge pull request #90 from yc-2503/main fix: 对话窗口的第一条对话没有传给大模型问题	2024-05-14 22:20:32 +08:00
Chason	02d7994bae	fix: 对话窗口的第一条对话丢失	2024-05-14 20:32:11 +08:00
zyxucp	b740957157	fix 调整KM版本	2024-05-12 20:49:13 +08:00
zyxucp	2480ec1272	margin	2024-05-12 19:07:51 +08:00
zyxucp	35c98a0d14	update 更新ant blazor \sk \km	2024-05-12 19:07:27 +08:00
zyxucp	0964a5ad5b	Merge pull request #88 from yc-2503/main bugfix: 调用function时报错 jsonbody 参数不存在	2024-05-09 23:33:24 +08:00
Chason	a95131efe9	fix: 调用function时报错 jsonbody 参数不存在 KernelParameterMetadata 的构造函数已指定参数名 jsonbody, 后续却又将参数名改为 json参数字符串	2024-05-09 17:41:43 +08:00
Chason	7783cdf3c4	bugfix: 语法错误	2024-05-09 10:55:41 +08:00
zyxucp	7a65f33cb6	Update README.md	2024-05-09 01:33:37 +08:00
zyxucp	6efd01db3f	Merge pull request #87 from yc-2503/main fix: 修正会话总结中的返回字符串	2024-05-08 13:26:15 +08:00
Chason	1e2322b573	Merge pull request #1 from yc-2503/yc-2503-patch-1 fix: 修正会话总结	2024-05-07 19:55:12 +08:00
Chason	2cb2241a66	fix: 修正会话总结	2024-05-07 19:54:29 +08:00
zyxucp	64efdd7881	add logo	2024-05-01 14:09:21 +08:00
zyxucp	be28e32803	update 更新nuget版本	2024-05-01 13:05:11 +08:00
zyxucp	468422baee	fix 处理异步聊天问题	2024-04-30 21:53:50 +08:00
zyxucp	7b1c6c8c64	fix 修改异步	2024-04-30 17:53:16 +08:00
zyxucp	7ff0ea0bfe	Update README.en.md	2024-04-29 21:42:57 +08:00
zyxucp	6bed4356f0	Update README.md	2024-04-29 18:17:06 +08:00