From 6952f021fa28b1dab2eac0542f58549a59d87da2 Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Fri, 2 May 2025 13:29:48 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0=20GitHub=20Actions=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=85=8D=E7=BD=AE=E5=B9=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加了用于触发部署的 GitHub Actions 配置文件，仅当 `main` 分支的 `docs` 目录发生变更时触发。同时删除了不再使用的 ISSUE_TEMPLATE 文件，并清理了 docker-compose.yml 中的注释代码，以保持代码库的整洁。 --- .github/ISSUE_TEMPLATE/subtask.yml | 29 ---------------------- .github/workflows/deploy.yml | 6 +++++ docker/.env | 7 ++++++ docker/docker-compose.yml | 39 +----------------------------- docker/magic-pdf.json | 12 ++++++++- docs/plan.md | 2 +- management/server/requirements.txt | 4 +-- 7 files changed, 28 insertions(+), 71 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/subtask.yml create mode 100644 .github/workflows/deploy.yml diff --git a/.github/ISSUE_TEMPLATE/subtask.yml b/.github/ISSUE_TEMPLATE/subtask.yml deleted file mode 100644 index 2378fed..0000000 --- a/.github/ISSUE_TEMPLATE/subtask.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Subtask -description: "Propose a subtask for RAGFlow-Plus" -title: "[Subtask]: " -labels: [subtask] - -body: - - type: textarea - attributes: - label: Parent Issue - description: Write the ID of the parent issue - placeholder: "Parent issue: #" - validations: - required: true - - - type: textarea - attributes: - label: Detail of Subtask - description: | - Describe the functions that this subtask should implement - validations: - required: true - - - type: textarea - attributes: - label: Describe implementation you've considered - description: A clear and concise description of implementation you've considered or investigated. - validations: - required: false - diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..be2a928 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,6 @@ +on: + push: + branches: + - main # 仅 main 分支的推送触发 + paths: + - 'docs/**' # 仅 docs 目录变更时触发 \ No newline at end of file diff --git a/docker/.env b/docker/.env index 56c7cc6..eb14412 100644 --- a/docker/.env +++ b/docker/.env @@ -81,6 +81,13 @@ RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.2 # The local time zone. TIMEZONE='Asia/Shanghai' +# Uncomment the following line if you have limited access to huggingface.co: +# HF_ENDPOINT=https://hf-mirror.com + +# Optimizations for MacOS +# Uncomment the following line if your operating system is MacOS: +# MACOS=1 + # 后端允许上传的最大文件大小 MAX_CONTENT_LENGTH=10737418240 # 10GB diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 21dbf7e..9d396f6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -69,41 +69,4 @@ services: - ragflow restart: on-failure extra_hosts: - - "host.docker.internal:host-gateway" - - # # vllm 嵌入模型 - # vllm-bge: - # container_name: vllm-bge - # image: vllm/vllm-openai:latest - # ipc: host - # volumes: - # - ./models/bge-m3:/models - # command: [ - # "--model", "/models", - # "--served-model-name", "bge-m3", - # "--dtype", "float16", - # "--gpu-memory-utilization", "0.9", - # ] - # ports: - # - "8000:8000" - # networks: - # - ragflow - - # # vllm 语言模型 - # vllm-deepseek: - # container_name: vllm-deepseek - # image: vllm/vllm-openai:latest - # ipc: host - # volumes: - # - ./models/DeepSeek-R1-1.5B:/models - # command: [ - # "--model", "/models", - # "--served-model-name", "deepseek-r1", - # "--dtype", "float16", - # "--tensor-parallel-size", "1", - # "--max-model-len", "4096" - # ] - # ports: - # - "8001:8000" - # networks: - # - ragflow \ No newline at end of file + - "host.docker.internal:host-gateway" \ No newline at end of file diff --git a/docker/magic-pdf.json b/docker/magic-pdf.json index 53f6f6f..732b2bf 100644 --- a/docker/magic-pdf.json +++ b/docker/magic-pdf.json @@ -28,6 +28,16 @@ "enable": true, "max_time": 400 }, + "latex-delimiter-config": { + "display": { + "left": "$$", + "right": "$$" + }, + "inline": { + "left": "$", + "right": "$" + } + }, "llm-aided-config": { "formula_aided": { "api_key": "your_api_key", @@ -48,5 +58,5 @@ "enable": false } }, - "config_version": "1.2.0" + "config_version": "1.2.1" } \ No newline at end of file diff --git a/docs/plan.md b/docs/plan.md index 775ebe9..2d0f23c 100644 --- a/docs/plan.md +++ b/docs/plan.md @@ -4,7 +4,7 @@ - [ ] 修复v0.2.1版本中已知问题 - [ ] 前台知识库界面，增加文本块关联的图片预览显示，并增加图像获取接口 - [ ] 前台聊天界面，增加字体样式动态配置 -- [ ] 后台管理系统中，调整知识库创建逻辑，支持为指定用户创建私人知识库 +- [ ] 后台管理系统中，调整知识库创建逻辑，支持为指定用户创建私人知识库，并增加对知识库属性的修改 - [ ] 后台管理系统中，优化用户配置管理交互 - [ ] 后台管理系统中，整体优化表格的时间排序，方便查看显示最新添加的记录 - [ ] 后台管理系统中，增加用户会话管理功能 diff --git a/management/server/requirements.txt b/management/server/requirements.txt index 656750d..44ec20c 100644 --- a/management/server/requirements.txt +++ b/management/server/requirements.txt @@ -6,8 +6,8 @@ tabulate==0.9.0 Werkzeug==3.1.3 PyJWT==2.10.1 dotenv==0.9.9 -magic-pdf[full]==1.3.0 -transformers==4.49.0 +magic-pdf==1.3.10 +transformers==4.51.3 elasticsearch==8.12.0 minio==7.2.4 strenum==0.4.15