From 529837a95a9e9d571aadc8a84f7c5f175871d4d8 Mon Sep 17 00:00:00 2001
From: yangxuan <xuan.yang@zilliz.com>
Date: Fri, 13 Dec 2024 12:12:08 +0800
Subject: [PATCH] fix: Opensearch requirements

Also remove some dup sub-packages

Signed-off-by: yangxuan <xuan.yang@zilliz.com>
---
 README.md      | 13 +++++--------
 pyproject.toml | 37 +++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 9a109146..893c0497 100644
--- a/README.md
+++ b/README.md
@@ -29,21 +29,18 @@ All the database client supported
 
 | Optional database client | install command                             |
 |--------------------------|---------------------------------------------|
-| pymilvus(*default*)      | `pip install vectordb-bench`                |
-| all                      | `pip install vectordb-bench[all]`           |
+| pymilvus, zilliz_cloud (*default*)     | `pip install vectordb-bench`                |
+| all (*clients requirements might be conflict with each other*) | `pip install vectordb-bench[all]`           |
 | qdrant                   | `pip install vectordb-bench[qdrant]`        |
 | pinecone                 | `pip install vectordb-bench[pinecone]`      |
 | weaviate                 | `pip install vectordb-bench[weaviate]`      |
-| elastic                  | `pip install vectordb-bench[elastic]`       |
-| pgvector                 | `pip install vectordb-bench[pgvector]`      |
+| elastic, aliyun_elasticsearch| `pip install vectordb-bench[elastic]`       |
+| pgvector, pgvectorscale, pgdiskann, alloydb | `pip install vectordb-bench[pgvector]`      |
 | pgvecto.rs               | `pip install vectordb-bench[pgvecto_rs]`    |
-| pgvectorscale            | `pip install vectordb-bench[pgvectorscale]` |
-| pgdiskann                | `pip install vectordb-bench[pgdiskann]`     |
 | redis                    | `pip install vectordb-bench[redis]`         |
 | memorydb                 | `pip install vectordb-bench[memorydb]`      |
 | chromadb                 | `pip install vectordb-bench[chromadb]`      |
-| awsopensearch            | `pip install vectordb-bench[awsopensearch]` |
-| alloydb                  | `pip install vectordb-bench[alloydb]`       |
+| awsopensearch            | `pip install vectordb-bench[opensearch]` |
 
 ### Run
 
diff --git a/pyproject.toml b/pyproject.toml
index 760404b1..6ad8e23e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,31 +55,32 @@ all = [
     "pinecone-client",
     "weaviate-client",
     "elasticsearch",
-    "pgvector",
-    "pgvecto_rs[psycopg3]>=0.2.2",
     "sqlalchemy",
     "redis",
     "chromadb",
+    "pgvector",
     "psycopg",
     "psycopg-binary",
-    "opensearch-dsl==2.1.0",
-    "opensearch-py==2.6.0",
+    "pgvecto_rs[psycopg3]>=0.2.2",
+    "opensearch-dsl",
+    "opensearch-py",
+    "memorydb",
 ]
 
-qdrant = [ "qdrant-client" ]
-pinecone = [ "pinecone-client" ]
-weaviate = [ "weaviate-client" ]
-elastic = [ "elasticsearch" ]
-pgvector = [ "psycopg", "psycopg-binary", "pgvector" ]
-pgvectorscale = [ "psycopg", "psycopg-binary", "pgvector" ]
-pgdiskann = [ "psycopg", "psycopg-binary", "pgvector" ]
-alloydb = [ "psycopg", "psycopg-binary", "pgvector"]
-pgvecto_rs = [ "pgvecto_rs[psycopg3]>=0.2.2" ]
-redis = [ "redis" ]
-memorydb = [ "memorydb" ]
-chromadb = [ "chromadb" ]
-awsopensearch = [ "awsopensearch" ]
-zilliz_cloud = []
+qdrant          = [ "qdrant-client" ]
+pinecone        = [ "pinecone-client" ]
+weaviate        = [ "weaviate-client" ]
+elastic         = [ "elasticsearch" ]
+# For elastic and aliyun_elasticsearch
+
+pgvector        = [ "psycopg", "psycopg-binary", "pgvector" ]
+# for pgvector, pgvectorscale, pgdiskann, and, alloydb
+
+pgvecto_rs      = [ "pgvecto_rs[psycopg3]>=0.2.2" ]
+redis           = [ "redis" ]
+memorydb        = [ "memorydb" ]
+chromadb        = [ "chromadb" ]
+opensearch      = [ "opensearch-py" ]
 
 [project.urls]
 "repository" = "https://github.com/zilliztech/VectorDBBench"