vectordb-bench 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

vectordb_bench/backend/data_source.py

@@ -1,12 +1,12 @@
 import logging
 import pathlib
 import typing
+from abc import ABC, abstractmethod
 from enum import Enum
+
 from tqdm import tqdm
-import os
-from abc import ABC, abstractmethod
 
-from .. import config
+from vectordb_bench import config
 
 logging.getLogger("s3fs").setLevel(logging.CRITICAL)
 
@@ -14,6 +14,7 @@ log = logging.getLogger(__name__)
 
 DatasetReader = typing.TypeVar("DatasetReader")
 
+
 class DatasetSource(Enum):
     S3 = "S3"
     AliyunOSS = "AliyunOSS"
@@ -25,6 +26,8 @@ class DatasetSource(Enum):
         if self == DatasetSource.AliyunOSS:
             return AliyunOSSReader()
 
+        return None
+
 
 class DatasetReader(ABC):
     source: DatasetSource
@@ -39,7 +42,6 @@ class DatasetReader(ABC):
             files(list[str]):  all filenames of the dataset
             local_ds_root(pathlib.Path): whether to write the remote data.
         """
-        pass
 
     @abstractmethod
     def validate_file(self, remote: pathlib.Path, local: pathlib.Path) -> bool:
@@ -52,15 +54,18 @@ class AliyunOSSReader(DatasetReader):
 
     def __init__(self):
         import oss2
+
         self.bucket = oss2.Bucket(oss2.AnonymousAuth(), self.remote_root, "benchmark", True)
 
     def validate_file(self, remote: pathlib.Path, local: pathlib.Path) -> bool:
         info = self.bucket.get_object_meta(remote.as_posix())
 
         # check size equal
-        remote_size, local_size = info.content_length, os.path.getsize(local)
+        remote_size, local_size = info.content_length, local.stat().st_size
         if remote_size != local_size:
-            log.info(f"local file: {local} size[{local_size}] not match with remote size[{remote_size}]")
+            log.info(
+                f"local file: {local} size[{local_size}] not match with remote size[{remote_size}]",
+            )
             return False
 
         return True
@@ -70,7 +75,13 @@ class AliyunOSSReader(DatasetReader):
         if not local_ds_root.exists():
             log.info(f"local dataset root path not exist, creating it: {local_ds_root}")
             local_ds_root.mkdir(parents=True)
-            downloads = [(pathlib.PurePosixPath("benchmark", dataset, f), local_ds_root.joinpath(f)) for f in files]
+            downloads = [
+                (
+                    pathlib.PurePosixPath("benchmark", dataset, f),
+                    local_ds_root.joinpath(f),
+                )
+                for f in files
+            ]
 
         else:
             for file in files:
@@ -78,7 +89,9 @@ class AliyunOSSReader(DatasetReader):
                 local_file = local_ds_root.joinpath(file)
 
                 if (not local_file.exists()) or (not self.validate_file(remote_file, local_file)):
-                    log.info(f"local file: {local_file} not match with remote: {remote_file}; add to downloading list")
+                    log.info(
+                        f"local file: {local_file} not match with remote: {remote_file}; add to downloading list",
+                    )
                     downloads.append((remote_file, local_file))
 
         if len(downloads) == 0:
@@ -92,17 +105,14 @@ class AliyunOSSReader(DatasetReader):
         log.info(f"Succeed to download all files, downloaded file count = {len(downloads)}")
 
 
-
 class AwsS3Reader(DatasetReader):
     source: DatasetSource = DatasetSource.S3
     remote_root: str = config.AWS_S3_URL
 
     def __init__(self):
         import s3fs
-        self.fs = s3fs.S3FileSystem(
-            anon=True,
-            client_kwargs={'region_name': 'us-west-2'}
-        )
+
+        self.fs = s3fs.S3FileSystem(anon=True, client_kwargs={"region_name": "us-west-2"})
 
     def ls_all(self, dataset: str):
         dataset_root_dir = pathlib.Path(self.remote_root, dataset)
@@ -112,7 +122,6 @@ class AwsS3Reader(DatasetReader):
             log.info(n)
         return names
 
-
     def read(self, dataset: str, files: list[str], local_ds_root: pathlib.Path):
         downloads = []
         if not local_ds_root.exists():
@@ -126,7 +135,9 @@ class AwsS3Reader(DatasetReader):
                 local_file = local_ds_root.joinpath(file)
 
                 if (not local_file.exists()) or (not self.validate_file(remote_file, local_file)):
-                    log.info(f"local file: {local_file} not match with remote: {remote_file}; add to downloading list")
+                    log.info(
+                        f"local file: {local_file} not match with remote: {remote_file}; add to downloading list",
+                    )
                     downloads.append(remote_file)
 
         if len(downloads) == 0:
@@ -139,15 +150,16 @@ class AwsS3Reader(DatasetReader):
 
         log.info(f"Succeed to download all files, downloaded file count = {len(downloads)}")
 
-
     def validate_file(self, remote: pathlib.Path, local: pathlib.Path) -> bool:
         # info() uses ls() inside, maybe we only need to ls once
         info = self.fs.info(remote)
 
         # check size equal
-        remote_size, local_size = info.get("size"), os.path.getsize(local)
+        remote_size, local_size = info.get("size"), local.stat().st_size
         if remote_size != local_size:
-            log.info(f"local file: {local} size[{local_size}] not match with remote size[{remote_size}]")
+            log.info(
+                f"local file: {local} size[{local_size}] not match with remote size[{remote_size}]",
+            )
             return False
 
         return True

vectordb_bench/backend/dataset.py

@@ -4,25 +4,30 @@ Usage:
     >>> Dataset.Cohere.get(100_000)
 """
 
-from collections import namedtuple
 import logging
 import pathlib
+import typing
 from enum import Enum
+
 import pandas as pd
-from pydantic import validator, PrivateAttr
 import polars as pl
 from pyarrow.parquet import ParquetFile
+from pydantic import PrivateAttr, validator
+
+from vectordb_bench import config
+from vectordb_bench.base import BaseModel
 
-from ..base import BaseModel
-from .. import config
-from ..backend.clients import MetricType
 from . import utils
-from .data_source import DatasetSource, DatasetReader
+from .clients import MetricType
+from .data_source import DatasetReader, DatasetSource
 
 log = logging.getLogger(__name__)
 
 
-SizeLabel = namedtuple('SizeLabel', ['size', 'label', 'file_count'])
+class SizeLabel(typing.NamedTuple):
+    size: int
+    label: str
+    file_count: int
 
 
 class BaseDataset(BaseModel):
@@ -33,12 +38,13 @@ class BaseDataset(BaseModel):
     use_shuffled: bool
     with_gt: bool = False
     _size_label: dict[int, SizeLabel] = PrivateAttr()
-    isCustom: bool = False
+    is_custom: bool = False
 
     @validator("size")
-    def verify_size(cls, v):
+    def verify_size(cls, v: int):
         if v not in cls._size_label:
-            raise ValueError(f"Size {v} not supported for the dataset, expected: {cls._size_label.keys()}")
+            msg = f"Size {v} not supported for the dataset, expected: {cls._size_label.keys()}"
+            raise ValueError(msg)
         return v
 
     @property
@@ -53,13 +59,14 @@ class BaseDataset(BaseModel):
     def file_count(self) -> int:
         return self._size_label.get(self.size).file_count
 
+
 class CustomDataset(BaseDataset):
     dir: str
     file_num: int
-    isCustom: bool = True
+    is_custom: bool = True
 
     @validator("size")
-    def verify_size(cls, v):
+    def verify_size(cls, v: int):
         return v
 
     @property
@@ -102,7 +109,7 @@ class Cohere(BaseDataset):
     dim: int = 768
     metric_type: MetricType = MetricType.COSINE
     use_shuffled: bool = config.USE_SHUFFLED_DATA
-    with_gt: bool = True,
+    with_gt: bool = (True,)
     _size_label: dict = {
         100_000: SizeLabel(100_000, "SMALL", 1),
         1_000_000: SizeLabel(1_000_000, "MEDIUM", 1),
@@ -124,7 +131,11 @@ class SIFT(BaseDataset):
     metric_type: MetricType = MetricType.L2
     use_shuffled: bool = False
     _size_label: dict = {
-        500_000: SizeLabel(500_000, "SMALL", 1,),
+        500_000: SizeLabel(
+            500_000,
+            "SMALL",
+            1,
+        ),
         5_000_000: SizeLabel(5_000_000, "MEDIUM", 1),
         #  50_000_000: SizeLabel(50_000_000, "LARGE", 50),
     }
@@ -135,7 +146,7 @@ class OpenAI(BaseDataset):
     dim: int = 1536
     metric_type: MetricType = MetricType.COSINE
     use_shuffled: bool = config.USE_SHUFFLED_DATA
-    with_gt: bool = True,
+    with_gt: bool = (True,)
     _size_label: dict = {
         50_000: SizeLabel(50_000, "SMALL", 1),
         500_000: SizeLabel(500_000, "MEDIUM", 1),
@@ -153,13 +164,14 @@ class DatasetManager(BaseModel):
         >>> for data in cohere:
         >>>    print(data.columns)
     """
-    data:   BaseDataset
+
+    data: BaseDataset
     test_data: pd.DataFrame | None = None
     gt_data: pd.DataFrame | None = None
-    train_files : list[str] = []
+    train_files: list[str] = []
     reader: DatasetReader | None = None
 
-    def __eq__(self, obj):
+    def __eq__(self, obj: any):
         if isinstance(obj, DatasetManager):
             return self.data.name == obj.data.name and self.data.label == obj.data.label
         return False
@@ -169,22 +181,27 @@ class DatasetManager(BaseModel):
 
     @property
     def data_dir(self) -> pathlib.Path:
-        """ data local directory: config.DATASET_LOCAL_DIR/{dataset_name}/{dataset_dirname}
+        """data local directory: config.DATASET_LOCAL_DIR/{dataset_name}/{dataset_dirname}
 
         Examples:
             >>> sift_s = Dataset.SIFT.manager(500_000)
             >>> sift_s.relative_path
             '/tmp/vectordb_bench/dataset/sift/sift_small_500k/'
         """
-        return pathlib.Path(config.DATASET_LOCAL_DIR, self.data.name.lower(), self.data.dir_name.lower())
+        return pathlib.Path(
+            config.DATASET_LOCAL_DIR,
+            self.data.name.lower(),
+            self.data.dir_name.lower(),
+        )
 
     def __iter__(self):
         return DataSetIterator(self)
 
     # TODO passing use_shuffle from outside
-    def prepare(self,
-        source: DatasetSource=DatasetSource.S3,
-        filters: int | float | str | None = None,
+    def prepare(
+        self,
+        source: DatasetSource = DatasetSource.S3,
+        filters: float | str | None = None,
     ) -> bool:
         """Download the dataset from DatasetSource
          url = f"{source}/{self.data.dir_name}"
@@ -208,7 +225,7 @@ class DatasetManager(BaseModel):
             gt_file, test_file = utils.compose_gt_file(filters), "test.parquet"
             all_files.extend([gt_file, test_file])
 
-        if not self.data.isCustom:
+        if not self.data.is_custom:
             source.reader().read(
                 dataset=self.data.dir_name.lower(),
                 files=all_files,
@@ -220,7 +237,7 @@ class DatasetManager(BaseModel):
             self.gt_data = self._read_file(gt_file)
 
         prefix = "shuffle_train" if use_shuffled else "train"
-        self.train_files = sorted([f.name for f in self.data_dir.glob(f'{prefix}*.parquet')])
+        self.train_files = sorted([f.name for f in self.data_dir.glob(f"{prefix}*.parquet")])
         log.debug(f"{self.data.name}: available train files {self.train_files}")
 
         return True
@@ -241,7 +258,7 @@ class DataSetIterator:
         self._ds = dataset
         self._idx = 0  # file number
         self._cur = None
-        self._sub_idx = [0 for i in range(len(self._ds.train_files))] # iter num for each file
+        self._sub_idx = [0 for i in range(len(self._ds.train_files))]  # iter num for each file
 
     def __iter__(self):
         return self
@@ -250,7 +267,9 @@ class DataSetIterator:
         p = pathlib.Path(self._ds.data_dir, file_name)
         log.info(f"Get iterator for {p.name}")
         if not p.exists():
-            raise IndexError(f"No such file {p}")
+            msg = f"No such file: {p}"
+            log.warning(msg)
+            raise IndexError(msg)
         return ParquetFile(p, memory_map=True, pre_buffer=True).iter_batches(config.NUM_PER_BATCH)
 
     def __next__(self) -> pd.DataFrame:
@@ -281,6 +300,7 @@ class Dataset(Enum):
         >>> Dataset.COHERE.manager(100_000)
         >>> Dataset.COHERE.get(100_000)
     """
+
     LAION = LAION
     GIST = GIST
     COHERE = Cohere

vectordb_bench/backend/result_collector.py

@@ -1,7 +1,7 @@
+import logging
 import pathlib
-from ..models import TestResult
 
-import logging
+from vectordb_bench.models import TestResult
 
 log = logging.getLogger(__name__)
 
@@ -14,7 +14,6 @@ class ResultCollector:
         if not result_dir.exists() or len(list(result_dir.rglob(reg))) == 0:
             return []
 
-
         for json_file in result_dir.rglob(reg):
             file_result = TestResult.read_file(json_file, trans_unit=True)
 

vectordb_bench/backend/runner/__init__.py

@@ -1,12 +1,10 @@
 from .mp_runner import (
     MultiProcessingSearchRunner,
 )
-
-from .serial_runner import SerialSearchRunner, SerialInsertRunner
-
+from .serial_runner import SerialInsertRunner, SerialSearchRunner
 
 __all__ = [
-    'MultiProcessingSearchRunner',
-    'SerialSearchRunner',
-    'SerialInsertRunner',
+    "MultiProcessingSearchRunner",
+    "SerialInsertRunner",
+    "SerialSearchRunner",
 ]

vectordb_bench/backend/runner/mp_runner.py

@@ -1,27 +1,29 @@
-import time
-import traceback
 import concurrent
+import logging
 import multiprocessing as mp
 import random
-import logging
-from typing import Iterable
+import time
+import traceback
+from collections.abc import Iterable
+
 import numpy as np
-from ..clients import api
-from ... import config
 
+from ... import config
+from ..clients import api
 
 NUM_PER_BATCH = config.NUM_PER_BATCH
 log = logging.getLogger(__name__)
 
 
 class MultiProcessingSearchRunner:
-    """ multiprocessing search runner
+    """multiprocessing search runner
 
     Args:
         k(int): search topk, default to 100
         concurrency(Iterable): concurrencies, default [1, 5, 10, 15, 20, 25, 30, 35]
         duration(int): duration for each concurency, default to 30s
     """
+
     def __init__(
         self,
         db: api.VectorDB,
@@ -40,7 +42,12 @@ class MultiProcessingSearchRunner:
         self.test_data = test_data
         log.debug(f"test dataset columns: {len(test_data)}")
 
-    def search(self, test_data: list[list[float]], q: mp.Queue, cond: mp.Condition) -> tuple[int, float]:
+    def search(
+        self,
+        test_data: list[list[float]],
+        q: mp.Queue,
+        cond: mp.Condition,
+    ) -> tuple[int, float]:
         # sync all process
         q.put(1)
         with cond:
@@ -71,24 +78,27 @@ class MultiProcessingSearchRunner:
                 idx = idx + 1 if idx < num - 1 else 0
 
                 if count % 500 == 0:
-                    log.debug(f"({mp.current_process().name:16}) search_count: {count}, latest_latency={time.perf_counter()-s}")
+                    log.debug(
+                        f"({mp.current_process().name:16}) ",
+                        f"search_count: {count}, latest_latency={time.perf_counter()-s}",
+                    )
 
         total_dur = round(time.perf_counter() - start_time, 4)
         log.info(
             f"{mp.current_process().name:16} search {self.duration}s: "
-            f"actual_dur={total_dur}s, count={count}, qps in this process: {round(count / total_dur, 4):3}"
-         )
+            f"actual_dur={total_dur}s, count={count}, qps in this process: {round(count / total_dur, 4):3}",
+        )
 
         return (count, total_dur, latencies)
 
     @staticmethod
     def get_mp_context():
         mp_start_method = "spawn"
-        log.debug(f"MultiProcessingSearchRunner get multiprocessing start method: {mp_start_method}")
+        log.debug(
+            f"MultiProcessingSearchRunner get multiprocessing start method: {mp_start_method}",
+        )
         return mp.get_context(mp_start_method)
 
-
-
     def _run_all_concurrencies_mem_efficient(self):
         max_qps = 0
         conc_num_list = []
@@ -99,8 +109,13 @@ class MultiProcessingSearchRunner:
             for conc in self.concurrencies:
                 with mp.Manager() as m:
                     q, cond = m.Queue(), m.Condition()
-                    with concurrent.futures.ProcessPoolExecutor(mp_context=self.get_mp_context(), max_workers=conc) as executor:
-                        log.info(f"Start search {self.duration}s in concurrency {conc}, filters: {self.filters}")
+                    with concurrent.futures.ProcessPoolExecutor(
+                        mp_context=self.get_mp_context(),
+                        max_workers=conc,
+                    ) as executor:
+                        log.info(
+                            f"Start search {self.duration}s in concurrency {conc}, filters: {self.filters}",
+                        )
                         future_iter = [executor.submit(self.search, self.test_data, q, cond) for i in range(conc)]
                         # Sync all processes
                         while q.qsize() < conc:
@@ -109,7 +124,9 @@ class MultiProcessingSearchRunner:
 
                         with cond:
                             cond.notify_all()
-                            log.info(f"Syncing all process and start concurrency search, concurrency={conc}")
+                            log.info(
+                                f"Syncing all process and start concurrency search, concurrency={conc}",
+                            )
 
                         start = time.perf_counter()
                         all_count = sum([r.result()[0] for r in future_iter])
@@ -123,13 +140,19 @@ class MultiProcessingSearchRunner:
                         conc_qps_list.append(qps)
                         conc_latency_p99_list.append(latency_p99)
                         conc_latency_avg_list.append(latency_avg)
-                        log.info(f"End search in concurrency {conc}: dur={cost}s, total_count={all_count}, qps={qps}")
+                        log.info(
+                            f"End search in concurrency {conc}: dur={cost}s, total_count={all_count}, qps={qps}",
+                        )
 
                 if qps > max_qps:
                     max_qps = qps
-                    log.info(f"Update largest qps with concurrency {conc}: current max_qps={max_qps}")
+                    log.info(
+                        f"Update largest qps with concurrency {conc}: current max_qps={max_qps}",
+                    )
         except Exception as e:
-            log.warning(f"Fail to search all concurrencies: {self.concurrencies}, max_qps before failure={max_qps}, reason={e}")
+            log.warning(
+                f"Fail to search all concurrencies: {self.concurrencies}, max_qps before failure={max_qps}, reason={e}",
+            )
             traceback.print_exc()
 
             # No results available, raise exception
@@ -139,7 +162,13 @@ class MultiProcessingSearchRunner:
         finally:
             self.stop()
 
-        return max_qps, conc_num_list, conc_qps_list, conc_latency_p99_list, conc_latency_avg_list
+        return (
+            max_qps,
+            conc_num_list,
+            conc_qps_list,
+            conc_latency_p99_list,
+            conc_latency_avg_list,
+        )
 
     def run(self) -> float:
         """
@@ -160,9 +189,16 @@ class MultiProcessingSearchRunner:
             for conc in self.concurrencies:
                 with mp.Manager() as m:
                     q, cond = m.Queue(), m.Condition()
-                    with concurrent.futures.ProcessPoolExecutor(mp_context=self.get_mp_context(), max_workers=conc) as executor:
-                        log.info(f"Start search_by_dur {duration}s in concurrency {conc}, filters: {self.filters}")
-                        future_iter = [executor.submit(self.search_by_dur, duration, self.test_data, q, cond) for i in range(conc)]
+                    with concurrent.futures.ProcessPoolExecutor(
+                        mp_context=self.get_mp_context(),
+                        max_workers=conc,
+                    ) as executor:
+                        log.info(
+                            f"Start search_by_dur {duration}s in concurrency {conc}, filters: {self.filters}",
+                        )
+                        future_iter = [
+                            executor.submit(self.search_by_dur, duration, self.test_data, q, cond) for i in range(conc)
+                        ]
                         # Sync all processes
                         while q.qsize() < conc:
                             sleep_t = conc if conc < 10 else 10
@@ -170,20 +206,28 @@ class MultiProcessingSearchRunner:
 
                         with cond:
                             cond.notify_all()
-                            log.info(f"Syncing all process and start concurrency search, concurrency={conc}")
+                            log.info(
+                                f"Syncing all process and start concurrency search, concurrency={conc}",
+                            )
 
                         start = time.perf_counter()
                         all_count = sum([r.result() for r in future_iter])
                         cost = time.perf_counter() - start
 
                         qps = round(all_count / cost, 4)
-                        log.info(f"End search in concurrency {conc}: dur={cost}s, total_count={all_count}, qps={qps}")
+                        log.info(
+                            f"End search in concurrency {conc}: dur={cost}s, total_count={all_count}, qps={qps}",
+                        )
 
                 if qps > max_qps:
                     max_qps = qps
-                    log.info(f"Update largest qps with concurrency {conc}: current max_qps={max_qps}")
+                    log.info(
+                        f"Update largest qps with concurrency {conc}: current max_qps={max_qps}",
+                    )
         except Exception as e:
-            log.warning(f"Fail to search all concurrencies: {self.concurrencies}, max_qps before failure={max_qps}, reason={e}")
+            log.warning(
+                f"Fail to search all concurrencies: {self.concurrencies}, max_qps before failure={max_qps}, reason={e}",
+            )
             traceback.print_exc()
 
             # No results available, raise exception
@@ -195,8 +239,13 @@ class MultiProcessingSearchRunner:
 
         return max_qps
 
-
-    def search_by_dur(self, dur: int, test_data: list[list[float]], q: mp.Queue, cond: mp.Condition) -> int:
+    def search_by_dur(
+        self,
+        dur: int,
+        test_data: list[list[float]],
+        q: mp.Queue,
+        cond: mp.Condition,
+    ) -> int:
         # sync all process
         q.put(1)
         with cond:
@@ -225,13 +274,15 @@ class MultiProcessingSearchRunner:
                 idx = idx + 1 if idx < num - 1 else 0
 
                 if count % 500 == 0:
-                    log.debug(f"({mp.current_process().name:16}) search_count: {count}, latest_latency={time.perf_counter()-s}")
+                    log.debug(
+                        f"({mp.current_process().name:16}) search_count: {count}, ",
+                        f"latest_latency={time.perf_counter()-s}",
+                    )
 
         total_dur = round(time.perf_counter() - start_time, 4)
         log.debug(
             f"{mp.current_process().name:16} search {self.duration}s: "
-            f"actual_dur={total_dur}s, count={count}, qps in this process: {round(count / total_dur, 4):3}"
-         )
+            f"actual_dur={total_dur}s, count={count}, qps in this process: {round(count / total_dur, 4):3}",
+        )
 
         return count
-