Update to pass the check

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

Author: XuanYang-cn

pymilvus/_utils/validator.py

@@ -19,10 +19,10 @@ def validate_params(**params: Tuple[Any, Any, Optional[bool]]) -> None:
         ParamError: If any spec tuple is invalid or any parameter fails validation.
 
     Examples:
-        validate_params(
-            ids=([1, 2, 3], List[int]),
-            score=(score_value, float, True),
-        )
+        >>> validate_params(
+        >>>     ids=([1, 2, 3], List[int]),
+        >>>     score=(score_value, float, True),
+        >>> )
     """
     for name, spec in params.items():
         if not (2 <= len(spec) <= 3):

pymilvus/client/check.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 
-from pymilvus._utils.validator import validate_params
 from pymilvus.exceptions import ParamError
 from pymilvus.grpc_gen import milvus_pb2 as milvus_types
 

pymilvus/client/grpc_handler.py

@@ -527,7 +527,9 @@ def list_partitions(self, collection_name: str, timeout: Optional[float] = None,
     def get_partition_stats(
         self, collection_name: str, partition_name: str, timeout: Optional[float] = None, **kwargs
     ):
-        check_pass_param(collection_name=collection_name, timeout=timeout)
+        check_pass_param(
+            collection_name=collection_name, partition_name=partition_name, timeout=timeout
+        )
         req = Prepare.get_partition_stats_request(collection_name, partition_name)
         response = self._stub.GetPartitionStatistics(
             req, timeout=timeout, metadata=_api_level_md(**kwargs)

pymilvus/milvus_client/milvus_client.py

@@ -17,7 +17,6 @@
 )
 from pymilvus.client.utils import get_params, is_vector_type
 from pymilvus.exceptions import (
-    DataTypeNotMatchException,
     ErrorCode,
     MilvusException,
     ParamError,
@@ -235,16 +234,11 @@ def insert(
         Returns:
             Dict: Number of rows that were inserted and the inserted primary key list.
         """
-        # If no data provided, we cannot input anything
         if isinstance(data, Dict):
             data = [data]
+        validate_params(insert_data=(data, List))
 
-        msg = "wrong type of argument 'data',"
-        msg += f"expected 'Dict' or list of 'Dict', got '{type(data).__name__}'"
-
-        if not isinstance(data, List):
-            raise TypeError(msg)
-
+        # If no data provided, we cannot input anything
         if len(data) == 0:
             return {"insert_count": 0, "ids": []}
 
@@ -287,21 +281,16 @@ def upsert(
         Returns:
             Dict: Number of rows that were upserted.
         """
-        # If no data provided, we cannot input anything
         if isinstance(data, Dict):
             data = [data]
 
-        msg = "wrong type of argument 'data',"
-        msg += f"expected 'Dict' or list of 'Dict', got '{type(data).__name__}'"
-
-        if not isinstance(data, List):
-            raise TypeError(msg)
+        validate_params(upsert_data=(data, List))
 
+        # If no data provided, we cannot input anything
         if len(data) == 0:
             return {"upsert_count": 0}
 
         conn = self._get_connection()
-        # Upsert into the collection.
         try:
             res = conn.upsert_rows(
                 collection_name, data, partition_name=partition_name, timeout=timeout, **kwargs
@@ -468,17 +457,15 @@ def query(
         Returns:
             List[dict]: A list of result dicts, vectors are not included.
         """
-        if filter and not isinstance(filter, str):
-            raise DataTypeNotMatchException(message=ExceptionsMessage.ExprType % type(filter))
+        validate_params(filter=(filter, str, True))
 
-        if filter and ids is not None:
+        if filter and ids:
             raise ParamError(message=ExceptionsMessage.AmbiguousQueryFilterParam)
 
         if isinstance(ids, (int, str)):
             ids = [ids]
 
         conn = self._get_connection()
-
         if ids:
             try:
                 schema_dict = conn.describe_collection(collection_name, timeout=timeout, **kwargs)
@@ -517,8 +504,7 @@ def query_iterator(
         timeout: Optional[float] = None,
         **kwargs,
     ):
-        if filter is not None and not isinstance(filter, str):
-            raise DataTypeNotMatchException(message=ExceptionsMessage.ExprType % type(filter))
+        validate_params(filter=(filter, str, True))
 
         conn = self._get_connection()
         # set up schema for iterator
@@ -624,8 +610,7 @@ def search_iterator(
             raise ex from ex
 
         # following is the old code for search_iterator V1
-        if filter is not None and not isinstance(filter, str):
-            raise DataTypeNotMatchException(message=ExceptionsMessage.ExprType % type(filter))
+        validate_params(filter=(filter, str, True))
 
         # set up schema for iterator
         try:
@@ -755,7 +740,7 @@ def get(
     def delete(
         self,
         collection_name: str,
-        ids: Optional[Union[list, str, int]] = None,
+        ids: Optional[Union[List, str, int]] = None,
         timeout: Optional[float] = None,
         filter: Optional[str] = None,
         partition_name: Optional[str] = None,
@@ -785,28 +770,20 @@ def delete(
             Dict: with key 'deleted_count' and value number of rows that were deleted.
         """
         pks = kwargs.get("pks", [])
+        validate_params(pks=(pks, int, str, List[int|str]))
         if isinstance(pks, (int, str)):
             pks = [pks]
 
-        for pk in pks:
-            if not isinstance(pk, (int, str)):
-                msg = f"wrong type of argument pks, expect list, int or str, got '{type(pk).__name__}'"
-                raise TypeError(msg)
-
-        if ids is not None:
+        validate_params(ids=(ids, int, str, List[int|str], True))
+        if ids:
             if isinstance(ids, (int, str)):
                 pks.append(ids)
-            elif isinstance(ids, list):
-                for id in ids:
-                    if not isinstance(id, (int, str)):
-                        msg = f"wrong type of argument ids, expect list, int or str, got '{type(id).__name__}'"
-                        raise TypeError(msg)
+            elif isinstance(ids, List):
+                validate_params(ids=(ids, List[int|str]))
                 pks.extend(ids)
-            else:
-                msg = f"wrong type of argument ids, expect list, int or str, got '{type(ids).__name__}'"
-                raise TypeError(msg)
 
         # validate ambiguous delete filter param before describe collection rpc
+        validate_params(filter=(filter, str, True))
         if filter and len(pks) > 0:
             raise ParamError(message=ExceptionsMessage.AmbiguousDeleteFilterParam)
 
@@ -822,8 +799,6 @@ def delete(
                 raise ex from ex
             expr = self._pack_pks_expr(schema_dict, pks)
         else:
-            if not isinstance(filter, str):
-                raise DataTypeNotMatchException(message=ExceptionsMessage.ExprType % type(filter))
             expr = filter
 
         ret_pks = []
@@ -1240,9 +1215,6 @@ def get_partition_stats(
         self, collection_name: str, partition_name: str, timeout: Optional[float] = None, **kwargs
     ) -> Dict:
         conn = self._get_connection()
-        if not isinstance(partition_name, str):
-            msg = f"wrong type of argument 'partition_name', str expected, got '{type(partition_name).__name__}'"
-            raise TypeError(msg)
         ret = conn.get_partition_stats(collection_name, partition_name, timeout=timeout, **kwargs)
         result = {stat.key: stat.value for stat in ret}
         if "row_count" in result: