KevinHuSh commited on
Commit
587659c
·
1 Parent(s): d54aa01

change readme for 0.3.0 release (#459)

Browse files

### What problem does this PR solve?


### Type of change

- [x] Documentation Update

README.md CHANGED
@@ -15,7 +15,7 @@
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
- alt="docker pull infiniflow/ragflow:v0.2.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
@@ -173,7 +173,7 @@ To build the Docker images from source:
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
- $ docker build -t infiniflow/ragflow:v0.2.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
 
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
+ alt="docker pull infiniflow/ragflow:v0.3.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
 
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
+ $ docker build -t infiniflow/ragflow:v0.3.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
README_ja.md CHANGED
@@ -15,7 +15,7 @@
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
- alt="docker pull infiniflow/ragflow:v0.2.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
@@ -173,7 +173,7 @@
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
- $ docker build -t infiniflow/ragflow:v0.2.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
 
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
+ alt="docker pull infiniflow/ragflow:v0.3.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
 
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
+ $ docker build -t infiniflow/ragflow:v0.3.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
README_zh.md CHANGED
@@ -15,7 +15,7 @@
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
- alt="docker pull infiniflow/ragflow:v0.2.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
@@ -173,7 +173,7 @@
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
- $ docker build -t infiniflow/ragflow:v0.2.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
 
15
  <img alt="Static Badge" src="https://img.shields.io/badge/RAGFLOW-LLM-white?&labelColor=dd0af7"></a>
16
  <a href="https://hub.docker.com/r/infiniflow/ragflow" target="_blank">
17
  <img src="https://img.shields.io/badge/docker_pull-ragflow:v1.0-brightgreen"
18
+ alt="docker pull infiniflow/ragflow:v0.3.0"></a>
19
  <a href="https://github.com/infiniflow/ragflow/blob/main/LICENSE">
20
  <img height="21" src="https://img.shields.io/badge/License-Apache--2.0-ffffff?style=flat-square&labelColor=d4eaf7&color=7d09f1" alt="license">
21
  </a>
 
173
  ```bash
174
  $ git clone https://github.com/infiniflow/ragflow.git
175
  $ cd ragflow/
176
+ $ docker build -t infiniflow/ragflow:v0.3.0 .
177
  $ cd ragflow/docker
178
  $ chmod +x ./entrypoint.sh
179
  $ docker compose up -d
docker/.env CHANGED
@@ -25,6 +25,8 @@ MINIO_PASSWORD=infini_rag_flow
25
 
26
  SVR_HTTP_PORT=9380
27
 
 
 
28
  TIMEZONE='Asia/Shanghai'
29
 
30
  ######## OS setup for ES ###########
 
25
 
26
  SVR_HTTP_PORT=9380
27
 
28
+ RAGFLOW_VERSION=v0.3.0
29
+
30
  TIMEZONE='Asia/Shanghai'
31
 
32
  ######## OS setup for ES ###########
docker/docker-compose-CN.yml CHANGED
@@ -9,7 +9,7 @@ services:
9
  condition: service_healthy
10
  es01:
11
  condition: service_healthy
12
- image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:v0.2.0
13
  container_name: ragflow-server
14
  ports:
15
  - ${SVR_HTTP_PORT}:9380
 
9
  condition: service_healthy
10
  es01:
11
  condition: service_healthy
12
+ image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:${RAGFLOW_VERSION}
13
  container_name: ragflow-server
14
  ports:
15
  - ${SVR_HTTP_PORT}:9380
docker/docker-compose.yml CHANGED
@@ -9,9 +9,10 @@ services:
9
  condition: service_healthy
10
  es01:
11
  condition: service_healthy
12
- image: infiniflow/ragflow:v0.2.0
13
  container_name: ragflow-server
14
  ports:
 
15
  - ${SVR_HTTP_PORT}:9380
16
  - 80:80
17
  - 443:443
 
9
  condition: service_healthy
10
  es01:
11
  condition: service_healthy
12
+ image: infiniflow/ragflow:${RAGFLOW_VERSION}
13
  container_name: ragflow-server
14
  ports:
15
+ - ${SVR_HTTP_PORT}:9380
16
  - ${SVR_HTTP_PORT}:9380
17
  - 80:80
18
  - 443:443
docs/faq.md CHANGED
@@ -135,7 +135,7 @@ $ docker ps
135
  *The system displays the following if all your RAGFlow components are running properly:*
136
 
137
  ```
138
- 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
139
  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
140
  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
141
  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:
209
 
210
  1. Prolong the sleep time: Go to **docker/entrypoint.sh**, locate line 26, and replace `sleep 60` with `sleep 280`.
211
  2. If using Windows, ensure that the **entrypoint.sh** has LF end-lines.
212
- 3. Go to **docker/docker-compose.yml**, add the following after line 109:
213
  ```
214
  ./entrypoint.sh:/ragflow/entrypoint.sh
215
  ```
@@ -232,4 +232,4 @@ This exception occurs when starting up the RAGFlow server. Try the following:
232
 
233
  1. Ensure that the RAGFlow server can access the base URL.
234
  2. Do not forget to append **/v1/** to **http://IP:port**:
235
- **http://IP:port/v1/**
 
135
  *The system displays the following if all your RAGFlow components are running properly:*
136
 
137
  ```
138
+ 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
139
  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
140
  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
141
  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
 
210
  1. Prolong the sleep time: Go to **docker/entrypoint.sh**, locate line 26, and replace `sleep 60` with `sleep 280`.
211
  2. If using Windows, ensure that the **entrypoint.sh** has LF end-lines.
212
+ 3. Go to **docker/docker-compose.yml**, add the following:
213
  ```
214
  ./entrypoint.sh:/ragflow/entrypoint.sh
215
  ```
 
232
 
233
  1. Ensure that the RAGFlow server can access the base URL.
234
  2. Do not forget to append **/v1/** to **http://IP:port**:
235
+ **http://IP:port/v1/**
rag/svr/task_broker.py CHANGED
@@ -121,7 +121,6 @@ def dispatch():
121
  tsks.append(new_task())
122
 
123
  bulk_insert_into_db(Task, tsks, True)
124
- print("TSK:", len(tsks))
125
  set_dispatching(r["id"])
126
  except Exception as e:
127
  cron_logger.exception(e)
 
121
  tsks.append(new_task())
122
 
123
  bulk_insert_into_db(Task, tsks, True)
 
124
  set_dispatching(r["id"])
125
  except Exception as e:
126
  cron_logger.exception(e)