fix: [cp25]Add and check timeout param in database api (#2665)

See also: #2594

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

Author: XuanYang-cn

pymilvus/client/grpc_handler.py

@@ -1240,8 +1240,7 @@ def wait_for_creating_index(
             end = time.time()
             if isinstance(timeout, int) and end - start > timeout:
                 msg = (
-                    f"collection {collection_name} create index {index_name} "
-                    f"timeout in {timeout}s"
+                    f"collection {collection_name} create index {index_name} timeout in {timeout}s"
                 )
                 raise MilvusException(message=msg)
 
@@ -1427,7 +1426,8 @@ def create_database(
         timeout: Optional[float] = None,
         **kwargs,
     ):
-        request = Prepare.create_database_req(db_name, properties=properties, **kwargs)
+        check_pass_param(db_name=db_name, timeout=timeout)
+        request = Prepare.create_database_req(db_name, properties=properties)
         status = self._stub.CreateDatabase(request, timeout=timeout)
         check_status(status)
 
@@ -1439,6 +1439,7 @@ def drop_database(self, db_name: str, timeout: Optional[float] = None):
 
     @retry_on_rpc_failure()
     def list_database(self, timeout: Optional[float] = None):
+        check_pass_param(timeout=timeout)
         request = Prepare.list_database_req()
         response = self._stub.ListDatabases(request, timeout=timeout)
         check_status(response.status)

pymilvus/client/prepare.py

@@ -1662,11 +1662,9 @@ def register_request(cls, user: str, host: str, **kwargs):
         )
 
     @classmethod
-    def create_database_req(cls, db_name: str, **kwargs):
-        check_pass_param(db_name=db_name)
-
+    def create_database_req(cls, db_name: str, properties: Optional[dict] = None):
         req = milvus_types.CreateDatabaseRequest(db_name=db_name)
-        properties = kwargs.get("properties")
+
         if is_legal_collection_properties(properties):
             properties = [
                 common_types.KeyValuePair(key=str(k), value=str(v)) for k, v in properties.items()

pymilvus/milvus_client/milvus_client.py

@@ -945,7 +945,7 @@ def _pack_pks_expr(self, schema_dict: Dict, pks: List) -> str:
         # Varchar pks need double quotes around the values
         if data_type == DataType.VARCHAR:
             ids = ["'" + str(entry) + "'" for entry in pks]
-            expr = f"""{pk_field_name} in [{','.join(ids)}]"""
+            expr = f"""{pk_field_name} in [{",".join(ids)}]"""
         else:
             ids = [str(entry) for entry in pks]
             expr = f"{pk_field_name} in [{','.join(ids)}]"
@@ -1371,17 +1371,23 @@ def use_database(self, db_name: str, **kwargs):
         conn = self._get_connection()
         conn.reset_db_name(db_name)
 
-    def create_database(self, db_name: str, properties: Optional[dict] = None, **kwargs):
+    def create_database(
+        self,
+        db_name: str,
+        properties: Optional[dict] = None,
+        timeout: Optional[float] = None,
+        **kwargs,
+    ):
         conn = self._get_connection()
-        conn.create_database(db_name, properties, **kwargs)
+        conn.create_database(db_name=db_name, properties=properties, timeout=timeout, **kwargs)
 
     def drop_database(self, db_name: str, **kwargs):
         conn = self._get_connection()
         conn.drop_database(db_name, **kwargs)
 
-    def list_databases(self, **kwargs) -> List[str]:
+    def list_databases(self, timeout: Optional[float] = None, **kwargs) -> List[str]:
         conn = self._get_connection()
-        return conn.list_database(**kwargs)
+        return conn.list_database(timeout=timeout, **kwargs)
 
     def describe_database(self, db_name: str, **kwargs) -> dict:
         conn = self._get_connection()