diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f1d5fb006..97a1cb5c3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,8 +1,7 @@ include: - path: ./docker-compose-base.yml env_file: ./.env - - path: ./docker-compose-admin-tool.yml - env_file: ./.env + services: ragflow: depends_on: @@ -28,4 +27,4 @@ services: - MACOS=${MACOS} networks: - ragflow - restart: always \ No newline at end of file + restart: always diff --git a/docker/service_conf.yaml b/docker/service_conf.yaml index a3538429c..778f0f0c1 100644 --- a/docker/service_conf.yaml +++ b/docker/service_conf.yaml @@ -17,10 +17,6 @@ es: hosts: 'http://es01:9200' username: 'elastic' password: 'infini_rag_flow' -kibana: - hosts: 'http://${host}:6601' - username: 'rag_flow' - password: 'infini_rag_flow' redis: db: 1 password: 'infini_rag_flow' diff --git a/rag/nlp/__init__.py b/rag/nlp/__init__.py index e620225dc..cd2a8e86c 100644 --- a/rag/nlp/__init__.py +++ b/rag/nlp/__init__.py @@ -550,7 +550,7 @@ def concat_img(img1, img2): def naive_merge_docx(sections, chunk_token_num=128, delimiter="\n。;!?"): if not sections: - return [] + return [], [] cks = [""] images = [None]