fix issue-67,issue-58

Signed-off-by: nameczz <zizhao.chen@zilliz.com>
zilliztech · Jan 17, 2024 · b57e035 · b57e035
1 parent 8563d12
commit b57e035
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/milvus_cli/Index.py b/milvus_cli/Index.py
@@ -94,7 +94,6 @@ def list_indexes(
             collectionName,
         )
         result = target.indexes
-        print(result[0].field_name, result[0].index_name, result[0]._index_params)
         rows = list(
             map(
                 lambda x: [

diff --git a/milvus_cli/Types.py b/milvus_cli/Types.py
@@ -45,6 +45,11 @@ def __str__(self):
     "ANNOY",
     "AUTOINDEX",
     "DISKANN",
+    "GPU_IVF_FLAT",
+    "GPU_IVF_PQ",
+    "SCANN",
+    "STL_SORT",
+    "Trie",
     "",
 ]
 
@@ -100,6 +105,18 @@ def __str__(self):
         "index_building_parameters": [],
         "search_parameters": [],
     },
+    "GPU_IVF_FLAT": {
+        "index_building_parameters": ["nlist"],
+        "search_parameters": ["nprobe"],
+    },
+    "GPU_IVF_PQ": {
+        "index_building_parameters": ["nlist", "m", "nbits"],
+        "search_parameters": ["nprobe"],
+    },
+    "SCANN": {
+        "index_building_parameters": ["nlist", "with_raw_data"],
+        "search_parameters": ["nprobe", "reorder_k"],
+    },
 }
 
 DupSearchParams = reduce(

diff --git a/milvus_cli/scripts/helper_cli.py b/milvus_cli/scripts/helper_cli.py
@@ -37,14 +37,14 @@ def clear():
 @cli.group("show", no_args_is_help=False)
 @click.pass_obj
 def show(obj):
-    """Show connection, database,collection, loading_progress and index_progress."""
+    """Show connection, database,collection, loading_progress or index_progress."""
     pass
 
 
 @cli.group("list", no_args_is_help=False)
 @click.pass_obj
 def getList(obj):
-    """List collections,databases, partitions,users and indexes."""
+    """List collections,databases, partitions,users or indexes."""
     pass
 
 
@@ -58,7 +58,7 @@ def rename(obj):
 @cli.group("create", no_args_is_help=False)
 @click.pass_obj
 def create(obj):
-    """Create collection, database, partition,user and index."""
+    """Create collection, database, partition,user or index."""
     pass
 
 
@@ -79,7 +79,7 @@ def release(obj):
 @cli.group("delete", no_args_is_help=False)
 @click.pass_obj
 def delete(obj):
-    """Delete collection, database, partition,alias,user and index."""
+    """Delete collection, database, partition,alias,user or index."""
     pass
 
 

diff --git a/milvus_cli/scripts/index_cli.py b/milvus_cli/scripts/index_cli.py
@@ -51,7 +51,7 @@ def createIndex(obj):
         )
         params = []
 
-        ignoreIndexType = ["", "AUTOINDEX"]
+        ignoreIndexType = ["", "AUTOINDEX", "Trie", "STL_SORT"]
         if indexType not in ignoreIndexType:
             index_building_parameters = IndexTypesMap[indexType][
                 "index_building_parameters"

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="milvus_cli",
-    version="v0.4.1",
+    version="v0.4.2",
     author="Milvus Team",
     author_email="milvus-team@zilliz.com",
     url="https://github.com/zilliztech/milvus_cli",
@@ -19,7 +19,7 @@
         "Click==8.0.1",
         "pymilvus==2.3.4",
         "tabulate==0.8.9",
-        "requests==2.26.0",
+        "requests==2.31.0",
     ],
     entry_points={
         "console_scripts": [