Merge pull request #76 from AIDotNet/feature_bge

Feature bge

README.md

@@ -91,7 +91,7 @@ version: '3.8'
 services:
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.2.9
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.3.0
     ports:
       - 5000:5000
     networks:

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

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

src/AntSK.Domain/AntSK.Domain.xml

@@ -177,7 +177,12 @@
             总数
             </summary>
         </member>
-        <member name="M:AntSK.Domain.Domain.Other.EmbeddingConfig.LoadModel(System.String,System.String)">
+        <member name="M:AntSK.Domain.Domain.Other.Bge.BegRerankConfig.LoadModel(System.String,System.String)">
+            <summary>
+            模型写死
+            </summary>
+        </member>
+        <member name="M:AntSK.Domain.Domain.Other.Bge.BgeEmbeddingConfig.LoadModel(System.String,System.String)">
             <summary>
             模型写死
             </summary>

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

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntSK.Domain.Domain.Other;
+using AntSK.Domain.Domain.Other.Bge;
 
 namespace AntSK.Domain.Common.Embedding
 {
@@ -22,12 +22,12 @@ namespace AntSK.Domain.Common.Embedding
 
         public HuggingfaceTextEmbeddingGenerator(string pyDllPath,string modelName)
         {
-            _embedder = EmbeddingConfig.LoadModel(pyDllPath, modelName);
+            _embedder = BgeEmbeddingConfig.LoadModel(pyDllPath, modelName);
         }
 
         public void Dispose()
         {
-            EmbeddingConfig.Dispose();
+            BgeEmbeddingConfig.Dispose();
         }
 
         //public async Task<IList<ReadOnlyMemory<float>>> GenerateEmbeddingAsync(IList<string> data, CancellationToken cancellationToken = default)
@@ -44,13 +44,13 @@ namespace AntSK.Domain.Common.Embedding
 
         public async Task<Microsoft.KernelMemory.Embedding> GenerateEmbeddingAsync(string text, CancellationToken cancellationToken = default)
         {
-            var embeddings = await EmbeddingConfig.GetEmbedding(text);
+            var embeddings = await BgeEmbeddingConfig.GetEmbedding(text);
             return new Microsoft.KernelMemory.Embedding(embeddings);
         }
 
         public int CountTokens(string text)
         {
-            return EmbeddingConfig.TokenCount(text);
+            return BgeEmbeddingConfig.TokenCount(text);
         }
     }
 }

src/AntSK.Domain/Domain/Model/Dto/RelevantSource.cs

@@ -8,6 +8,8 @@ namespace AntSK.Domain.Domain.Model.Dto
         public string Text { get; set; }
         public float Relevance { get; set; }
 
+        public double RerankScore { get; set; }
+
         public override string ToString()
         {
             return $"[file:{SourceName};Relevance:{(Relevance * 100):F2}%]:{Text}";

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

@@ -26,8 +26,10 @@ namespace AntSK.Domain.Domain.Model.Enum
         LLamaFactory = 6,
         [Display(Name = "Bge Embedding")]
         BgeEmbedding = 7,
+        [Display(Name = "Bge Rerank")]
+        BgeRerank = 8,
         [Display(Name = "StableDiffusion")]
-        StableDiffusion = 8,
+        StableDiffusion = 9,
         [Display(Name = "模拟输出")]
         Mock = 100,
 
@@ -41,5 +43,6 @@ namespace AntSK.Domain.Domain.Model.Enum
         Chat = 1,
         Embedding = 2,
         Image=3,
+        Rerank=4
     }
 }

src/AntSK.Domain/Domain/Other/Bge/BegRerankConfig.cs

@@ -0,0 +1,81 @@
+using Newtonsoft.Json;
+using Python.Runtime;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Python.Runtime.Py;
+
+namespace AntSK.Domain.Domain.Other.Bge
+{
+    public static class BegRerankConfig
+    {
+        public static dynamic model { get; set; }
+
+        static object lockobj = new object();
+
+
+
+        /// <summary>
+        /// 模型写死
+        /// </summary>
+        public static dynamic LoadModel(string pythondllPath, string modelName)
+        {
+            lock (lockobj)
+            {
+                if (model == null)
+                {
+                    if (string.IsNullOrEmpty(Runtime.PythonDLL))
+                    {
+                        Runtime.PythonDLL = pythondllPath;
+                    }
+                    PythonEngine.Initialize();
+                    try
+                    {
+                        using (GIL())// 初始化Python环境的Global Interpreter Lock)
+                        {
+                            dynamic modelscope = Py.Import("modelscope");
+                            dynamic flagEmbedding = Py.Import("FlagEmbedding");
+
+                            dynamic model_dir = modelscope.snapshot_download(modelName, revision: "master");
+                            dynamic flagReranker = flagEmbedding.FlagReranker(model_dir, use_fp16: true);
+                            model = flagReranker;
+                            return model;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw ex;
+                    }
+                }
+                else
+                {
+                    return model;
+                }
+            }
+        }
+
+
+        public static double Rerank(List<string> list)
+        {
+            using (GIL())
+            {
+                try
+                {
+                    PyList pyList = new PyList();
+                    foreach (string item in list)
+                    {
+                        pyList.Append(item.ToPython()); // 将C# string转换为Python对象并添加到PyList中
+                    }
+                    PyObject result = model.compute_score(pyList, normalize: true);
+                    return result.As<double>();
+                }
+                catch (Exception ex)
+                {
+                    throw ex;
+                }
+            }
+        }
+    }
+}

src/AntSK.Domain/Domain/Other/Bge/BgeEmbeddingConfig.cs

@@ -7,9 +7,9 @@ using System.Text;
 using System.Threading.Tasks;
 using static Python.Runtime.Py;
 
-namespace AntSK.Domain.Domain.Other
+namespace AntSK.Domain.Domain.Other.Bge
 {
-    public static class EmbeddingConfig
+    public static class BgeEmbeddingConfig
     {
         public static dynamic model { get; set; }
 
@@ -27,18 +27,20 @@ namespace AntSK.Domain.Domain.Other
                 if (model == null)
                 {
                     //Runtime.PythonDLL = @"D:\Programs\Python\Python311\python311.dll";
-                    Runtime.PythonDLL = pythondllPath;
+                    if (string.IsNullOrEmpty(Runtime.PythonDLL))
+                    {
+                        Runtime.PythonDLL = pythondllPath;
+                    }
                     PythonEngine.Initialize();
                     PythonEngine.BeginAllowThreads();
-                    
                     try
                     {
-                        using (Py.GIL())// 初始化Python环境的Global Interpreter Lock)
+                        using (GIL())// 初始化Python环境的Global Interpreter Lock)
                         {
-                            dynamic modelscope = Py.Import("modelscope");
+                            dynamic modelscope = Import("modelscope");
                             //dynamic model_dir = modelscope.snapshot_download("AI-ModelScope/bge-large-zh-v1.5", revision: "master");
                             dynamic model_dir = modelscope.snapshot_download(modelName, revision: "master");
-                            dynamic HuggingFaceBgeEmbeddingstemp = Py.Import("langchain_community.embeddings.huggingface");
+                            dynamic HuggingFaceBgeEmbeddingstemp = Import("langchain_community.embeddings.huggingface");
                             dynamic HuggingFaceBgeEmbeddings = HuggingFaceBgeEmbeddingstemp.HuggingFaceBgeEmbeddings;
                             string model_name = model_dir;
                             dynamic model_kwargs = new PyDict();
@@ -51,7 +53,7 @@ namespace AntSK.Domain.Domain.Other
                             return hugginmodel;
                         }
                     }
-                    catch(Exception ex)
+                    catch (Exception ex)
                     {
                         throw ex;
                     }
@@ -63,7 +65,7 @@ namespace AntSK.Domain.Domain.Other
 
         public static Task<float[]> GetEmbedding(string queryStr)
         {
-            using (Py.GIL())
+            using (GIL())
             {
                 PyObject queryResult = model.embed_query(queryStr);
                 var floatList = queryResult.As<float[]>();

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

@@ -3,6 +3,7 @@ using AntSK.Domain.Domain.Interface;
 using AntSK.Domain.Domain.Model;
 using AntSK.Domain.Domain.Model.Constant;
 using AntSK.Domain.Domain.Model.Dto;
+using AntSK.Domain.Domain.Other.Bge;
 using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
 using AntSK.LLM.StableDiffusion;
@@ -100,24 +101,66 @@ namespace AntSK.Domain.Domain.Service
                 })));
             }
 
+
             var dataMsg = new StringBuilder();
             if (relevantSourceList.Any())
             {
+                if (!string.IsNullOrEmpty(app.RerankModelID))
+                {
+                    var rerankModel=_aIModels_Repositories.GetById(app.RerankModelID);
+                    BegRerankConfig.LoadModel(rerankModel.EndPoint, rerankModel.ModelName);
+                    //进行rerank
+                    foreach (var item in relevantSourceList)
+                    {
+                        List<string> rerank = new List<string>();
+                        rerank.Add(questions);
+                        rerank.Add(item.Text);
+                        item.RerankScore = BegRerankConfig.Rerank(rerank);
+                      
+                    }
+                    relevantSourceList = relevantSourceList.OrderByDescending(p => p.RerankScore).Take(app.MaxMatchesCount).ToList();
+                }
+                    
                 bool isSearch = false;
                 foreach (var item in relevantSourceList)
                 {
-                    //匹配相似度
-                    if (item.Relevance >= app.Relevance / 100)
+                    if (!string.IsNullOrEmpty(app.RerankModelID))
                     {
-                        dataMsg.AppendLine(item.ToString());
-                        isSearch = true;
+                        //匹配重排后相似度
+                        if (item.RerankScore >= app.Relevance / 100)
+                        {
+                            dataMsg.AppendLine(item.ToString());
+                            isSearch = true;
+                        }
+                    }
+                    else 
+                    {
+                        //匹配相似度
+                        if (item.Relevance >= app.Relevance / 100)
+                        {
+                            dataMsg.AppendLine(item.ToString());
+                            isSearch = true;
+                        }
                     }
                 }
 
                 //处理markdown显示
                 relevantSources?.AddRange(relevantSourceList);
+                Dictionary<string, string> fileDic = new Dictionary<string, string>();
                 foreach (var item in relevantSourceList)
                 {
+                    if (fileDic.ContainsKey(item.SourceName))
+                    {
+                        item.SourceName = fileDic[item.SourceName];
+                    }
+                    else
+                    {
+                        string fileName = _kmsDetails_Repositories.GetFirst(p => p.FileGuidName == item.SourceName).FileName;
+                        fileDic.Add(item.SourceName, fileName);
+                        item.SourceName = fileName;
+
+
+                    }
                     item.Text = Markdown.ToHtml(item.Text);
                 }
 

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

@@ -45,14 +45,30 @@ namespace AntSK.Domain.Domain.Service
             var embedModel = _aIModels_Repositories.GetFirst(p => p.Id == app.EmbeddingModelID);
             var chatHttpClient = OpenAIHttpClientHandlerUtil.GetHttpClient(chatModel.EndPoint);
             var embeddingHttpClient = OpenAIHttpClientHandlerUtil.GetHttpClient(embedModel.EndPoint);
-
-            var searchClientConfig = new SearchClientConfig
+            SearchClientConfig searchClientConfig;
+            if (string.IsNullOrEmpty(app.RerankModelID))
             {
-                MaxAskPromptSize = app.MaxAskPromptSize,
-                MaxMatchesCount = app.MaxMatchesCount,
-                AnswerTokens = app.AnswerTokens,
-                EmptyAnswer = KmsConstantcs.KmsSearchNull
-            };
+                //不重排直接取查询数
+                searchClientConfig = new SearchClientConfig
+                {
+                    MaxAskPromptSize = app.MaxAskPromptSize,
+                    MaxMatchesCount = app.MaxMatchesCount,
+                    AnswerTokens = app.AnswerTokens,
+                    EmptyAnswer = KmsConstantcs.KmsSearchNull
+                };
+            }
+            else 
+            {
+                //重排取rerank数
+                searchClientConfig = new SearchClientConfig
+                {
+                    MaxAskPromptSize = app.MaxAskPromptSize,
+                    MaxMatchesCount = app.RerankCount,
+                    AnswerTokens = app.AnswerTokens,
+                    EmptyAnswer = KmsConstantcs.KmsSearchNull
+                };
+            }
+           
 
             var memoryBuild = new KernelMemoryBuilder()
                   .WithSearchClientConfig(searchClientConfig)

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

@@ -44,6 +44,9 @@ namespace AntSK.Domain.Repositories
         /// </summary>
         public string? EmbeddingModelID { get; set; }
 
+        public string? RerankModelID { get; set; }
+
+
         public string? ImageModelID { get; set; }
         /// <summary>
         /// 温度
@@ -96,6 +99,9 @@ namespace AntSK.Domain.Repositories
         [SugarColumn(DefaultValue = "3")]
         public int MaxMatchesCount { get; set; } = 3;
 
+
+        [SugarColumn(DefaultValue = "20")]
+        public int RerankCount { get; set; } = 20;
         /// <summary>
         /// 回答最大token数
         /// </summary>

src/AntSK.LLamaFactory/requirements.txt

@@ -17,4 +17,5 @@ matplotlib
 fire
 modelscope
 langchain-community
-sentence_transformers
+sentence_transformers
+FlagEmbedding

src/AntSK/Pages/AppPage/AddApp.razor

@@ -61,6 +61,7 @@
                         <span>更发散</span>
                     </FormItem>
                 }
+
                 else              
                 {
                     <FormItem Label="图片模型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
@@ -124,6 +125,17 @@
                         </Select>
                         <Button Type="@ButtonType.Link" OnClick="NavigateKmsList">去创建</Button>
                     </FormItem>
+                    <FormItem Label="Rerank重排模型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <Select DataSource="@_rerankList"
+                                @bind-Value="@context.RerankModelID"
+                                ValueProperty="c=>c.Id"
+                                LabelProperty="c=>'【'+c.AIType.ToString()+'】'+c.ModelDescription">
+                        </Select>
+                        <Button Type="@ButtonType.Link" OnClick="NavigateModelList">去创建</Button>
+                    </FormItem>
+                    <FormItem Label="Rerank数" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <AntDesign.InputNumber @bind-Value="context.RerankCount" PlaceHolder="Rerank数"></AntDesign.InputNumber>
+                    </FormItem>
                     <FormItem Label="提问最大token数" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                         <AntDesign.InputNumber @bind-Value="context.MaxAskPromptSize" PlaceHolder="提问最大token数"></AntDesign.InputNumber>
                     </FormItem>              

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

@@ -47,6 +47,7 @@ namespace AntSK.Pages.AppPage
 
         private List<AIModels> _chatList;
         private List<AIModels> _embedingList;
+        private List<AIModels> _rerankList;
         private List<AIModels> _imageList;
         protected override async Task OnInitializedAsync()
         {
@@ -56,6 +57,7 @@ namespace AntSK.Pages.AppPage
             var models=_aimodels_Repositories.GetList();
             _chatList = models.Where(p => p.AIModelType == AIModelType.Chat).ToList();
             _embedingList = models.Where(p => p.AIModelType == AIModelType.Embedding).ToList();
+            _rerankList = models.Where(p => p.AIModelType == AIModelType.Rerank).ToList();
             _imageList = models.Where(p => p.AIModelType == AIModelType.Image).ToList();
 
             _functionService.SearchMarkedMethods();
@@ -141,7 +143,7 @@ namespace AntSK.Pages.AppPage
 
         private void NavigateModelList()
         {
-            NavigationManager.NavigateTo("/setting/modellist");
+            NavigationManager.NavigateTo("/modelmanager/modellist");
         }
 
         private void NavigateKmsList()

src/AntSK/Pages/ChatPage/Chat.razor

@@ -41,7 +41,14 @@
             <Body>
                 <AntList Bordered DataSource="@_relevantSources" Style="padding:10px;">
                     <ChildContent Context="item">
-                        <span> <b>@item.SourceName </b>  相似度：<Text Mark> @item.Relevance</Text></span>
+                        <span> <b>@item.SourceName </b>  </span>
+                        <br/>
+                        <span>相似度：<Text Mark> @item.Relevance</Text></span>
+                        @if (@item.RerankScore != 0)
+                        {
+                            <br/>
+                            <span> Rerank相关性：<Text Mark> @item.RerankScore</Text></span>
+                        }
                         <Body>
                             @((MarkupString)(@item.Text))
                         </Body>

src/AntSK/Pages/Index.Razor.cs

@@ -70,7 +70,7 @@ namespace AntSK.Pages
 
         private void NavToAIModel()
         {
-            NavigationManager.NavigateTo("/setting/modellist");
+            NavigationManager.NavigateTo("/modelmanager/modellist");
         }
     }
 }

src/AntSK/Pages/KmsPage/AddKms.razor.cs

@@ -80,7 +80,7 @@ namespace AntSK.Pages.KmsPage
 
         private void NavigateModelList()
         {
-            NavigationManager.NavigateTo("/setting/modellist");
+            NavigationManager.NavigateTo("/modelmanager/modellist");
         }
     }
 }

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

@@ -5,9 +5,9 @@
 @using AntSK.LLamaFactory.Model
 @using AntSK.LLamaFactory
 @using BlazorComponents.Terminal
-@page "/setting/model/add"
-@page "/setting/model/add/{ModelId}"
-@page "/setting/model/addbypath/{ModelPath}"
+@page "/modelmanager/model/add"
+@page "/modelmanager/model/add/{ModelId}"
+@page "/modelmanager/model/addbypath/{ModelPath}"
 @using AntSK.Services.Auth
 @inherits AuthComponentBase
 @using Microsoft.AspNetCore.Authorization
@@ -27,21 +27,25 @@
                     <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">                  
+                    <RadioGroup @bind-Value="context.AIModelType">
                         @if (context.AIType == AIType.StableDiffusion)
                         {
                             <Radio RadioButton Value="@(AIModelType.Image)">图片模型</Radio>
                         }
-                        else  
+                        else
                         {
-                            @if (context.AIType != AIType.BgeEmbedding)
+                            @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)
+                            @if (context.AIType != AIType.LLamaFactory && context.AIType != AIType.Mock && context.AIType != AIType.SparkDesk && context.AIType != AIType.BgeRerank)
                             {
                                 <Radio RadioButton Value="@(AIModelType.Embedding)">向量模型</Radio>
                             }
+                            @if (context.AIType == AIType.BgeRerank)
+                            {
+                                <Radio RadioButton Value="@(AIModelType.Rerank)">Rerank重排模型</Radio>
+                            }
                         }
                     </RadioGroup>
                 </FormItem>
@@ -140,7 +144,7 @@
                                 <Button OnClick="StopLFService" Disabled="@(!llamaFactoryIsStart)">停止</Button>
                             }
                         </InputGroup>
-                    </FormItem>               
+                    </FormItem>
                 }
 
                 @if (context.AIType == AIType.BgeEmbedding)
@@ -152,19 +156,45 @@
                                 LabelProperty="c=>c">
                         </Select>
                     </FormItem>
-                    <FormItem Label="PythonDll路径" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
-                        <Input Placeholder="D:\Programs\Python\Python311\python311.dll" @bind-Value="@context.EndPoint" />
+
+                    <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" />
+                        </Popover>
+                    </FormItem>
+
+                    <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">
+                        <Spin Tip="请等待..." Spinning="@(BgeEmbeddingIsStart)">
+                            <Button Type="primary" Disabled="@(BgeEmbeddingIsStart)" OnClick="BgeEmbedding">@BgeEmbeddingBtnText</Button>
+                        </Spin>
+                    </FormItem>
+                }
+                @if (context.AIType == AIType.BgeRerank)
+                {
+                    <FormItem Label="模型名称" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                        <Select DataSource="@bgeRerankList"
+                                @bind-Value="@context.ModelName"
+                                ValueProperty="c=>c"
+                                LabelProperty="c=>c">
+                        </Select>
+                    </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" />
+                        </Popover>
                     </FormItem>
                     <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">
-                        <Spin Tip="请等待..." Spinning="@(BgeIsStart)" >
-                            <Button Type="primary" Disabled="@(BgeIsStart)" OnClick="BgeDownload">@BgeBtnText</Button>
+                        <Spin Tip="请等待..." Spinning="@(BgeRerankIsStart)">
+                            <Button Type="primary" Disabled="@(BgeRerankIsStart)" OnClick="BgeRerank">@BgeRerankBtnText</Button>
                         </Spin>
                     </FormItem>
                 }
-
                 @if (context.AIType == AIType.Mock)
                 {
                 }
@@ -206,5 +236,8 @@
 
 @code
 {
-
+    RenderFragment _content =
+    @<div>
+        <p>在windows上使用 python311.dll文件，在linux上使用 libpython3.10.so</p>
+    </div>;
 }

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

@@ -3,7 +3,7 @@ using AntDesign.ProLayout;
 using AntSK.Domain.Domain.Interface;
 using AntSK.Domain.Domain.Model.Constant;
 using AntSK.Domain.Domain.Model.Enum;
-using AntSK.Domain.Domain.Other;
+using AntSK.Domain.Domain.Other.Bge;
 using AntSK.Domain.Domain.Service;
 using AntSK.Domain.Options;
 using AntSK.Domain.Repositories;
@@ -61,8 +61,13 @@ namespace AntSK.Pages.Setting.AIModel
         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 bool BgeIsStart = false;
-        private string BgeBtnText = "初始化";
+        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 = "初始化";
+
+        private bool BgeRerankIsStart = false;
+        private string BgeRerankBtnText = "初始化";
+
 
         protected override async Task OnInitializedAsync()
         {
@@ -150,7 +155,7 @@ namespace AntSK.Pages.Setting.AIModel
 
         private void Back()
         {
-            NavigationManager.NavigateTo("/setting/modellist");
+            NavigationManager.NavigateTo("/modelmanager/modellist");
         }
 
         private async Task StartDownload()
@@ -268,7 +273,7 @@ namespace AntSK.Pages.Setting.AIModel
             }
         }
 
-        private async Task BgeDownload()
+        private async Task BgeEmbedding()
         {
             if (string.IsNullOrEmpty(_aiModel.ModelName))
             {
@@ -277,27 +282,60 @@ namespace AntSK.Pages.Setting.AIModel
             }
             if (string.IsNullOrEmpty(_aiModel.EndPoint))
             {
-                _ = Message.Error("请输入正确的Python dll路径！", 2);
+                _ = Message.Error("请输入正确的Python dll或python so路径！", 2);
                 return;
             }
 
-            BgeIsStart = true;
-            BgeBtnText = "正在初始化...";
+            BgeEmbeddingIsStart = true;
+            BgeEmbeddingBtnText = "正在初始化...";
             await Task.Run(() =>
             {
                 try
                 {
-                    EmbeddingConfig.LoadModel(_aiModel.EndPoint, _aiModel.ModelName);
-                    BgeBtnText = "初始化完成";
-                    BgeIsStart = false;
+                    BgeEmbeddingConfig.LoadModel(_aiModel.EndPoint, _aiModel.ModelName);
+                    BgeEmbeddingBtnText = "初始化完成";
+                    BgeEmbeddingIsStart = false;
                 }
                 catch (System.Exception ex)
                 {
                     _ = Message.Error(ex.Message, 2);
-                    BgeIsStart = false;
+                    BgeEmbeddingIsStart = false;
                 }
             });   
         }
+
+        private async Task BgeRerank()
+        {
+            if (string.IsNullOrEmpty(_aiModel.ModelName))
+            {
+                _ = Message.Error("请输入模型名称！", 2);
+                return;
+            }
+            if (string.IsNullOrEmpty(_aiModel.EndPoint))
+            {
+                _ = Message.Error("请输入正确的Python dll或python so路径！", 2);
+                return;
+            }
+
+            BgeRerankIsStart = true;
+            BgeRerankBtnText = "正在初始化...";
+            await Task.Run(() =>
+            {
+                try
+                {
+                    BegRerankConfig.LoadModel(_aiModel.EndPoint, _aiModel.ModelName);
+                    BgeRerankBtnText = "初始化完成";
+                    BgeRerankIsStart = false;
+                }
+                catch (System.Exception ex)
+                {
+                    _ = Message.Error(ex.Message, 2);
+                    BgeRerankIsStart = false;
+                }
+            });
+        }
+
+
         private async Task CmdLogHandler(string message)
         {
             await InvokeAsync(() =>
@@ -331,6 +369,9 @@ namespace AntSK.Pages.Setting.AIModel
                 case AIType.BgeEmbedding:
                     _aiModel.AIModelType = AIModelType.Embedding;
                     break;
+                case AIType.BgeRerank:
+                    _aiModel.AIModelType = AIModelType.Rerank;
+                    break;
                 default:
                     _aiModel.AIModelType = AIModelType.Chat;
                     break;

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

@@ -1,5 +1,5 @@
 @namespace AntSK.Pages.Setting.AIModel
-@page "/setting/modeldown"
+@page "/modelmanager/modeldown"
 @using AntSK.Services.Auth
 @inherits AuthComponentBase
 @using Microsoft.AspNetCore.Authorization

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

@@ -71,7 +71,7 @@ namespace AntSK.Pages.Setting.AIModel
 
         private void Down(string modelPath)
         {
-            NavigationManager.NavigateTo($"/setting/modeldown/detail/{modelPath}");
+            NavigationManager.NavigateTo($"/modelmanager/modeldown/detail/{modelPath}");
         }
 
         private void OnModelTypeChange(string value)

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

@@ -1,5 +1,5 @@
 @namespace AntSK.Pages.Setting.AIModel
-@page "/setting/modeldown/detail/{ModelName}/{ModelPath}"
+@page "/modelmanager/modeldown/detail/{ModelName}/{ModelPath}"
 @using AntSK.Services.Auth
 @inherits AuthComponentBase
 @using Microsoft.AspNetCore.Authorization

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

@@ -50,7 +50,7 @@ namespace AntSK.Pages.Setting.AIModel
 
         private void Down(string path)
         {
-            NavigationManager.NavigateTo($"/setting/model/addbypath/{path.Replace("?download=true", "").Replace("/", "---")}");
+            NavigationManager.NavigateTo($"/modelmanager/model/addbypath/{path.Replace("?download=true", "").Replace("/", "---")}");
         }
     }
 }

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

@@ -1,7 +1,7 @@
 @namespace AntSK.Pages.Setting.AIModel
 @using AntSK.Domain.Repositories
 @using AntSK.Domain.Domain.Model.Enum
-@page "/setting/modellist"
+@page "/modelmanager/modellist"
 @inject NavigationManager NavigationManager
 @using AntSK.Services.Auth
 @inherits AuthComponentBase
@@ -39,44 +39,48 @@
                             delete(async ()=>await Delete(context.Id))
                              }" Style="width:100%">
                                 <div class="listContent" style="width:100%">
-                                    <div class="listContentItem" style="width:20%">
+                                    <div class="listContentItem" style="width:15%">
                                         <b>模型描述</b>
-                                        <p>@context.ModelDescription</p>
+                                        <p title="@context.ModelDescription">@context.ModelDescription</p>
                                     </div>
                                     <div class="listContentItem" style="width:10%">
                                         <b>AI类型</b>
                                         <p>
                                             @if (context.AIType == AIType.OpenAI)
                                             {
-                                                <Tag Color="@PresetColor.Yellow.ToString()">OpenAI</Tag>
+                                                <Tag Color="@PresetColor.Pink.ToString()">OpenAI</Tag>
                                             }
                                             else if (context.AIType == AIType.AzureOpenAI)
                                             {
-                                                <Tag Color="@PresetColor.Green.ToString()">AzureOpenAI</Tag>
+                                                <Tag Color="@PresetColor.Red.ToString()">AzureOpenAI</Tag>
                                             }
                                             else if (context.AIType == AIType.LLamaSharp)
                                             {
-                                                <Tag Color="@PresetColor.Red.ToString()">LLamaSharp</Tag>
+                                                <Tag Color="@PresetColor.Yellow.ToString()">LLamaSharp</Tag>
                                             }
                                             else if (context.AIType == AIType.SparkDesk)
                                             {
-                                                <Tag Color="@PresetColor.Orange.ToString()">SparkDesk</Tag>
+                                                <Tag Color="@PresetColor.Cyan.ToString()">SparkDesk</Tag>
                                             }
                                             else if (context.AIType == AIType.Mock)
                                             {
-                                                <Tag Color="@PresetColor.Cyan.ToString()">Mock</Tag>
+                                                <Tag Color="@PresetColor.Green.ToString()">Mock</Tag>
                                             }
                                             else if (context.AIType == AIType.LLamaFactory)
                                             {
-                                                <Tag Color="@PresetColor.Cyan.ToString()">LLamaFactory</Tag>
+                                                <Tag Color="@PresetColor.Blue.ToString()">LLamaFactory</Tag>
                                             }
                                             else if (context.AIType == AIType.BgeEmbedding)
                                             {
-                                                <Tag Color="@PresetColor.Gold.ToString()">BgeEmbedding</Tag>
+                                                <Tag Color="@PresetColor.Purple.ToString()">BgeEmbedding</Tag>
+                                            }
+                                            else if (context.AIType == AIType.BgeRerank)
+                                            {
+                                                <Tag Color="@PresetColor.GeekBlue.ToString()">BgeRerank</Tag>
                                             }
                                             else if (context.AIType == AIType.StableDiffusion)
                                             {
-                                                <Tag Color="@PresetColor.Lime.ToString()">StableDiffusion</Tag>
+                                                <Tag Color="@PresetColor.Magenta.ToString()">StableDiffusion</Tag>
                                             }
                                         </p>
                                     </div>
@@ -97,15 +101,19 @@
                                             {
                                                 <Tag Color="@PresetColor.Lime.ToString()">图片模型</Tag>
                                             }
+                                            else if (context.AIModelType == AIModelType.Rerank)
+                                            {
+                                                <Tag Color="@PresetColor.GeekBlue.ToString()">Rerank重排模型</Tag>
+                                            }
                                         </p>
                                     </div>
-                                    <div class="listContentItem" style="width:20%">
+                                    <div class="listContentItem" style="width:25%">
                                         <b>模型地址</b>
-                                        <p>@context.EndPoint</p>
+                                        <p title="@context.EndPoint">@context.EndPoint</p>
                                     </div>
-                                    <div class="listContentItem" style="width:10%">
+                                    <div class="listContentItem" style="width:15%">
                                         <b>模型名称</b>
-                                        <p>@context.ModelName</p>
+                                        <p title="@context.ModelName">@context.ModelName</p>
                                     </div>
                                 </div>
                             </ListItem>
@@ -116,7 +124,31 @@
         </ChildContent>
     </PageContainer>
 </div>
+<style>
+.listContentItem {
+    width: 20%;
+    overflow: hidden; /* 防止内容溢出 */
+    text-overflow: ellipsis; /* 超出部分显示省略号 */
+    white-space: nowrap; /* 防止内容换行 */
+}
 
+/* 为需要显示工具提示的元素设置title属性 */
+.listContentItem p[title] {
+    cursor: pointer; /* 鼠标移动上去时显示小手势 */
+}
+
+/* 悬停样式 */
+.listContentItem:hover p[title]:before {
+    content: attr(title); /* 使用title属性的内容 */
+    position: absolute;
+    background: #333; /* 工具提示的背景颜色 */
+    color: #fff; /* 工具提示的文字颜色 */
+    padding: 4px 8px; /* 工具提示内部的填充 */
+    border-radius: 4px; /* 工具提示的边框圆角 */
+    text-align: center; /* 工具提示文字居中对齐 */
+    z-index: 1000; /* 工具提示在最顶层 */
+}
+</style>
 @code
 {
     RenderFragment edit(Action clickAction) =>@<a key="edit" @onclick="@clickAction">修改</a>;

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

@@ -51,12 +51,12 @@ namespace AntSK.Pages.Setting.AIModel
 
         public async Task AddModel()
         {
-            NavigationManager.NavigateTo("/setting/model/add");
+            NavigationManager.NavigateTo("/modelmanager/model/add");
         }
 
         public void Edit(string modelid)
         {
-            NavigationManager.NavigateTo("/setting/model/add/" + modelid);
+            NavigationManager.NavigateTo("/modelmanager/model/add/" + modelid);
         }
 
         public async Task Delete(string modelid)

src/AntSK/wwwroot/data/menu.json

@@ -35,9 +35,27 @@
       }
     ]
   },
+  {
+    "path": "/modelmanager",
+    "name": "模型管理",
+    "key": "modelmanager",
+    "icon": "shop",
+    "children": [
+      {
+        "path": "/modelmanager/modellist",
+        "name": "模型管理",
+        "key": "modelmanager.modellist"
+      },
+      {
+        "path": "/modelmanager/modeldown",
+        "name": "模型下载",
+        "key": "modelmanager.modeldown"
+      }
+    ]
+  },
   {
     "path": "/setting",
-    "name": "设置",
+    "name": "系统设置",
     "key": "setting",
     "icon": "setting",
     "children": [
@@ -46,16 +64,6 @@
         "name": "用户管理",
         "key": "setting.user"
       },
-      {
-        "path": "/setting/modellist",
-        "name": "模型管理",
-        "key": "setting.modellist"
-      },
-      {
-        "path": "/setting/modeldown",
-        "name": "模型下载",
-        "key": "setting.modeldown"
-      },
       {
         "path": "/setting/delkms",
         "name": "删除向量表",