fix nuget

fix 修改ocr runtime
Merge pull request #65 from AIDotNet/feature_ocr
2026-02-23 10:39:31 +08:00 · 2024-04-10 23:23:18 +08:00 · 2024-04-10 22:51:37 +08:00 · 2024-04-10 22:39:28 +08:00 · 2024-04-10 22:37:32 +08:00 · 2024-04-10 22:25:36 +08:00
24 changed files with 188 additions and 112 deletions
--- a/1
+++ b/1
@@ -22,4 +22,5 @@ WORKDIR /app
 COPY --from=build /app/publish .
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' >/etc/timezone
+RUN apt update && apt install -y libpugixml-dev libtbb-dev
 ENTRYPOINT ["dotnet", "AntSK.dll"]
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ version: '3.8'
 services:
  antsk:
    container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.2.3
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.2.7
    ports:
      - 5000:5000
    networks:
@@ -102,6 +102,7 @@ services:
    volumes:
      - ./appsettings.json:/app/appsettings.json # 本地配置文件 需要放在同级目录
      - D://model:/app/model
+      - D://model:/root/.cache/modelscope/hub/AI-ModelScope #使用Llamafactory时需要挂载 否则初始化的环境重启后会丢失
 networks:
  antsk:
 ```
--- a/docker-compose.simple.yml
+++ b/docker-compose.simple.yml
@@ -3,9 +3,9 @@ version: '3.8'
 services:
  antsk:
    container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.6
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.7
    # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大
-    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.2.6
+    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.2.7
    ports:
      - 5000:5000
    networks:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,9 +18,9 @@ services:
      - ./pg/data:/var/lib/postgresql/data
  antsk:
    container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.6
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.7
    # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大
-    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.2.6
+    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.2.7
    ports:
      - 5000:5000
    networks:
--- a/src/AntSK.Domain/AntSK.Domain.csproj
+++ b/src/AntSK.Domain/AntSK.Domain.csproj
@@ -24,28 +24,29 @@
    <PackageReference Include="SqlSugarCore" Version="5.1.4.151" />
    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
    <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="NPOI" Version="2.5.5" />
+    <PackageReference Include="NPOI" Version="2.7.0" />
    
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.3" />
-    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.6.3" />
-    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.6.3-alpha" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.7.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.7.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.7.1-alpha" />
    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.35.240321.1" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="0.35.240321.1" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Qdrant" Version="0.35.240321.1" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Redis" Version="0.35.240321.1" />
    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.AzureAISearch" Version="0.35.240321.1" />

-    <PackageReference Include="LLamaSharp" Version="0.11.1" />
-    <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.11.1" />
-    <PackageReference Include="LLamaSharp.Backend.Cuda12" Version="0.11.1" />
-    <PackageReference Include="LLamaSharp.kernel-memory" Version="0.11.1" />
-    <PackageReference Include="LLamaSharp.semantic-kernel" Version="0.11.1" />
+    <PackageReference Include="LLamaSharp" Version="0.11.2" />
+    <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.11.2" />
+    <PackageReference Include="LLamaSharp.Backend.Cuda12" Version="0.11.2" />
+    <PackageReference Include="LLamaSharp.kernel-memory" Version="0.11.2" />
+    <PackageReference Include="LLamaSharp.semantic-kernel" Version="0.11.2" />
    
    
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\AntSK.LLamaFactory\AntSK.LLamaFactory.csproj" />
    <ProjectReference Include="..\AntSk.LLM\AntSK.LLM.csproj" />
+    <ProjectReference Include="..\AntSK.OCR\AntSK.OCR.csproj" />
    <ProjectReference Include="..\MiddleWare\AntSK.BackgroundTask\AntSK.BackgroundTask.csproj" />
  </ItemGroup>

--- a/src/AntSK.Domain/Common/DependencyInjection/InitExtensions.cs
+++ b/src/AntSK.Domain/Common/DependencyInjection/InitExtensions.cs
@@ -50,6 +50,8 @@ namespace AntSK.Domain.Common.DependencyInjection
                        _repository.GetDB().CodeFirst.InitTables(type);
                    }
                }
+                //安装向量插件
+                _repository.GetDB().Ado.ExecuteCommandAsync($"CREATE EXTENSION IF NOT EXISTS vector;");
            }
            return app;
        }
--- a/src/AntSK.Domain/Domain/Service/KMService.cs
+++ b/src/AntSK.Domain/Domain/Service/KMService.cs
@@ -8,6 +8,7 @@ using AntSK.Domain.Domain.Other;
 using AntSK.Domain.Options;
 using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
+using AntSK.OCR;
 using DocumentFormat.OpenXml.Drawing.Diagrams;
 using LLama;
 using LLamaSharp.KernelMemory;
@@ -16,6 +17,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Configuration;
 using Microsoft.KernelMemory;
 using Microsoft.KernelMemory.Configuration;
+using Microsoft.KernelMemory.DataFormats;
 using Microsoft.KernelMemory.FileSystem.DevTools;
 using Microsoft.KernelMemory.MemoryStorage;
 using Microsoft.KernelMemory.MemoryStorage.DevTools;
@@ -104,13 +106,15 @@ namespace AntSK.Domain.Domain.Service
                        MaxTokensPerParagraph = kms.MaxTokensPerParagraph,
                        OverlappingTokens = kms.OverlappingTokens
                    });
+                //加载OCR
+                WithOcr(memoryBuild, kms);
                //加载会话模型
                WithTextGenerationByAIType(memoryBuild, chatModel, chatHttpClient);
                //加载向量模型
                WithTextEmbeddingGenerationByAIType(memoryBuild, embedModel, embeddingHttpClient);
                //加载向量库
                WithMemoryDbByVectorDB(memoryBuild);
-
+              
                _memory = memoryBuild.Build<MemoryServerless>();
                return _memory;
            }
@@ -119,6 +123,14 @@ namespace AntSK.Domain.Domain.Service
            //}
        }

+        private static void WithOcr(IKernelMemoryBuilder memoryBuild, Kmss kms)
+        {
+            if (kms.IsOCR == 1)
+            {
+                memoryBuild.WithCustomImageOcr(new AntSKOcrEngine());
+            }
+        }
+
        private void WithTextEmbeddingGenerationByAIType(IKernelMemoryBuilder memory, AIModels embedModel,
            HttpClient embeddingHttpClient)
        {
@@ -193,7 +205,7 @@ namespace AntSK.Domain.Domain.Service

                    memory.WithOpenAITextGeneration(new OpenAIConfig()
                    {
-                        APIKey = "123",
+                        APIKey = "NotNull",
                        TextModel = chatModel.ModelName
                    }, null, chatHttpClient);
                    break;
@@ -262,7 +274,7 @@ namespace AntSK.Domain.Domain.Service
            {
                foreach (var memoryDb in memoryDbs)
                {
-                    var items = await memoryDb.GetListAsync(memoryIndex.Name, new List<MemoryFilter>() { new MemoryFilter().ByDocument(fileId) }, 100, true).ToListAsync();
+                    var items = await memoryDb.GetListAsync(memoryIndex.Name, new List<MemoryFilter>() { new MemoryFilter().ByDocument(fileId) }, 1000, true).ToListAsync();
                    docTextList.AddRange(items.Select(item => new KMFile()
                    {
                        DocumentId = item.GetDocumentId(),
@@ -319,7 +331,10 @@ namespace AntSK.Domain.Domain.Service
                "application/pdf",
                "application/json",
                "text/x-markdown",
-                "text/markdown"
+                "text/markdown",
+                "image/jpeg",
+                "image/png",
+                "image/tiff"
            };

            string[] exceptExts = [".md", ".pdf"];
--- a/src/AntSK.Domain/Repositories/AI/App/Apps.cs
+++ b/src/AntSK.Domain/Repositories/AI/App/Apps.cs
@@ -83,7 +83,7 @@ namespace AntSK.Domain.Repositories
        /// 相似度
        /// </summary>
        [SugarColumn(DefaultValue = "70")]
-        public double Relevance { get; set; } = 70;
+        public double Relevance { get; set; } = 70f;

        /// <summary>
        /// 提问最大token数
--- a/src/AntSK.Domain/Repositories/AI/Kms/Kmss.cs
+++ b/src/AntSK.Domain/Repositories/AI/Kms/Kmss.cs
@@ -55,6 +55,7 @@ namespace AntSK.Domain.Repositories
        [SugarColumn(DefaultValue = "49")]
        public int OverlappingTokens { get; set; } = 49;

-
+        [SugarColumn(DefaultValue = "0")]
+        public int IsOCR { get; set; } = 0;
    }
 }
--- a/src/AntSK.OCR/AntSK.OCR.csproj
+++ b/src/AntSK.OCR/AntSK.OCR.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.35.240321.1" />
+    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
+    <PackageReference Include="Sdcb.OpenCvSharp4.mini.runtime.debian.12-x64" Version="4.8.0.20231125" />
+    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.4" />
+    <PackageReference Include="Sdcb.OpenVINO.PaddleOCR.Models.Online" Version="0.6.2" />
+    <PackageReference Include="Sdcb.OpenVINO.PaddleOCR" Version="0.6.3" />
+    <PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2024.0.0" />
+    <PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2024.0.0" />
+    
+  </ItemGroup>
+</Project>
--- a/src/AntSK.OCR/AntSKOcrEngine.cs
+++ b/src/AntSK.OCR/AntSKOcrEngine.cs
@@ -0,0 +1,57 @@
+using Microsoft.KernelMemory.DataFormats;
+using Sdcb.OpenVINO.PaddleOCR;
+using Sdcb.OpenVINO.PaddleOCR.Models.Online;
+using Sdcb.OpenVINO.PaddleOCR.Models;
+using OpenCvSharp;
+using static Microsoft.KernelMemory.DataFormats.WebPages.WebScraper;
+
+namespace AntSK.OCR
+{
+    /// <summary>
+    /// OCR
+    /// </summary>
+    public class AntSKOcrEngine : IOcrEngine
+    {
+        FullOcrModel model;
+        public Task<string> ExtractTextFromImageAsync(Stream imageContent, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                if (model == null)
+                {
+                    model = OnlineFullModels.ChineseV4.DownloadAsync().Result;
+                }
+                using (PaddleOcrAll all = new(model)
+                {
+                    AllowRotateDetection = true,
+                    Enable180Classification = true,
+                })
+                {
+                    Mat src = Cv2.ImDecode(StreamToByte(imageContent), ImreadModes.Color);
+                    PaddleOcrResult result = all.Run(src);
+                    return Task.FromResult(result.Text);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return Task.FromResult("");
+            }
+        }
+
+        private byte[] StreamToByte(Stream stream)
+        {
+            using (var memoryStream = new MemoryStream())
+            {
+                byte[] buffer = new byte[1024]; //自定义大小，例如 1024
+                int bytesRead;
+                while ((bytesRead = stream.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    memoryStream.Write(buffer, 0, bytesRead);
+                }
+                byte[] bytes = memoryStream.ToArray();
+                return bytes;
+            }
+        }
+    }
+}
--- a/src/AntSK.PyNet/AntSK.PyNet.csproj
+++ b/src/AntSK.PyNet/AntSK.PyNet.csproj
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
--- a/src/AntSK.PyNet/Class1.cs
+++ b/src/AntSK.PyNet/Class1.cs
@@ -1,7 +0,0 @@
-namespace AntSK.PyNet
-{
-    public class Class1
-    {
-
-    }
-}
--- a/src/AntSK.sln
+++ b/src/AntSK.sln
@@ -24,6 +24,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.Test", "AntSK.Test\An
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.LLamaFactory", "AntSK.LLamaFactory\AntSK.LLamaFactory.csproj", "{664DFA1F-68B7-49C7-B889-FA14D1756D3D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntSK.OCR", "AntSK.OCR\AntSK.OCR.csproj", "{6195F7AA-18C2-4372-85CA-11FC4B522686}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Settings", "Settings", "{EB227FAB-6060-4271-9A0A-6C99C7965126}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet.config = NuGet.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,6 +61,10 @@ Global
 		{664DFA1F-68B7-49C7-B889-FA14D1756D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{664DFA1F-68B7-49C7-B889-FA14D1756D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{664DFA1F-68B7-49C7-B889-FA14D1756D3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6195F7AA-18C2-4372-85CA-11FC4B522686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6195F7AA-18C2-4372-85CA-11FC4B522686}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6195F7AA-18C2-4372-85CA-11FC4B522686}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6195F7AA-18C2-4372-85CA-11FC4B522686}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/AntSK/Controllers/InitController.cs
+++ b/src/AntSK/Controllers/InitController.cs
@@ -1,35 +0,0 @@
-using AntSK.Domain.Repositories;
-using Microsoft.AspNetCore.Mvc;
-
-namespace AntSK.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class InitController : ControllerBase
-    {
-        private readonly IApps_Repositories _repository;
-
-        public InitController(IApps_Repositories repository)
-        {
-            _repository = repository;
-        }
-        /// <summary>
-        /// 初始化DB 和表
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public IActionResult InitTable()
-        {
-            _repository.GetDB().DbMaintenance.CreateDatabase();
-            _repository.GetDB().CodeFirst.InitTables(typeof(Apps));
-            _repository.GetDB().CodeFirst.InitTables(typeof(Kmss));
-            _repository.GetDB().CodeFirst.InitTables(typeof(KmsDetails));
-            _repository.GetDB().CodeFirst.InitTables(typeof(Users));
-            _repository.GetDB().CodeFirst.InitTables(typeof(Apis));
-            _repository.GetDB().CodeFirst.InitTables(typeof(AIModels));
-            //创建vector插件如果数据库没有则需要提供支持向量的数据库
-            _repository.GetDB().Ado.ExecuteCommandAsync($"CREATE EXTENSION IF NOT EXISTS vector;");
-            return Ok();
-        }
-    }
-}
--- a/src/AntSK/Pages/ChatPage/Chat.razor
+++ b/src/AntSK/Pages/ChatPage/Chat.razor
@@ -9,7 +9,7 @@
@inherits AuthComponentBase

 <GridRow Gutter="(16, 16)">
-    <GridCol Span="12">
+    <GridCol Span="14">
        <Card Style="height:75vh;overflow: auto;">
            <TitleTemplate>
                <Icon Type="setting" /> 选择应用
@@ -30,7 +30,7 @@
            </Body>
        </Card>
    </GridCol>
-    <GridCol Span="12">
+    <GridCol Span="10">
        <Card Style="height: 75vh;overflow: auto;">
            <TitleTemplate>
                <Icon Type="search" /> 调试结果
--- a/src/AntSK/Pages/ChatPage/Components/ChatView.razor.cs
+++ b/src/AntSK/Pages/ChatPage/Components/ChatView.razor.cs
@@ -51,7 +51,7 @@ namespace AntSK.Pages.ChatPage.Components
        protected override async Task OnInitializedAsync()
        {
            await base.OnInitializedAsync();
-            await LoadData();
+            LoadData();
            var msgs = await _localStorage.GetItemAsync<List<MessageInfo>>("msgs");
            if (msgs != null && msgs.Count > 0)
            {
@@ -61,12 +61,12 @@ namespace AntSK.Pages.ChatPage.Components

        protected override async Task OnParametersSetAsync()
        {
-           await LoadData();
+            LoadData();
        }

-        private async Task LoadData()
+        private void LoadData()
        {
-            app =await _apps_Repositories.GetFirstAsync(p => p.Id == AppId);
+            app = _apps_Repositories.GetFirst(p => p.Id == AppId);
        }

        protected async Task OnClearAsync()
--- a/src/AntSK/Pages/KmsPage/AddKms.razor
+++ b/src/AntSK/Pages/KmsPage/AddKms.razor
@@ -50,6 +50,9 @@
                <FormItem Label="重叠部分(token)" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                    <AntDesign.InputNumber @bind-Value="context.OverlappingTokens" PlaceHolder="重叠部分"></AntDesign.InputNumber>
                </FormItem>
+                <FormItem Label="是否开启OCR" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                    <Switch @bind-Value="@isOcr" />
+                </FormItem>

                <FormItem Label=" " Style="margin-top:32px" WrapperCol="LayoutModel._submitFormLayout.WrapperCol">
                    <Button Type="primary" HtmlType="submit">
--- a/src/AntSK/Pages/KmsPage/AddKms.razor.cs
+++ b/src/AntSK/Pages/KmsPage/AddKms.razor.cs
@@ -25,6 +25,8 @@ namespace AntSK.Pages.KmsPage

        private List<AIModels> _chatList { get; set; }
        private List<AIModels> _embeddingList { get; set; }
+
+        private bool isOcr { get; set; }
        protected override async Task OnInitializedAsync()
        {
            await base.OnInitializedAsync();
@@ -36,6 +38,7 @@ namespace AntSK.Pages.KmsPage
            {
                //查看
                _kmsModel = await _kmss_Repositories.GetFirstAsync(p => p.Id == KmsId);
+                isOcr = _kmsModel.IsOCR == 1;
            }
        }
        private void HandleSubmit()
@@ -51,6 +54,10 @@ namespace AntSK.Pages.KmsPage
                _ = Message.Error("行切片需小于段落切片！", 2);
                return;
            }
+            if (isOcr)
+            {
+                _kmsModel.IsOCR = 1;
+            }

            if (string.IsNullOrEmpty(KmsId))
            {
--- a/src/AntSK/Pages/KmsPage/KmsDetail.razor
+++ b/src/AntSK/Pages/KmsPage/KmsDetail.razor
@@ -159,9 +159,19 @@
            <Icon Type="inbox" />
        </p>
        <p class="ant-upload-text">单击或拖动文件到此区域进行上传</p>
-        <p class="ant-upload-hint">
-            支持txt、word、pdf、md、excel、ppt等文件。
-        </p>
+        @if (km.IsOCR == 1)
+        {
+            <p class="ant-upload-hint">
+                支持 txt、word、pdf、md、excel、ppt、jpeg、png、tiff 等文件。
+            </p>
+        }
+        else    
+        {
+            <p class="ant-upload-hint">
+                支持 txt、word、pdf、md、excel、ppt 等文件。
+            </p>
+        }
+
    </Upload>
 </Modal>

--- a/src/AntSK/Pages/KmsPage/KmsDetail.razor.cs
+++ b/src/AntSK/Pages/KmsPage/KmsDetail.razor.cs
@@ -19,6 +19,31 @@ namespace AntSK.Pages.KmsPage
        [Parameter]
        public string KmsId { get; set; }

+        [Inject]
+        protected IConfirmService _confirmService { get; set; }
+
+        [Inject]
+        protected IKmsDetails_Repositories _kmsDetails_Repositories { get; set; }
+
+        [Inject]
+        protected IKmss_Repositories _kmss_Repositories { get; set; }
+
+        private MemoryServerless _memory { get; set; }
+
+        [Inject]
+        protected IKMService iKMService { get; set; }
+
+        [Inject]
+        protected MessageService? _message { get; set; }
+
+        [Inject]
+        protected BackgroundTaskBroker<ImportKMSTaskReq> _taskBroker { get; set; }
+
+        [Inject]
+        protected IHttpService _httpService { get; set; }
+
+        private Kmss km;
+
        private readonly KmsDetails _model = new KmsDetails();

        private bool _urlVisible = false;
@@ -51,34 +76,15 @@ namespace AntSK.Pages.KmsPage

        private List<KmsDetails> _data = new List<KmsDetails>();

-        [Inject]
-        protected IConfirmService _confirmService { get; set; }
+       

-        [Inject]
-        protected IKmsDetails_Repositories _kmsDetails_Repositories { get; set; }

-        [Inject]
-        protected IKmss_Repositories _kmss_Repositories { get; set; }
-
-        private MemoryServerless _memory { get; set; }
-
-        [Inject]
-        protected IKMService iKMService { get; set; }
-
-        [Inject]
-        protected MessageService? _message { get; set; }
-
-        [Inject]
-        protected BackgroundTaskBroker<ImportKMSTaskReq> _taskBroker { get; set; }
-
-        [Inject]
-        protected IHttpService _httpService { get; set; }

        protected override async Task OnInitializedAsync()
        {
            await base.OnInitializedAsync();
            _data = await _kmsDetails_Repositories.GetListAsync(p => p.KmsId == KmsId);
-            var km = _kmss_Repositories.GetFirst(p => p.Id == KmsId);
+            km = _kmss_Repositories.GetFirst(p => p.Id == KmsId);
            //使用知识库设置的参数，
            _memory = iKMService.GetMemoryByKMS(km.Id);
        }
--- a/src/AntSK/Pages/KmsPage/KmsDetailList.razor
+++ b/src/AntSK/Pages/KmsPage/KmsDetailList.razor
@@ -15,14 +15,8 @@
                            info(()=> Info(context.Text)) ,
                             })">
            <CardMeta>
-                <AvatarTemplate>
-
-                </AvatarTemplate>
-                <TitleTemplate>
-                    <a>@context.LastUpdate</a>
-                </TitleTemplate>
                <DescriptionTemplate>
-                    <Paragraph class="item" Ellipsis Style=" white-space: nowrap; ">
+                    <Paragraph class="item" Ellipsis Style="display: -webkit-box; -webkit-line-clamp: 3;-webkit-box-orient: vertical;overflow: hidden; text-overflow: ellipsis;white-space: normal;height:65px;">
                        <!--todo: Ellipsis not working-->
                        @context.Text
                    </Paragraph>
--- a/src/AntSK/Pages/Setting/AIModel/AddModel.razor.cs
+++ b/src/AntSK/Pages/Setting/AIModel/AddModel.razor.cs
@@ -319,7 +319,7 @@ namespace AntSK.Pages.Setting.AIModel
            switch (aiType)
            { 
                case AIType.LLamaFactory:
-                    _aiModel.EndPoint = "http://localhost:8080/";
+                    _aiModel.EndPoint = "http://localhost:8000/";
                    _aiModel.AIModelType=AIModelType.Chat;
                    break;
                case AIType.StableDiffusion:
--- a/src/AntSK/Program.cs
+++ b/src/AntSK/Program.cs
@@ -65,15 +65,14 @@ builder.Services.AddBackgroundTaskBroker().AddHandler<ImportKMSTaskReq, BackGrou
    {
        NativeLibraryConfig
           .Instance
-           .WithCuda(false)
-           .WithLogs(true);
+           .WithCuda(false);
    }
    else if (LLamaSharpOption.RunType.ToUpper() == "GPU")
    {
        NativeLibraryConfig
        .Instance
        .WithCuda(true)
-        .WithLogs(true);
+        .WithAvx(NativeLibraryConfig.AvxLevel.Avx);
    }
 }
Author	SHA1	Message	Date
zyxucp	3f8ed109f9	fix nuget	2024-04-10 23:23:18 +08:00
zyxucp	3f969627a4	fix 修改ocr runtime	2024-04-10 22:51:37 +08:00
zyxucp	d92970819a	Merge pull request #65 from AIDotNet/feature_ocr add runtime	2024-04-10 22:39:28 +08:00
zyxucp	23e756fa9b	add runtime	2024-04-10 22:37:32 +08:00
zyxucp	5f58126fbf	Merge pull request #64 from AIDotNet/feature_ocr Feature ocr	2024-04-10 22:25:36 +08:00
zyxucp	dcfd0ffb8f	add ocr	2024-04-10 22:23:59 +08:00
zyxucp	17221d056c	add img	2024-04-10 21:57:45 +08:00
zyxucp	4a9dcfada4	fix 修改默认key	2024-04-10 21:54:26 +08:00
zyxucp	bb6c2bb020	fix 升级LLamaSharp	2024-04-09 12:32:39 +08:00
zyxucp	a8760a34de	fix 修改地址错误问题	2024-04-09 12:20:15 +08:00
zeyu xu	1e432a5782	fix 删除pynet	2024-04-08 14:50:34 +08:00
zeyu xu	cb861ef2bb	fix OCR	2024-04-08 12:38:14 +08:00
zeyu xu	7cee8fd87a	add OCR 和文档查询上限	2024-04-08 12:10:32 +08:00
zeyu xu	8ce0e5d348	add ocr	2024-04-07 22:31:57 +08:00
zyxucp	90bce7c89f	Merge branch 'main' of https://github.com/AIDotNet/AntSK	2024-04-07 15:59:03 +08:00
zyxucp	b840d0bcce	fix add gpu avx	2024-04-07 15:58:26 +08:00
zyxucp	bfa6d28289	Update README.md	2024-04-07 14:40:47 +08:00
zeyu xu	f6e6ca9747	Merge branch 'main' of github.com:AIDotNet/AntSK	2024-04-07 11:44:15 +08:00
zeyu xu	75f8d39648	fix 修改类型	2024-04-07 11:44:05 +08:00
zyxucp	9a939eba5a	fix 修改异步为同步	2024-04-07 11:03:18 +08:00
zyxucp	4e93efe821	fix 修改异步为同步	2024-04-07 10:49:35 +08:00
zyxucp	8bdbee80a0	fix 修改类型	2024-04-07 10:37:16 +08:00
zyxucp	6bdf5dcc03	fix 修复PG字段报错问题	2024-04-07 10:05:15 +08:00
zeyu xu	0bf0a9d78a	fix chat style	2024-04-06 11:50:15 +08:00
zeyu xu	38e9fea601	Merge branch 'main' of github.com:AIDotNet/AntSK	2024-04-06 11:47:59 +08:00
zeyu xu	d2366b3b46	update Semantic Kernel and fix kmsdetaillist style	2024-04-06 11:47:49 +08:00
zyxucp	3aff93083a	Update README.md	2024-04-06 11:04:58 +08:00
zeyu xu	eb998199db	fix 删除不要的Controller	2024-04-06 00:03:53 +08:00
zeyu xu	1dd794af1b	fix 修改安装向量插件	2024-04-06 00:03:17 +08:00
zeyu xu	08c9923e7e	update docker-compose.yal	2024-04-05 23:58:45 +08:00