os environment variables should take precedences over the defaults, f… (

#2100)

dbgpt/storage/vector_store/elastic_store.py

@@ -130,18 +130,18 @@ def __init__(self, vector_store_config: ElasticsearchVectorConfig) -> None:
 
         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