Use Infinity by default

infiniflow · Nov 9, 2024 · 062b91a · 062b91a
1 parent 1b62c13
commit 062b91a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git a/api/settings.py b/api/settings.py
@@ -208,8 +208,8 @@
 PRIVILEGE_COMMAND_WHITELIST = []
 CHECK_NODES_IDENTITY = False
 
-docStoreConn = rag.utils.es_conn.ESConnection()
-#docStoreConn = rag.utils.infinity_conn.InfinityConnection()
+#docStoreConn = rag.utils.es_conn.ESConnection()
+docStoreConn = rag.utils.infinity_conn.InfinityConnection()
 retrievaler = search.Dealer(docStoreConn)
 kg_retrievaler = kg_search.KGSearch(docStoreConn)
 

diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
@@ -1,60 +1,65 @@
 services:
-  es01:
-    container_name: ragflow-es-01
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+  # es01:
+  #   container_name: ragflow-es-01
+  #   image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+  #   volumes:
+  #     - esdata01:/usr/share/elasticsearch/data
+  #   ports:
+  #     - ${ES_PORT}:9200
+  #   env_file: .env
+  #   environment:
+  #     - node.name=es01
+  #     - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+  #     - bootstrap.memory_lock=false
+  #     - discovery.type=single-node
+  #     - xpack.security.enabled=true
+  #     - xpack.security.http.ssl.enabled=false
+  #     - xpack.security.transport.ssl.enabled=false
+  #     - TZ=${TIMEZONE}
+  #   mem_limit: ${MEM_LIMIT}
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
+  #   healthcheck:
+  #     test: ["CMD-SHELL", "curl http://localhost:9200"]
+  #     interval: 10s
+  #     timeout: 10s
+  #     retries: 120
+  #   networks:
+  #     - ragflow
+  #   restart: on-failure
+
+  infinity:
+    container_name: ragflow-infinity
+    image: infiniflow/infinity:nightly
     volumes:
-      - esdata01:/usr/share/elasticsearch/data
+      - infinity_data:/var/infinity
     ports:
-      - ${ES_PORT}:9200
+      - ${INFINITY_THRIFT_PORT}:23817
+      - ${INFINITY_HTTP_PORT}:23820
+      - ${INFINITY_PSQL_PORT}:5432
     env_file: .env
     environment:
-      - node.name=es01
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - bootstrap.memory_lock=false
-      - discovery.type=single-node
-      - xpack.security.enabled=true
-      - xpack.security.http.ssl.enabled=false
-      - xpack.security.transport.ssl.enabled=false
       - TZ=${TIMEZONE}
     mem_limit: ${MEM_LIMIT}
     ulimits:
-      memlock:
-        soft: -1
-        hard: -1
+      nofile:
+        soft: 500000
+        hard: 500000
+    networks:
+      - ragflow
     healthcheck:
-      test: ["CMD-SHELL", "curl http://localhost:9200"]
+      test: ["CMD", "curl", "http://localhost:23820/admin/node/current"]
       interval: 10s
       timeout: 10s
       retries: 120
-    networks:
-      - ragflow
     restart: on-failure
-
-  # infinity:
-  #   container_name: ragflow-infinity
-  #   image: infiniflow/infinity:nightly
-  #   volumes:
-  #     - infinity_data:/var/infinity
-  #   ports:
-  #     - ${INFINITY_THRIFT_PORT}:23817
-  #     - ${INFINITY_HTTP_PORT}:23820
-  #     - ${INFINITY_PSQL_PORT}:5432
-  #   env_file: .env
-  #   environment:
-  #     - TZ=${TIMEZONE}
-  #   mem_limit: ${MEM_LIMIT}
-  #   ulimits:
-  #     nofile:
-  #       soft: 500000
-  #       hard: 500000
-  #   networks:
-  #     - ragflow
   #   healthcheck:
   #     test: ["CMD", "curl", "http://localhost:23820/admin/node/current"]
   #     interval: 10s
   #     timeout: 10s
   #     retries: 120
-  #   restart: on-failure
 
 
   mysql:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -6,7 +6,8 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-      es01:
+      # es01:
+      infinity:
         condition: service_healthy
     image: ${RAGFLOW_IMAGE}
     container_name: ragflow-server