remove redundant empty_field config check for qdrant and tidb

Signed-off-by: min.tian <min.tian.cn@gmail.com>

Author: alwayslove2013

vectordb_bench/backend/clients/clickhouse/config.py

@@ -1,9 +1,10 @@
-from typing import TypedDict
 from pydantic import BaseModel, SecretStr
-from ..api import DBConfig, DBCaseConfig, MetricType, IndexType
+
+from ..api import DBCaseConfig, DBConfig, IndexType, MetricType
+
 
 class ClickhouseConfig(DBConfig):
-    user_name: str  = "clickhouse"
+    user_name: str = "clickhouse"
     password: SecretStr
     host: str = "localhost"
     port: int = 8123
@@ -16,7 +17,7 @@ def to_dict(self) -> dict:
             "port": self.port,
             "dbname": self.db_name,
             "user": self.user_name,
-            "password": pwd_str
+            "password": pwd_str,
         }
 
 
@@ -32,8 +33,11 @@ def parse_metric(self) -> str:
     def parse_metric_str(self) -> str:
         if self.metric_type == MetricType.L2:
             return "L2Distance"
-        elif self.metric_type == MetricType.COSINE:
+        if self.metric_type == MetricType.COSINE:
             return "cosineDistance"
+        msg = f"Not Support for {self.metric_type}"
+        raise RuntimeError(msg)
+        return None
 
 
 class ClickhouseHNSWConfig(ClickhouseIndexConfig, DBCaseConfig):
@@ -51,6 +55,6 @@ def index_param(self) -> dict:
 
     def search_param(self) -> dict:
         return {
-            "metric_type": self.parse_metric_str(),
+            "met˝ric_type": self.parse_metric_str(),
             "params": {"ef": self.ef},
-        }
+        }

vectordb_bench/backend/clients/mariadb/cli.py

@@ -1,17 +1,16 @@
 from typing import Annotated, Optional, Unpack
 
 import click
-import os
 from pydantic import SecretStr
 
+from vectordb_bench.backend.clients import DB
+
 from ....cli.cli import (
     CommonTypedDict,
-    HNSWFlavor1,
     cli,
     click_parameter_decorators_from_typed_dict,
     run,
 )
-from vectordb_bench.backend.clients import DB
 
 
 class MariaDBTypedDict(CommonTypedDict):

vectordb_bench/backend/clients/mariadb/config.py

@@ -1,6 +1,9 @@
-from pydantic import SecretStr, BaseModel
 from typing import TypedDict
-from ..api import DBConfig, DBCaseConfig, MetricType, IndexType
+
+from pydantic import BaseModel, SecretStr
+
+from ..api import DBCaseConfig, DBConfig, IndexType, MetricType
+
 
 class MariaDBConfigDict(TypedDict):
     """These keys will be directly used as kwargs in mariadb connection string,
@@ -36,10 +39,10 @@ class MariaDBIndexConfig(BaseModel):
     def parse_metric(self) -> str:
         if self.metric_type == MetricType.L2:
             return "euclidean"
-        elif self.metric_type == MetricType.COSINE:
+        if self.metric_type == MetricType.COSINE:
             return "cosine"
-        else:
-            raise ValueError(f"Metric type {self.metric_type} is not supported!")
+        msg = f"Metric type {self.metric_type} is not supported!"
+        raise ValueError(msg)
 
 class MariaDBHNSWConfig(MariaDBIndexConfig, DBCaseConfig):
     M: int | None

vectordb_bench/backend/clients/qdrant_cloud/config.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, SecretStr, validator
+from pydantic import BaseModel, SecretStr
 
 from ..api import DBCaseConfig, DBConfig, MetricType
 
@@ -20,14 +20,6 @@ def to_dict(self) -> dict:
             "url": self.url.get_secret_value(),
         }
 
-    @validator("*")
-    def not_empty_field(cls, v: any, field: any):
-        if field.name in ["api_key", "db_label"]:
-            return v
-        if isinstance(v, str | SecretStr) and len(v) == 0:
-            raise ValueError("Empty string!")
-        return v
-
 
 class QdrantIndexConfig(BaseModel, DBCaseConfig):
     metric_type: MetricType | None = None

vectordb_bench/backend/clients/tidb/config.py

@@ -1,5 +1,6 @@
-from pydantic import SecretStr, BaseModel, validator
-from ..api import DBConfig, DBCaseConfig, MetricType
+from pydantic import BaseModel, SecretStr
+
+from ..api import DBCaseConfig, DBConfig, MetricType
 
 
 class TiDBConfig(DBConfig):
@@ -10,10 +11,6 @@ class TiDBConfig(DBConfig):
     db_name: str = "test"
     ssl: bool = False
 
-    @validator("*")
-    def not_empty_field(cls, v: any, field: any):
-        return v
-
     def to_dict(self) -> dict:
         pwd_str = self.password.get_secret_value()
         return {
@@ -33,10 +30,10 @@ class TiDBIndexConfig(BaseModel, DBCaseConfig):
     def get_metric_fn(self) -> str:
         if self.metric_type == MetricType.L2:
             return "vec_l2_distance"
-        elif self.metric_type == MetricType.COSINE:
+        if self.metric_type == MetricType.COSINE:
             return "vec_cosine_distance"
-        else:
-            raise ValueError(f"Unsupported metric type: {self.metric_type}")
+        msg = f"Unsupported metric type: {self.metric_type}"
+        raise ValueError(msg)
 
     def index_param(self) -> dict:
         return {