Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CLI Support for pgvectorscale #365

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 108 additions & 0 deletions vectordb_bench/backend/clients/pgvectorscale/cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import click
import os
from pydantic import SecretStr

from ....cli.cli import (
CommonTypedDict,
cli,
click_parameter_decorators_from_typed_dict,
run,
)
from typing import Annotated, Unpack
from vectordb_bench.backend.clients import DB


class PgVectorScaleTypedDict(CommonTypedDict):
user_name: Annotated[
str, click.option("--user-name", type=str, help="Db username", required=True)
]
password: Annotated[
str,
click.option("--password",
type=str,
help="Postgres database password",
default=lambda: os.environ.get("POSTGRES_PASSWORD", ""),
show_default="$POSTGRES_PASSWORD",
),
]

host: Annotated[
str, click.option("--host", type=str, help="Db host", required=True)
]
db_name: Annotated[
str, click.option("--db-name", type=str, help="Db name", required=True)
]


class PgVectorScaleDiskAnnTypedDict(PgVectorScaleTypedDict):
storage_layout: Annotated[
str,
click.option(
"--storage-layout", type=str, help="Streaming DiskANN storage layout",
),
]
num_neighbors: Annotated[
int,
click.option(
"--num-neighbors", type=int, help="Streaming DiskANN num neighbors",
),
]
search_list_size: Annotated[
int,
click.option(
"--search-list-size", type=int, help="Streaming DiskANN search list size",
),
]
max_alpha: Annotated[
float,
click.option(
"--max-alpha", type=float, help="Streaming DiskANN max alpha",
),
]
num_dimensions: Annotated[
int,
click.option(
"--num-dimensions", type=int, help="Streaming DiskANN num dimensions",
),
]
query_search_list_size: Annotated[
int,
click.option(
"--query-search-list-size", type=int, help="Streaming DiskANN query search list size",
),
]
query_rescore: Annotated[
int,
click.option(
"--query-rescore", type=int, help="Streaming DiskANN query rescore",
),
]


@cli.command()
@click_parameter_decorators_from_typed_dict(PgVectorScaleDiskAnnTypedDict)
def PgVectorScaleDiskAnn(
**parameters: Unpack[PgVectorScaleDiskAnnTypedDict],
):
from .config import PgVectorScaleConfig, PgVectorScaleStreamingDiskANNConfig

run(
db=DB.PgVectorScale,
db_config=PgVectorScaleConfig(
db_label=parameters["db_label"],
user_name=SecretStr(parameters["user_name"]),
password=SecretStr(parameters["password"]),
host=parameters["host"],
db_name=parameters["db_name"],
),
db_case_config=PgVectorScaleStreamingDiskANNConfig(
storage_layout=parameters["storage_layout"],
num_neighbors=parameters["num_neighbors"],
search_list_size=parameters["search_list_size"],
max_alpha=parameters["max_alpha"],
num_dimensions=parameters["num_dimensions"],
query_search_list_size=parameters["query_search_list_size"],
query_rescore=parameters["query_rescore"],
),
**parameters,
)
3 changes: 2 additions & 1 deletion vectordb_bench/cli/vectordbbench.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from ..backend.clients.pgvector.cli import PgVectorHNSW
from ..backend.clients.pgvecto_rs.cli import PgVectoRSHNSW, PgVectoRSIVFFlat
from ..backend.clients.pgvectorscale.cli import PgVectorScaleDiskAnn
from ..backend.clients.redis.cli import Redis
from ..backend.clients.memorydb.cli import MemoryDB
from ..backend.clients.test.cli import Test
Expand All @@ -8,7 +9,6 @@
from ..backend.clients.milvus.cli import MilvusAutoIndex
from ..backend.clients.aws_opensearch.cli import AWSOpenSearch


from .cli import cli

cli.add_command(PgVectorHNSW)
Expand All @@ -21,6 +21,7 @@
cli.add_command(ZillizAutoIndex)
cli.add_command(MilvusAutoIndex)
cli.add_command(AWSOpenSearch)
cli.add_command(PgVectorScaleDiskAnn)


if __name__ == "__main__":
Expand Down