diff --git a/README.md b/README.md index 7c484736d855fd3f98cd1bfa25f50cf7215a26d7..8f9827a51385e541e551ce75f14d83c56659015c 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ ### 🚀 Start up the server -1. Ensure `vm.max_map_count` > 65535: +1. Ensure `vm.max_map_count` >= 262144 ([more](./docs/max_map_count.md)): > To check the value of `vm.max_map_count`: > @@ -78,7 +78,7 @@ > $ sysctl vm.max_map_count > ``` > - > Reset `vm.max_map_count` to a value greater than 65535 if it is not. + > Reset `vm.max_map_count` to a value at least 262144 if it is not. > > ```bash > # In this case, we set it to 262144: @@ -104,7 +104,7 @@ $ docker compose up -d ``` - > The core image is about 15 GB in size and may take a while to load. + > The core image is about 9 GB in size and may take a while to load. 4. Check the server status after having the server up and running: @@ -129,7 +129,7 @@ ``` 5. In your web browser, enter the IP address of your server as prompted and log in to RAGFlow. - > In the given scenario, you only need to enter `http://172.22.0.5` (sans port number) as the default HTTP serving port `80` can be omitted when using the default configurations. + > In the given scenario, you only need to enter `http://IP_of_RAGFlow ` (sans port number) as the default HTTP serving port `80` can be omitted when using the default configurations. 6. In [service_conf.yaml](./docker/service_conf.yaml), select the desired LLM factory in `user_default_llm` and update the `API_KEY` field with the corresponding API key. > See [./docs/llm_api_key_setup.md](./docs/llm_api_key_setup.md) for more information. diff --git a/README_ja.md b/README_ja.md index a87e2a3ed10d06427fcda3448f5b3d5a505d7fd4..e6e2ed35a28bc942fcd1f203343835f0bec6c806 100644 --- a/README_ja.md +++ b/README_ja.md @@ -66,11 +66,11 @@ - CPU >= 2 cores - RAM >= 8 GB - Docker - > ăăĽă‚«ă«ăžă‚·ăłďĽWindowsă€Macă€ăľăźăŻ Linux)㫠Docker をイăłă‚ąăăĽă«ă—ă¦ă„ăŞă„ĺ ´ĺăŻă€[Docker Engine ă®ă‚¤ăłă‚ąăăĽă«](https://docs.docker.com/engine/install/)を参照ă—ă¦ăŹă ă•ă„。 + > ăăĽă‚«ă«ăžă‚·ăłďĽWindowsă€Macă€ăľăźăŻ Linux)㫠Docker をイăłă‚ąăăĽă«ă—ă¦ă„ăŞă„ĺ ´ĺăŻă€[Docker Engine ă®ă‚¤ăłă‚ąăăĽă«](https://docs.docker.com/engine/install/) を参照ă—ă¦ăŹă ă•ă„。 ### 🚀 サăĽăăĽă‚’čµ·ĺ‹• -1. `vm.max_map_count` > 65535 ă§ă‚ă‚‹ă“ă¨ă‚’確認ă™ă‚‹: +1. `vm.max_map_count` >= 262144 ă§ă‚ă‚‹ă“ă¨ă‚’確認ă™ă‚‹ă€[ă‚‚ăŁă¨](./docs/max_map_count.md)】: > `vm.max_map_count` ă®ĺ€¤ă‚’ăェăă‚Żă™ă‚‹ă«ăŻ: > @@ -78,7 +78,7 @@ > $ sysctl vm.max_map_count > ``` > - > `vm.max_map_count` ㌠65535 ă‚り大ăŤă„値ă§ăŞă‘ă‚Śă°ăŞă‚»ăăă™ă‚‹ă€‚ + > `vm.max_map_count` ㌠262144 ă‚り大ăŤă„値ă§ăŞă‘ă‚Śă°ăŞă‚»ăăă™ă‚‹ă€‚ > > ```bash > # In this case, we set it to 262144: diff --git a/README_zh.md b/README_zh.md index 4dcc5cd84e81626cc9d438362513cedb0f2bb746..d7452bd0ee8f4ae4a5f67c2fdde57d31fb9dc705 100644 --- a/README_zh.md +++ b/README_zh.md @@ -70,7 +70,7 @@ ### 🚀 ĺŻĺŠ¨ćśŤĺŠˇĺ™¨ -1. 确保 `vm.max_map_count` 大于 65535: +1. 确保 `vm.max_map_count` 不小于 262144 ă€[更多](./docs/max_map_count.md)】: > 如需确认 `vm.max_map_count` 的大小: > @@ -78,7 +78,7 @@ > $ sysctl vm.max_map_count > ``` > - > 如果 `vm.max_map_count` 的值不大于 65535,可以进行重置: + > 如果 `vm.max_map_count` 的值小于 262144,可以进行重置: > > ```bash > # 这里ć‘们设为 262144: diff --git a/docs/max_map_count.md b/docs/max_map_count.md new file mode 100644 index 0000000000000000000000000000000000000000..168e8d74fbf17c6e55f687abea17ef46a4215bc1 --- /dev/null +++ b/docs/max_map_count.md @@ -0,0 +1,66 @@ +# Set vm.max_map_count to at least 262144 + +## Linux + +To check the value of `vm.max_map_count`: + +```bash +$ sysctl vm.max_map_count +``` + +Reset `vm.max_map_count` to a value at least 262144 if it is not. + +```bash +# In this case, we set it to 262144: +$ sudo sysctl -w vm.max_map_count=262144 +``` + +This change will be reset after a system reboot. To ensure your change remains permanent, add or update the `vm.max_map_count` value in **/etc/sysctl.conf** accordingly: + +```bash +vm.max_map_count=262144 +``` + +## Mac + +```bash +$ screen ~/Library/Containers/com.docker.docker/Data/vms/0/tty +$ sysctl -w vm.max_map_count=262144 +``` +To exit the screen session, type Ctrl a d. + +## Windows and macOS with Docker Desktop + +The vm.max_map_count setting must be set via docker-machine: + +```bash +$ docker-machine ssh +$ sudo sysctl -w vm.max_map_count=262144 +``` + +## Windows with Docker Desktop WSL 2 backend + +To manually set it every time you reboot, you must run the following commands in a command prompt or PowerShell window every time you restart Docker: + +```bash +$ wsl -d docker-desktop -u root +$ sysctl -w vm.max_map_count=262144 +``` +If you are on these versions of WSL and you do not want to have to run those commands every time you restart Docker, you can globally change every WSL distribution with this setting by modifying your %USERPROFILE%\.wslconfig as follows: + +```bash +[wsl2] +kernelCommandLine = "sysctl.vm.max_map_count=262144" +``` +This will cause all WSL2 VMs to have that setting assigned when they start. + +If you are on Windows 11, or Windows 10 version 22H2 and have installed the Microsoft Store version of WSL, you can modify the /etc/sysctl.conf within the "docker-desktop" WSL distribution, perhaps with commands like this: + +```bash +$ wsl -d docker-desktop -u root +$ vi /etc/sysctl.conf +``` +and appending a line which reads: +```bash +vm.max_map_count = 262144 +``` \ No newline at end of file diff --git a/rag/app/naive.py b/rag/app/naive.py index 3e43cce68173236ccb7ec8c28a9ae3a0069bbc8d..b97cf15736c25b4dac4477febe98b48957b4174a 100644 --- a/rag/app/naive.py +++ b/rag/app/naive.py @@ -60,7 +60,7 @@ class Docx(DocxParser): html += f"<td>{c.text}</td>" if span == 1 else f"<td colspan='{span}'>{c.text}</td>" html += "</tr>" html += "</table>" - tbls.append(((None, html), "")) + tbls.append(((None, html), "")) return [(l, "") for l in lines if l], tbls