Skip to content

Commit 8e54549

Browse files
authored
chore!: Qdrant - remove init_from init parameter for compatibility with qdrant-client==1.16.0 (#2531)
* chore: Qdrant- remove init_from init parameter for compatibility with qdrant-client==1.16.0 * fix types
1 parent 01a0d5a commit 8e54549

File tree

6 files changed

+10
-17
lines changed

6 files changed

+10
-17
lines changed

integrations/qdrant/src/haystack_integrations/document_stores/qdrant/document_store.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from haystack.document_stores.types import DuplicatePolicy
1212
from haystack.utils import Secret, deserialize_secrets_inplace
1313
from numpy import exp
14-
from qdrant_client import grpc
1514
from qdrant_client.http import models as rest
1615
from qdrant_client.http.exceptions import UnexpectedResponse
1716
from tqdm import tqdm
@@ -128,7 +127,6 @@ def __init__(
128127
optimizers_config: Optional[dict] = None,
129128
wal_config: Optional[dict] = None,
130129
quantization_config: Optional[dict] = None,
131-
init_from: Optional[dict] = None,
132130
wait_result_from_api: bool = True,
133131
metadata: Optional[dict] = None,
134132
write_batch_size: int = 100,
@@ -210,8 +208,6 @@ def __init__(
210208
Params for Write-Ahead-Log.
211209
:param quantization_config:
212210
Params for quantization. If `None`, quantization will be disabled.
213-
:param init_from:
214-
Use data stored in another collection to initialize this collection.
215211
:param wait_result_from_api:
216212
Whether to wait for the result from the API after each request.
217213
:param metadata:
@@ -251,7 +247,6 @@ def __init__(
251247
self.optimizers_config = optimizers_config
252248
self.wal_config = wal_config
253249
self.quantization_config = quantization_config
254-
self.init_from = init_from
255250
self.wait_result_from_api = wait_result_from_api
256251
self.recreate_index = recreate_index
257252
self.payload_fields_to_index = payload_fields_to_index
@@ -685,8 +680,11 @@ def _get_documents_generator(
685680
with_vectors=True,
686681
)
687682
stop_scrolling = next_offset is None or (
688-
isinstance(next_offset, grpc.PointId) and next_offset.num == 0 and next_offset.uuid == "" # type: ignore[union-attr]
689-
) # grpc.PointId always has num and uuid
683+
hasattr(next_offset, "num")
684+
and hasattr(next_offset, "uuid")
685+
and next_offset.num == 0
686+
and next_offset.uuid == ""
687+
) # PointId always has num and uuid
690688

691689
for record in records:
692690
yield convert_qdrant_point_to_haystack_document(
@@ -722,8 +720,11 @@ async def _get_documents_generator_async(
722720
with_vectors=True,
723721
)
724722
stop_scrolling = next_offset is None or (
725-
isinstance(next_offset, grpc.PointId) and next_offset.num == 0 and next_offset.uuid == "" # type: ignore[union-attr]
726-
) # grpc.PointId always has num and uuid
723+
hasattr(next_offset, "num")
724+
and hasattr(next_offset, "uuid")
725+
and next_offset.num == 0
726+
and next_offset.uuid == ""
727+
) # PointId always has num and uuid
727728

728729
for record in records:
729730
yield convert_qdrant_point_to_haystack_document(
@@ -1644,7 +1645,6 @@ def _prepare_collection_params(self) -> dict[str, Any]:
16441645
"optimizers_config": self.optimizers_config,
16451646
"wal_config": self.wal_config,
16461647
"quantization_config": self.quantization_config,
1647-
"init_from": self.init_from,
16481648
}
16491649

16501650
def _prepare_client_params(self) -> dict[str, Any]:

integrations/qdrant/tests/test_dict_converters.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def test_to_dict():
3838
"optimizers_config": None,
3939
"wal_config": None,
4040
"quantization_config": None,
41-
"init_from": None,
4241
"wait_result_from_api": True,
4342
"metadata": {},
4443
"write_batch_size": 100,
@@ -69,7 +68,6 @@ def test_from_dict():
6968
"recreate_index": True,
7069
"shard_number": None,
7170
"quantization_config": None,
72-
"init_from": None,
7371
"wait_result_from_api": True,
7472
"metadata": {},
7573
"write_batch_size": 1000,
@@ -98,7 +96,6 @@ def test_from_dict():
9896
document_store.optimizers_config is None,
9997
document_store.wal_config is None,
10098
document_store.quantization_config is None,
101-
document_store.init_from is None,
10299
document_store.wait_result_from_api,
103100
document_store.metadata == {},
104101
document_store.write_batch_size == 1000,

integrations/qdrant/tests/test_document_store.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ def test_to_dict(self, monkeypatch):
101101
"optimizers_config": None,
102102
"wal_config": None,
103103
"quantization_config": None,
104-
"init_from": None,
105104
"wait_result_from_api": True,
106105
"metadata": {},
107106
"write_batch_size": 100,

integrations/qdrant/tests/test_embedding_retriever.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ def test_to_dict(self):
7070
"optimizers_config": None,
7171
"wal_config": None,
7272
"quantization_config": None,
73-
"init_from": None,
7473
"wait_result_from_api": True,
7574
"metadata": {},
7675
"write_batch_size": 100,

integrations/qdrant/tests/test_hybrid_retriever.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def test_to_dict(self):
6969
"optimizers_config": None,
7070
"wal_config": None,
7171
"quantization_config": None,
72-
"init_from": None,
7372
"wait_result_from_api": True,
7473
"metadata": {},
7574
"write_batch_size": 100,

integrations/qdrant/tests/test_sparse_embedding_retriever.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def test_to_dict(self):
6969
"optimizers_config": None,
7070
"wal_config": None,
7171
"quantization_config": None,
72-
"init_from": None,
7372
"wait_result_from_api": True,
7473
"metadata": {},
7574
"write_batch_size": 100,

0 commit comments

Comments
 (0)