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.

Sign up for GitHub

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

convert limits dict to httpx.Limits #282

Merged
merged 4 commits into from
Jan 21, 2025
Merged

convert limits dict to httpx.Limits #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c494461
convert limits dict to httpx.Limits
kzamlynska Jan 20, 2025
a9842ee
remove limits from qdrant vectore store init
kzamlynska Jan 21, 2025
a18eeeb
Merge branch 'main' into kz/269-feat-limits-qdrant-config
kzamlynska Jan 21, 2025
4c74ae1
Merge branch 'main' into kz/269-feat-limits-qdrant-config
kzamlynska Jan 21, 2025
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
4 changes: 4 additions & 0 deletions packages/ragbits-core/src/ragbits/core/vector_stores/qdrant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import typing

import httpx
import qdrant_client
from qdrant_client import AsyncQdrantClient, models
from qdrant_client.models import Distance, Filter, VectorParams
Expand Down Expand Up @@ -59,6 +60,9 @@ def from_config(cls, config: dict) -> Self:
"""
client_options = ObjectContructionConfig.model_validate(config["client"])
client_cls = import_by_path(client_options.type, qdrant_client)
if "limits" in client_options.config:
limits = httpx.Limits(**client_options.config["limits"])
client_options.config["limits"] = limits
config["client"] = client_cls(**client_options.config)
return super().from_config(config)

Expand Down
7 changes: 6 additions & 1 deletion packages/ragbits-core/tests/unit/vector_stores/test_from_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import httpx
from chromadb import ClientAPI
from qdrant_client import AsyncQdrantClient
from qdrant_client.local.async_qdrant_local import AsyncQdrantLocal
Expand Down Expand Up @@ -61,7 +62,7 @@ def test_subclass_from_config_chroma_client():
assert store.default_options.max_distance == 0.22


def test_subclass_from_config_drant_client():
def test_subclass_from_config_qdrant_client():
config = ObjectContructionConfig.model_validate(
{
"type": "ragbits.core.vector_stores.qdrant:QdrantVectorStore",
Expand All @@ -70,6 +71,7 @@ def test_subclass_from_config_drant_client():
"type": "AsyncQdrantClient",
"config": {
"location": ":memory:",
"limits": {"keepalive_expiry": 20, "max_keepalive_connections": 0},
},
},
"index_name": "some_index",
Expand All @@ -84,6 +86,9 @@ def test_subclass_from_config_drant_client():
assert isinstance(store, QdrantVectorStore)
assert store._index_name == "some_index"
assert isinstance(store._client, AsyncQdrantClient)
assert isinstance(store._client.init_options["limits"], httpx.Limits)
assert store._client.init_options["limits"].keepalive_expiry == 20
assert store._client.init_options["limits"].max_keepalive_connections == 0
assert isinstance(store._client._client, AsyncQdrantLocal)
assert store.default_options.k == 10
assert store.default_options.max_distance == 0.22
Loading