Update README.md

Feature delllamasharp

LICENSE

@@ -1,9 +1,17 @@
-                                 Apache License
+                                 AntSK License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
+   This project follows the Apache 2.0 agreement, in addition to the following additional terms
+    1.This project can be used for commercial purposes, but it has the right to prohibit you from using it if it violates the following provisions
+    2. Without authorization, you are not allowed to modify AntSK's logo and title information
+    3. Without authorization, you are not allowed to modify the copyright information at the bottom of the page
+    4. If you need authorization, you can contact WeChat: xuzeyu91
+    
+
+   Apache 2.0 License
    1. Definitions.
 
       "License" shall mean the terms and conditions for use, reproduction,

README.md

@@ -42,6 +42,8 @@ AntSK is suitable for various business scenarios, such as:
 [document](http://antsk.cn/)
 
 [demo](https://demo.antsk.cn/)
+and
+[demo1](https://antsk.ai-dotnet.com/)
 
 ```
 Default account: test
@@ -84,7 +86,8 @@ version: '3.8'
 services:
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.1.5ports:
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.4.5
+    ports:
       - 5000:5000
     networks:
       - antsk
@@ -119,11 +122,6 @@ model/xxx.gguf
   "FileDir": {
     "DirectoryPath": "D:\\git\\AntBlazor\\model"
   },
-  "LLamaSharp": {
-    "RunType": "GPU",
-    "ContextSize": 2048,
-    "GpuLayerCount": 20
-  },
   "Login": {
     "User": "admin",
     "Password": "xuzeyu"
@@ -188,13 +186,6 @@ I'm using CodeFirst mode for the database, so as long as the database connection
 8. Many people ask about the difference between LLamaSharp and llamafactory. In fact, LLamaSharp is a .NET implementation of llama.cpp, but only supports local gguf models, while llamafactory supports a wider variety of models and uses Python implementation. The main difference lies here. Additionally, llamafactory has the ability to fine-tune models, which is an area we will focus on integrating in the future.
 ```
 
-## 🤝 Contributing
-
-[PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)
-
-If you would like to contribute, feel free to create a [Pull Request](https://github.com/AIDotNet/AntSK/pulls), or give us [Bug Report](https://github.com/AIDotNet/AntSK/issues/new).
-
-
 ## 💕 Contributors
 
 This project exists thanks to all the people who contribute.
@@ -204,11 +195,29 @@ This project exists thanks to all the people who contribute.
 </a>
 
 ## 🚨  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.
+
+This warehouse follows the [AntSK License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) open source protocol.
+
+This project follows the Apache 2.0 agreement, in addition to the following additional terms
+
+1. This project can be used for commercial purposes, but it has the right to prohibit you from using it if it violates the following provisions
+
+2. Without authorization, you are not allowed to modify AntSK's logo and title information
+   
+4. Without authorization, you are not allowed to modify the copyright information at the bottom of the page
+   
+6. If you need authorization, you can contact WeChat: **xuzeyu91**
+
 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).
+
+1. Copyright statement containing AntSK license. [AntSK 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.
+   
+3. Meet the above four requirements  
+
+## 💕 Special thanks
+Helping enterprise AI application development, we recommend [AntBlazor](https://antblazor.com)
 
 ## ☎️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.

README.zh.md

@@ -43,10 +43,11 @@ AntSK 适用于多种业务场景，例如：
 ## ✏️功能示例
 ### 在线演示
 
-[文档地址](http://antsk.cn/)
+[体验地址1](https://demo.antsk.cn/)
 
-[体验地址](https://demo.antsk.cn/)
+和
 
+[体验地址2](https://antsk.ai-dotnet.com/)
 ```
 默认账号：test
 
@@ -130,11 +131,6 @@ model/xxx.gguf
   "FileDir": {
     "DirectoryPath": "D:\\git\\AntBlazor\\model"
   },
-  "LLamaSharp": {
-    "RunType": "GPU",
-	"ContextSize": 2048,
-    "GpuLayerCount": 20
-  },
   "Login": {
     "User": "admin",
     "Password": "xuzeyu"
@@ -195,13 +191,6 @@ DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是
 7、点击保存，然后就可以开始聊天了
 8、很多人会问 LLamaSharp与llamafactory有什么区别？其实这两者LLamaSharp是llama.cpp的 dotnet实现，但是只支持本地gguf模型，  而llamafactory 支持的模型种类更多，但使用的是python的实现，其主要差异在这里，另外llamafactory具有模型微调的能力，这也是我们下一步需要重点集成的部分。
 ```
-
-## 🤝 贡献
-
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/AIDotNet/AntSK/pulls)
-
-如果你想贡献，可以创建一个[拉取请求](https://github.com/AIDotNet/AntSK/pulls), 或给我们[错误报告](https://github.com/AIDotNet/AntSK/issues/new).
-
 
 ## 💕 贡献者
 
@@ -213,14 +202,28 @@ DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是
 
 ## 🚨 使用协议
 
-本仓库遵循  [Apache-2.0 License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 开源协议。
-Apache开源许可证允许在商业环境中使用AntSK，前提是需要遵守许可证的条款。主要条款之一是要保留版权声明和许可证声明。
+本仓库遵循  [AntSK License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 开源协议。
+
+除以下附加条款外，该项目遵循Apache 2.0协议
+
+1. 本项目可以用于商业目的，但如果违反以下规定，它有权禁止您使用
+   
+2. 未经授权，您不允许修改AntSK的徽标和标题信息
+   
+3. 未经授权，您不能修改页面底部的版权信息
+   
+4. 如果您需要授权，可以联系微信：xuzeyu91
 
 如果您打算在商业项目中使用AntSK，您需要确保遵守以下步骤：
 
-1、包含Apache许可证的版权声明。 [Apache-2.0 License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 。
+1. 包含AntSK许可证的版权声明。 [AntSK License](https://github.com/AIDotNet/AntSK?tab=Apache-2.0-1-ov-file) 。
 
-2、如果您修改了软件源代码，您需要在源代码中明确标明这些修改。
+2. 如果您修改了软件源代码，您需要在源代码中明确标明这些修改。
+
+3. 满足以上四个要求
+
+## 💕 特别感谢
+助力企业级AI应用开发，推荐使用 [AntBlazor](https://antblazor.com)
 
 
 ## ☎️联系我

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.4.3
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.4.5
     # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大
-    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.4.3
+    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.4.5
     ports:
       - 5000:5000
     networks:

docker-compose.yml

@@ -32,9 +32,9 @@ services:
       - ./pg/data:/var/lib/postgresql/data
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.4.3
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.4.5
     # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大
-    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.4.3
+    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.4.5
     ports:
       - 5000:5000
     networks:

src/AntSK.Domain/AntSK.Domain.csproj

@@ -35,12 +35,6 @@
     <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Redis" Version="$(KMVersion)" />
     <PackageReference Include="Microsoft.KernelMemory.MemoryDb.AzureAISearch" Version="$(KMVersion)" />
 
-    <PackageReference Include="LLamaSharp" Version="$(LLamaSharpVersion)" />
-    <PackageReference Include="LLamaSharp.Backend.Cpu" Version="$(LLamaSharpVersion)" />
-    <PackageReference Include="LLamaSharp.Backend.Cuda12" Version="$(LLamaSharpVersion)" />
-    <PackageReference Include="LLamaSharp.kernel-memory" Version="$(LLamaSharpVersion)" />
-    <PackageReference Include="LLamaSharp.semantic-kernel" Version="$(LLamaSharpVersion)" />
-
     <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />

src/AntSK.Domain/AntSK.Domain.xml

@@ -188,11 +188,6 @@
         <member name="M:AntSK.Domain.Domain.Other.KMExcelHandler.InvokeAsync(Microsoft.KernelMemory.Pipeline.DataPipeline,System.Threading.CancellationToken)">
             <inheritdoc />
         </member>
-        <member name="F:AntSK.Domain.Domain.Other.LLamaConfig.dicLLamaWeights">
-            <summary>
-            避免模型重复加载，本地缓存
-            </summary>
-        </member>
         <member name="P:AntSK.Domain.Domain.Other.QAHandler.StepName">
             <inheritdoc />
         </member>
@@ -924,6 +919,20 @@
             <param name="value"></param>
             <returns></returns>
         </member>
+        <member name="M:AntSK.Domain.Utils.ConvertUtils.Unescape(System.String)">
+            <summary>
+            \uxxxx转中文,保留换行符号
+            </summary>
+            <param name="unicodeString"></param>
+            <returns></returns>
+        </member>
+        <member name="M:AntSK.Domain.Utils.ConvertUtils.IsStream(System.String)">
+            <summary>
+            是否为流式请求
+            </summary>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
         <member name="M:AntSK.Domain.Utils.RepoFiles.SamplePluginsPath">
             <summary>
             Scan the local folders from the repo, looking for "samples/plugins" folder.

src/AntSK.Domain/Common/Embedding/BuilderBgeExtensions.cs

@@ -1,5 +1,4 @@
-using LLamaSharp.KernelMemory;
-using Microsoft.KernelMemory.AI;
+using Microsoft.KernelMemory.AI;
 using Microsoft.KernelMemory;
 using System;
 using System.Collections.Generic;

src/AntSK.Domain/Common/Embedding/HuggingfaceTextEmbeddingGenerator.cs

@@ -1,12 +1,4 @@
-using LLama.Common;
-using LLama;
-using LLamaSharp.KernelMemory;
-using Microsoft.KernelMemory.AI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.KernelMemory.AI;
 using AntSK.Domain.Domain.Other.Bge;
 
 namespace AntSK.Domain.Common.Embedding

src/AntSK.Domain/Domain/Interface/ILLamaFactoryService.cs

@@ -12,7 +12,9 @@ namespace AntSK.Domain.Domain.Interface
     {
         public event LogMessageHandler LogMessageReceived;
         Task PipInstall();
-        Task StartLLamaFactory(string modelName, string templateName);
+
+        Task PipInstallName(string name);
+        Task StartLLamaFactory(string modelName);
 
         void KillProcess();
 

src/AntSK.Domain/Domain/Model/Enum/AIModelType.cs

@@ -13,9 +13,6 @@ namespace AntSK.Domain.Domain.Model.Enum
         [Display(Name = "Azure Open AI")]
         AzureOpenAI = 2,
 
-        [Display(Name = "LLama本地模型")]
-        LLamaSharp = 3,
-
         [Display(Name = "星火大模型")]
         SparkDesk = 4,
 
@@ -33,6 +30,8 @@ namespace AntSK.Domain.Domain.Model.Enum
 
         [Display(Name = "Ollama")]
         Ollama = 10,
+        [Display(Name = "OllamaEmbedding")]
+        OllamaEmbedding = 11,
         [Display(Name = "模拟输出")]
         Mock = 100,
 

src/AntSK.Domain/Domain/Other/LLamaConfig.cs

@@ -1,45 +0,0 @@
-using AntSK.Domain.Options;
-using LLama;
-using LLama.Common;
-using LLamaSharp.KernelMemory;
-
-namespace AntSK.Domain.Domain.Other
-{
-    public static class LLamaConfig
-    {
-        static object lockobj = new object();
-        /// <summary>
-        /// 避免模型重复加载，本地缓存
-        /// </summary>
-        static Dictionary<string, (LLamaWeights, ModelParams)> dicLLamaWeights = new Dictionary<string, (LLamaWeights, ModelParams)>();
-        public static (LLamaWeights, ModelParams) GetLLamaConfig(string modelPath, LLamaSharpConfig config = null)
-        {
-            lock (lockobj)
-            {
-                if (dicLLamaWeights.ContainsKey(modelPath))
-                {
-                    return dicLLamaWeights.GetValueOrDefault(modelPath);
-                }
-                else
-                {
-                    InferenceParams infParams = new() { AntiPrompts = ["\n\n"] };
-                    LLamaSharpConfig lsConfig = new(modelPath) { DefaultInferenceParams = infParams };
-                    if (config != null)
-                    {
-                        lsConfig = config;
-                    }
-                    var parameters = new ModelParams(lsConfig.ModelPath)
-                    {
-                        ContextSize = LLamaSharpOption.ContextSize ?? 2048,
-                        Seed = lsConfig?.Seed ?? 0,
-                        GpuLayerCount = LLamaSharpOption.GpuLayerCount ?? 20,
-                        Embeddings = true
-                    };
-                    var weights = LLamaWeights.LoadFromFile(parameters);
-                    dicLLamaWeights.Add(modelPath, (weights, parameters));
-                    return (weights, parameters);
-                }
-            }
-        }
-    }
-}

src/AntSK.Domain/Domain/Service/KMService.cs

@@ -11,7 +11,6 @@ using AntSK.Domain.Utils;
 using AntSK.OCR;
 using DocumentFormat.OpenXml.Drawing.Diagrams;
 using LLama;
-using LLamaSharp.KernelMemory;
 using Markdig;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Configuration;
@@ -171,12 +170,6 @@ namespace AntSK.Domain.Domain.Service
                         APIType = AzureOpenAIConfig.APITypes.EmbeddingGeneration,
                     });
                     break;
-
-                case Model.Enum.AIType.LLamaSharp:
-                    var (weights, parameters) = LLamaConfig.GetLLamaConfig(embedModel.ModelName);
-                    var embedder = new LLamaEmbedder(weights, parameters);
-                    memory.WithLLamaSharpTextEmbeddingGeneration(new LLamaSharpTextEmbeddingGenerator(embedder));
-                    break;
                 case Model.Enum.AIType.BgeEmbedding:
                     string pyDll = embedModel.EndPoint;
                     string bgeEmbeddingModelName = embedModel.ModelName;
@@ -185,6 +178,13 @@ namespace AntSK.Domain.Domain.Service
                 case Model.Enum.AIType.DashScope:
                     memory.WithDashScopeDefaults(embedModel.ModelKey);
                     break;
+                case Model.Enum.AIType.OllamaEmbedding:
+                    memory.WithOpenAITextEmbeddingGeneration(new OpenAIConfig()
+                    {
+                        APIKey = "NotNull",
+                        EmbeddingModel = embedModel.ModelName
+                    }, null, false, embeddingHttpClient);
+                    break;
             }
         }
 
@@ -211,13 +211,6 @@ namespace AntSK.Domain.Domain.Service
                         APIType = AzureOpenAIConfig.APITypes.TextCompletion,
                     });
                     break;
-
-                case Model.Enum.AIType.LLamaSharp:
-                    var (weights, parameters) = LLamaConfig.GetLLamaConfig(chatModel.ModelName);
-                    var context = weights.CreateContext(parameters);
-                    var executor = new StatelessExecutor(weights, parameters);
-                    memory.WithLLamaSharpTextGeneration(new LlamaSharpTextGenerator(weights, context, executor));
-                    break;
                 case Model.Enum.AIType.LLamaFactory:
 
                     memory.WithOpenAITextGeneration(new OpenAIConfig()

src/AntSK.Domain/Domain/Service/KernelService.cs

@@ -4,25 +4,15 @@ using AntSK.Domain.Domain.Interface;
 using AntSK.Domain.Domain.Other;
 using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
-using LLama;
-using LLamaSharp.SemanticKernel.TextCompletion;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.Plugins.Core;
 using Microsoft.SemanticKernel.TextGeneration;
 using RestSharp;
-using System;
 using ServiceLifetime = AntSK.Domain.Common.DependencyInjection.ServiceLifetime;
 using AntSK.LLM.Mock;
 using AntSK.Domain.Domain.Model.Enum;
-using AntSK.LLM.LLamaFactory;
-using System.Reflection;
-using DocumentFormat.OpenXml.Drawing;
-using Microsoft.KernelMemory;
-using OpenCvSharp.ML;
-using LLamaSharp.SemanticKernel.ChatCompletion;
 using Microsoft.SemanticKernel.ChatCompletion;
-using Amazon.Runtime.Internal.Util;
 using Microsoft.Extensions.Logging;
 
 namespace AntSK.Domain.Domain.Service
@@ -108,13 +98,6 @@ namespace AntSK.Domain.Domain.Service
                         );
                     break;
 
-                case Model.Enum.AIType.LLamaSharp:
-                    var (weights, parameters) = LLamaConfig.GetLLamaConfig(chatModel.ModelName);
-                    var ex = new StatelessExecutor(weights, parameters);
-                    builder.Services.AddKeyedSingleton<ITextGenerationService>("local-llama", new LLamaSharpTextCompletion(ex));
-                    builder.Services.AddKeyedSingleton<IChatCompletionService>("local-llama-chat", new LLamaSharpChatCompletion(ex));
-                    break;
-
                 case Model.Enum.AIType.SparkDesk:
 
                     var settings = chatModel.ModelKey.Split("|");

src/AntSK.Domain/Domain/Service/LLamaFactoryService.cs

@@ -7,6 +7,7 @@ using AntSK.LLamaFactory.Model;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Serilog;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -74,8 +75,45 @@ namespace AntSK.Domain.Domain.Service
             }, TaskCreationOptions.LongRunning);
             await cmdTask;
         }
+        public async Task PipInstallName(string name)
+        {
 
-        public async Task StartLLamaFactory(string modelName, string templateName)
+            var cmdTask = Task.Factory.StartNew(() =>
+            {
+
+                var isProcessComplete = false;
+
+                process = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = "pip",
+                        Arguments = $"install {name} -i https://pypi.tuna.tsinghua.edu.cn/simple",
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
+                    }
+                };
+                process.OutputDataReceived += (sender, eventArgs) =>
+                {
+                    Log.Information($"{eventArgs.Data}");
+                    OnLogMessageReceived(eventArgs.Data);
+                };
+                process.ErrorDataReceived += (sender, eventArgs) =>
+                {
+                    Log.Information($"{eventArgs.Data}");
+                    OnLogMessageReceived(eventArgs.Data);
+                };
+                process.Start();
+                process.BeginOutputReadLine();
+                process.BeginErrorReadLine();
+                process.WaitForExit();
+                OnLogMessageReceived("--------------------完成--------------------");
+            }, TaskCreationOptions.LongRunning);
+            await cmdTask;
+        }
+        public async Task StartLLamaFactory(string modelName)
         {
             var cmdTask = Task.Factory.StartNew(() =>
             {
@@ -87,7 +125,7 @@ namespace AntSK.Domain.Domain.Service
                     StartInfo = new ProcessStartInfo
                     {
                         FileName = "python",
-                        Arguments = "api_antsk.py --model_name_or_path " + modelName + " --template " + templateName + " ",
+                        Arguments = "api_antsk.py --model_name_or_path " + modelName + " --template default ",
                         UseShellExecute = false,
                         RedirectStandardOutput = true,
                         RedirectStandardError=true,

src/AntSK.Domain/Options/LLamaSharpOption.cs

@@ -1,9 +0,0 @@
-namespace AntSK.Domain.Options
-{
-    public class LLamaSharpOption
-    {
-        public static string RunType { get; set; }
-        public static uint? ContextSize { get; set; }
-        public static int? GpuLayerCount { get; set; }
-    }
-}

src/AntSK.Domain/Repositories/AI/App/Apps.cs

@@ -25,7 +25,7 @@ namespace AntSK.Domain.Repositories
         /// 图标
         /// </summary>
         [Required]
-        public string Icon { get; set; }
+        public string Icon { get; set; } = "windows";
 
         /// <summary>
         /// 类型

src/AntSK.Domain/Repositories/AI/Kms/Kmss.cs

@@ -12,7 +12,7 @@ namespace AntSK.Domain.Repositories
         /// 图标
         /// </summary>
         [Required]
-        public string Icon { get; set; }
+        public string Icon { get; set; } = "question-circle";
         /// <summary>
         /// 名称
         /// </summary>

src/AntSK.LLM/AntSK.LLM.csproj

@@ -17,6 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="OllamaEmbeddingModelList.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="OllamaModelList.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/AntSK/Layouts/BasicLayout.razor

@@ -99,6 +99,13 @@
             BlankTarget = true,
         },
         new LinkItem
+        {
+            Key = "antsk.cn",
+            Title = "antsk.cn",
+            Href = "https://antsk.cn",
+            BlankTarget = true,
+        },
+        new LinkItem
         {
             Key = "github",
             Title = (RenderFragment)(@<Icon Type="github" />),

src/AntSK/Layouts/UserLayout.razor

@@ -33,6 +33,13 @@
             BlankTarget = true,
         },
         new LinkItem
+        {
+            Key = "antsk.cn",
+            Title = "antsk.cn",
+            Href = "https://antsk.cn",
+            BlankTarget = true,
+        },
+        new LinkItem
         {
             Key = "github",
             Title = (RenderFragment)(@<Icon Type="github" />),

src/AntSK/Pages/AppPage/AppList.razor

@@ -33,6 +33,7 @@
                     {
                         <Card Hoverable Bordered Class="card" Actions="@(new[] {
                             info(()=> Info(context.Id)) ,
+                            use(()=> Use(context.Id)),
                             open(()=> Open(context.Id)),
                             delete(async ()=>await Delete(context.Id)) ,
                        
@@ -75,6 +76,7 @@
 @code
 {
     RenderFragment info(Action clickAction) =>@<a key="info" @onclick="@clickAction">查看</a>;
+    RenderFragment use(Action clickAction) =>@<a key="use" @onclick="@clickAction">使用</a>;
     RenderFragment open(Action clickAction) =>@<a key="info" @onclick="@clickAction">外部使用</a>;
     RenderFragment delete(Action clickAction) => @<a key="delete" @onclick="@clickAction">删除</a> ;
 }

src/AntSK/Pages/AppPage/AppList.razor.cs

@@ -57,6 +57,10 @@ namespace AntSK.Pages.AppPage
             NavigationManager.NavigateTo($"/app/open/{id}");
         }
 
+        private void Use(string id)
+        {
+            NavigationManager.NavigateTo($"/chat/{id}");
+        }
 
         private async Task Delete(string id)
         {

src/AntSK/Pages/Setting/AIModel/AddModel.razor

@@ -18,103 +18,113 @@
         <Card>
             <Form Model="@_aiModel"
                   Style="margin-top: 8px;"
-                  OnFinish="HandleSubmit">
+                  OnFinish="HandleSubmit"
+                  Autocomplete="off">
                 <FormItem Label="模型描述" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                     <Input Placeholder="请输入模型描述" @bind-Value="@context.ModelDescription" />
                 </FormItem>
 
-                <FormItem Label="AI类型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                    <EnumRadioGroup @bind-Value="context.AIType" ButtonStyle="RadioButtonStyle.Solid" OnChange="AITypeChange" TEnum="AIType"> </EnumRadioGroup>
-                </FormItem>
                 <FormItem Label="模型类型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                    <RadioGroup @bind-Value="context.AIModelType" ButtonStyle="RadioButtonStyle.Solid">
-                        @if (context.AIType == AIType.StableDiffusion)
+                    <RadioGroup @bind-Value="context.AIModelType" ButtonStyle="RadioButtonStyle.Solid" OnChange="AIModelTypeChange" TValue="AIModelType">
+                        <Radio RadioButton Value="@(AIModelType.Chat)">会话模型</Radio>
+                        <Radio RadioButton Value="@(AIModelType.Embedding)">向量模型</Radio>
+                        <Radio RadioButton Value="@(AIModelType.Rerank)">Rerank重排模型</Radio>
+                        <Radio RadioButton Value="@(AIModelType.Image)">图片模型</Radio>
+                    </RadioGroup>
+                </FormItem>
+
+                <FormItem Label="AI类型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                    <RadioGroup @bind-Value="context.AIType" ButtonStyle="RadioButtonStyle.Solid" OnChange="AITypeChange" TValue="AIType">
+                        @if (context.AIModelType == AIModelType.Chat)
                         {
-                            <Radio RadioButton Value="@(AIModelType.Image)">图片模型</Radio>
+                            <Radio RadioButton Value="@(AIType.OpenAI)">OpenAI</Radio>
+                            <Radio RadioButton Value="@(AIType.AzureOpenAI)">AzureOpenAI</Radio>
+                            <Radio RadioButton Value="@(AIType.SparkDesk)">星火大模型</Radio>
+                            <Radio RadioButton Value="@(AIType.DashScope)">灵积大模型</Radio>
+                            <Radio RadioButton Value="@(AIType.Ollama)">Ollama本地模型</Radio>
+                            <Radio RadioButton Value="@(AIType.LLamaFactory)">LLamaFactory本地模型</Radio>
+                            <Radio RadioButton Value="@(AIType.Mock)">模拟输出</Radio>
                         }
-                        else
+                        else if (context.AIModelType == AIModelType.Embedding)
                         {
-                            @if (context.AIType != AIType.BgeEmbedding && context.AIType != AIType.BgeRerank)
-                            {
-                                <Radio RadioButton Value="@(AIModelType.Chat)">会话模型</Radio>
-                            }
-                            @if (context.AIType != AIType.LLamaFactory && context.AIType != AIType.Mock && context.AIType != AIType.SparkDesk && context.AIType != AIType.BgeRerank && context.AIType != AIType.Ollama)
-                            {
-                                <Radio RadioButton Value="@(AIModelType.Embedding)">向量模型</Radio>
-                            }
-                            @if (context.AIType == AIType.BgeRerank)
-                            {
-                                <Radio RadioButton Value="@(AIModelType.Rerank)">Rerank重排模型</Radio>
-                            }
+                            <Radio RadioButton Value="@(AIType.BgeEmbedding)">BgeEmbedding</Radio>
+                            <Radio RadioButton Value="@(AIType.OpenAI)">OpenAI</Radio>
+                            <Radio RadioButton Value="@(AIType.AzureOpenAI)">AzureOpenAI</Radio>
+                            <Radio RadioButton Value="@(AIType.OllamaEmbedding)">Ollama本地模型</Radio>
+                        }
+                        else if (context.AIModelType == AIModelType.Rerank)
+                        {
+                            <Radio RadioButton Value="@(AIType.BgeRerank)">BgeRerank</Radio>
+                        }
+                        else if (context.AIModelType == AIModelType.Image)
+                        {
+                            <Radio RadioButton Value="@(AIType.StableDiffusion)">StableDiffusion</Radio>
                         }
                     </RadioGroup>
                 </FormItem>
+
                 @if (context.AIModelType == AIModelType.Embedding)
                 {
                     <FormItem Label="注意事项" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <span style="color:red"><b>请不要使用不同维度的向量模型，否则会导致无法向量存储</b></span>
                     </FormItem>
                 }
-
                 @if (context.AIType == AIType.AzureOpenAI)
                 {
                     <FormItem Label="请求地址" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入请求地址" @bind-Value="@context.EndPoint" />
+                        <Input Placeholder="请输入请求地址" @bind-Value="@context.EndPoint" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="部署名(模型名)" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入部署名" @bind-Value="@context.ModelName" />
+                        <Input Placeholder="请输入部署名" @bind-Value="@context.ModelName" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="模型秘钥" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" />
+                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" AutoComplete="false" />
                     </FormItem>
                 }
                 @if (context.AIType == AIType.OpenAI)
                 {
-                    <FormItem Label="代理API" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <a href="https://api.antsk.cn/" target="_blank">去创建</a>
-                    </FormItem>
                     <FormItem Label="请求地址" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入请求地址 示例格式 http://ip:port/" @bind-Value="@context.EndPoint" />
+                        <Input Placeholder="请输入请求地址 示例格式 http://ip:port/" @bind-Value="@context.EndPoint" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="模型名称" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入模型名称" @bind-Value="@context.ModelName" />
+                        <Input Placeholder="请输入模型名称" @bind-Value="@context.ModelName" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="模型秘钥" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" />
+                        <InputPassword @bind-Value="@context.ModelKey" Placeholder="请输入模型秘钥" AutoComplete="false" />
                     </FormItem>
                 }
                 @if (context.AIType == AIType.SparkDesk)
                 {
                     <FormItem Label="模型版本" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <SimpleSelect DefaultValue="V3_5" @bind-Value="@context.ModelName">
+                        <SimpleSelect DefaultValue="Lite" @bind-Value="@context.ModelName">
                             <SelectOptions>
-                                <SimpleSelectOption Value="V3_5" Label="V3_5"></SimpleSelectOption>
-                                <SimpleSelectOption Value="V3" Label="V3"></SimpleSelectOption>
-                                <SimpleSelectOption Value="V2" Label="V2" Disabled></SimpleSelectOption>
-                                <SimpleSelectOption Value="V1_5" Label="V1_5"></SimpleSelectOption>
+                                <SimpleSelectOption Value="Max" Label="Max"></SimpleSelectOption>
+                                <SimpleSelectOption Value="Pro" Label="Pro"></SimpleSelectOption>
+                                <SimpleSelectOption Value="V2" Label="V2"></SimpleSelectOption>
+                                <SimpleSelectOption Value="Lite" Label="Lite"></SimpleSelectOption>
                             </SelectOptions>
                         </SimpleSelect>
                     </FormItem>
                     <FormItem Label="请输入模型APPID|APISecret|APIKey" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <InputPassword Placeholder="APPID|APISecret|APIKey" @bind-Value="@context.ModelKey" />
+                        <InputPassword Placeholder="APPID|APISecret|APIKey" @bind-Value="@context.ModelKey" AutoComplete="false" />
                     </FormItem>
 
                 }
                 @if (context.AIType == AIType.DashScope)
                 {
                     <FormItem Label="API KEY" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入API KEY" @bind-Value="@context.ModelKey" />
+                        <Input Placeholder="请输入API KEY" @bind-Value="@context.ModelKey" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="模型名称" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="请输入模型名称" @bind-Value="@context.ModelName" />
+                        <Input Placeholder="请输入模型名称" @bind-Value="@context.ModelName" AutoComplete="false" />
                     </FormItem>
                 }
-                @if (context.AIType == AIType.LLamaSharp || context.AIType == AIType.StableDiffusion)
+                @if (context.AIType == AIType.StableDiffusion)
                 {
                     <FormItem Label="模型路径" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <InputGroup>
                             <AutoComplete Options="_modelFiles" Placeholder="请输入模型路径" @bind-Value="@context.ModelName" />
-                            <Button OnClick="()=>_downloadModalVisible=true">从Haggingface下载</Button>
+                            <Button OnClick="()=>_downloadModalVisible=true" Style="margin-top:5px">从Haggingface下载</Button>
                         </InputGroup>
                     </FormItem>
                 }
@@ -136,10 +146,14 @@
                         </InputGroup>
                     </FormItem>
                     <FormItem Label="请求地址" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="http://localhost:8080/" @bind-Value="@context.EndPoint" />
+                        <Input Placeholder="http://localhost:8080/" @bind-Value="@context.EndPoint" AutoComplete="false" />
                     </FormItem>
-                    <FormItem Label="环境安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Button Type="primary" OnClick="PipInstall">环境安装</Button>
+                    <FormItem Label="基础环境安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <Button Type="primary" OnClick="PipInstall">开始安装</Button>
+                    </FormItem>
+
+                    <FormItem Label="缺失依赖包安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <Button Type="primary" OnClick="PipInstallShow">pip install</Button>
                     </FormItem>
                     <FormItem Label="llama factory服务" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <InputGroup>
@@ -173,19 +187,46 @@
                         <a href="https://ollama.com/library" target="_blank">获取更多模型</a>
                     </FormItem>
                     <FormItem Label="请求地址" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="http://localhost:11434/" @bind-Value="@context.EndPoint" />
+                        <Input Placeholder="http://localhost:11434/" @bind-Value="@context.EndPoint" AutoComplete="false" />
                     </FormItem>
                     <FormItem Label="环境安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <a href="https://ollama.com/download" target="_blank">下载Ollama</a>
                     </FormItem>
                     <FormItem Label="Ollama服务" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <InputGroup>
-
-                            <Button Type="primary" OnClick="StartOllamaService" >启动</Button>
-
+                            <Button Type="primary" OnClick="StartOllamaService">启动</Button>
+                        </InputGroup>
+                    </FormItem>
+                }
+                @if (context.AIType == AIType.OllamaEmbedding)
+                {
+                    <FormItem Label="模型名称" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <InputGroup>
+                            <Select TItem="string"
+                                    TItemValue="string"
+                                    DataSource="@ollamaEmbeddingModelList"
+                                    @bind-Value="@context.ModelName"
+                                    ValueProperty="c=>c"
+                                    LabelProperty="c=>c"
+                                    Placeholder="选择模型"
+                                    DefaultActiveFirstOption="false"
+                                    EnableSearch
+                                    OnSearch="OnOllamaEmbeddingSearch">
+                            </Select>
+                        </InputGroup>
+                        <a href="https://ollama.com/library" target="_blank">获取更多模型</a>
+                    </FormItem>
+                    <FormItem Label="请求地址" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <Input Placeholder="http://localhost:11434/" @bind-Value="@context.EndPoint" AutoComplete="false" />
+                    </FormItem>
+                    <FormItem Label="环境安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <a href="https://ollama.com/download" target="_blank">下载Ollama</a>
+                    </FormItem>
+                    <FormItem Label="Ollama服务" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <InputGroup>
+                            <Button Type="primary" OnClick="StartOllamaService">启动</Button>
                         </InputGroup>
                     </FormItem>
-
                 }
                 @if (context.AIType == AIType.BgeEmbedding)
                 {
@@ -199,7 +240,7 @@
 
                     <FormItem Label="Python路径" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <Popover ContentTemplate="@_content" Title="提示" Style="width:100%">
-                            <Input Placeholder="D:\Programs\Python\Python311\python311.dll" @bind-Value="@context.EndPoint" />
+                            <Input Placeholder="D:\Programs\Python\Python311\python311.dll" @bind-Value="@context.EndPoint" AutoComplete="false" />
                         </Popover>
                     </FormItem>
 
@@ -223,7 +264,7 @@
                     </FormItem>
                     <FormItem Label="Python路径" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <Popover ContentTemplate="@_content" Title="提示" Style="width:100%">
-                            <Input Placeholder="D:\Programs\Python\Python311\python311.dll" @bind-Value="@context.EndPoint" />
+                            <Input Placeholder="D:\Programs\Python\Python311\python311.dll" @bind-Value="@context.EndPoint" AutoComplete="false" />
                         </Popover>
                     </FormItem>
                     <FormItem Label="环境安装" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
@@ -257,7 +298,7 @@
             <Input Disabled="_downloadStarted" Placeholder="请输入下载地址" @bind-Value="_downloadUrl" Style="width:80%"></Input>
             @if (!_downloadStarted)
             {
-                <Button OnClick="StartDownload">开始</Button>
+                <Button OnClick="StartDownload" Style="margin-left:10px;" Type="@ButtonType.Primary">开始</Button>
             }
             else
             {
@@ -269,8 +310,19 @@
     </Flex>
 </Modal>
 
+<Modal @ref="_modal" Visible="_pipModalVisible" Footer="null" Closable Title="pip install" OnCancel="OnCancelPipInstall" DestroyOnClose>
+    <Flex Gap="10" Vertical>
+        <InputGroup>
+            <Input Placeholder="请输入包名（例如 pip install torch 则只需要输入 torch）" @bind-Value="_pipName" Style="border-radius: 8px"></Input>
+        </InputGroup>
+        <InputGroup>
+            <Button OnClick="PipInstallName" Type="@ButtonType.Primary">pip install</Button>
+        </InputGroup>
+    </Flex>
+</Modal>
+
 <Modal Visible="_logModalVisible" Footer="null" Closable Title="日志输出" OnCancel="OnCancelLog" DestroyOnClose Width="1000">
-    <BlazorTerminal @ref="blazorTerminal" Style="height:600px;"></BlazorTerminal>
+    <BlazorTerminal @ref="blazorTerminal" Style="height:600px;overflow-y: auto;"></BlazorTerminal>
 </Modal>
 
 

src/AntSK/Pages/Setting/AIModel/AddModel.razor.cs

@@ -4,17 +4,16 @@ using AntSK.Domain.Domain.Interface;
 using AntSK.Domain.Domain.Model.Constant;
 using AntSK.Domain.Domain.Model.Enum;
 using AntSK.Domain.Domain.Other.Bge;
-using AntSK.Domain.Domain.Service;
 using AntSK.Domain.Options;
 using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
 using AntSK.LLamaFactory.Model;
 using BlazorComponents.Terminal;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using Downloader;
 using Microsoft.AspNetCore.Components;
-using NRedisStack.Search;
+using Serilog;
 using System.ComponentModel;
+using System.Runtime.InteropServices;
 
 namespace AntSK.Pages.Setting.AIModel
 {
@@ -45,6 +44,9 @@ namespace AntSK.Pages.Setting.AIModel
         private bool _downloadStarted;
         private IDownload _download;
 
+        private bool _pipModalVisible;
+        private string _pipName;
+
         private Modal _modal;
         private string[] _modelFiles;
 
@@ -53,19 +55,19 @@ namespace AntSK.Pages.Setting.AIModel
         private List<MenuDataItem> menuList = new List<MenuDataItem>();
 
         //llamafactory
-        private List<LLamaModel> modelList=new List<LLamaModel>();
+        private List<LLamaModel> modelList = new List<LLamaModel>();
         private bool llamaFactoryIsStart = false;
-        private Dics llamaFactoryDic= new Dics();
-
+        private Dics llamaFactoryDic = new Dics();
+        //ollama
         private List<string> ollamaModelList = new List<string>();
-
+        private List<string> ollamaEmbeddingModelList = new List<string>();
         //日志输出
-        private  BlazorTerminal blazorTerminal = new BlazorTerminal();
+        private BlazorTerminal blazorTerminal = new BlazorTerminal();
         private TerminalParagraph para;
         private bool _logModalVisible;
 
         private List<string> bgeEmbeddingList = new List<string>() { "AI-ModelScope/bge-small-zh-v1.5", "AI-ModelScope/bge-base-zh-v1.5", "AI-ModelScope/bge-large-zh-v1.5" };
-        private List<string> bgeRerankList = new List<string>() { "Xorbits/bge-reranker-base", "Xorbits/bge-reranker-large", "AI-ModelScope/bge-reranker-v2-m3", "AI-ModelScope/bge-reranker-v2-gemma"};
+        private List<string> bgeRerankList = new List<string>() { "Xorbits/bge-reranker-base", "Xorbits/bge-reranker-large", "AI-ModelScope/bge-reranker-v2-m3", "AI-ModelScope/bge-reranker-v2-gemma" };
         private bool BgeEmbeddingIsStart = false;
         private string BgeEmbeddingBtnText = "初始化";
 
@@ -84,23 +86,23 @@ namespace AntSK.Pages.Setting.AIModel
                 }
 
                 modelList = _ILLamaFactoryService.GetLLamaFactoryModels();
+                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList();
+                ollamaEmbeddingModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaEmbeddingModelList.txt")).ToList();
+
                 llamaFactoryDic = await _IDics_Repositories.GetFirstAsync(p => p.Type == LLamaFactoryConstantcs.LLamaFactorDic && p.Key == LLamaFactoryConstantcs.IsStartKey);
                 if (llamaFactoryDic != null)
                 {
                     llamaFactoryIsStart = llamaFactoryDic.Value == "false" ? false : true;
                 }
 
-                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList();
+
                 //目前只支持gguf的 所以筛选一下
-                _modelFiles = Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), FileDirOption.DirectoryPath)).Where(p=> p.Contains(".gguf")||p.Contains(".ckpt")|| p.Contains(".safetensors")).ToArray();
+                _modelFiles = Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), FileDirOption.DirectoryPath)).Where(p => p.Contains(".gguf") || p.Contains(".ckpt") || p.Contains(".safetensors")).ToArray();
                 if (!string.IsNullOrEmpty(ModelPath))
                 {
                     string extension = Path.GetExtension(ModelPath);
                     switch (extension)
                     {
-                        case ".gguf":
-                            _aiModel.AIType = AIType.LLamaSharp;
-                            break;
                         case ".safetensors":
                         case ".ckpt":
                             _aiModel.AIType = AIType.StableDiffusion;
@@ -108,23 +110,24 @@ namespace AntSK.Pages.Setting.AIModel
 
                     }
                     //下载页跳入
-                 
+
                     _downloadModalVisible = true;
 
-                    _downloadUrl = $"https://hf-mirror.com{ModelPath.Replace("---","/")}";
-                }        
+                    _downloadUrl = $"https://hf-mirror.com{ModelPath.Replace("---", "/")}";
+                }
             }
-            catch 
+            catch (System.Exception ex)
             {
-                _ = Message.Error("LLamaSharp.FileDirectory目录配置不正确！", 2);
+                Log.Error(ex.Message + ex.StackTrace);
+                _ = Message.Error("FileDirOption.FileDirectory目录配置不正确！", 2);
             }
         }
 
         private void HandleSubmit()
         {
-            if (_aimodels_Repositories.IsAny(p => p.Id!=_aiModel.Id.ConvertToString()&& p.AIModelType == _aiModel.AIModelType && p.EndPoint == _aiModel.EndPoint.ConvertToString() && p.ModelKey == _aiModel.ModelKey && p.ModelName == _aiModel.ModelName))
+            if (_aiModel.ModelDescription.IsNull())
             {
-                _ = Message.Error("模型已存在！", 2);
+                _ = Message.Error("模型描述必须填写", 2);
                 return;
             }
             if (_aiModel.AIType.IsNull())
@@ -137,6 +140,12 @@ namespace AntSK.Pages.Setting.AIModel
                 _ = Message.Error("模型类型必须选择", 2);
                 return;
             }
+            if (_aimodels_Repositories.IsAny(p => p.Id != _aiModel.Id.ConvertToString() && p.AIModelType == _aiModel.AIModelType && p.EndPoint == _aiModel.EndPoint.ConvertToString() && p.ModelKey == _aiModel.ModelKey && p.ModelName == _aiModel.ModelName))
+            {
+                _ = Message.Error("模型已存在！", 2);
+                return;
+            }
+
             if (string.IsNullOrEmpty(ModelId))
             {
                 //新增
@@ -189,7 +198,7 @@ namespace AntSK.Pages.Setting.AIModel
 
         private void DownloadProgressChanged(object? sender, DownloadProgressChangedEventArgs e)
         {
-            _downloadProgress = Math.Round( e.ProgressPercentage,2);
+            _downloadProgress = Math.Round(e.ProgressPercentage, 2);
             InvokeAsync(StateHasChanged);
         }
 
@@ -221,7 +230,7 @@ namespace AntSK.Pages.Setting.AIModel
 
         private void StopDownload()
         {
-            _downloadStarted=false;
+            _downloadStarted = false;
             _download?.Stop();
             InvokeAsync(StateHasChanged);
         }
@@ -229,8 +238,8 @@ namespace AntSK.Pages.Setting.AIModel
         private void OnSearch(string value)
         {
             if (string.IsNullOrEmpty(value))
-            { 
-                modelList = _ILLamaFactoryService.GetLLamaFactoryModels(); 
+            {
+                modelList = _ILLamaFactoryService.GetLLamaFactoryModels();
             }
             else
             {
@@ -239,19 +248,6 @@ namespace AntSK.Pages.Setting.AIModel
 
         }
 
-        private void OnOllamaSearch(string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList(); 
-            }
-            else
-            {
-                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList().Where(p => p.ToLower().Contains(value.ToLower())).ToList();
-            }
-
-        }
-
         /// <summary>
         /// 启动服务
         /// </summary>
@@ -268,7 +264,7 @@ namespace AntSK.Pages.Setting.AIModel
             _IDics_Repositories.Update(llamaFactoryDic);
             _ILLamaFactoryService.LogMessageReceived -= CmdLogHandler;
             _ILLamaFactoryService.LogMessageReceived += CmdLogHandler;
-            _ILLamaFactoryService.StartLLamaFactory(_aiModel.ModelName, "default");
+            _ILLamaFactoryService.StartLLamaFactory(_aiModel.ModelName);
         }
 
         private void StopLFService()
@@ -278,7 +274,57 @@ namespace AntSK.Pages.Setting.AIModel
             _IDics_Repositories.Update(llamaFactoryDic);
             _ILLamaFactoryService.KillProcess();
         }
+        private async Task PipInstall()
+        {
+            var content = "初次使用需要执行pip install，点击确认后可自动执行，是否执行";
+            var title = "提示";
+            var result = await _confirmService.Show(content, title, ConfirmButtons.YesNo);
+            if (result == ConfirmResult.Yes)
+            {
+                _logModalVisible = true;
+                _ILLamaFactoryService.LogMessageReceived -= CmdLogHandler;
+                _ILLamaFactoryService.LogMessageReceived += CmdLogHandler;
+                _ILLamaFactoryService.PipInstall();
+            }
+        }
 
+        private async Task PipInstallShow()
+        {
+            _pipModalVisible = true;
+        }
+
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="value"></param>
+        private void OnOllamaSearch(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList();
+            }
+            else
+            {
+                ollamaModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaModelList.txt")).ToList().Where(p => p.ToLower().Contains(value.ToLower())).ToList();
+            }
+        }
+
+        /// <summary>
+        /// Embedding 搜索
+        /// </summary>
+        /// <param name="value"></param>
+        private void OnOllamaEmbeddingSearch(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                ollamaEmbeddingModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaEmbeddingModelList.txt")).ToList();
+            }
+            else
+            {
+                ollamaEmbeddingModelList = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "OllamaEmbeddingModelList.txt")).ToList().Where(p => p.ToLower().Contains(value.ToLower())).ToList();
+            }
+
+        }
         /// <summary>
         /// Ollama
         /// </summary>
@@ -291,25 +337,27 @@ namespace AntSK.Pages.Setting.AIModel
                 return;
             }
             _logModalVisible = true;
-           
+
             _ollamaService.LogMessageReceived -= CmdLogHandler;
             _ollamaService.LogMessageReceived += CmdLogHandler;
             _ollamaService.StartOllama(_aiModel.ModelName);
         }
 
-     
-
-        private async Task PipInstall()
+        private void OnCancelPipInstall()
         {
-            var content = "初次使用需要执行pip install，点击确认后可自动执行，是否执行";
-            var title = "提示";
-            var result = await _confirmService.Show(content, title, ConfirmButtons.YesNo);
-            if (result == ConfirmResult.Yes)
+            _pipModalVisible = false;
+        }
+
+        private async Task PipInstallName()
+        {
+            if (!string.IsNullOrEmpty(_pipName))
             {
+                _pipModalVisible = false;
                 _logModalVisible = true;
                 _ILLamaFactoryService.LogMessageReceived -= CmdLogHandler;
                 _ILLamaFactoryService.LogMessageReceived += CmdLogHandler;
-                _ILLamaFactoryService.PipInstall();
+                _ILLamaFactoryService.PipInstallName(_pipName);
+
             }
         }
 
@@ -341,7 +389,7 @@ namespace AntSK.Pages.Setting.AIModel
                     _ = Message.Error(ex.Message, 2);
                     BgeEmbeddingIsStart = false;
                 }
-            });   
+            });
         }
 
         private async Task BgeRerank()
@@ -381,46 +429,73 @@ namespace AntSK.Pages.Setting.AIModel
             await InvokeAsync(() =>
             {
                 para = blazorTerminal.RespondText("");
-                para.AddTextLine(message);          
+                para.AddTextLine(message);
             });
         }
         /// <summary>
         /// 停止服务
         /// </summary>
-   
-        private void OnCancelLog() {
+
+        private void OnCancelLog()
+        {
             _logModalVisible = false;
         }
 
-        private void AITypeChange(AIType aiType) 
+        private void AITypeChange(AIType aiType)
         {
+            //切换时清空
+            _aiModel.EndPoint = "";
+            _aiModel.ModelKey = "";
+            _aiModel.ModelName = "";
             switch (aiType)
             {
-                case AIType.OpenAI:
-                    _aiModel.EndPoint = "https://api.antsk.cn/";
-                    break;
                 case AIType.LLamaFactory:
                     _aiModel.EndPoint = "http://localhost:8000/";
-                    _aiModel.AIModelType=AIModelType.Chat;
+                    _aiModel.AIModelType = AIModelType.Chat;
                     break;
                 case AIType.Ollama:
                     _aiModel.EndPoint = "http://localhost:11434/";
                     _aiModel.AIModelType = AIModelType.Chat;
                     break;
+                case AIType.OllamaEmbedding:
+                    _aiModel.EndPoint = "http://localhost:11434/";
+                    _aiModel.AIModelType = AIModelType.Embedding;
+                    break;
                 case AIType.StableDiffusion:
                     _aiModel.AIModelType = AIModelType.Image;
                     break;
                 case AIType.Mock:
                     _aiModel.AIModelType = AIModelType.Chat;
-                    break ;
+                    break;
                 case AIType.BgeEmbedding:
                     _aiModel.AIModelType = AIModelType.Embedding;
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                    {
+                        _aiModel.EndPoint = "/opt/conda/pkgs/python-3.10.13-h955ad1f_0/lib/libpython3.10.so";
+                    }
                     break;
                 case AIType.BgeRerank:
                     _aiModel.AIModelType = AIModelType.Rerank;
+
                     break;
-                default:
-                    _aiModel.AIModelType = AIModelType.Chat;
+            }
+        }
+
+        private void AIModelTypeChange(AIModelType aIModelType)
+        {
+            switch (aIModelType)
+            {
+                case AIModelType.Chat:
+                    _aiModel.AIType = AIType.OpenAI;
+                    break;
+                case AIModelType.Embedding:
+                    _aiModel.AIType = AIType.BgeEmbedding;
+                    break;
+                case AIModelType.Rerank:
+                    _aiModel.AIType = AIType.BgeRerank;
+                    break;
+                case AIModelType.Image:
+                    _aiModel.AIType = AIType.StableDiffusion;
                     break;
             }
         }

src/AntSK/Pages/Setting/AIModel/ModelDown.razor

@@ -9,10 +9,9 @@
 <div>
     <PageContainer Title="模型列表">
         <Content>
-            <RadioGroup @bind-Value="@_modelType" OnChange="OnModelTypeChange" TValue="string">
-                <Radio Value="@("gguf")" DefaultChecked=true>LLama本地模型(gguf)</Radio>
-                <Radio Value="@("safetensors")">StableDiffusion(safetensors)</Radio>
-                <Radio Value="@("ckpt")">StableDiffusion2(ckpt)</Radio>
+            <RadioGroup @bind-Value="@_modelType" OnChange="OnModelTypeChange" TValue="string" ButtonStyle="@RadioButtonStyle.Solid">
+                <Radio RadioButton Value="@("ckpt")">StableDiffusion2(ckpt)</Radio>
+                <Radio RadioButton Value="@("safetensors")">StableDiffusion(safetensors)</Radio>
             </RadioGroup>
             <div style="text-align: center;">
 

src/AntSK/Pages/Setting/AIModel/ModelDown.razor.cs

@@ -38,7 +38,7 @@ namespace AntSK.Pages.Setting.AIModel
                     }
                     RestClient client = new RestClient();
                     RestRequest request = new RestRequest(urlBase, Method.Get);
-                    var response =await client.ExecuteAsync(request);
+                    var response = await client.ExecuteAsync(request);
                     var model = JsonConvert.DeserializeObject<HfModel>(response.Content);
                     _modelList.AddRange(model.models);
                 }

src/AntSK/Pages/Setting/AIModel/ModelList.razor

@@ -54,10 +54,6 @@
                                             {
                                                 <Tag Color="@PresetColor.Red.ToString()">AzureOpenAI</Tag>
                                             }
-                                            else if (context.AIType == AIType.LLamaSharp)
-                                            {
-                                                <Tag Color="@PresetColor.Yellow.ToString()">LLamaSharp</Tag>
-                                            }
                                             else if (context.AIType == AIType.SparkDesk)
                                             {
                                                 <Tag Color="@PresetColor.Cyan.ToString()">SparkDesk</Tag>
@@ -82,8 +78,8 @@
                                             {
                                                 <Tag Color="@PresetColor.Magenta.ToString()">StableDiffusion</Tag>
                                             }
-                                            else if (context.AIType == AIType.Ollama)
-                                            {
+                                            else if (context.AIType == AIType.Ollama || context.AIType == AIType.OllamaEmbedding)
+                                                            {
                                                 <Tag Color="@PresetColor.Pink.ToString()">Ollama</Tag>
                                             }
                                         </p>

src/AntSK/Program.cs

@@ -37,7 +37,6 @@ builder.AddServiceDefaults();
 
 builder.Configuration.GetSection("DBConnection").Get<DBConnectionOption>();
 builder.Configuration.GetSection("Login").Get<LoginOption>();
-builder.Configuration.GetSection("LLamaSharp").Get<LLamaSharpOption>();
 builder.Configuration.GetSection("KernelMemory").Get<KernelMemoryOption>();
 builder.Configuration.GetSection("FileDir").Get<FileDirOption>();
 
@@ -79,27 +78,6 @@ builder.Services.AddBlazoredLocalStorage(config =>
 builder.Services.AddMapper();
 //后台队列任务
 builder.Services.AddBackgroundTaskBroker().AddHandler<ImportKMSTaskReq, BackGroundTaskHandler>("ImportKMSTask");
-// 读取连接字符串配置
-
-    if (LLamaSharpOption.RunType.ToUpper() == "CPU")
-    {
-        NativeLibraryConfig
-           .All
-           .WithCuda(false)
-           .WithLogCallback((level, message) => {
-               logger.LogInformation($"[llama {level}]: {message.TrimEnd('\n')}");
-            });
-    }
-    else if (LLamaSharpOption.RunType.ToUpper() == "GPU")
-    {
-        NativeLibraryConfig
-        .All
-        .WithCuda(true)
-        .WithLogCallback((level, message) => {
-            logger.LogInformation($"[llama {level}]: {message.TrimEnd('\n')}");
-         });
-    }
-
 
 //增加API允许跨域调用
 builder.Services.AddCors(options => options.AddPolicy("Any",

src/AntSK/appsettings.json

@@ -33,11 +33,6 @@
     "ConnectionString": "Host=;Port=;Database=antsk;Username=;Password=",
     "TableNamePrefix": "km-"
   },
-  "LLamaSharp": {
-    "RunType": "GPU",
-    "ContextSize": 2048,
-    "GpuLayerCount": 20
-  },
   "FileDir": {
     "DirectoryPath": "D:\\model"
   },

src/AntSK/wwwroot/data/menu.json

@@ -48,7 +48,7 @@
       },
       {
         "path": "/modelmanager/modeldown",
-        "name": "模型下载",
+        "name": "作图模型下载",
         "key": "modelmanager.modeldown"
       }
     ]

src/AntSk.LLM/OllamaEmbeddingModelList.txt

@@ -0,0 +1,12 @@
+nomic-embed-text:v1.5
+mxbai-embed-large:335m
+all-minilm:22m
+all-minilm:33m
+snowflake-arctic-embed:22m
+snowflake-arctic-embed:33m
+snowflake-arctic-embed:110m
+snowflake-arctic-embed:137m
+snowflake-arctic-embed:335m
+bge-m3:567m
+bge-large:335m
+paraphrase-multilingual:278m

src/Directory.Build.props

@@ -2,9 +2,8 @@
   <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
   <PropertyGroup>
     <KMVersion>0.70.240803.1</KMVersion>
-    <LLamaSharpVersion>0.15.0</LLamaSharpVersion>
     <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
     <RestSharpVersion>111.4.1</RestSharpVersion>
-    <SKVersion>1.16.2</SKVersion>
+    <SKVersion>1.17.1</SKVersion>
   </PropertyGroup>
 </Project>