From 28b7c631a4da5b72a01bf6f47b1b67cc26101e8e Mon Sep 17 00:00:00 2001 From: hhhhsc701 <56435672+hhhhsc701@users.noreply.github.com> Date: Fri, 7 Nov 2025 17:19:00 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=96=87=E6=A1=A3=20(#65)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-zh.md | 40 +++++++++++++++++++++++----------- README.md | 40 +++++++++++++++++++++++----------- runtime/deer-flow/.env.example | 1 - 3 files changed, 54 insertions(+), 27 deletions(-) diff --git a/README-zh.md b/README-zh.md index bc71cdf..ea89a6b 100644 --- a/README-zh.md +++ b/README-zh.md @@ -34,6 +34,14 @@ - kubernetes (用于部署服务-k8s方式) - Helm (用于部署服务-k8s方式) +本项目支持docker-compose和helm两种方式部署,请在执行命令后输入部署方式的对应编号,命令回显如下所示: +```shell +Choose a deployment method: +1. Docker/Docker-Compose +2. Kubernetes/Helm +Enter choice: +``` + ### 拉取代码 ```bash @@ -41,22 +49,28 @@ git clone git@github.com:ModelEngine-Group/DataMate.git cd DataMate ``` -### 镜像构建 +### 部署基础服务 +```bash +make install +``` + +### 构建并部署Mineru增强pdf处理 +```bash +make build-mineru +make install-mineru +``` + +### 部署DeerFlow服务 +1. 修改runtime/deer-flow/.env.example,添加SEARCH_API_KEY和EMBEDDING模型配置 +2. 修改runtime/deer-flow/.conf.yaml.example,添加基础模型服务配置 +3. 执行`make install-deer-flow` + +### 本地开发部署 +本地代码修改后,请执行以下命令构建镜像并使用本地镜像部署 ```bash make build -``` - -### Docker安装 - -```bash -make install INSTALLER=docker -``` - -### kubernetes安装 - -```bash -make install INSTALLER=k8s +make install REGISTRY="" ``` ## 🤝 贡献指南 diff --git a/README.md b/README.md index 087285d..3dce053 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,14 @@ If you like this project, please give it a Star⭐️! - Kubernetes (for service deployment - k8s method) - Helm (for service deployment - k8s method) +This project supports deployment via two methods: docker-compose and helm. After executing the command, please enter the corresponding number for the deployment method. The command echo is as follows: +```shell +Choose a deployment method: +1. Docker/Docker-Compose +2. Kubernetes/Helm +Enter choice: +``` + ### Clone the Code ```bash @@ -44,22 +52,28 @@ git clone git@github.com:ModelEngine-Group/DataMate.git cd DataMate ``` -### Build Images +### Deploy the basic services +```bash +make install +``` + +### Build and deploy Mineru Enhanced PDF Processing +```bash +make build-mineru +make install-mineru +``` + +### Deploy the DeerFlow service +1. Modify `runtime/deer-flow/.env.example` and add configurations for SEARCH_API_KEY and the EMBEDDING model. +2. Modify `runtime/deer-flow/.conf.yaml.example` and add basic model service configurations. +3. Execute `make install-deer-flow` + +### Local Development and Deployment +After modifying the local code, please execute the following commands to build the image and deploy using the local image. ```bash make build -``` - -### Docker Installation - -```bash -make install INSTALLER=docker -``` - -### Kubernetes Installation - -```bash -make install INSTALLER=k8s +make install REGISTRY="" ``` ## 🤝 Contribution Guidelines diff --git a/runtime/deer-flow/.env.example b/runtime/deer-flow/.env.example index 48ebed2..aa4ebbc 100644 --- a/runtime/deer-flow/.env.example +++ b/runtime/deer-flow/.env.example @@ -59,7 +59,6 @@ MILVUS_URI=http://milvus-standalone:19530 MILVUS_USER=root MILVUS_PASSWORD=Milvus MILVUS_AUTO_LOAD_EXAMPLES=false -# MILVUS_COLLECTION=documents # MILVUS_EMBEDDING_PROVIDER=openai # support openai,dashscope # MILVUS_EMBEDDING_BASE_URL= # MILVUS_EMBEDDING_MODEL=