fix: Revert "feat: initial support for Milvus 2.4.x (#3795)" downgrad…

…ing to 2.3.x for Linux arm64 installation failure (#5414)
langgenius · Jun 20, 2024 · aed56b1 · aed56b1
1 parent a88aa20
commit aed56b1
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 31 deletions.
diff --git a/api/core/rag/datasource/vdb/milvus/milvus_vector.py b/api/core/rag/datasource/vdb/milvus/milvus_vector.py
@@ -6,7 +6,6 @@
 from flask import current_app
 from pydantic import BaseModel, model_validator
 from pymilvus import MilvusClient, MilvusException, connections
-from pymilvus.milvus_client import IndexParams
 
 from core.rag.datasource.entity.embedding import Embeddings
 from core.rag.datasource.vdb.field import Field
@@ -255,15 +254,11 @@ def create_collection(
                 # Since primary field is auto-id, no need to track it
                 self._fields.remove(Field.PRIMARY_KEY.value)
 
-                # Create Index params for the collection
-                index_params_obj = IndexParams()
-                index_params_obj.add_index(field_name=Field.VECTOR.value, **index_params)
-
                 # Create the collection
                 collection_name = self._collection_name
-                self._client.create_collection(collection_name=collection_name,
-                                               schema=schema, index_params=index_params_obj,
-                                               consistency_level=self._consistency_level)
+                self._client.create_collection_with_schema(collection_name=collection_name,
+                                                           schema=schema, index_param=index_params,
+                                                           consistency_level=self._consistency_level)
             redis_client.set(collection_exist_cache_key, 1, ex=3600)
 
     def _init_client(self, config) -> MilvusClient:

diff --git a/api/poetry.lock b/api/poetry.lock
diff --git a/api/pyproject.toml b/api/pyproject.toml
@@ -145,7 +145,7 @@ xinference-client = "0.9.4"
 safetensors = "~0.4.3"
 zhipuai = "1.0.7"
 werkzeug = "~3.0.1"
-pymilvus = "~2.4.3"
+pymilvus = "2.3.1"
 qdrant-client = "1.7.3"
 cohere = "~5.2.4"
 pyyaml = "~6.0.1"

diff --git a/api/requirements.txt b/api/requirements.txt
@@ -53,7 +53,7 @@ xinference-client==0.9.4
 safetensors~=0.4.3
 zhipuai==1.0.7
 werkzeug~=3.0.1
-pymilvus~=2.4.3
+pymilvus==2.3.1
 qdrant-client==1.7.3
 cohere~=5.2.4
 pyyaml~=6.0.1

diff --git a/docker/docker-compose.milvus.yaml b/docker/docker-compose.milvus.yaml
@@ -38,7 +38,7 @@ services:
 
   milvus-standalone:
     container_name: milvus-standalone
-    image: milvusdb/milvus:v2.4.4
+    image: milvusdb/milvus:v2.3.1
     command: ["milvus", "run", "standalone"]
     environment:
       ETCD_ENDPOINTS: etcd:2379