Revert "Enhance MilvusClient Initialization and Connection Management… (#2880)

… (#2863)"

This reverts commit 795db9d.

---------

Signed-off-by: yangxuan <[email protected]>

Author: XuanYang-cn

examples/loop_create_milvus_client.py

@@ -1,6 +1,5 @@
 import logging
 from typing import Dict, List, Optional, Union
-from uuid import uuid4
 
 from pymilvus.client.abstract import AnnSearchRequest, BaseRanker
 from pymilvus.client.constants import DEFAULT_CONSISTENCY_LEVEL
@@ -826,8 +825,9 @@ def _create_connection(
         **kwargs,
     ) -> str:
         """Create the connection to the Milvus server."""
-        # TODO: Implement reuse with new uri style
-        using = uuid4().hex
+        using = kwargs.pop("alias", None)
+        if not using or using == "":
+            using = f"async-{uri}{user}"
         try:
             connections.connect(
                 using, user, password, db_name, token, uri=uri, _async=True, **kwargs

examples/with_usage.py

@@ -1,7 +1,5 @@
-import contextlib
 import logging
-from types import TracebackType
-from typing import Dict, List, Optional, Type, Union
+from typing import Dict, List, Optional, Union
 
 from pymilvus.client.abstract import AnnSearchRequest, BaseRanker
 from pymilvus.client.constants import DEFAULT_CONSISTENCY_LEVEL
@@ -63,30 +61,10 @@ def __init__(
                 to None.
                 Unit: second
         """
-        self._uri = uri
-        self._user = user
-        self._password = password
-        self._db_name = db_name
-        self._token = token
-        self._timeout = timeout
-        self._kwargs = kwargs
-        self._using = None
-        self._inited = False
-        self._init()
-
-    def _init(self):
-        if not self._inited:
-            self._using = self._create_connection(
-                self._uri,
-                self._user,
-                self._password,
-                self._db_name,
-                self._token,
-                timeout=self._timeout,
-                **self._kwargs,
-            )
-            self.is_self_hosted = bool(utility.get_server_type(using=self._using) == "milvus")
-            self._inited = True
+        self._using = self._create_connection(
+            uri, user, password, db_name, token, timeout=timeout, **kwargs
+        )
+        self.is_self_hosted = bool(utility.get_server_type(using=self._using) == "milvus")
 
     def create_collection(
         self,
@@ -934,26 +912,8 @@ def _create_collection_with_schema(
             self.create_index(collection_name, index_params, timeout=timeout)
             self.load_collection(collection_name, timeout=timeout)
 
-    def __enter__(self) -> "MilvusClient":
-        self._init()
-        return self
-
-    def __exit__(
-        self,
-        exc_type: Optional[Type[BaseException]],
-        exc: Optional[BaseException],
-        traceback: Optional[TracebackType],
-    ) -> Optional[bool]:
-        self.close()
-
-    def __del__(self):
-        self.close()
-
     def close(self):
-        if self._using is not None:
-            with contextlib.suppress(MilvusException):
-                connections.remove_connection(self._using)
-            self._using = None
+        connections.remove_connection(self._using)
 
     def _get_connection(self):
         return connections._fetch_handler(self._using)
@@ -969,7 +929,7 @@ def _create_connection(
     ) -> str:
         """Create the connection to the Milvus server."""
         using = kwargs.pop("alias", None)
-        if using is None or using == "":
+        if not using or using == "":
             using = f"{uri}{user}"
         try:
             connections.connect(using, user, password, db_name, token, uri=uri, **kwargs)

pymilvus/milvus_client/async_milvus_client.py

@@ -555,9 +555,6 @@ def _fetch_handler(
         self, alias: str = Config.MILVUS_CONN_ALIAS
     ) -> Union[GrpcHandler, AsyncGrpcHandler]:
         """Retrieves a GrpcHandler by alias."""
-        if alias is None:
-            raise ConnectionNotExistException(message=ExceptionsMessage.ConnectFirst)
-
         if not isinstance(alias, str):
             raise ConnectionConfigException(message=ExceptionsMessage.AliasType % type(alias))