From 21c282e6599df52aa49943883d4c56235f5bc9b6 Mon Sep 17 00:00:00 2001 From: Alexis Yushin Date: Mon, 28 Oct 2024 00:24:28 -0700 Subject: [PATCH] =?UTF-8?q?os=20environment=20variables=20should=20take=20?= =?UTF-8?q?precedences=20over=20the=20defaults,=20f=E2=80=A6=20(#2100)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbgpt/storage/vector_store/elastic_store.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dbgpt/storage/vector_store/elastic_store.py b/dbgpt/storage/vector_store/elastic_store.py index e3979dc39..f91048d5f 100644 --- a/dbgpt/storage/vector_store/elastic_store.py +++ b/dbgpt/storage/vector_store/elastic_store.py @@ -130,18 +130,18 @@ class ElasticStore(VectorStoreBase): connect_kwargs = {} elasticsearch_vector_config = vector_store_config.dict() - self.uri = elasticsearch_vector_config.get("uri") or os.getenv( + self.uri = os.getenv( "ELASTICSEARCH_URL", "localhost" - ) - self.port = elasticsearch_vector_config.get("post") or os.getenv( + ) or elasticsearch_vector_config.get("uri") + self.port = os.getenv( "ELASTICSEARCH_PORT", "9200" - ) - self.username = elasticsearch_vector_config.get("username") or os.getenv( + ) or elasticsearch_vector_config.get("post") + self.username = os.getenv( "ELASTICSEARCH_USERNAME" - ) - self.password = elasticsearch_vector_config.get("password") or os.getenv( + ) or elasticsearch_vector_config.get("username") + self.password = os.getenv( "ELASTICSEARCH_PASSWORD" - ) + ) or elasticsearch_vector_config.get("password") self.collection_name = ( elasticsearch_vector_config.get("name") or vector_store_config.name