Merge pull request #56 from AIDotNet/feature_chatview

add chathistory to localstorage

Dockerfile-py

@@ -0,0 +1,28 @@
+# 1. Define the Python image to use for getting pip
+FROM pytorch/pytorch AS python-base
+
+# 2. Define the .NET SDK image to build your application
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /src
+COPY ["src/AntSK/AntSK.csproj", "AntSK/"]
+RUN dotnet restore "AntSK/AntSK.csproj"
+COPY src/ .
+WORKDIR "/src/AntSK"
+RUN dotnet build "AntSK.csproj" -c Release -o /app/build
+RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish
+
+# 3. Define the final image that will contain both .NET runtime and Python
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
+
+# Copy the Python/pip installation from the official Python image
+COPY --from=python-base /usr/local /usr/local
+COPY --from=python-base /opt/conda/ /opt/conda/
+WORKDIR /app
+COPY --from=build /app/publish .
+# Make sure the app and Python directories are in PATH
+ENV PATH="/app:/opt/conda/bin:/usr/local/bin:${PATH}"
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+ENTRYPOINT ["dotnet", "AntSK.dll"]

README.en.md

@@ -1,152 +1,89 @@
 [简体中文](./README.md) | English
 # AntSK
+## AI Knowledge Base/Intelligent Agent built on .Net8+AntBlazor+SemanticKernel
 
-## An AI knowledge base/intelligent agent built with .Net 8+AntBlazor+SemanticKernel
+## ⭐Core Features
 
+- **Semantic Kernel**: Utilizes advanced natural language processing technology to accurately understand, process, and respond to complex semantic queries, providing users with precise information retrieval and recommendation services.
 
+- **Kernel Memory**: Capable of continuous learning and storing knowledge points, AntSK has long-term memory function, accumulates experience, and provides a more personalized interaction experience.
 
-## Core Features
+- **Knowledge Base**: Import knowledge base through documents (Word, PDF, Excel, Txt, Markdown, Json, PPT) and perform knowledge base Q&A.
 
+- **GPT Generation**: This platform supports creating personalized GPT models, enabling users to build their own GPT models.
 
+- **API Interface Publishing**: Exposes internal functions in the form of APIs, enabling developers to integrate AntSK into other applications and enhance application intelligence.
 
-- **Semantic Kernel**: Utilizes advanced natural language processing technologies to accurately understand, process, and respond to complex semantic queries, providing users with precise information retrieval and recommendation services.
+- **API Plugin System**: Open API plugin system that allows third-party developers or service providers to easily integrate their services into AntSK, continuously enhancing application functionality.
 
+- **.Net Plugin System**: Open dll plugin system that allows third-party developers or service providers to easily integrate their business functions by generating dll in standard format code, continuously enhancing application functionality.
 
-- **Kernel Memory**: Capable of continuous learning and knowledge storage, AntSK has a long-term memory function, accumulating experience to offer more personalized interaction experiences.
+- **Online Search**: AntSK, real-time access to the latest information, ensuring users receive the most timely and relevant data.
 
+- **Model Management**: Adapts and manages integration of different models from different manufacturers, including gguf types supported by **llama.cpp** and models offline running supported by **llamafactory**.
 
-- **Knowledge base**: Import knowledge into the database through documents (Word, PDF, Excel, Txt, Markdown, Json, PPT) and manage knowledge base documents.
-
-
-- **GPTs Generation**：The platform supports the creation of personalized GPT models, try building your own GPT model.
-
-
-- **API Interface Release**: Internal functions are provided as APIs for developers to integrate AntSK into other applications, enhancing application intelligence.
-
-
-- **API Plugin System**: An open API plugin system allows third-party developers or service providers to easily integrate their services into AntSK, continuously enhancing application functions.
-
-
-- **.Net Plugin System**: An open dll plugin system allows third-party developers or service providers to integrate their business functions into AntSK by generating dlls with the standard format codes, continuously enhancing application functions.
-
-
-- **Internet Search**: AntSK can retrieve the latest information in real-time, ensuring that the information users receive is always timely and relevant.
-
-
-- **Model management**: Adapts and manages different models from various manufacturers. It also supports offline running of models in 'gguf' format supported by llama.cpp.
-
-
-- **National Information Creation**: AntSK supports domestic models and databases, and can operate under information creation conditions.
-
-
-
-## Application scenarios
+- **Domestic Innovation**: AntSK supports domestic models and databases and can run under domestic innovation conditions.
 
+- **Model Fine-Tuning**: Planned based on llamafactory for model fine-tuning.
 
+## ⛪Application Scenarios
 
 AntSK is suitable for various business scenarios, such as:
-
-- Corporate knowledge management systems
-
-- Automated customer service and chatbots
-
-- Enterprise Search Engine
-
+- Enterprise knowledge management system
+- Automatic customer service and chatbots
+- Enterprise search engine
 - Personalized recommendation system
+- Intelligent writing assistance
+- Education and online learning platforms
+- Other interesting AI Apps
 
-- Intelligent assisted writing
-
-- Education and online learning platform
-
-- Other interesting AI applications
-
-
-
-## Function example
-
-
-
-First, you need to create a knowledge base
-
-![Knowledge base](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%9F%A5%E8%AF%86%E5%BA%93.png)
-
-
-
-In the knowledge base, you can use documents or urls to import
-
-![Knowledge base details](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%9F%A5%E8%AF%86%E5%BA%93%E8%AF%A6%E6%83%85.png)
-
-
-
-Click View to view the document slicing of the knowledge base
-
-![Document Slice](https://github.com/xuzeyu91/AntSK/blob/main/images/%E6%96%87%E6%A1%A3%E5%88%87%E7%89%87.png)
-
-
-
-Then we need to create applications, which can create dialog applications and knowledge bases.
-
-![Application](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%BA%94%E7%94%A8.png)
-
-
-
-The application of knowledge base needs to select the existing knowledge base, which can be multiple
-
-![Application Configuration](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%BA%94%E7%94%A8%E9%85%8D%E7%BD%AE.png)
-
-
-
-Then you can ask questions about the knowledge base documents in the dialogue
-
-![Q&A](https://github.com/xuzeyu91/AntSK/blob/main/images/%E9%97%AE%E7%AD%94.png)
-
-
-
-In addition, we can also create dialogue applications, and configure prompt word templates in corresponding applications
-
-![Conversation application](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%AE%80%E5%8D%95%E5%AF%B9%E8%AF%9D.png)
-
-
-
-Let's see the effect
-
-![Conversation effect](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%AF%B9%E8%AF%9D%E6%95%88%E6%9E%9C.png)
-
-
-
-## How do I get started?
-
-Here I am using Postgres as a data and vector store, because the Semantic Kernel and Kernel Memory both support it, though you can switch to others.
-
-The model by default supports local models in 'gguf' format from openai, azure openai, and llama. If you need to use other models, you can integrate them using the one-api.
-
-The login configuration in the configuration file is the default account and password.
-
-The following configuration files are needed:
-
-## Using Docker Compose
-A appsettings.json for the pg version and a simplified version (Sqlite+disk) docker-compose.simple.yml are provided.
-
-Download docker-compose.yml from the project root directory, then place the configuration file appsettings.json in the same directory,
-
-The pg image has already been prepared. You can modify the default account and password in the docker-compose.yml, and then your appsettings.json database connection needs to be consistent.
-
-Then you can enter the directory and execute
+## ✏️Function Examples
+### Online Demo
 ```
-docker compose up - d
+https://antsk.ai-dotnet.com/
 ```
-to start AntSK.
-
-How to mount local models and model download directories in docker
-
 ```
-# Non-host version, does not use local proxy
+Default account: test
+
+Default password: test
+
+Due to the low configuration of the cloud server, the local model cannot be run, so the system settings permissions have been closed. You can simply view the interface. If you want to use the local model, please download and use it on your own.
+```
+
+### Other Function Examples
+[Video Demonstration](https://www.bilibili.com/video/BV1zH4y1h7Y9/)
+
+## ❓How to get started?
+
+Here I am using Postgres as the data and vector storage because Semantic Kernel and Kernel Memory support it, but you can also use other options.
+
+The model by default supports the local model of openai, azure openai, and llama. If you need to use other models, you can integrate them using one-api.
+
+The Login configuration in the configuration file is the default login account and password.
+
+The following configuration file needs to be configured
+
+## 1️⃣Using docker-compose
+
+Provided the pg version **appsettings.json** and simplified version (Sqlite+disk) **docker-compose.simple.yml**
+
+Download **docker-compose.yml** from the project root directory and place the configuration file **appsettings.json** in the same directory.
+
+The pg image has already been prepared. You can modify the default username and password in docker-compose.yml, and then the database connection in your **appsettings.json** needs to be consistent.
+
+Then you can execute the following command in the directory to start AntSK
+```
+docker-compose up -d
+```
+
+## 2️⃣How to mount local models and model download directory in docker
+```
+# Non-host version, do not use local proxy
 version: '3.8'
 services:
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.1
-    ports:
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.1.5ports:
       - 5000:5000
     networks:
       - antsk
@@ -156,48 +93,30 @@ services:
     environment:
       - ASPNETCORE_URLS=http://*:5000
     volumes:
-      - ./appsettings.json:/app/appsettings.json # local configuration file must be placed in the same directory
+      - ./appsettings.json:/app/appsettings.json # Local configuration file needs to be placed in the same directory
       - D://model:/app/model
 networks:
   antsk:
-
 ```
-Using this as an example, the meaning is to mount the local folder D://model from Windows into the container /app/model. If so, your appsettings.json model directory should be configured as
-
+Taking this as an example, it means mounting the local D://model folder of Windows into the container /app/model. If so, the model address in your appsettings.json should be configured as
 ```
 model/xxx.gguf
 ```
-Some meanings of the configuration file
-// (The rest of the information is omitted as it's unnecessary for the translation example context.)
 
-Solving the missing style issue:
-Execute under AntSK/src/AntSK:
+## 3️⃣Some meanings of configuration file
 ```
-dotnet clean
-dotnet build
-dotnet publish "AntSK.csproj"
-```
-Then go to AntSK/src/AntSK/bin/Release/net8.0/publish
-```
-dotnet AntSK.dll
-```
-
-```
-
 {
   "DBConnection": {
-    "DbType": "Sqlite", 
+    "DbType": "Sqlite",
     "ConnectionStrings": "Data Source=AntSK.db;"
   },
   "KernelMemory": {
-    "VectorDb": "Disk", 
+    "VectorDb": "Disk",
     "ConnectionString": "Host=;Port=;Database=antsk;Username=;Password=",
     "TableNamePrefix": "km-"
   },
   "LLamaSharp": {
-    "RunType": "GPU", 
-    "Chat": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
-    "Embedding": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
+    "RunType": "GPU",
     "FileDirectory": "D:\\Code\\AI\\AntBlazor\\model\\"
   },
   "Login": {
@@ -210,44 +129,86 @@ dotnet AntSK.dll
     }
   }
 }
-
 ```
-
 ```
-//Supports multiple databases, including SqlSugar, MySql, SqlServer, Sqlite, Oracle, PostgreSQL, Dm, Kdbndp, Oscar, MySqlConnector, Access, OpenGaussian, QuestDB, HG, ClickHouse, GBase, Odbc, OceanBaseForOracle, TDengine, GaussDB, OceanBase, Tidb, Vastbase, PolarDB, Custom
-DBConnection DbType
-//Connection string, corresponding strings need to be used according to different DB types
-DBConnection ConnectionStrings
-//The type of vector storage supports Postgres Disk Memory, where Postgres requires the configuration of ConnectionString
-KernelMemory VectorDb
-//The running mode used by the local model is GUP CPU. If using an online API, you can freely use one
-LLamaSharp RunType
-//The model path of the local session model should pay attention to distinguishing between Linux and Windows drive letters
-LLamaSharp Chat
-//The model path of the local vector model should pay attention to distinguishing between Linux and Windows drive letters
-LLamaSharp Embedding
-//Default administrator account password
+// Supports various databases, you can check SqlSugar, MySql, SqlServer, Sqlite, Oracle, PostgreSQL, Dm, Kdbndp, Oscar, MySqlConnector, Access, OpenGauss, QuestDB, HG, ClickHouse, GBase, Odbc, OceanBaseForOracle, TDengine, GaussDB, OceanBase, Tidb, Vastbase, PolarDB, Custom
+DBConnection.DbType
+
+// Connection string, need to use the corresponding string according to the different DB types
+DBConnection.ConnectionStrings
+
+//The type of vector storage, supporting Postgres, Disk, Memory, Qdrant, Redis, AzureAISearch
+//Postgres and Redis require ConnectionString configuration
+//The ConnectionString of Qdrant and AzureAISearch uses Endpoint | APIKey
+KernelMemory.VectorDb
+
+//Local model execution options: GPU and CPU. When using the online API, any option can be used.
+LLamaSharp.RunType
+
+//Local model path, used for quick selection of models under llama, as well as saving downloaded models.
+LLamaSharp.FileDirectory
+
+//Default admin account password
 Login
-//The number of threads for importing asynchronous processing can be higher when using online APIs. Local models suggest 1, otherwise memory overflow and crash may occur
-BackgroundTaskBroker ImportKMSTask WorkerCount
+
+//Import asynchronous processing thread count. A higher count can be used for online API, but for local models, 1 is recommended to avoid memory overflow issues.
+BackgroundTaskBroker.ImportKMSTask.WorkerCount
 
 ```
 
+## ⚠️Fixing Style Issues:
+Run the following in AntSK/src/AntSK:
+```
+dotnet clean
+dotnet build
+dotnet publish "AntSK.csproj"
+```
+Then navigate to AntSK/src/AntSK/bin/Release/net8.0/publish and run:
+```
+dotnet AntSK.dll
+```
+The styles should now be applied after starting.
 
-To learn more or start using**AntSK**, you can follow my public account and join the exchange group.
+I'm using CodeFirst mode for the database, so as long as the database connection is properly configured, the table structure will be created automatically.
+
+## ✔️Using llamafactory
+```
+1. First, ensure that Python and pip are installed in your environment. This step is not necessary if using an image, such as version v0.2.3.2, which already includes the complete Python environment.
+2. Go to the model add page and select llamafactory.
+3. Click "Initialize" to check whether the 'pip install' environment setup is complete.
+4. Choose a model that you like.
+5. Click "Start" to begin downloading the model from the tower. This may involve a somewhat lengthy wait.
+6. After the model has finished downloading, enter http://localhost:8000/ in the request address. The default port is 8000.
+7. Click "Save" and start chatting.
+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)](https://github.com/AIDotNet/AntSK/pulls)
+
+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
 
-## Contact me
+This project exists thanks to all the people who contribute.
 
-If you have any questions or suggestions, please follow my public account through the following ways, and send a message to me. We also have an exchange group, which can send messages such as joining the group, and then I will bring you into the exchange group
+<a href="https://github.com/AIDotNet/AntSK/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=AIDotNet/AntSK&max=1000&columns=15&anon=1" />
+</a>
 
-![Official account](https://github.com/xuzeyu91/Avalonia-Assistant/blob/main/img/gzh.jpg)
+## 🚨 Code of Conduct
 
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
+To learn more or get started with **AntSK**, follow my official WeChat account and join the discussion group.
+
+## ☎️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.
+![Official WeChat Account](https://github.com/AIDotNet/Avalonia-Assistant/blob/main/img/gzh.jpg)
 
 ---
 
-
-
-We appreciate your interest in**AntSK**and look forward to working with you to create an intelligent future!
+We appreciate your interest in **AntSK** and look forward to collaborating with you to create an intelligent future!

README.md

@@ -1,14 +1,14 @@
-中文|[English](https://github.com/xuzeyu91/AntSK/blob/main/README.en.md)
+中文|[English](https://github.com/AIDotNet/AntSK/blob/main/README.en.md)
 # AntSK
-## 基于.Net8+AntBlazor+SemanticKernel 打造的AI知识库/智能体
+## 使用.Net8+Blazor+SemanticKernel 打造的AI知识库/智能体
 
-## 核心功能
+## ⭐核心功能
 
 - **语义内核 (Semantic Kernel)**：采用领先的自然语言处理技术，准确理解、处理和响应复杂的语义查询，为用户提供精确的信息检索和推荐服务。
 
 - **内存内核 (Kernel Memory)**：具备持续学习和存储知识点的能力，AntSK 拥有长期记忆功能，累积经验，提供更个性化的交互体验。
 
-- **知识库**：通过文档（Word、PDF、Excel、Txt、Markdown、Json、PPT）等形式导入知识库，可以进行知识库文档。
+- **知识库**：通过文档（Word、PDF、Excel、Txt、Markdown、Json、PPT）等形式导入知识库，可以进行知识库问答。
 
 - **GPTs 生成**：此平台支持创建个性化的GPT模型，尝试构建您自己的GPT模型。
 
@@ -20,11 +20,14 @@
 
 - **联网搜索**：AntSK，实时获取最新信息，确保用户接受到的资料总是最及时、最相关的。
 
-- **模型管理**：适配和管理集成不同厂商的不同模型。并且支持llama.cpp所支持的gguf类型，以及llamafactory所支持的模型离线运行
+- **模型管理**：适配和管理集成不同厂商的不同模型。并且支持**llama.cpp**所支持的gguf类型，以及**llamafactory**所支持的模型离线运行
 
 - **国产信创**：AntSK支持国产模型，和国产数据库，可以在信创条件下运行
 
-## 应用场景
+- **模型微调**：规划中，基于llamafactory进行模型微调
+  
+
+## ⛪应用场景
 
 AntSK 适用于多种业务场景，例如：
 - 企业级知识管理系统
@@ -35,57 +38,35 @@ AntSK 适用于多种业务场景，例如：
 - 教育与在线学习平台
 - 其他有意思的AI App
 
-## 功能示例
-
+## ✏️功能示例
 ### 在线演示
 ```
 https://antsk.ai-dotnet.com/
 ```
-默认账号：admin
+```
+默认账号：test
 
-默认密码：xuzeyu
+默认密码：test
 
+由于云服务器配置较低，无法运行本地模型，所以把系统设置权限关闭了，大家看看界面即可，要使用本地模型，请下载自行使用
+```
 
 ### 其他功能示例
 [视频示例](https://www.bilibili.com/video/BV1zH4y1h7Y9/)
 
-首先需要创建知识库
-![知识库](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%9F%A5%E8%AF%86%E5%BA%93.png)
-
-在知识库里可以使用文档或者url进行导入
-![知识库详情](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%9F%A5%E8%AF%86%E5%BA%93%E8%AF%A6%E6%83%85.png)
-
-点击查看可以查看知识库的文档切片情况
-![文档切片](https://github.com/xuzeyu91/AntSK/blob/main/images/%E6%96%87%E6%A1%A3%E5%88%87%E7%89%87.png)
-
-然后我们需要创建应用，可以创建对话应用和知识库。
-![应用](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%BA%94%E7%94%A8.png)
-
-知识库应用需要选择已有的知识库，可以选多个
-![应用配置](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%BA%94%E7%94%A8%E9%85%8D%E7%BD%AE.png)
-
-然后再对话中可以对知识库的文档进行提问
-![问答](https://github.com/xuzeyu91/AntSK/blob/main/images/%E9%97%AE%E7%AD%94.png)
-
-另外我们也可以创建对话应用，可以在对应应用中配置提示词模板
-![对话应用](https://github.com/xuzeyu91/AntSK/blob/main/images/%E7%AE%80%E5%8D%95%E5%AF%B9%E8%AF%9D.png)
-
-下面来看看效果吧
-![对话效果](https://github.com/xuzeyu91/AntSK/blob/main/images/%E5%AF%B9%E8%AF%9D%E6%95%88%E6%9E%9C.png)
-
-## 如何开始？
+## ❓如何开始？
 
 在这里我使用的是Postgres 作为数据存储和向量存储，因为Semantic Kernel和Kernel Memory都支持他，当然你也可以换成其他的。
 
-模型默认支持openai、azure openai 和llama支持的gguf本地模型,如果需要使用其他模型，可以使用one-api进行集成。
+模型默认支持openai、azure openai、讯飞星火、阿里云积、 和llama支持的gguf本地模型 以及llamafactory的本地模型,如果需要使用其他模型，可以使用one-api进行集成。
 
-配置文件中的Login配置是默认的登陆账号和密码
+配置文件中的Login配置是默认的登录账号和密码
 
 需要配置如下的配置文件
 
-## 使用docker-compose 
+## 1️⃣使用docker-compose 
 
-提供了pg版本 **appsettings.json** 和 简化版本（Sqlite+disk） **docker-compose.simple.yml**
+提供了pg版本 **appsettings.json** 和 简化版本（**Sqlite+disk**） **docker-compose.simple.yml**
 
 从项目根目录下载**docker-compose.yml**,然后把配置文件**appsettings.json**和它放在统一目录，
 
@@ -97,14 +78,14 @@ docker-compose up -d
 ```
 来启动AntSK
 
-## 如何在docker中挂载本地模型，和模型下载的目录
+## 2️⃣如何在docker中挂载本地模型，和模型下载的目录
 ```
 # 非 host 版本, 不使用本机代理
 version: '3.8'
 services:
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.2.3
     ports:
       - 5000:5000
     networks:
@@ -125,7 +106,7 @@ networks:
 model/xxx.gguf
 ```
 
-## 配置文件的一些含义
+## 3️⃣配置文件的一些含义
 ```
 {
   "DBConnection": {
@@ -139,8 +120,6 @@ model/xxx.gguf
   },
   "LLamaSharp": {
     "RunType": "GPU", 
-    "Chat": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
-    "Embedding": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
     "FileDirectory": "D:\\Code\\AI\\AntBlazor\\model\\"
   },
   "Login": {
@@ -160,15 +139,14 @@ DBConnection.DbType
 //连接字符串，需要根据不同DB类型，用对应的字符串
 DBConnection.ConnectionStrings
 
-//向量存储的类型，支持  Postgres  Disk  Memory ，其中Postgres需要配置 ConnectionString
+//向量存储的类型，支持  Postgres、Disk、Memory、Qdrant、Redis、AzureAISearch
+//Postgres、Redis需要配置 ConnectionString
+//Qdrant 和AzureAISearch 的 ConnectionString 使用 Endpoint|APIKey  
 KernelMemory.VectorDb
 
 //本地模型使用的运行方式  GUP  CPU ,如果用在线API 这个随意使用一个即可
 LLamaSharp.RunType
-//本地会话模型的模型路径 注意区分linux和windows盘符不同
-LLamaSharp.Chat
-//本地向量模型的模型路径 注意区分linux和windows盘符不同
-LLamaSharp.Embedding
+
 //本地模型路径，用于在选择llama时可以快速选择目录下的模型，以及保存下载的模型
 LLamaSharp.FileDirectory
 
@@ -178,7 +156,7 @@ Login
 BackgroundTaskBroker.ImportKMSTask.WorkerCount
 ```
 
-## 找不到样式问题解决：
+## ⚠️找不到样式问题解决：
 AntSK/src/AntSK下执行:
 ```
 dotnet clean
@@ -193,15 +171,49 @@ dotnet AntSK.dll
 
 DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是自动创建的
 
+## ✔️使用llamafactory
+```
+1、首先需要确保你的环境已经安装了python和pip，如果使用镜像，例如v0.2.3.2版本已经包含了 python全套环境则无需此步骤
+2、进入模型添加页面选择llamafactory
+3、点击初始化，可以检查pip install 环境是否完成
+4、选择一个喜欢的模型
+5、点击启动,这会开始从魔塔下载模型，你可能需要有一个较为漫长的等待
+6、等待模型下载完毕后，在请求地址输入 http://localhost:8000/   这里默认是使用8000端口
+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).
+
+
+## 💕 贡献者
+
+这个项目的存在要感谢所有的贡献者。
+
+<a href="https://github.com/AIDotNet/AntSK/graphs/contributors">
+<img src="https://contrib.rocks/image?repo=AIDotNet/AntSK&max=1000&columns=15&anon=1" />
+</a>
+
+## 🚨 行为准则
+
+该项目采用了贡献者公约定义的行为准则，以阐明我们社区的预期行为。有关更多信息，请参见 .NET Foundation 行为准则。 [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
 想了解更多信息或开始使用 **AntSK**，可以关注我的公众号以及加入交流群。
 
-## 联系我
+## ☎️联系我
 如有任何问题或建议，请通过以下方式关注我的公众号，发消息与我联系，我们也有交流群，可以发送进群等消息，然后我会拉你进交流群
-![公众号](https://github.com/xuzeyu91/Avalonia-Assistant/blob/main/img/gzh.jpg)
+![公众号](https://github.com/AIDotNet/AntSK/blob/main/images/gzh.jpg)
 
----
-
-我们对您在**AntSK**的兴趣表示感谢，并期待与您携手共创智能化的未来！
+## 🌟 Star History
+<a href="https://github.com/AIDotNet/AntSK/stargazers" target="_blank" style="display: block" align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=AIDotNet/AntSK&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=AIDotNet/AntSK&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=AIDotNet/AntSK&type=Date" />
+  </picture>
+</a>
 

docker-compose.simple.yml

@@ -3,7 +3,9 @@ version: '3.8'
 services:
   antsk:
     container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.3
+    # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大
+    # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.2.3.2
     ports:
       - 5000:5000
     networks:

docker-compose.yml

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

docs/deploy/_category_.json

@@ -0,0 +1,14 @@
+{
+    "position": 3,
+    "label": "部署",
+    "collapsible": true,
+    "collapsed": false,
+    "className": "red",
+    "link": {
+        "type": "generated-index",
+        "title": "使用案例"
+    },
+    "customProps": {
+        "description": "提供快速使用AntSK的一些案例！"
+    }
+}

docs/deploy/settings.md

@@ -0,0 +1,56 @@
+---
+sidebar_position: 2
+---
+
+# 配置文件的一些含义
+```
+{
+  "DBConnection": {
+    "DbType": "Sqlite", 
+    "ConnectionStrings": "Data Source=AntSK.db;"
+  },
+  "KernelMemory": {
+    "VectorDb": "Disk", 
+    "ConnectionString": "Host=;Port=;Database=antsk;Username=;Password=",
+    "TableNamePrefix": "km-"
+  },
+  "LLamaSharp": {
+    "RunType": "GPU", 
+    "Chat": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
+    "Embedding": "D:\\Code\\AI\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
+    "FileDirectory": "D:\\Code\\AI\\AntBlazor\\model\\"
+  },
+  "Login": {
+    "User": "admin",
+    "Password": "xuzeyu"
+  },
+  "BackgroundTaskBroker": {
+    "ImportKMSTask": {
+      "WorkerCount": 1 
+    }
+  }
+}
+```
+```
+//支持多种数据库，具体可以查看SqlSugar，MySql，SqlServer，Sqlite，Oracle，PostgreSQL，Dm，Kdbndp，Oscar，MySqlConnector，Access，OpenGauss，QuestDB，HG，ClickHouse，GBase，Odbc，OceanBaseForOracle，TDengine，GaussDB，OceanBase，Tidb，Vastbase，PolarDB，Custom
+DBConnection.DbType
+//连接字符串，需要根据不同DB类型，用对应的字符串
+DBConnection.ConnectionStrings
+
+//向量存储的类型，支持  Postgres  Disk  Memory ，其中Postgres需要配置 ConnectionString
+KernelMemory.VectorDb
+
+//本地模型使用的运行方式  GUP  CPU ,如果用在线API 这个随意使用一个即可
+LLamaSharp.RunType
+//本地会话模型的模型路径 注意区分linux和windows盘符不同
+LLamaSharp.Chat
+//本地向量模型的模型路径 注意区分linux和windows盘符不同
+LLamaSharp.Embedding
+//本地模型路径，用于在选择llama时可以快速选择目录下的模型，以及保存下载的模型
+LLamaSharp.FileDirectory
+
+//默认管理员账号密码
+Login
+//导入异步处理的线程数，使用在线API可以高一点，本地模型建议1 否则容易内存溢出崩掉
+BackgroundTaskBroker.ImportKMSTask.WorkerCount
+```

docs/deploy/start.md

@@ -0,0 +1,57 @@
+---
+sidebar_position: 1
+---
+
+# 如何开始？
+
+在这里我使用的是Postgres 作为数据存储和向量存储，因为Semantic Kernel和Kernel Memory都支持他，当然你也可以换成其他的。
+
+模型默认支持openai、azure openai 和llama支持的gguf本地模型,如果需要使用其他模型，可以使用one-api进行集成。
+
+配置文件中的Login配置是默认的登陆账号和密码
+
+需要配置如下的配置文件
+
+## 使用docker-compose 
+
+提供了pg版本 **appsettings.json** 和 简化版本（Sqlite+disk） **docker-compose.simple.yml**
+
+从项目根目录下载**docker-compose.yml**,然后把配置文件**appsettings.json**和它放在统一目录，
+
+这里已经把pg的镜像做好了。在docker-compose.yml中可以修改默认账号密码，然后你的**appsettings.json**的数据库连接需要保持一致。
+
+然后你可以进入到目录后执行
+```
+docker-compose up -d
+```
+来启动AntSK
+
+## 如何在docker中挂载本地模型，和模型下载的目录
+```
+# 非 host 版本, 不使用本机代理
+version: '3.8'
+services:
+  antsk:
+    container_name: antsk
+    image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.1.5
+    ports:
+      - 5000:5000
+    networks:
+      - antsk
+    depends_on:
+      - antskpg
+    restart: always
+    environment:
+      - ASPNETCORE_URLS=http://*:5000
+    volumes:
+      - ./appsettings.json:/app/appsettings.json # 本地配置文件 需要放在同级目录
+      - D://model:/app/model
+networks:
+  antsk:
+```
+以这个为示例，意思是把windows本地D://model的文件夹挂载进 容器内/app/model 如果是这样你的appsettings.json中的模型地址应该配置为  
+```
+model/xxx.gguf
+```
+
+DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是自动创建的

docs/deploy/style.md

@@ -0,0 +1,16 @@
+---
+sidebar_position: 3
+---
+
+# 找不到样式问题解决
+AntSK/src/AntSK下执行:
+```
+dotnet clean
+dotnet build
+dotnet publish "AntSK.csproj"
+```
+再去AntSK/src/AntSK/bin/Release/net8.0/publish下
+```
+dotnet AntSK.dll
+```
+然后启动就有样式了

docs/develop/_category_.json

@@ -0,0 +1,14 @@
+{
+    "position": 2,
+    "label": "快速开发",
+    "collapsible": true,
+    "collapsed": false,
+    "className": "red",
+    "link": {
+        "type": "generated-index",
+        "title": "快速开发"
+    },
+    "customProps": {
+        "description": "快速基于项目二次开发！"
+    }
+}

docs/introduce/_category_.json

@@ -0,0 +1,14 @@
+{
+    "position": 2,
+    "label": "介绍",
+    "collapsible": true,
+    "collapsed": false,
+    "className": "red",
+    "link": {
+        "type": "generated-index",
+        "title": "使用案例"
+    },
+    "customProps": {
+        "description": "提供快速使用AntSK的一些案例！"
+    }
+}

docs/introduce/readme.md

@@ -0,0 +1,70 @@
+---
+sidebar_position: 1
+---
+
+# AntSK功能介绍
+## 基于.Net8+AntBlazor+SemanticKernel 打造的AI知识库/智能体
+
+## 核心功能
+
+- **语义内核 (Semantic Kernel)**：采用领先的自然语言处理技术，准确理解、处理和响应复杂的语义查询，为用户提供精确的信息检索和推荐服务。
+
+- **内存内核 (Kernel Memory)**：具备持续学习和存储知识点的能力，AntSK 拥有长期记忆功能，累积经验，提供更个性化的交互体验。
+
+- **知识库**：通过文档（Word、PDF、Excel、Txt、Markdown、Json、PPT）等形式导入知识库，可以进行知识库问答。
+
+- **GPTs 生成**：此平台支持创建个性化的GPT模型，尝试构建您自己的GPT模型。
+
+- **API接口发布**：将内部功能以API的形式对外提供，便于开发者将AntSK 集成进其他应用，增强应用智慧。
+
+- **API插件系统**：开放式API插件系统，允许第三方开发者或服务商轻松将其服务集成到AntSK，不断增强应用功能。
+
+- **.Net插件系统**：开放式dll插件系统，允许第三方开发者或服务商轻松将其业务功能通过标准格式的代码生成dll后集成到AntSK，不断增强应用功能。
+
+- **联网搜索**：AntSK，实时获取最新信息，确保用户接受到的资料总是最及时、最相关的。
+
+- **模型管理**：适配和管理集成不同厂商的不同模型。并且支持**llama.cpp**所支持的gguf类型，以及**llamafactory**所支持的模型离线运行
+
+- **国产信创**：AntSK支持国产模型，和国产数据库，可以在信创条件下运行
+
+- **模型微调**：规划中，基于llamafactory进行模型微调
+  
+
+## 应用场景
+
+AntSK 适用于多种业务场景，例如：
+- 企业级知识管理系统
+- 自动客服与聊天机器人
+- 企业级搜索引擎
+- 个性化推荐系统
+- 智能辅助写作
+- 教育与在线学习平台
+- 其他有意思的AI App
+
+## 功能示例
+
+[视频示例](https://www.bilibili.com/video/BV1zH4y1h7Y9/)
+
+首先需要创建知识库
+![知识库](./img/知识库.png)
+
+在知识库里可以使用文档或者url进行导入
+![知识库详情](./img/知识库详情.png)
+
+点击查看可以查看知识库的文档切片情况
+![文档切片](./img/文档切片.png)
+
+然后我们需要创建应用，可以创建对话应用和知识库。
+![应用](./img/应用.png)
+
+知识库应用需要选择已有的知识库，可以选多个
+![应用配置](./img/应用配置.png)
+
+然后再对话中可以对知识库的文档进行提问
+![问答](./img/问答.png)
+
+另外我们也可以创建对话应用，可以在对应应用中配置提示词模板
+![对话应用](./img/简单对话.png)
+
+下面来看看效果吧
+![对话效果](./img/对话效果.png)

src/AntSK.Domain/AntSK.Domain.csproj

@@ -9,24 +9,28 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.5.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.18.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.18.1" />
     <PackageReference Include="BlazorComponents.Terminal" Version="0.6.0" />
-    
+    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
+  
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     
     <PackageReference Include="AutoMapper" Version="8.1.0" />
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Markdig" Version="0.36.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.145" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.148" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
     
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.2" />
-    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.6.2" />
-    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.6.2-alpha" />
-    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.34.240313.1" />
-    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="0.34.240313.1" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.3" />
+    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.6.3" />
+    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.6.3-alpha" />
+    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.35.240321.1" />
+    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="0.35.240321.1" />
+    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Qdrant" Version="0.35.240321.1" />
+    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Redis" Version="0.35.240321.1" />
+    <PackageReference Include="Microsoft.KernelMemory.MemoryDb.AzureAISearch" Version="0.35.240321.1" />
 
     <PackageReference Include="LLamaSharp" Version="0.10.0" />
     <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.10.0" />

src/AntSK.Domain/AntSK.Domain.xml

@@ -104,7 +104,7 @@
             避免模型重复加载，本地缓存
             </summary>
         </member>
-        <member name="M:AntSK.Domain.Domain.Service.ChatService.SendChatByAppAsync(AntSK.Domain.Repositories.Apps,System.String,System.String)">
+        <member name="M:AntSK.Domain.Domain.Service.ChatService.SendChatByAppAsync(AntSK.Domain.Repositories.Apps,System.String,Microsoft.SemanticKernel.ChatCompletion.ChatHistory)">
             <summary>
             发送消息
             </summary>

src/AntSK.Domain/Domain/Interface/IChatService.cs

@@ -1,6 +1,8 @@
-using AntSK.Domain.Domain.Model.Dto;
+using AntSK.Domain.Domain.Model;
+using AntSK.Domain.Domain.Model.Dto;
 using AntSK.Domain.Repositories;
 using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,8 +13,10 @@ namespace AntSK.Domain.Domain.Interface
 {
     public interface IChatService
     {
-        IAsyncEnumerable<StreamingKernelContent> SendChatByAppAsync(Apps app, string questions, string history);
+        IAsyncEnumerable<StreamingKernelContent> SendChatByAppAsync(Apps app, string questions, ChatHistory history);
 
-        IAsyncEnumerable<StreamingKernelContent> SendKmsByAppAsync(Apps app, string questions, string history, string filePath, List<RelevantSource> relevantSources = null);
+        IAsyncEnumerable<StreamingKernelContent> SendKmsByAppAsync(Apps app, string questions, ChatHistory history, string filePath, List<RelevantSource> relevantSources = null);
+
+        Task<ChatHistory> GetChatHistory(List<MessageInfo> MessageList);
     }
 }

src/AntSK.Domain/Domain/Model/hfmirror/HfModel.cs

@@ -18,7 +18,7 @@ namespace AntSK.Domain.Domain.Model.hfmirror
         public string Author { get; set; }
         public HfAuthorData AuthorData { get; set; }
         public int Downloads { get; set; }
-        public bool Gated { get; set; }
+        public object Gated { get; set; }
         public string Id { get; set; }
         public DateTime LastModified { get; set; }
         public int Likes { get; set; }

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

@@ -31,7 +31,7 @@ namespace AntSK.Domain.Domain.Other
                     {
                         ContextSize = lsConfig?.ContextSize ?? 2048,
                         Seed = lsConfig?.Seed ?? 0,
-                        GpuLayerCount = lsConfig?.GpuLayerCount ?? 10,
+                        GpuLayerCount = lsConfig?.GpuLayerCount ?? 20,
                         EmbeddingMode = true
                     };
                     var weights = LLamaWeights.LoadFromFile(parameters);

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

@@ -12,6 +12,10 @@ using System.Reflection.Metadata;
 using Microsoft.KernelMemory;
 using System.Collections.Generic;
 using Markdig;
+using ChatHistory = Microsoft.SemanticKernel.ChatCompletion.ChatHistory;
+using Microsoft.SemanticKernel.Plugins.Core;
+using Azure.Core;
+using AntSK.Domain.Domain.Model;
 
 namespace AntSK.Domain.Domain.Service
 {
@@ -29,13 +33,31 @@ namespace AntSK.Domain.Domain.Service
         /// <param name="questions"></param>
         /// <param name="history"></param>
         /// <returns></returns>
-        public async IAsyncEnumerable<StreamingKernelContent> SendChatByAppAsync(Apps app, string questions, string history)
+        public async IAsyncEnumerable<StreamingKernelContent> SendChatByAppAsync(Apps app, string questions, ChatHistory history)
         {
+
             if (string.IsNullOrEmpty(app.Prompt) || !app.Prompt.Contains("{{$input}}"))
             {
                 //如果模板为空，给默认提示词
                 app.Prompt = app.Prompt.ConvertToString() + "{{$input}}";
             }
+            KernelArguments args =new KernelArguments();
+            if (history.Count > 10)
+            {
+                app.Prompt = @"${{ConversationSummaryPlugin.SummarizeConversation $history}}" + app.Prompt;
+                args = new() {
+                { "history", string.Join("\n", history.Select(x => x.Role + ": " + x.Content)) },
+                { "input", questions }
+                };
+            }
+            else 
+            {
+                args=new()
+                {
+                { "input", $"{string.Join("\n", history.Select(x => x.Role + ": " + x.Content))}{Environment.NewLine} user:{questions}" }
+                };
+            }
+    
             var _kernel = _kernelService.GetKernelByApp(app);
             var temperature = app.Temperature / 100;//存的是0~100需要缩小
             OpenAIPromptExecutionSettings settings = new() { Temperature = temperature };
@@ -45,14 +67,15 @@ namespace AntSK.Domain.Domain.Service
                 settings.ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions;
             }
             var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
-            var chatResult = _kernel.InvokeStreamingAsync(function: func, arguments: new KernelArguments() { ["input"] = $"{history}{Environment.NewLine} user:{questions}" });
+            var chatResult = _kernel.InvokeStreamingAsync(function: func, 
+                arguments: args);
             await foreach (var content in chatResult)
             {
                 yield return content;
             }
         }
 
-        public async IAsyncEnumerable<StreamingKernelContent> SendKmsByAppAsync(Apps app, string questions, string history, string filePath, List<RelevantSource> relevantSources = null)
+        public async IAsyncEnumerable<StreamingKernelContent> SendKmsByAppAsync(Apps app, string questions, ChatHistory history, string filePath, List<RelevantSource> relevantSources = null)
         {
             var relevantSourceList = await _kMService.GetRelevantSourceList(app.KmsIdList, questions);
             var _kernel = _kernelService.GetKernelByApp(app);
@@ -84,9 +107,9 @@ namespace AntSK.Domain.Domain.Service
                     dataMsg.AppendLine(item.ToString());
                 }
 
-                KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask");
+                KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask1");
                 var chatResult = _kernel.InvokeStreamingAsync(function: jsonFun,
-                    arguments: new KernelArguments() { ["doc"] = dataMsg, ["history"] = history, ["questions"] = questions });
+                    arguments: new KernelArguments() { ["doc"] = dataMsg, ["history"] = string.Join("\n", history.Select(x => x.Role + ": " + x.Content)), ["questions"] = questions });
 
                 await foreach (var content in chatResult)
                 {
@@ -98,5 +121,26 @@ namespace AntSK.Domain.Domain.Service
                 yield return new StreamingTextContent(KmsConstantcs.KmsSearchNull);
             }
         }
+
+        public async Task<ChatHistory> GetChatHistory(List<MessageInfo> MessageList)
+        {
+            ChatHistory history = new ChatHistory();
+            if (MessageList.Count > 1)
+            {
+
+                foreach (var item in MessageList)
+                {
+                    if (item.IsSend)
+                    {
+                        history.AddUserMessage(item.Context);
+                    }
+                    else
+                    {
+                        history.AddAssistantMessage(item.Context);
+                    }
+                }
+            }
+            return history;
+        }
     }
 }

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

@@ -220,6 +220,20 @@ namespace AntSK.Domain.Domain.Service
                         StorageType = FileSystemTypes.Volatile
                     });
                     break;
+                case "Qdrant":
+                    var qdrantConfig = ConnectionString.Split("|");
+                    memory.WithQdrantMemoryDb(qdrantConfig[0],qdrantConfig[1]);
+                    break;
+                case "Redis":
+                    memory.WithRedisMemoryDb(new RedisConfig()
+                    {
+                        ConnectionString = ConnectionString,
+                    });
+                    break;
+                case "AzureAISearch":
+                    var aisearchConfig = ConnectionString.Split("|");
+                    memory.WithAzureAISearchMemoryDb(aisearchConfig[0], aisearchConfig[1]);
+                    break;
             }
         }
 

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

@@ -162,7 +162,7 @@ namespace AntSK.Domain.Domain.Service
                                      new KernelParameterMetadata("jsonbody"){
                                       Name="json参数字符串",
                                       ParameterType=typeof(string),
-                                      Description=$"需要根据背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.Query}"
+                                      Description=$"背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.Query}"
                                     }
                                 };
                             functions.Add(_kernel.CreateFunctionFromMethod((string jsonbody) =>
@@ -201,7 +201,7 @@ namespace AntSK.Domain.Domain.Service
                                     new KernelParameterMetadata("jsonbody"){
                                       Name="json参数字符串",
                                       ParameterType=typeof(string),
-                                      Description=$"需要根据背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.JsonBody}"
+                                      Description=$"背景文档:{Environment.NewLine}{api.InputPrompt} {Environment.NewLine}提取出对应的json格式字符串，参考如下格式:{Environment.NewLine}{api.JsonBody}"
                                     }
                                 };
                             functions.Add(_kernel.CreateFunctionFromMethod((string jsonBody) =>

src/AntSK.Domain/Options/LLamaSharpOption.cs

@@ -3,10 +3,6 @@
     public class LLamaSharpOption
     {
         public static string RunType { get; set; }
-        public static string Chat { get; set; }
-
-        public static string Embedding { get; set; }
-
         public static string FileDirectory { get; set; } = Directory.GetCurrentDirectory();
     }
 }

src/AntSK.sln

@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.LLM", "AntSk.LLM\AntS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.Test", "AntSK.Test\AntSK.Test.csproj", "{6AD71410-127F-4C83-95A8-F699C39B44FF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntSK.LLamaFactory", "AntSK.LLamaFactory\AntSK.LLamaFactory.csproj", "{664DFA1F-68B7-49C7-B889-FA14D1756D3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.LLamaFactory", "AntSK.LLamaFactory\AntSK.LLamaFactory.csproj", "{664DFA1F-68B7-49C7-B889-FA14D1756D3D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/AntSK/Components/GlobalHeader/RightContent.razor

@@ -3,7 +3,7 @@
 @inherits AntDomComponentBase
 
 <Space Class="@ClassMapper.Class" Size="@("26")">
-    <Image Src="http://img.shields.io/github/stars/aidotnet/antsk?style=social" Width="88px" Height="20px;"></Image>
+    <button class="github_btn" onclick="window.open('https://github.com/AIDotNet/AntSK')"></button>
     <SpaceItem Style="margin-left:20px;">
         <AvatarDropdown Name="@context.Identity.Name"
                         Avatar="@_currentUser.Avatar"
@@ -12,3 +12,14 @@
 
     </SpaceItem>
 </Space>
+
+<style>
+    .github_btn
+    {
+        cursor:pointer;
+        border:none;
+        background-image: url('http://img.shields.io/github/stars/aidotnet/antsk?style=social');
+        width:88px;
+        height:20px;
+    }
+</style>

src/AntSK/Controllers/LLamaSharpController.cs

@@ -1,45 +0,0 @@
-using AntSK.Domain.Domain.Model.Dto.OpenAPI;
-using AntSK.Services.LLamaSharp;
-using Microsoft.AspNetCore.Mvc;
-
-namespace AntSK.Controllers
-{
-    [ApiController]
-    public class LLamaSharpController(ILLamaSharpService _lLamaSharpService) : ControllerBase
-    {
-        /// <summary>
-        /// 本地会话接口
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("llama/v1/chat/completions")]
-        public async Task chat(OpenAIModel model)
-        {
-            Console.WriteLine("开始：llama/v1/chat/completions");
-            if (model.stream)
-            {
-                await _lLamaSharpService.ChatStream(model, HttpContext);
-            }
-            else
-            {
-                await _lLamaSharpService.Chat(model, HttpContext);
-            }
-            Console.WriteLine("结束：llama/v1/chat/completions");
-        }
-
-        /// <summary>
-        /// 本地嵌入接口
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("llama/v1/embeddings")]
-        public async Task embedding(OpenAIEmbeddingModel model)
-        {
-            Console.WriteLine("开始：llama/v1/embeddings");
-            await _lLamaSharpService.Embedding(model, HttpContext);
-            Console.WriteLine("结束：llama/v1/embeddings");
-
-        }
-    }
-}

src/AntSK/Layouts/BasicLayout.razor

@@ -95,7 +95,7 @@
         {
             Key = "许泽宇的技术分享",
             Title = "许泽宇的技术分享",
-            Href = "http://studiogpt.cn/",
+            Href = "./assets/gzh.jpg",
             BlankTarget = true,
         },
         new LinkItem

src/AntSK/Layouts/UserLayout.razor

@@ -29,7 +29,7 @@
         {
             Key = "许泽宇的技术分享",
             Title = "许泽宇的技术分享",
-            Href = "http://studiogpt.cn/",
+            Href = "./assets/gzh.jpg",
             BlankTarget = true,
         },
         new LinkItem

src/AntSK/Pages/AppPage/AddApp.razor

@@ -41,7 +41,7 @@
                      </Select>
                      <Button Type="@ButtonType.Link" OnClick="NavigateModelList">去创建</Button>
                  </FormItem>
-                <FormItem Label="Embedding模型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
+                <FormItem Label="向量模型" LabelCol="LayoutModel._formItemLayout.LabelCol" WrapperCol="LayoutModel._formItemLayout.WrapperCol">
                     <Select DataSource="@_embedignList"
                             @bind-Value="@context.EmbeddingModelID"
                             ValueProperty="c=>c.Id"

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

@@ -58,7 +58,13 @@ namespace AntSK.Pages.AppPage
 
         private void GetDesc()
         {
-            _desc = @$"为了方便其他应用对接，接口符合openai规范，省略了温度TopP等参数。{Environment.NewLine}BaseUrl:{Environment.NewLine}{_openApiUrl} {Environment.NewLine}headers:{Environment.NewLine}Authorization:Bearer ""{_appModel.SecretKey}"" {Environment.NewLine}Body:  {Environment.NewLine}{JsonConvert.SerializeObject(new OpenAIModel() { messages = new List<OpenAIMessage>() { new OpenAIMessage() { role = "user", content = "你好，你是谁" } } }, Formatting.Indented)}";
+            _desc = @$"为了方便其他应用对接，接口符合openai规范，省略了温度TopP等参数。
+BaseUrl:
+{_openApiUrl}
+headers:
+Authorization:Bearer {_appModel.SecretKey}
+Body: 
+{JsonConvert.SerializeObject(new OpenAIModel() { messages = new List<OpenAIMessage>() { new OpenAIMessage() { role = "user", content = "你好，你是谁" } } }, Formatting.Indented)}";
         }
 
         private void GetScript()

src/AntSK/Pages/ChatPage/Chat.razor

@@ -2,6 +2,7 @@
 @using AntSK.Domain.Repositories
 @using AntSK.Models
 @using Microsoft.AspNetCore.Components.Web.Virtualization
+@using AntSK.Pages.ChatPage.Components
 @page "/Chat"
 @page "/Chat/{AppId}"
 @using AntSK.Services.Auth
@@ -9,89 +10,25 @@
 
 <GridRow Gutter="(16, 16)">
     <GridCol Span="12">
-        <Spin Size="large" Tip="请稍等..." Spinning="@(_loading)">
-            <Card Style="height:75vh;overflow: auto;">
-                <TitleTemplate>
-                    <Icon Type="setting" /> 选择应用
-                    <Select DataSource="@_list"
-                            @bind-Value="@AppId"
-                            DefaultValue="@("lucy")"
-                            ValueProperty="c=>c.Id"
-                            LabelProperty="c=>c.Name"
-                            Style="width:200px">
-                    </Select>
-                    <a href="@( NavigationManager.BaseUri + "openchat/" + AppId)" target="_blank">分享使用</a>
-                </TitleTemplate>
-                <Body>
-                    <div id="scrollDiv" style="height: calc(75vh - 190px); overflow-y: auto; overflow-x: hidden;">
-                        <GridRow Gutter="(8, 8)" Style="margin:0">
-                            <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
-                                @if (item.IsSend)
-                                {
-                                    <GridRow Style="width:100%">
-                                        <GridCol Span="23">
-                                            <div class="chat-bubble sent">
-                                                <Popover Title="@item.CreateTime.ToString()">
-                                                    <Unbound>
-                                                        <Flex Vertical RefBack="context">
-                                                            @if (item.FileName != null)
-                                                            {
-                                                                <p class="message-file">
-                                                                    <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
-                                                                </p>
-                                                            }
-                                                            <p>@(item.Context)</p>
-                                                        </Flex>
-                                                    </Unbound>
-                                                </Popover>
-                                            </div>
-                                            <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
-                                        </GridCol>
-                                        <GridCol Span="1">
-                                            <Image Width="25px" Height="25px" Style="margin-top:10px;margin-right:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
-                                        </GridCol>
-                                    </GridRow>
-                                }
-                                else
-                                {
-                                    <GridRow Style="width:100%">
-                                        <GridCol Span="1">
-                                            <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
-                                        </GridCol>
-                                        <GridCol Span="23">
-                                            <div class="chat-bubble received">
-                                                @((MarkupString)(item.HtmlAnswers))
-                                            </div>
-                                        </GridCol>
-                                    </GridRow>
-                                }
-                            </Virtualize>
-                        </GridRow>
-                    </div>
-
-                    <Flex Vertical>
-                        @if (fileList.Count > 0)
-                        {
-                            <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
-                        }
-                        <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
-                    </Flex>
-                    <Flex Justify="end">
-                        <Upload Action="@("api/File/UploadFile")"
-                                Name="file"
-                                Accept="*/*"
-                                ShowUploadList="false"
-                                BeforeUpload="_kMService.BeforeUpload"
-                                OnSingleCompleted="OnSingleCompleted" >
-                            <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
-                        </Upload>
-                        <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
-                        <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
-                    </Flex>
-
-                </Body>
-            </Card>
-        </Spin>
+        <Card Style="height:75vh;overflow: auto;">
+            <TitleTemplate>
+                <Icon Type="setting" /> 选择应用
+                <Select DataSource="@_list"
+                        @bind-Value="@AppId"
+                        DefaultValue="@("lucy")"
+                        ValueProperty="c=>c.Id"
+                        LabelProperty="c=>c.Name"
+                        Style="width:200px">
+                </Select>
+                <a href="@( NavigationManager.BaseUri + "openchat/" + AppId)" target="_blank">分享使用</a>
+            </TitleTemplate>
+            <Body>
+                @if (!string.IsNullOrEmpty(AppId))
+                {
+                    <ChatView AppId="@AppId" ShowTitle=false OnRelevantSources="OnRelevantSources"></ChatView>
+                }
+            </Body>
+        </Card>
     </GridCol>
     <GridCol Span="12">
         <Card Style="height: 75vh;overflow: auto;">
@@ -116,6 +53,15 @@
 </GridRow>
 
 <style>
+    #chat {
+        height: calc(75vh - 120px);
+        display: flex;
+        flex-direction: column;
+        overflow-x: hidden;
+        overflow-y: auto;
+        font-family: Arial, sans-serif;
+        margin: 0;
+    }
 
     body {
         font-family: Arial, sans-serif;
@@ -123,39 +69,7 @@
         justify-content: center;
         align-items: flex-start;
         height: 100vh;
-    }
-
-    .chat-container {
-        width: 350px;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        background-color: #fff;
-        padding-bottom: 15px;
-    }
-
-    .chat-bubble {
-        padding: 10px;
-        margin: 10px;
-        margin-bottom: 0;
-        border-radius: 5px;
-        max-width: 70%;
-        position: relative;
-    }
-
-    .received {
-        background-color: #f0f0f0;
-        align-self: flex-start;
-        float: left;
-    }
-
-    .sent {
-        background-color: #daf8cb;
-        align-self: flex-end;
-        float: right;
-        position: relative;
+        overflow-y: hidden;
     }
 </style>
 @code {

src/AntSK/Pages/ChatPage/Chat.razor.cs

@@ -8,288 +8,30 @@ using System.Text;
 using Markdig;
 using AntSK.Domain.Domain.Model;
 using AntSK.Domain.Domain.Model.Dto;
+using Microsoft.SemanticKernel.ChatCompletion;
 
 namespace AntSK.Pages.ChatPage
 {
     public partial class Chat
     {
         [Parameter] public string AppId { get; set; }
-        [Inject] protected MessageService? Message { get; set; }
+
         [Inject] protected IApps_Repositories _apps_Repositories { get; set; }
-        [Inject] protected IApis_Repositories _apis_Repositories { get; set; }
-        [Inject] protected IKmss_Repositories _kmss_Repositories { get; set; }
-        [Inject] protected IKmsDetails_Repositories _kmsDetails_Repositories { get; set; }
-        [Inject] private IJSRuntime _JSRuntime { get; set; }
-
-        [Inject] protected IKernelService _kernelService { get; set; }
-        [Inject] protected IKMService _kMService { get; set; }
-        [Inject] private IConfirmService _confirmService { get; set; }
-        [Inject] private IChatService _chatService { get; set; }
-
-        [Inject] private ILogger<Chat> Logger { get; set; }
-
-        protected bool _loading = false;
-        protected List<MessageInfo> MessageList = [];
-        protected string? _messageInput;
-        protected string _json = "";
-        protected bool Sendding = false;
-
+      
         private List<RelevantSource> _relevantSources = new List<RelevantSource>();
 
         protected List<Apps> _list = new List<Apps>();
 
-        private List<UploadFileItem> fileList = [];
-
-        private Upload _uploadRef;
-
         protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
             _list = _apps_Repositories.GetList();
         }
 
-        protected async Task OnSendAsync()
+        private void OnRelevantSources(List<RelevantSource> relevantSources)
         {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(_messageInput))
-                {
-                    _ = Message.Info("请输入消息", 2);
-                    return;
-                }
-
-                if (string.IsNullOrWhiteSpace(AppId))
-                {
-                    _ = Message.Info("请选择应用进行测试", 2);
-                    return;
-                }
-
-                var filePath = fileList.FirstOrDefault()?.Url;
-                var fileName = fileList.FirstOrDefault()?.FileName;
-
-                MessageList.Add(new MessageInfo()
-                {
-                    ID = Guid.NewGuid().ToString(),
-                    Context = _messageInput,
-                    CreateTime = DateTime.Now,
-                    IsSend = true,
-                    FilePath = filePath,
-                    FileName = fileName
-                });
-
-                var prompt = _messageInput;
-                _messageInput = "";
-                fileList.Clear();
-
-                Sendding = true;
-        
-                await SendAsync(prompt, filePath);
-
-                Sendding = false;
-            }
-            catch (System.Exception ex)
-            {
-                Sendding = false;
-                Logger.LogError(ex, "对话异常");
-                _ = Message.Error("异常:" + ex.Message, 2);
-            }
-        }
-
-        protected async Task OnCopyAsync(MessageInfo item)
-        {
-            await Task.Run(() => { _messageInput = item.Context; });
-        }
-
-        protected async Task OnClearAsync()
-        {
-            if (MessageList.Count > 0)
-            {
-                var content = "是否要清理会话记录";
-                var title = "清理";
-                var result = await _confirmService.Show(content, title, ConfirmButtons.YesNo);
-                if (result == ConfirmResult.Yes)
-                {
-                    MessageList.Clear();
-                    _ = Message.Info("清理成功");
-                }
-            }
-            else
-            {
-                _ = Message.Info("没有会话记录");
-            }
-        }
-
-        protected async Task<bool> SendAsync(string questions, string? filePath)
-        {
-            string msg = "";
-            //处理多轮会话
-            Apps app = _apps_Repositories.GetFirst(p => p.Id == AppId);
-            if (MessageList.Count > 0)
-            {
-                msg = await HistorySummarize(app, questions);
-            }
-
-            switch (app.Type)
-            {
-                case "chat" when filePath == null:
-                    //普通会话
-                    await SendChat(questions, msg, app);
-                    break;
-
-                default:
-                    //知识库问答
-                    await SendKms(questions, msg, filePath, app);
-                    break;
-            }
-
-            return await Task.FromResult(true);
-        }
-
-        /// <summary>
-        /// 发送知识库问答
-        /// </summary>
-        /// <param name="questions"></param>
-        /// <param name="msg"></param>
-        /// <param name="filePath"></param>
-        /// <param name="app"></param>
-        /// <returns></returns>
-        private async Task SendKms(string questions, string msg, string filePath, Apps app)
-        {
-            MessageInfo info = null;
-            var chatResult = _chatService.SendKmsByAppAsync(app, questions, msg, filePath, _relevantSources);
-            await foreach (var content in chatResult)
-            {
-                if (info == null)
-                {
-                    info = new MessageInfo();
-                    info.ID = Guid.NewGuid().ToString();
-                    info.Context = content?.ConvertToString();
-                    info.HtmlAnswers = content?.ConvertToString();
-                    info.CreateTime = DateTime.Now;
-
-                    MessageList.Add(info);
-                }
-                else
-                {
-                    info.HtmlAnswers += content.ConvertToString();
-                    await Task.Delay(50);
-                }
-
-                await InvokeAsync(StateHasChanged);
-            }
-
-            //全部处理完后再处理一次Markdown
-            await MarkDown(info);
-        }
-
-        /// <summary>
-        /// 发送普通对话
-        /// </summary>
-        /// <param name="questions"></param>
-        /// <param name="history"></param>
-        /// <param name="app"></param>
-        /// <returns></returns>
-        private async Task SendChat(string questions, string history, Apps app)
-        {
-            MessageInfo info = null;
-            var chatResult = _chatService.SendChatByAppAsync(app, questions, history);
-            await foreach (var content in chatResult)
-            {
-                if (info == null)
-                {
-                    info = new MessageInfo();
-                    info.ID = Guid.NewGuid().ToString();
-                    info.Context = content?.ConvertToString();
-                    info.HtmlAnswers = content?.ConvertToString();
-                    info.CreateTime = DateTime.Now;
-
-                    MessageList.Add(info);
-                }
-                else
-                {
-                    info.HtmlAnswers += content.ConvertToString();
-                    await Task.Delay(50);
-                }
-
-                await InvokeAsync(StateHasChanged);
-            }
-
-            //全部处理完后再处理一次Markdown
-            await MarkDown(info);
-        }
-
-        private async Task MarkDown(MessageInfo info)
-        {
-            if (info.IsNotNull())
-            {
-                // info!.HtmlAnswers = markdown.Transform(info.HtmlAnswers);
-                info!.HtmlAnswers = Markdown.ToHtml(info.HtmlAnswers);
-            }
-
-            await InvokeAsync(StateHasChanged);
-            await _JSRuntime.InvokeVoidAsync("Prism.highlightAll");
-            await _JSRuntime.ScrollToBottomAsync("scrollDiv");
-        }
-
-        /// <summary>
-        /// 历史会话的会话总结
-        /// </summary>
-        /// <param name="questions"></param>
-        /// <returns></returns>
-        private async Task<string> HistorySummarize(Apps app, string questions)
-        {
-            var _kernel = _kernelService.GetKernelByApp(app);
-            if (MessageList.Count > 1)
-            {
-                StringBuilder history = new StringBuilder();
-                foreach (var item in MessageList)
-                {
-                    if (item.IsSend)
-                    {
-                        history.Append($"user:{item.Context}{Environment.NewLine}");
-                    }
-                    else
-                    {
-                        history.Append($"assistant:{item.Context}{Environment.NewLine}");
-                    }
-                }
-
-                if (MessageList.Count > 10)
-                {
-                    //历史会话大于10条，进行总结
-                    var msg = await _kernelService.HistorySummarize(_kernel, questions, history.ToString());
-                    return msg;
-                }
-                else
-                {
-                    var msg =
-                        $"history：{Environment.NewLine}{history.ToString()}{Environment.NewLine}{Environment.NewLine}";
-                    return msg;
-                }
-            }
-            else
-            {
-                return "";
-            }
-        }
-
-        private void OnSingleCompleted(UploadInfo fileInfo)
-        {
-            fileList.Add(new()
-            {
-                FileName = fileInfo.File.FileName,
-                Url = fileInfo.File.Url = fileInfo.File.Response,
-                Ext = fileInfo.File.Ext,
-                State = UploadState.Success,
-            });
-            _kMService.OnSingleCompleted(fileInfo);
-        }
-
-        private async Task<bool> HandleFileRemove(UploadFileItem file)
-        {
-            fileList.RemoveAll(x => x.FileName == file.FileName);
-            await Task.Yield();
-            return true;
+            _relevantSources = relevantSources;
+            InvokeAsync(StateHasChanged);
         }
     }
 }

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

@@ -0,0 +1,132 @@
+@namespace AntSK.Pages.ChatPage.Components
+@using AntSK.Domain.Repositories
+@using AntSK.Models
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@layout OpenLayout
+@inherits AntDomComponentBase
+
+<div id="chat">
+    @if (ShowTitle)
+    {
+        <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
+    }
+    <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
+        <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
+            @if (item.IsSend)
+            {
+                <GridRow>
+                    <GridCol Span="23">
+                        <div class="chat-bubble sent">
+                            <Popover Title="@item.CreateTime.ToString()">
+                                <Unbound>
+                                    <Flex Vertical RefBack="context">
+                                        @if (item.FileName != null)
+                                        {
+                                            <p class="message-file">
+                                                <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
+                                            </p>
+                                        }
+                                        <p>@(item.Context)</p>
+                                    </Flex>
+                                </Unbound>
+                            </Popover>
+                        </div>
+                        <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
+                    </GridCol>
+                    <GridCol Span="1">
+                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
+                    </GridCol>
+                </GridRow>
+            }
+            else
+            {
+                <GridRow>
+                    <GridCol Span="1">
+                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
+                    </GridCol>
+                    <GridCol Span="23">
+                        <div class="chat-bubble received">
+                            @((MarkupString)(item.HtmlAnswers))
+                        </div>
+
+                    </GridCol>
+                </GridRow>
+            }
+        </Virtualize>
+    </div>
+
+    @if (fileList.Count > 0)
+    {
+        <Flex Vertical>
+            <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
+        </Flex>
+    }
+    <Flex Justify="end">
+
+        <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
+        @if (app.EmbeddingModelID!=null)
+        {
+            <Upload Action="@("api/File/UploadFile")"
+                    Name="file"
+                    Accept="*/*"
+                    ShowUploadList="false"
+                    BeforeUpload="_kMService.BeforeUpload"
+                    OnSingleCompleted="OnSingleCompleted">
+                <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
+            </Upload>
+        }
+        <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
+        <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
+    </Flex>
+</div>
+
+<style>
+
+    body {
+        font-family: Arial, sans-serif;
+        margin: 0;
+        justify-content: center;
+        align-items: flex-start;
+        height: 100vh;
+    }
+
+    .chat-container {
+        width: 350px;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        background-color: #fff;
+        padding-bottom: 15px;
+    }
+
+    .chat-bubble {
+        padding: 10px;
+        margin: 10px;
+        margin-bottom: 0;
+        border-radius: 5px;
+        max-width: 70%;
+        position: relative;
+    }
+
+    .received {
+        background-color: #f0f0f0;
+        align-self: flex-start;
+        float: left;
+    }
+
+    .sent {
+        background-color: #daf8cb;
+        align-self: flex-end;
+        float: right;
+    }
+
+    .ant-card-body {
+        height: 90% !important;
+    }
+</style>
+
+@code {
+
+}

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

@@ -1,44 +1,38 @@
 using AntDesign;
 using AntSK.Domain.Domain.Interface;
+using AntSK.Domain.Domain.Model;
+using AntSK.Domain.Domain.Model.Dto;
 using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
-using Microsoft.AspNetCore.Components;
-using Microsoft.KernelMemory;
-using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.Connectors.OpenAI;
-using SqlSugar;
-using System.Text;
-using AntSK.Domain.Utils;
-using Microsoft.JSInterop;
+using Blazored.LocalStorage;
 using Markdig;
-using AntSK.Domain.Domain.Model;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Newtonsoft.Json;
 
-namespace AntSK.Pages.ChatPage
+namespace AntSK.Pages.ChatPage.Components
 {
-    public partial class OpenChat
+    public partial class ChatView
     {
         [Parameter]
         public string AppId { get; set; }
-        [Inject]
-        protected MessageService? Message { get; set; }
-        [Inject]
-        protected IApps_Repositories _apps_Repositories { get; set; }
-        [Inject]
-        protected IKmss_Repositories _kmss_Repositories { get; set; }
-        [Inject]
-        protected IKmsDetails_Repositories _kmsDetails_Repositories { get; set; }
-        [Inject]
-        protected IKernelService _kernelService { get; set; }
-        [Inject]
-        protected IKMService _kMService { get; set; }
-        [Inject]
-        IConfirmService _confirmService { get; set; }
-        [Inject]
-        IChatService _chatService { get; set; }
+
+        [Parameter]
+        public bool ShowTitle { get; set; } = false;
+        [Parameter]
+        public EventCallback<List<RelevantSource>> OnRelevantSources { get; set; }
+        [Inject] protected MessageService? Message { get; set; }
+        [Inject] protected IApps_Repositories _apps_Repositories { get; set; }
+        [Inject] protected IKmss_Repositories _kmss_Repositories { get; set; }
+        [Inject] protected IKmsDetails_Repositories _kmsDetails_Repositories { get; set; }
+        [Inject] protected IKernelService _kernelService { get; set; }
+        [Inject] protected IKMService _kMService { get; set; }
+        [Inject] IConfirmService _confirmService { get; set; }
+        [Inject] IChatService _chatService { get; set; }
         [Inject] IJSRuntime _JSRuntime { get; set; }
+        [Inject] ILocalStorageService _localStorage { get; set; }
 
-
-        protected bool _loading = false;
         protected List<MessageInfo> MessageList = [];
         protected string? _messageInput;
         protected string _json = "";
@@ -46,10 +40,29 @@ namespace AntSK.Pages.ChatPage
 
         protected Apps app = new Apps();
 
+        private List<UploadFileItem> fileList = [];
+
+        private List<RelevantSource> _relevantSources = new List<RelevantSource>();
+
         protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
-            app = _apps_Repositories.GetFirst(p => p.Id == AppId);
+            await LoadData();
+            var msgs = await _localStorage.GetItemAsync<List<MessageInfo>>("msgs");
+            if (msgs != null && msgs.Count > 0)
+            {
+                MessageList = msgs;
+            }
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
+           await LoadData();
+        }
+
+        private async Task LoadData()
+        {
+            app =await _apps_Repositories.GetFirstAsync(p => p.Id == AppId);
         }
 
         protected async Task OnClearAsync()
@@ -62,6 +75,7 @@ namespace AntSK.Pages.ChatPage
                 if (result == ConfirmResult.Yes)
                 {
                     MessageList.Clear();
+                    await _localStorage.SetItemAsync<List<MessageInfo>>("msgs", MessageList);
                     _ = Message.Info("清理成功");
                 }
             }
@@ -79,6 +93,8 @@ namespace AntSK.Pages.ChatPage
                     _ = Message.Info("请输入消息", 2);
                     return;
                 }
+                var filePath = fileList.FirstOrDefault()?.Url;
+                var fileName = fileList.FirstOrDefault()?.FileName;
 
                 MessageList.Add(new MessageInfo()
                 {
@@ -87,12 +103,13 @@ namespace AntSK.Pages.ChatPage
                     CreateTime = DateTime.Now,
                     IsSend = true
                 });
-
-
+       
                 Sendding = true;
-                await SendAsync(_messageInput);
+                await SendAsync(_messageInput,filePath);
                 _messageInput = "";
                 Sendding = false;
+
+                await _localStorage.SetItemAsync<List<MessageInfo>>("msgs", MessageList);
             }
             catch (System.Exception ex)
             {
@@ -118,24 +135,26 @@ namespace AntSK.Pages.ChatPage
             });
         }
 
-        protected async Task<bool> SendAsync(string questions)
+        protected async Task<bool> SendAsync(string questions, string? filePath)
         {
-            string msg = "";
+            ChatHistory history = new ChatHistory();
             //处理多轮会话
             Apps app = _apps_Repositories.GetFirst(p => p.Id == AppId);
             if (MessageList.Count > 0)
             {
-                msg = await HistorySummarize(app, questions);
+                history = await _chatService.GetChatHistory(MessageList);
             }
+            
             switch (app.Type)
             {
-                case "chat":
+                case "chat" when filePath == null||app.EmbeddingModelID.IsNull():
                     //普通会话
-                    await SendChat(questions, msg, app);
+                    await SendChat(questions, history, app);
                     break;
-                case "kms":
+
+                default:
                     //知识库问答
-                    await SendKms(questions, msg, app);
+                    await SendKms(questions, history,  app, filePath);
                     break;
             }
 
@@ -149,10 +168,10 @@ namespace AntSK.Pages.ChatPage
         /// <param name="msg"></param>
         /// <param name="app"></param>
         /// <returns></returns>
-        private async Task SendKms(string questions, string msg, Apps app)
+        private async Task SendKms(string questions, ChatHistory history, Apps app, string? filePath)
         {
             MessageInfo info = null;
-            var chatResult=_chatService.SendKmsByAppAsync(app, questions, "" ,msg);
+            var chatResult = _chatService.SendKmsByAppAsync(app, questions, history, filePath, _relevantSources);
             await foreach (var content in chatResult)
             {
                 if (info == null)
@@ -172,6 +191,7 @@ namespace AntSK.Pages.ChatPage
                 }
                 await InvokeAsync(StateHasChanged);
             }
+            await OnRelevantSources.InvokeAsync(_relevantSources);
             //全部处理完后再处理一次Markdown
             await MarkDown(info);
         }
@@ -183,7 +203,7 @@ namespace AntSK.Pages.ChatPage
         /// <param name="history"></param>
         /// <param name="app"></param>
         /// <returns></returns>
-        private async Task SendChat(string questions, string history, Apps app)
+        private async Task SendChat(string questions, ChatHistory history, Apps app)
         {
             MessageInfo info = null;
             var chatResult = _chatService.SendChatByAppAsync(app, questions, history);
@@ -222,44 +242,23 @@ namespace AntSK.Pages.ChatPage
             await _JSRuntime.InvokeVoidAsync("Prism.highlightAll");
             await _JSRuntime.ScrollToBottomAsync("scrollDiv");
         }
-        /// <summary>
-        /// 历史会话的会话总结
-        /// </summary>
-        /// <param name="questions"></param>
-        /// <returns></returns>
-        private async Task<string> HistorySummarize(Apps app, string questions)
+
+        private void OnSingleCompleted(UploadInfo fileInfo)
         {
-            var _kernel = _kernelService.GetKernelByApp(app);
-            if (MessageList.Count > 1)
+            fileList.Add(new()
             {
-                StringBuilder history = new StringBuilder();
-                foreach (var item in MessageList)
-                {
-                    if (item.IsSend)
-                    {
-                        history.Append($"user:{item.Context}{Environment.NewLine}");
-                    }
-                    else
-                    {
-                        history.Append($"assistant:{item.Context}{Environment.NewLine}");
-                    }
-                }
-                if (MessageList.Count > 10)
-                {
-                    //历史会话大于10条，进行总结
-                    var msg = await _kernelService.HistorySummarize(_kernel, questions, history.ToString());
-                    return msg;
-                }
-                else
-                {
-                    var msg = $"history：{history.ToString()}{Environment.NewLine} user：{questions}"; ;
-                    return msg;
-                }
-            }
-            else
-            {
-                return "";
-            }
+                FileName = fileInfo.File.FileName,
+                Url = fileInfo.File.Url = fileInfo.File.Response,
+                Ext = fileInfo.File.Ext,
+                State = UploadState.Success,
+            });
+            _kMService.OnSingleCompleted(fileInfo);
+        }
+        private async Task<bool> HandleFileRemove(UploadFileItem file)
+        {
+            fileList.RemoveAll(x => x.FileName == file.FileName);
+            await Task.Yield();
+            return true;
         }
     }
 }

src/AntSK/Pages/ChatPage/OpenChat.razor

@@ -2,100 +2,26 @@
 @using AntSK.Domain.Repositories
 @using AntSK.Models
 @using Microsoft.AspNetCore.Components.Web.Virtualization
+@using AntSK.Pages.ChatPage.Components
 @page "/OpenChat/{AppId}"
 @layout OpenLayout
 
-<div id="chat" style="display:flex; flex-direction:column; height:100%; overflow-x:hidden;">
-    <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
-    <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
-        <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
-            @if (item.IsSend)
-            {
-                <GridRow>
-                    <GridCol Span="23">
-                        <div class="chat-bubble sent">
-                            <Popover Title="@item.CreateTime.ToString()">
-                                @(item.Context)
-                            </Popover>
-                        </div>
-                        <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
-                    </GridCol>
-                    <GridCol Span="1">
-                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
-                    </GridCol>
-                </GridRow>
-            }
-            else
-            {
-                <GridRow>
-                    <GridCol Span="1">
-                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
-                    </GridCol>
-                    <GridCol Span="23">
-                        <div class="chat-bubble received">
-                            @((MarkupString)(item.HtmlAnswers))
-                        </div>
+<ChatView AppId="@AppId" ShowTitle=true>
 
-                    </GridCol>
-                </GridRow>
-            }
-
-        </Virtualize>
-    </div>
-    <div style="flex-shrink:0;margin:10px;">
-        <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding">
-            <Suffix>
-                <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
-                <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
-            </Suffix>
-        </AntDesign.Input>
-    </div>
-</div>
+</ChatView>
 
 <style>
-
-    body {
+    #chat{
+        height:100% ;
+        display:flex;
+        flex-direction: column;
+        overflow-x: hidden;
         font-family: Arial, sans-serif;
         margin: 0;
         padding: 10px;
-        justify-content: center;
-        align-items: flex-start;
-        height: 100vh;
-    }
-
-    .chat-container {
-        width: 350px;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        background-color: #fff;
-        padding-bottom: 15px;
-    }
-
-    .chat-bubble {
-        padding: 10px;
-        margin: 10px;
-        margin-bottom: 0;
-        border-radius: 5px;
-        max-width: 70%;
-        position: relative;
-    }
-
-    .received {
-        background-color: #f0f0f0;
-        align-self: flex-start;
-        float: left;
-    }
-
-    .sent {
-        background-color: #daf8cb;
-        align-self: flex-end;
-        float: right;
     }
 </style>
-
-@code {
-
-}
+@code{
+    [Parameter]
+    public string AppId { get; set; }
+}

src/AntSK/Pages/ChatPage/OpenChat.razor.css

@@ -1,3 +0,0 @@
-.ant-card-body {
-    height: 90% !important;
-}

src/AntSK/Pages/Index.razor

@@ -116,7 +116,7 @@
              </Card>
          </SpaceItem>
          <SpaceItem>
-             <Card Bordered="true" Title=@("📱模型管理") Hoverable="true" Style="height:260px;width:300px">
+             <Card Bordered="true" Title=@("📱模型集成与管理") Hoverable="true" Style="height:260px;width:300px">
                  <Body>
                      <Text>1、适配和管理集成不同厂商的不同模型</Text>
                      <br>
@@ -124,8 +124,12 @@
                          2、并且支持llama.cpp所支持的gguf类型的模型离线运行
                      </Text>
                      <br>
+                    <Text>
+                        3、支持llamafactory所支持的模型，包括baichuan、gemma、yuan、yi等
+                    </Text>
+                    <br>
                      <Text>
-                         3、未来将实现模型的训练、微调、部署一站式服务
+                         4、未来将实现模型的训练、微调、部署一站式服务
                      </Text>
                      <br>
                  </Body>
@@ -148,16 +152,17 @@
              </Card>
          </SpaceItem>
          <SpaceItem>
-             <Card Bordered="true" Title=@("🥤如果本项目帮助到了您") Hoverable="true" Style="height:260px;width:300px">
+            <Card Bordered="true" Title=@("❤项目最新进展") Hoverable="true" Style="height:260px;width:300px">
                  <Body>
-                     <Image Height="170" Src="./assets/zfb.png" />
+                     <Image Height="170" Src="./assets/gzh.jpg" />
                  </Body>
              </Card>
          </SpaceItem>
          <SpaceItem>
-             <Card Bordered="true" Title=@("您可用以下方式支持~🥤") Hoverable="true" Style="height:260px;width:300px">
+             <Card Bordered="true" Title=@("🥤项目赞助") Hoverable="true" Style="height:260px;width:300px">
                  <Body>
-                     <Image Height="170" Src="./assets/wx.png" />
+                    <Image Width="110" Src="./assets/zfb.png" />
+                    <Image Width="110" Src="./assets/wx.png" />
                  </Body>
              </Card>
          </SpaceItem>

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

@@ -67,6 +67,14 @@ namespace AntSK.Pages.Setting.AIModel
                 {
                     _aiModel = _aimodels_Repositories.GetFirst(p => p.Id == ModelId);
                 }
+
+                modelList = _ILLamaFactoryService.GetLLamaFactoryModels();
+                llamaFactoryDic = await _IDics_Repositories.GetFirstAsync(p => p.Type == LLamaFactoryConstantcs.LLamaFactorDic && p.Key == LLamaFactoryConstantcs.IsStartKey);
+                if (llamaFactoryDic != null)
+                {
+                    llamaFactoryIsStart = llamaFactoryDic.Value == "false" ? false : true;
+                }
+
                 //目前只支持gguf的 所以筛选一下
                 _modelFiles = Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), LLamaSharpOption.FileDirectory)).Where(p=>p.Contains(".gguf")).ToArray();
                 if (!string.IsNullOrEmpty(ModelPath))
@@ -76,14 +84,7 @@ namespace AntSK.Pages.Setting.AIModel
                     _downloadModalVisible = true;
 
                     _downloadUrl = $"https://hf-mirror.com{ModelPath.Replace("---","/")}";
-                }
-
-                modelList = _ILLamaFactoryService.GetLLamaFactoryModels();
-                llamaFactoryDic = await _IDics_Repositories.GetFirstAsync(p => p.Type == LLamaFactoryConstantcs.LLamaFactorDic && p.Key == LLamaFactoryConstantcs.IsStartKey);
-                if (llamaFactoryDic != null)
-                {
-                    llamaFactoryIsStart= llamaFactoryDic.Value== "false" ? false:true;
-                }
+                }        
             }
             catch 
             {

src/AntSK/Pages/User/Login/Login.razor

@@ -8,7 +8,7 @@
     <div class="login">
         <Form Model="@_model" OnFinish="HandleSubmit">
             <Tabs ActiveKey="@context.LoginType">
-                <TabPane Key="1" Tab="账号登陆">
+                <TabPane Key="1" Tab="账号登录">
                     <FormItem>
                         <AntDesign.Input Placeholder="请输入账号" Size="large" @bind-Value="@context.UserName">
                             <Prefix><Icon Type="user" /></Prefix>
@@ -21,7 +21,7 @@
                     </FormItem>
                 </TabPane>
             </Tabs>
-            <Button Type="primary" HtmlType="submit" Class="submit" Size="large" Block>登陆</Button>
+            <Button Type="primary" HtmlType="submit" Class="submit" Size="large" Block>登录</Button>
         </Form>
     </div>
 </div>

src/AntSK/Program.cs

@@ -9,6 +9,7 @@ using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
 using AntSK.plugins.Functions;
 using AntSK.Services.Auth;
+using Blazored.LocalStorage;
 using LLama.Native;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -48,6 +49,8 @@ builder.Services.AddServicesFromAssemblies("AntSK.Domain");
 builder.Services.AddSingleton(sp => new FunctionService(sp, [typeof(AntSK.App).Assembly]));
 builder.Services.AddScoped<FunctionTest>();
 builder.Services.AddAntSKSwagger();
+builder.Services.AddBlazoredLocalStorage(config =>
+        config.JsonSerializerOptions.WriteIndented = true);
 //Mapper
 builder.Services.AddMapper();
 //后台队列任务

src/AntSK/Services/LLamaSharp/LLamaChatService.cs

@@ -1,102 +0,0 @@
-using AntSK.Domain.Common.DependencyInjection;
-using AntSK.Domain.Options;
-using LLama;
-using LLama.Common;
-
-namespace AntSK.Services.LLamaSharp
-{
-    public interface ILLamaChatService
-    {
-        Task<string> ChatAsync(string input);
-        IAsyncEnumerable<string> ChatStreamAsync(string input);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [ServiceDescription(typeof(ILLamaChatService), Domain.Common.DependencyInjection.ServiceLifetime.Singleton)]
-    public class LLamaChatService : IDisposable, ILLamaChatService
-    {
-        private readonly ChatSession _session;
-        private readonly LLamaContext _context;
-        private readonly ILogger<LLamaChatService> _logger;
-        private bool _continue = false;
-
-        private const string SystemPrompt = "You are a personal assistant who needs to help users .";
-
-        public LLamaChatService(ILogger<LLamaChatService> logger)
-        {
-            var @params = new ModelParams(LLamaSharpOption.Chat)
-            {
-                ContextSize = 2048,
-            };
-
-            // todo: share weights from a central service
-            using var weights = LLamaWeights.LoadFromFile(@params);
-
-            _logger = logger;
-            _context = new LLamaContext(weights, @params);
-
-            _session = new ChatSession(new InteractiveExecutor(_context));
-            _session.History.AddMessage(AuthorRole.System, SystemPrompt);
-        }
-
-        public void Dispose()
-        {
-            _context?.Dispose();
-        }
-
-        public async Task<string> ChatAsync(string input)
-        {
-
-            if (!_continue)
-            {
-                _logger.LogInformation("Prompt: {text}", SystemPrompt);
-                _continue = true;
-            }
-            _logger.LogInformation("Input: {text}", input);
-            var outputs = _session.ChatAsync(
-                new ChatHistory.Message(AuthorRole.User, input),
-                new InferenceParams()
-                {
-                    RepeatPenalty = 1.0f,
-                    AntiPrompts = new string[] { "User:" },
-                });
-
-            var result = "";
-            await foreach (var output in outputs)
-            {
-                _logger.LogInformation("Message: {output}", output);
-                result += output;
-            }
-
-            return result;
-        }
-
-        public async IAsyncEnumerable<string> ChatStreamAsync(string input)
-        {
-            if (!_continue)
-            {
-                _logger.LogInformation(SystemPrompt);
-                _continue = true;
-            }
-
-            _logger.LogInformation(input);
-
-            var outputs = _session.ChatAsync(
-                new ChatHistory.Message(AuthorRole.User, input!)
-                , new InferenceParams()
-                {
-                    RepeatPenalty = 1.0f,
-                    AntiPrompts = new string[] { "User:" },
-                });
-
-            await foreach (var output in outputs)
-            {
-                _logger.LogInformation(output);
-                yield return output;
-            }
-        }
-
-    }
-}

src/AntSK/Services/LLamaSharp/LLamaEmbeddingService.cs

@@ -1,40 +0,0 @@
-using AntSK.Domain.Common.DependencyInjection;
-using AntSK.Domain.Options;
-using LLama;
-using LLama.Common;
-
-namespace AntSK.Services.LLamaSharp
-{
-    public interface ILLamaEmbeddingService
-    {
-        Task<List<float>> Embedding(string text);
-    }
-
-    /// <summary>
-    /// 本地Embedding
-    /// </summary>
-    [ServiceDescription(typeof(ILLamaEmbeddingService), Domain.Common.DependencyInjection.ServiceLifetime.Singleton)]
-    public class LLamaEmbeddingService : IDisposable, ILLamaEmbeddingService
-    {
-        private LLamaEmbedder _embedder;
-
-        public LLamaEmbeddingService()
-        {
-
-            var @params = new ModelParams(LLamaSharpOption.Embedding) { EmbeddingMode = true };
-            using var weights = LLamaWeights.LoadFromFile(@params);
-            _embedder = new LLamaEmbedder(weights, @params);
-        }
-        public void Dispose()
-        {
-            _embedder?.Dispose();
-        }
-
-        public async Task<List<float>> Embedding(string text)
-        {
-            float[] embeddings = await _embedder.GetEmbeddings(text);
-            //PG只有1536维
-            return embeddings.ToList();
-        }
-    }
-}

src/AntSK/Services/LLamaSharp/LLamaSharpService.cs

@@ -1,68 +0,0 @@
-using AntSK.Domain.Common.DependencyInjection;
-using AntSK.Domain.Domain.Model.Dto.OpenAPI;
-using AntSK.Domain.Utils;
-using Newtonsoft.Json;
-using System.Text;
-using ServiceLifetime = AntSK.Domain.Common.DependencyInjection.ServiceLifetime;
-
-namespace AntSK.Services.LLamaSharp
-{
-
-    public interface ILLamaSharpService
-    {
-        Task Chat(OpenAIModel model, HttpContext HttpContext);
-        Task ChatStream(OpenAIModel model, HttpContext HttpContext);
-        Task Embedding(OpenAIEmbeddingModel model, HttpContext HttpContext);
-    }
-
-    [ServiceDescription(typeof(ILLamaSharpService), ServiceLifetime.Scoped)]
-    public class LLamaSharpService(
-        ILLamaEmbeddingService _lLamaEmbeddingService,
-        ILLamaChatService _lLamaChatService
-        ) : ILLamaSharpService
-    {
-
-        public async Task ChatStream(OpenAIModel model, HttpContext HttpContext)
-        {
-            HttpContext.Response.Headers.Add("Content-Type", "text/event-stream");
-            OpenAIStreamResult result = new OpenAIStreamResult();
-            result.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-            result.choices = new List<StreamChoicesModel>() { new StreamChoicesModel() { delta = new OpenAIMessage() { role = "assistant" } } };
-            string questions = model.messages.LastOrDefault().content;
-
-            await foreach (var r in _lLamaChatService.ChatStreamAsync(questions))
-            {
-                result.choices[0].delta.content = r.ConvertToString();
-                string message = $"data: {JsonConvert.SerializeObject(result)}\n\n";
-                await HttpContext.Response.WriteAsync(message, Encoding.UTF8);
-                await HttpContext.Response.Body.FlushAsync();
-            }
-            await HttpContext.Response.WriteAsync("data: [DONE]");
-            await HttpContext.Response.Body.FlushAsync();
-            await HttpContext.Response.CompleteAsync();
-        }
-
-        public async Task Chat(OpenAIModel model, HttpContext HttpContext)
-        {
-            string questions = model.messages.LastOrDefault().content;
-            OpenAIResult result = new OpenAIResult();
-            result.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-            result.choices = new List<ChoicesModel>() { new ChoicesModel() { message = new OpenAIMessage() { role = "assistant" } } };
-
-            result.choices[0].message.content = await _lLamaChatService.ChatAsync(questions); ;
-            HttpContext.Response.ContentType = "application/json";
-            await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result));
-            await HttpContext.Response.CompleteAsync();
-        }
-
-
-        public async Task Embedding(OpenAIEmbeddingModel model, HttpContext HttpContext)
-        {
-            var result = new OpenAIEmbeddingResult();
-            result.data[0].embedding = await _lLamaEmbeddingService.Embedding(model.input[0]);
-            HttpContext.Response.ContentType = "application/json";
-            await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result));
-            await HttpContext.Response.CompleteAsync();
-        }
-    }
-}

src/AntSK/Services/OpenApi/OpenApiService.cs

@@ -5,6 +5,7 @@ using AntSK.Domain.Repositories;
 using AntSK.Domain.Utils;
 using Microsoft.KernelMemory;
 using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
 using Newtonsoft.Json;
 using System.Text;
@@ -35,7 +36,7 @@ namespace AntSK.Services.OpenApi
             Apps app = _apps_Repositories.GetFirst(p => p.SecretKey == token);
             if (app.IsNotNull())
             {
-                string msg = await HistorySummarize(app, model);
+                (string questions,ChatHistory history) = await GetHistory(model);
                 switch (app.Type)
                 {
                     case "chat":
@@ -46,7 +47,7 @@ namespace AntSK.Services.OpenApi
                             result1.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                             result1.choices = new List<StreamChoicesModel>()
                                 { new StreamChoicesModel() { delta = new OpenAIMessage() { role = "assistant" } } };
-                            await SendChatStream(HttpContext, result1, app, msg);
+                            await SendChatStream(HttpContext, result1, app, questions,history);
                             HttpContext.Response.ContentType = "application/json";
                             await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result1));
                             await HttpContext.Response.CompleteAsync();
@@ -58,7 +59,7 @@ namespace AntSK.Services.OpenApi
                             result2.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                             result2.choices = new List<ChoicesModel>()
                                 { new ChoicesModel() { message = new OpenAIMessage() { role = "assistant" } } };
-                            result2.choices[0].message.content = await SendChat(msg, app);
+                            result2.choices[0].message.content = await SendChat(questions,history, app);
                             HttpContext.Response.ContentType = "application/json";
                             await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result2));
                             await HttpContext.Response.CompleteAsync();
@@ -74,7 +75,7 @@ namespace AntSK.Services.OpenApi
                             result3.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                             result3.choices = new List<StreamChoicesModel>()
                                 { new StreamChoicesModel() { delta = new OpenAIMessage() { role = "assistant" } } };
-                            await SendKmsStream(HttpContext, result3, app, msg);
+                            await SendKmsStream(HttpContext, result3, app, questions,history);
                             HttpContext.Response.ContentType = "application/json";
                             await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result3));
                             await HttpContext.Response.CompleteAsync();
@@ -85,7 +86,7 @@ namespace AntSK.Services.OpenApi
                             result4.created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                             result4.choices = new List<ChoicesModel>()
                                 { new ChoicesModel() { message = new OpenAIMessage() { role = "assistant" } } };
-                            result4.choices[0].message.content = await SendKms(msg, app);
+                            result4.choices[0].message.content = await SendKms(questions,history, app);
                             HttpContext.Response.ContentType = "application/json";
                             await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result4));
                             await HttpContext.Response.CompleteAsync();
@@ -96,10 +97,10 @@ namespace AntSK.Services.OpenApi
             }
         }
 
-        private async Task SendChatStream(HttpContext HttpContext, OpenAIStreamResult result, Apps app, string msg)
+        private async Task SendChatStream(HttpContext HttpContext, OpenAIStreamResult result, Apps app,string questions, ChatHistory history)
         {
             HttpContext.Response.Headers.Add("Content-Type", "text/event-stream");
-            var chatResult = _chatService.SendChatByAppAsync(app, msg, "");
+            var chatResult = _chatService.SendChatByAppAsync(app, questions, history);
             await foreach (var content in chatResult)
             {
                 result.choices[0].delta.content = content.ConvertToString();
@@ -119,17 +120,35 @@ namespace AntSK.Services.OpenApi
         /// <summary>
         /// 发送普通对话
         /// </summary>
-        /// <param name="msg"></param>
+        /// <param name="questions"></param>
+        /// <param name="history"></param>
         /// <param name="app"></param>
         /// <returns></returns>
-        private async Task<string> SendChat(string msg, Apps app)
+        private async Task<string> SendChat(string questions, ChatHistory history, Apps app)
         {
             string result = "";
+
             if (string.IsNullOrEmpty(app.Prompt) || !app.Prompt.Contains("{{$input}}"))
             {
                 //如果模板为空，给默认提示词
                 app.Prompt = app.Prompt.ConvertToString() + "{{$input}}";
             }
+            KernelArguments args = new KernelArguments();
+            if (history.Count > 10)
+            {
+                app.Prompt = @"${{ConversationSummaryPlugin.SummarizeConversation $history}}" + app.Prompt;
+                args = new() {
+                { "history", string.Join("\n", history.Select(x => x.Role + ": " + x.Content)) },
+                { "input", questions }
+                };
+            }
+            else
+            {
+                args = new()
+                {
+                { "input", $"{string.Join("\n", history.Select(x => x.Role + ": " + x.Content))}{Environment.NewLine} user:{questions}" }
+                };
+            }
 
             var _kernel = _kernelService.GetKernelByApp(app);
             var temperature = app.Temperature / 100; //存的是0~100需要缩小
@@ -139,9 +158,8 @@ namespace AntSK.Services.OpenApi
                 _kernelService.ImportFunctionsByApp(app, _kernel);
                 settings.ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions;
             }
-
             var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
-            var chatResult =await _kernel.InvokeAsync(function: func, arguments: new KernelArguments() { ["input"] = msg });
+            var chatResult =await _kernel.InvokeAsync(function: func, arguments: args);
             if (chatResult.IsNotNull())
             {
                 string answers = chatResult.GetValue<string>();
@@ -151,10 +169,10 @@ namespace AntSK.Services.OpenApi
             return result;
         }
 
-        private async Task SendKmsStream(HttpContext HttpContext, OpenAIStreamResult result, Apps app, string msg)
+        private async Task SendKmsStream(HttpContext HttpContext, OpenAIStreamResult result, Apps app, string questions,ChatHistory history)
         {
             HttpContext.Response.Headers.Add("Content-Type", "text/event-stream");
-            var chatResult = _chatService.SendKmsByAppAsync(app, msg,"", "");
+            var chatResult = _chatService.SendKmsByAppAsync(app, questions, history, "");
             int i = 0;
             await foreach (var content in chatResult)
             {
@@ -175,15 +193,15 @@ namespace AntSK.Services.OpenApi
         /// <summary>
         /// 发送知识库问答
         /// </summary>
-        /// <param name="msg"></param>
+        /// <param name="questions"></param>
         /// <param name="app"></param>
         /// <returns></returns>
-        private async Task<string> SendKms(string msg, Apps app)
+        private async Task<string> SendKms(string questions, ChatHistory history, Apps app)
         {
             string result = "";
             var _kernel = _kernelService.GetKernelByApp(app);
 
-            var relevantSource = await _kMService.GetRelevantSourceList(app.KmsIdList, msg);
+            var relevantSource = await _kMService.GetRelevantSourceList(app.KmsIdList, questions);
             var dataMsg = new StringBuilder();
             if (relevantSource.Any())
             {
@@ -192,9 +210,9 @@ namespace AntSK.Services.OpenApi
                     dataMsg.AppendLine(item.ToString());
                 }
 
-                KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask");
+                KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask1");
                 var chatResult = await _kernel.InvokeAsync(function: jsonFun,
-                    arguments: new KernelArguments() { ["doc"] = dataMsg, ["history"] = "", ["questions"] = msg });
+                    arguments: new KernelArguments() { ["doc"] = dataMsg, ["history"] = string.Join("\n", history.Select(x => x.Role + ": " + x.Content)), ["questions"] = questions });
                 if (chatResult.IsNotNull())
                 {
                     string answers = chatResult.GetValue<string>();
@@ -211,29 +229,27 @@ namespace AntSK.Services.OpenApi
         /// <param name="app"></param>
         /// <param name="model"></param>
         /// <returns></returns>
-        private async Task<string> HistorySummarize(Apps app, OpenAIModel model)
+        private async Task<(string,ChatHistory)> GetHistory(OpenAIModel model)
         {
-            var _kernel = _kernelService.GetKernelByApp(app);
-            StringBuilder history = new StringBuilder();
+            ChatHistory history = new ChatHistory();
             string questions = model.messages[model.messages.Count - 1].content;
             for (int i = 0; i < model.messages.Count() - 1; i++)
             {
                 var item = model.messages[i];
-                history.Append($"{item.role}:{item.content}{Environment.NewLine}");
-            }
-
-            if (model.messages.Count() > 10)
-            {
-                //历史会话大于10条，进行总结
-                var msg = await _kernelService.HistorySummarize(_kernel, questions, history.ToString());
-                return msg;
-            }
-            else
-            {
-                var msg = $"history：{history.ToString()}{Environment.NewLine} user：{questions}";
-                ;
-                return msg;
+                if (item.role.ToLower() == "user")
+                {
+                    history.AddUserMessage(item.content);
+                }
+                else if (item.role.ToLower() == "assistant")
+                {
+                    history.AddAssistantMessage(item.content);
+                }
+                else if (item.role.ToLower() == "system")
+                {
+                    history.AddSystemMessage(item.content);
+                }
             }
+            return (questions,history);
         }
     }
 }

src/AntSK/appsettings.json

@@ -35,8 +35,6 @@
   },
   "LLamaSharp": {
     "RunType": "GPU",
-    "Chat": "D:\\git\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
-    "Embedding": "D:\\git\\AntBlazor\\model\\qwen1_5-1_8b-chat-q8_0.gguf",
     "FileDirectory": "D:\\git\\AntBlazor\\model"
   },
   "Login": {

src/AntSK/plugins/KMSPlugin/Ask/skprompt.txt

@@ -1,7 +1,7 @@
 Facts:
 {{$doc}}
 --------------------------
-History:{{$history}}
+History:{{ConversationSummaryPlugin.SummarizeConversation $history}}
 --------------------------
 Question: {{$questions}}
 --------------------------

src/AntSK/plugins/KMSPlugin/Ask1/skprompt.txt

@@ -11,7 +11,7 @@
 - 如果Markdown有图片则正常显示
 --------------------------
 
-历史聊天记录:{{$history}}
+历史聊天记录:{{ConversationSummaryPlugin.SummarizeConversation $history}}
 --------------------------
 用户问题: {{$questions}}
 

src/AntSk.LLM/AntSK.LLM.csproj

@@ -10,8 +10,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
     <PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.1.0" />
-    <PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.2.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.2" />
+    <PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.3.2" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.3" />
     <PackageReference Include="Sdcb.SparkDesk" Version="3.0.0" />
   </ItemGroup>
 

src/AntSk.LLM/SparkDesk/SparkDeskTextCompletion.cs

@@ -68,10 +68,10 @@ namespace AntSK.LLM.SparkDesk
             parameters.MaxTokens = chatExecutionSettings.MaxTokens ?? parameters.MaxTokens;
 
             IList<KernelFunctionMetadata> functions = kernel?.Plugins.GetFunctionsMetadata().Where(x => x.PluginName == "AntSkFunctions").ToList() ?? [];
-            var functionDefs = functions.Select(func => new FunctionDef(func.Name, func.Description, func.Parameters.Select(p => new FunctionParametersDef(p.Name, p.ParameterType?.IsClass == true ? "object" : "string", func.Description, p.IsRequired)).ToList())).ToList();
+            var functionDefs = functions.Select(func => new FunctionDef(func.Name, func.Description, func.Parameters.Select(p => new FunctionParametersDef(p.Name, p.ParameterType?.IsClass == true ? "object" : "string", p.Description, p.IsRequired)).ToList())).ToList();
 
             //var messages = GetHistories(prompt);
-            var messages = new ChatMessage[] { new ChatMessage("user", prompt)  };
+            var messages = new ChatMessage[] { new ChatMessage("user", prompt) };
 
             return GetStreamingMessageAsync(messages, parameters, functionDefs, cancellationToken);
 
@@ -108,7 +108,7 @@ namespace AntSK.LLM.SparkDesk
                                 {
                                     error = $"参数{parameter.Name}解析错误:{ex.Message}";
                                 }
-                             
+
                                 if (!string.IsNullOrEmpty(error))
                                 {
                                     yield return new(error);
@@ -118,12 +118,13 @@ namespace AntSK.LLM.SparkDesk
 
                             var result = (await function.InvokeAsync(kernel, arguments, cancellationToken)).GetValue<object>() ?? string.Empty;
                             var stringResult = ProcessFunctionResult(result, chatExecutionSettings.ToolCallBehavior);
-                            messages = [.. messages, ChatMessage.FromUser($"""
-                                                                           function call result:
-                                                                           {stringResult}
-                                                                           """)];
+                            messages = [ChatMessage.FromSystem($"""
+                                用户意图{func.Description}结果是：{stringResult}
 
-                            functionDefs.RemoveAll(x => x.Name == msg.FunctionCall.Name);
+                                请结合用户的提问回复：
+                                """), ChatMessage.FromUser(prompt)];
+
+                            functionDefs.Clear();
 
                             await foreach (var content in GetStreamingMessageAsync(messages, parameters, functionDefs, cancellationToken))
                             {

src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>xuzeyu91</Authors>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />