Merge branch 'milvus-io:master' into bugfix/close_global_logger

milvus-io · Aug 3, 2023 · 9427b10 · 9427b10
2 parents 7fbc2eb + 11d0aa0
commit 9427b10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pymilvus/client/grpc_handler.py b/pymilvus/client/grpc_handler.py
@@ -130,11 +130,13 @@ def _wait_for_channel_ready(self, timeout: Union[int, float] = 10):
         try:
             grpc.channel_ready_future(self._channel).result(timeout=timeout)
             self._setup_identifier_interceptor(self._user)
-        except (grpc.FutureTimeoutError, MilvusException) as e:
+        except grpc.FutureTimeoutError as e:
             raise MilvusException(
                 code=Status.CONNECT_FAILED,
                 message=f"Fail connecting to server on {self._address}. Timeout",
             ) from e
+        except Exception as e:
+            raise e from e
 
     def close(self):
         self._channel.close()

diff --git a/pymilvus/orm/constants.py b/pymilvus/orm/constants.py
@@ -35,10 +35,10 @@
 RANGE_FILTER = "range_filter"
 FIELDS = "fields"
 ITERATION_EXTENSION_REDUCE_RATE = "iteration_extension_reduce_rate"
-DEFAULT_MAX_L2_DISTANCE = float(99999999.0)
-DEFAULT_MIN_IP_DISTANCE = float(-99999999.0)
-DEFAULT_MAX_HAMMING_DISTANCE = float(99999999.0)
-DEFAULT_MAX_TANIMOTO_DISTANCE = float(99999999.0)
-DEFAULT_MAX_JACCARD_DISTANCE = float(2.0)
-DEFAULT_MIN_COSINE_DISTANCE = float(-2.0)
+DEFAULT_MAX_L2_DISTANCE = 99999999.0
+DEFAULT_MIN_IP_DISTANCE = -99999999.0
+DEFAULT_MAX_HAMMING_DISTANCE = 99999999.0
+DEFAULT_MAX_TANIMOTO_DISTANCE = 99999999.0
+DEFAULT_MAX_JACCARD_DISTANCE = 2.0
+DEFAULT_MIN_COSINE_DISTANCE = -2.0
 MAX_FILTERED_IDS_COUNT_ITERATION = 100000