From 0178ef1d30a01e18edead47cb6c9d02808be0a4b Mon Sep 17 00:00:00 2001 From: Jael Gu Date: Wed, 25 Oct 2023 16:57:14 +0800 Subject: [PATCH] Support milvus uri and token Signed-off-by: Jael Gu --- README.md | 8 ++++++++ osschat_insert.py | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d9a1c96..1f72864 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,10 @@ Whether to normalize the embedding vectors, defaults to `True`. #### **Configuration for [Milvus](https://towhee.io/ann-insert/osschat-milvus):** +***milvus_uri***: str + +URI of Milvus vector database, default is `None`, which will use host and port instead. + ***milvus_host***: str Host of Milvus vector database, default is `'127.0.0.1'`. @@ -119,6 +123,10 @@ Host of Milvus vector database, default is `'127.0.0.1'`. Port of Milvus vector database, default is `'19530'`. +***milvus_token***: str + +Token of [Zilliz Cloud user](https://zilliz.com/cloud), default is `None`. + ***milvus_user***: str The user name for [Cloud user](https://zilliz.com/cloud), defaults to `None`. diff --git a/osschat_insert.py b/osschat_insert.py index 710033d..06ef0c7 100644 --- a/osschat_insert.py +++ b/osschat_insert.py @@ -33,6 +33,8 @@ class OSSChatInsertConfig(BaseModel, extra=Extra.allow): embedding_device: Optional[int] = -1 embedding_normalize: Optional[bool] = True # config for insert_milvus + milvus_uri: Optional[str] = None + milvus_token: Optional[str] = None milvus_host: Optional[str] = '127.0.0.1' milvus_port: Optional[str] = '19530' milvus_user: Optional[str] = None @@ -89,8 +91,10 @@ def osschat_insert_pipe(config): else: sentence_embedding_config = AutoConfig.TritonCPUConfig() - insert_milvus_op = ops.ann_insert.osschat_milvus(host=config.milvus_host, + insert_milvus_op = ops.ann_insert.osschat_milvus(uri=config.milvus_uri, + host=config.milvus_host, port=config.milvus_port, + token=config.milvus_token, user=config.milvus_user, password=config.milvus_password, )