Skip to content

Commit 542e54b

Browse files
author
Filip Haltmayer
committed
finish testing
Signed-off-by: Filip Haltmayer <filip.haltmayer@zilliz.com>
1 parent 3cf7092 commit 542e54b

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

Diff for: pymilvus/orm/connections.py

+11-10
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ def connect_milvus(**kwargs):
233233
and connection_details["address"] == kwargs["address"]
234234
and connection_details["user"] == kwargs["user"]
235235
and connection_details["db_name"] == kwargs["db_name"]
236-
237236
):
238237
gh = self._connected_alias[key]
239238
break
@@ -267,9 +266,8 @@ def connect_milvus(**kwargs):
267266
password = '' if password is None else str(password)
268267
db_name = '' if db_name is None else str(db_name)
269268

270-
address, user, password, db_name = self.__parse_info(address, uri, host, port, db_name, user, password)
271-
272-
if set([address, uri, host, port]) != {None}:
269+
if set([address, uri, host, port]) != {''}:
270+
address, user, password, db_name = self.__parse_info(address, uri, host, port, db_name, user, password)
273271
kwargs["address"] = address
274272

275273
elif alias in self._alias:
@@ -362,13 +360,14 @@ def __parse_info(
362360
db_name: str = "",
363361
user: str = "",
364362
password: str = "",
365-
) -> dict:
363+
**kwargs) -> dict:
366364

367365
passed_in_address = ""
368366
passed_in_user = ""
369367
passed_in_password = ""
370368
passed_in_db_name = ""
371369

370+
# If uri
372371
if uri != "":
373372
passed_in_address, passed_in_user, passed_in_password, passed_in_db_name = (
374373
self.__parse_address_from_uri(uri)
@@ -429,11 +428,13 @@ def __parse_address_from_uri(self, uri: str) -> Tuple[str, str, str, str]:
429428
user = parsed_uri.username if parsed_uri.username is not None else ""
430429
password = parsed_uri.password if parsed_uri.password is not None else ""
431430

432-
if host != "" and port != "":
433-
self.__verify_host_port(host, port)
434-
addr = f"{host}:{port}"
435-
else:
436-
addr = ""
431+
if host == "":
432+
raise ConnectionConfigException(message="Illegal uri: URI is missing host address: {}".format(uri))
433+
if port == "":
434+
raise ConnectionConfigException(message="Illegal uri: URI is missing port: {}".format(uri))
435+
436+
self.__verify_host_port(host, port)
437+
addr = f"{host}:{port}"
437438

438439
if not is_legal_address(addr):
439440
raise ConnectionConfigException(message=illegal_uri_msg.format(uri))

Diff for: tests/test_connections.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ def test_add_connection_address_invalid(self, invalid_addr):
328328
{"uri": "http://127.0.0.1:19530"},
329329
{"uri": "http://localhost:19530"},
330330
{"uri": "http://example.com:80"},
331-
{"uri": "http://example.com"},
332331
])
333332
def test_add_connection_uri(self, valid_uri):
334333
alias = self.test_add_connection_uri.__name__
@@ -350,6 +349,8 @@ def test_add_connection_uri(self, valid_uri):
350349
{"uri": "http://"},
351350
{"uri": None},
352351
{"uri": -1},
352+
{"uri": "http://example.com"},
353+
{"uri": "http://:90"},
353354
])
354355
def test_add_connection_uri_invalid(self, invalid_uri):
355356
alias = self.test_add_connection_uri_invalid.__name__

0 commit comments

Comments
 (0)