From 8e2dfdd116ab381024edd5a68d70c8e6281bc5e6 Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Fri, 6 Jun 2025 00:01:18 +0800 Subject: [PATCH] =?UTF-8?q?build(deploy):=20=E6=9B=B4=E6=96=B0=20Docker=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC=E4=B8=BAv0.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Docker 镜像版本从 v0.3.0 升级到 v0.4.0 - 更新 management 服务依赖版本 - 优化 requirements.txt 中的依赖版本 --- bulid_order.txt | 14 +++++------ docker/.env | 6 ++--- management/Dockerfile | 2 +- management/docker-compose.yml | 4 ++-- management/server/requirements.txt | 5 +++- .../common/assets/icons/team-management.svg | 24 ++++--------------- .../src/common/assets/icons/user-config.svg | 19 ++++++--------- .../common/assets/icons/user-management.svg | 8 +++---- requirements.txt | 14 +++++------ web/src/pages/chat/index.tsx | 4 ++-- 10 files changed, 41 insertions(+), 59 deletions(-) diff --git a/bulid_order.txt b/bulid_order.txt index 19216dd..21e9319 100644 --- a/bulid_order.txt +++ b/bulid_order.txt @@ -1,13 +1,13 @@ docker 镜像相关命令： 前台镜像构建相关： -docker build -t zstar1003/ragflowplus:v0.3.0 . -docker tag zstar1003/ragflowplus:v0.3.0 zstar1003/ragflowplus:v0.3.0 -docker push zstar1003/ragflowplus:v0.3.0 +docker build -t zstar1003/ragflowplus:v0.4.0 . +docker tag zstar1003/ragflowplus:v0.4.0 zstar1003/ragflowplus:v0.4.0 +docker push zstar1003/ragflowplus:v0.4.0 后台镜像构建相关： cd management docker-compose build -docker tag zstar1003/ragflowplus-management-web:v0.3.0 zstar1003/ragflowplus-management-web:v0.3.0 -docker tag zstar1003/ragflowplus-management-server:v0.3.0 zstar1003/ragflowplus-management-server:v0.3.0 -docker push zstar1003/ragflowplus-management-web:v0.3.0 -docker push zstar1003/ragflowplus-management-server:v0.3.0 +docker tag zstar1003/ragflowplus-management-web:v0.4.0 zstar1003/ragflowplus-management-web:v0.4.0 +docker tag zstar1003/ragflowplus-management-server:v0.4.0 zstar1003/ragflowplus-management-server:v0.4.0 +docker push zstar1003/ragflowplus-management-web:v0.4.0 +docker push zstar1003/ragflowplus-management-server:v0.4.0 diff --git a/docker/.env b/docker/.env index c29a759..389cba8 100644 --- a/docker/.env +++ b/docker/.env @@ -76,9 +76,9 @@ REDIS_PASSWORD=infini_rag_flow SVR_HTTP_PORT=9380 # RAGFLOW_IMAGE原始为infiniflow/ragflow:v0.18.0-slim -RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.3.0 -RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.3.0 -RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.3.0 +RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.4.0 +RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.4.0 +RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.4.0 # The local time zone. TIMEZONE='Asia/Shanghai' diff --git a/management/Dockerfile b/management/Dockerfile index 0126088..c282d20 100644 --- a/management/Dockerfile +++ b/management/Dockerfile @@ -45,7 +45,7 @@ RUN mkdir -p /root/.cache/huggingface/hub/ COPY models--opendatalab--PDF-Extract-Kit-1.0 /root/.cache/huggingface/hub/models--opendatalab--PDF-Extract-Kit-1.0 COPY models--hantian--layoutreader /root/.cache/huggingface/hub/models--hantian--layoutreader COPY models--slanet_plus/slanet-plus.onnx /usr/local/lib/python3.10/site-packages/rapid_table/models/ -# COPY magic-pdf.json /root/magic-pdf.json +COPY nltk_data /root/nltk_data # 暴露后端端口 EXPOSE 5000 diff --git a/management/docker-compose.yml b/management/docker-compose.yml index 358e826..f283038 100644 --- a/management/docker-compose.yml +++ b/management/docker-compose.yml @@ -1,7 +1,7 @@ services: management-frontend: container_name: ragflowplus-management-frontend - image: zstar1003/ragflowplus-management-web:v0.3.0 + image: zstar1003/ragflowplus-management-web:v0.4.0 build: context: . dockerfile: Dockerfile @@ -17,7 +17,7 @@ services: management-backend: container_name: ragflowplus-management-backend - image: zstar1003/ragflowplus-management-server:v0.3.0 + image: zstar1003/ragflowplus-management-server:v0.4.0 build: context: . dockerfile: Dockerfile diff --git a/management/server/requirements.txt b/management/server/requirements.txt index 4386116..c69a00f 100644 --- a/management/server/requirements.txt +++ b/management/server/requirements.txt @@ -25,4 +25,7 @@ omegaconf==2.3.0 rapid-table==1.0.3 openai==1.70.0 redis==6.2.0 -tokenizer==3.4.5 \ No newline at end of file +tokenizer==3.4.5 +datrie==0.8.2 +hanziconv==0.3.2 +nltk==3.9.1 \ No newline at end of file diff --git a/management/web/src/common/assets/icons/team-management.svg b/management/web/src/common/assets/icons/team-management.svg index b6e5715..36cc1d7 100644 --- a/management/web/src/common/assets/icons/team-management.svg +++ b/management/web/src/common/assets/icons/team-management.svg @@ -1,21 +1,5 @@ - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/management/web/src/common/assets/icons/user-config.svg b/management/web/src/common/assets/icons/user-config.svg index 7f3cf79..481cff3 100644 --- a/management/web/src/common/assets/icons/user-config.svg +++ b/management/web/src/common/assets/icons/user-config.svg @@ -1,13 +1,8 @@ - - - - - + + + \ No newline at end of file diff --git a/management/web/src/common/assets/icons/user-management.svg b/management/web/src/common/assets/icons/user-management.svg index 0b8fd3f..65069a0 100644 --- a/management/web/src/common/assets/icons/user-management.svg +++ b/management/web/src/common/assets/icons/user-management.svg @@ -1,5 +1,5 @@ - - - - + + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1909c9c..c394067 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,11 +23,11 @@ discord-py==2.3.2 duckduckgo-search>=7.2.0,<8.0.0 editdistance==0.8.1 elastic-transport==8.12.0 -elasticsearch==8.12.1 +elasticsearch==8.12.0 elasticsearch-dsl==8.12.0 filelock==3.15.4 -flask==3.0.3 -flask-cors==5.0.0 +Flask==3.1.0 +flask_cors==5.0.1 flask-login==0.6.3 flask-session==0.8.0 google-search-results==2.4.2 @@ -49,7 +49,7 @@ numpy>=1.26.0,<2.0.0 ollama==0.2.1 onnxruntime==1.19.2; sys_platform == 'darwin' or platform_machine != 'x86_64' onnxruntime-gpu==1.19.2; sys_platform != 'darwin' and platform_machine == 'x86_64' -openai==1.45.0 +openai==1.70.0 opencv-python==4.10.0.84 opencv-python-headless==4.10.0.84 openpyxl>=3.1.0,<4.0.0 @@ -60,7 +60,7 @@ peewee==3.17.1 pillow==10.4.0 protobuf==5.27.2 psycopg2-binary==2.9.9 -pyclipper==1.3.0.post5 +pyclipper==1.3.0.post6 pycryptodomex==3.20.0 pypdf>=5.0.0,<6.0.0 pytest>=8.3.0,<9.0.0 @@ -81,7 +81,7 @@ scikit-learn==1.5.0 selenium==4.22.0 selenium-wire==5.1.0 setuptools>=75.2.0,<76.0.0 -shapely==2.0.5 +shapely==2.1.0 six==1.16.0 strenum==0.4.15 tabulate==0.9.0 @@ -94,7 +94,7 @@ vertexai==1.64.0 volcengine==1.0.146 voyageai==0.2.3 webdriver-manager==4.0.1 -werkzeug==3.0.6 +Werkzeug==3.1.3 wikipedia==1.4.0 word2number==1.1 xgboost==1.5.0 diff --git a/web/src/pages/chat/index.tsx b/web/src/pages/chat/index.tsx index ec5c96d..4fd5495 100644 --- a/web/src/pages/chat/index.tsx +++ b/web/src/pages/chat/index.tsx @@ -167,7 +167,7 @@ const Chat = () => { }, [addTemporaryConversation]); const [fontSizeModalVisible, setFontSizeModalVisible] = useState(false); - const [fontSize, setFontSize] = useState(18); // 默认字体大小 + const [fontSize, setFontSize] = useState(20); // 默认字体大小 // 从存储加载字体大小设置 useEffect(() => { @@ -429,7 +429,7 @@ const Chat = () => { {'当前字体大小'}: {fontSize}px