diff --git a/README.md b/README.md index b8339ec83e11823d1cf10dd3e3177bc895defb48..2f2c6655e667fa2198c14a6aff7764f40191a200 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a> <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank"> <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen" - alt="docker pull infiniflow/ragflow:v0.2.0"></a> + alt="docker pull infiniflow/ragflow:v0.3.0"></a> <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE"> <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license"> </a> @@ -173,7 +173,7 @@ To build the Docker images from source: ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/README_ja.md b/README_ja.md index 77942682fad936ede9ea0ca26c5bd535e545b351..61135dc7c1987890e5b3f41662776e172f18c755 100644 --- a/README_ja.md +++ b/README_ja.md @@ -15,7 +15,7 @@ <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a> <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank"> <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen" - alt="docker pull infiniflow/ragflow:v0.2.0"></a> + alt="docker pull infiniflow/ragflow:v0.3.0"></a> <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE"> <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license"> </a> @@ -173,7 +173,7 @@ ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/README_zh.md b/README_zh.md index 455e6dfe0afe1995c7a9dbdacd7608941772647f..000e194a90e60631bb31065a1bc68615d0240d67 100644 --- a/README_zh.md +++ b/README_zh.md @@ -15,7 +15,7 @@ <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a> <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank"> <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen" - alt="docker pull infiniflow/ragflow:v0.2.0"></a> + alt="docker pull infiniflow/ragflow:v0.3.0"></a> <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE"> <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license"> </a> @@ -173,7 +173,7 @@ ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/docker/.env b/docker/.env index 36acba8c16b4b47df8a829757823cabd91f976fa..bb0ec683b2b02fef49406e3bc7406dc032a856e4 100644 --- a/docker/.env +++ b/docker/.env @@ -25,6 +25,8 @@ MINIO_PASSWORD=infini_rag_flow SVR_HTTP_PORT=9380 +RAGFLOW_VERSION=v0.3.0 + TIMEZONE='Asia/Shanghai' ######## OS setup for ES ########### diff --git a/docker/docker-compose-CN.yml b/docker/docker-compose-CN.yml index 68576e515b7c38f243350e1b708a16d75b63f526..929777580affe664220e54ea10736bcec9c6d538 100644 --- a/docker/docker-compose-CN.yml +++ b/docker/docker-compose-CN.yml @@ -9,7 +9,7 @@ services: condition: service_healthy es01: condition: service_healthy - image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:v0.2.0 + image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:${RAGFLOW_VERSION} container_name: ragflow-server ports: - ${SVR_HTTP_PORT}:9380 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1a82ec67b7dc636936179f9cf7d0714380361f19..490a055f5fe1a8b96e8dc748790de760a730ae85 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,9 +9,10 @@ services: condition: service_healthy es01: condition: service_healthy - image: infiniflow/ragflow:v0.2.0 + image: infiniflow/ragflow:${RAGFLOW_VERSION} container_name: ragflow-server ports: + - ${SVR_HTTP_PORT}:9380 - ${SVR_HTTP_PORT}:9380 - 80:80 - 443:443 diff --git a/docs/faq.md b/docs/faq.md index 729d0f0922c245d59baceb7da97cceb51eba8f38..7aa97fcf3d7796863cb3cd370d49b3ac57962a0b 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -135,7 +135,7 @@ $ docker ps *The system displays the following if all your RAGFlow components are running properly:* ``` -5bc45806b680 infiniflow/ragflow:v0.2.0 "./entrypoint.sh" 11 hours ago Up 11 hours 0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp ragflow-server +5bc45806b680 infiniflow/ragflow:v0.3.0 "./entrypoint.sh" 11 hours ago Up 11 hours 0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp ragflow-server 91220e3285dd docker.elastic.co/elasticsearch/elasticsearch:8.11.3 "/bin/tini -- /usr/l…" 11 hours ago Up 11 hours (healthy) 9300/tcp, 0.0.0.0:9200->9200/tcp, :::9200->9200/tcp ragflow-es-01 d8c86f06c56b mysql:5.7.18 "docker-entrypoint.s…" 7 days ago Up 16 seconds (healthy) 0.0.0.0:3306->3306/tcp, :::3306->3306/tcp ragflow-mysql cd29bcb254bc quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z "/usr/bin/docker-ent…" 2 weeks ago Up 11 hours 0.0.0.0:9001->9001/tcp, :::9001->9001/tcp, 0.0.0.0:9000->9000/tcp, :::9000->9000/tcp ragflow-minio @@ -209,7 +209,7 @@ This exception occurs when starting up the RAGFlow server. Try the following: 1. Prolong the sleep time: Go to **docker/entrypoint.sh**, locate line 26, and replace `sleep 60` with `sleep 280`. 2. If using Windows, ensure that the **entrypoint.sh** has LF end-lines. - 3. Go to **docker/docker-compose.yml**, add the following after line 109: + 3. Go to **docker/docker-compose.yml**, add the following: ``` ./entrypoint.sh:/ragflow/entrypoint.sh ``` @@ -232,4 +232,4 @@ This exception occurs when starting up the RAGFlow server. Try the following: 1. Ensure that the RAGFlow server can access the base URL. 2. Do not forget to append **/v1/** to **http://IP:port**: - **http://IP:port/v1/** + **http://IP:port/v1/** \ No newline at end of file diff --git a/rag/svr/task_broker.py b/rag/svr/task_broker.py index 90e4ce0a1a1c60cf2a7c4c4bf1ac2479e24e3096..b54792aa987bd4636ca443f2d0c391f6d6fc7ee7 100644 --- a/rag/svr/task_broker.py +++ b/rag/svr/task_broker.py @@ -121,7 +121,6 @@ def dispatch(): tsks.append(new_task()) bulk_insert_into_db(Task, tsks, True) - print("TSK:", len(tsks)) set_dispatching(r["id"]) except Exception as e: cron_logger.exception(e)