diff --git a/pymilvus/orm/connections.py b/pymilvus/orm/connections.py index 5b5c5dee3..8941ed66c 100644 --- a/pymilvus/orm/connections.py +++ b/pymilvus/orm/connections.py @@ -11,6 +11,7 @@ # the License. import copy +from pprint import pprint import threading from urllib import parse from typing import Tuple @@ -224,13 +225,15 @@ def connect(self, alias=Config.MILVUS_CONN_ALIAS, user="", password="", db_name= def connect_milvus(**kwargs): with self._con_lock: gh = None + pprint(self._alias) for key, connection_details in self._alias.items(): if ( - connection_details["address"] == kwargs["address"] + key in self._connected_alias + and connection_details["address"] == kwargs["address"] and connection_details["user"] == kwargs["user"] and connection_details["db_name"] == kwargs["db_name"] - and key in self._connected_alias + ): gh = self._connected_alias[key] break @@ -246,7 +249,6 @@ def connect_milvus(**kwargs): self._connected_alias[alias] = gh - self._alias[alias] = copy.deepcopy(kwargs) if id(gh) not in self._connection_references: @@ -267,8 +269,6 @@ def connect_milvus(**kwargs): address, user, password, db_name = self.__parse_info(address, uri, host, port, db_name, user, password) - print("address", address, "user", user, "password", password, "db_name", db_name) - if set([address, uri, host, port]) != {None}: kwargs["address"] = address @@ -408,7 +408,7 @@ def __verify_host_port(self, host, port): raise ConnectionConfigException(message=f"port number {port} out of range, valid range [0, 65535)") def __parse_address_from_uri(self, uri: str) -> Tuple[str, str, str, str]: - illegal_uri_msg = "Illegal uri: [{}], expected form 'https://user:pwd@example.com:12345/db_name'" + illegal_uri_msg = "Illegal uri: [{}], expected form 'https://user:pwd@example.com:12345'" try: parsed_uri = parse.urlparse(uri) except (Exception) as e: diff --git a/tests/test_connections.py b/tests/test_connections.py index 6251c8340..0adcd75ee 100644 --- a/tests/test_connections.py +++ b/tests/test_connections.py @@ -195,7 +195,7 @@ def test_add_connection_then_connect(self, uri): def test_connect_with_reuse_grpc(self): alias = "default" - default_addr = {"address": "localhost:19530", "user": "", "db_field": ""} + default_addr = {"address": "localhost:19530", "user": "", "db_name": ""} reuse_alias = "reuse" @@ -386,13 +386,13 @@ def test_issue_1196(self): config = {"alias": alias, "host": "localhost", "port": "19531", "user": "root", "password": 12345, "secure": True} connections.connect(**config) config = connections.get_connection_addr(alias) - assert config == {"address": 'localhost:19531', "user": 'root'} + assert config == {"address": 'localhost:19531', "user": 'root', "db_name": ""} connections.add_connection(default={"host": "localhost", "port": 19531}) config = connections.get_connection_addr("default") - assert config == {"address": 'localhost:19531', "user": ""} + assert config == {"address": 'localhost:19531', "user": "", "db_name": ""} connections.connect("default", user="root", password="12345", secure=True) config = connections.get_connection_addr("default") - assert config == {"address": 'localhost:19531', "user": 'root'} + assert config == {"address": 'localhost:19531', "user": 'root', "db_name": ""}