Skip to content

Commit 14ce779

Browse files
committed
fix: Change default alpha value to float
1 parent bd33bcc commit 14ce779

3 files changed

Lines changed: 14 additions & 19 deletions

File tree

integrations/weaviate/src/haystack_integrations/components/retrievers/weaviate/hybrid_retriever.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from haystack.document_stores.types.filter_policy import apply_filter_policy
1010

1111
from haystack_integrations.document_stores.weaviate import WeaviateDocumentStore
12-
from haystack_integrations.document_stores.weaviate.document_store import DEFAULT_ALPHA
1312

1413

1514
@component
@@ -24,7 +23,7 @@ def __init__(
2423
document_store: WeaviateDocumentStore,
2524
filters: dict[str, Any] | None = None,
2625
top_k: int = 10,
27-
alpha: float = DEFAULT_ALPHA,
26+
alpha: float = 0.7,
2827
max_vector_distance: float | None = None,
2928
filter_policy: str | FilterPolicy = FilterPolicy.REPLACE,
3029
):

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
# See WeaviateDocumentStore._query_with_filters() for more information.
6767
DEFAULT_QUERY_LIMIT = 9999
6868

69-
# See weaviate.collections.queries.hybrid.query.sync.pyi for the default value of alpha
70-
DEFAULT_ALPHA = 0.7
71-
7269

7370
class WeaviateDocumentStore:
7471
"""
@@ -1572,7 +1569,7 @@ def _hybrid_retrieval(
15721569
query_embedding: list[float],
15731570
filters: dict[str, Any] | None = None,
15741571
top_k: int | None = None,
1575-
alpha: float = DEFAULT_ALPHA,
1572+
alpha: float = 0.7,
15761573
max_vector_distance: float | None = None,
15771574
) -> list[Document]:
15781575
properties = [p.name for p in self.collection.config.get().properties]
@@ -1597,7 +1594,7 @@ async def _hybrid_retrieval_async(
15971594
query_embedding: list[float],
15981595
filters: dict[str, Any] | None = None,
15991596
top_k: int | None = None,
1600-
alpha: float = DEFAULT_ALPHA,
1597+
alpha: float = 0.7,
16011598
max_vector_distance: float | None = None,
16021599
) -> list[Document]:
16031600
collection = await self.async_collection

integrations/weaviate/tests/test_hybrid_retriever.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from haystack_integrations.components.retrievers.weaviate import WeaviateHybridRetriever
1111
from haystack_integrations.document_stores.weaviate import WeaviateDocumentStore
12-
from haystack_integrations.document_stores.weaviate.document_store import DEFAULT_ALPHA
1312

1413

1514
def test_init_default():
@@ -18,7 +17,7 @@ def test_init_default():
1817
assert retriever._document_store == mock_document_store
1918
assert retriever._filters == {}
2019
assert retriever._top_k == 10
21-
assert retriever._alpha == DEFAULT_ALPHA
20+
assert retriever._alpha == 0.7
2221
assert retriever._max_vector_distance is None
2322
assert retriever._filter_policy == FilterPolicy.REPLACE
2423

@@ -57,7 +56,7 @@ def test_to_dict(_mock_weaviate):
5756
"init_parameters": {
5857
"filters": {},
5958
"top_k": 10,
60-
"alpha": DEFAULT_ALPHA,
59+
"alpha": 0.7,
6160
"max_vector_distance": None,
6261
"filter_policy": "replace",
6362
"document_store": {
@@ -113,7 +112,7 @@ def test_from_dict(_mock_weaviate):
113112
"init_parameters": {
114113
"filters": {},
115114
"top_k": 10,
116-
"alpha": DEFAULT_ALPHA,
115+
"alpha": 0.7,
117116
"max_vector_distance": None,
118117
"filter_policy": "replace",
119118
"document_store": {
@@ -143,7 +142,7 @@ def test_from_dict(_mock_weaviate):
143142
assert retriever._document_store
144143
assert retriever._filters == {}
145144
assert retriever._top_k == 10
146-
assert retriever._alpha == DEFAULT_ALPHA
145+
assert retriever._alpha == 0.7
147146
assert retriever._max_vector_distance is None
148147

149148

@@ -205,7 +204,7 @@ def test_run_basic():
205204
query_embedding=[0.1, 0.2, 0.3],
206205
filters={},
207206
top_k=10,
208-
alpha=DEFAULT_ALPHA,
207+
alpha=0.7,
209208
max_vector_distance=None,
210209
)
211210

@@ -223,7 +222,7 @@ def test_run_with_runtime_filters():
223222
query_embedding=[0.1, 0.2, 0.3],
224223
filters={"runtime": "filter"},
225224
top_k=10,
226-
alpha=DEFAULT_ALPHA,
225+
alpha=0.7,
227226
max_vector_distance=None,
228227
)
229228

@@ -265,7 +264,7 @@ def test_run_empty_query():
265264
assert "documents" in result
266265
assert len(result["documents"]) == 0
267266
mock_document_store._hybrid_retrieval.assert_called_once_with(
268-
query="", query_embedding=[0.1, 0.2, 0.3], filters={}, top_k=10, alpha=DEFAULT_ALPHA, max_vector_distance=None
267+
query="", query_embedding=[0.1, 0.2, 0.3], filters={}, top_k=10, alpha=0.7, max_vector_distance=None
269268
)
270269

271270

@@ -294,7 +293,7 @@ def test_from_dict_no_filter_policy(_mock_weaviate):
294293
"init_parameters": {
295294
"filters": {},
296295
"top_k": 10,
297-
"alpha": DEFAULT_ALPHA,
296+
"alpha": 0.7,
298297
"max_vector_distance": None,
299298
# filter_policy intentionally omitted
300299
"document_store": {
@@ -324,7 +323,7 @@ def test_from_dict_no_filter_policy(_mock_weaviate):
324323
assert retriever._document_store
325324
assert retriever._filters == {}
326325
assert retriever._top_k == 10
327-
assert retriever._alpha == DEFAULT_ALPHA
326+
assert retriever._alpha == 0.7
328327
assert retriever._max_vector_distance is None
329328
assert retriever._filter_policy == FilterPolicy.REPLACE
330329

@@ -387,7 +386,7 @@ def test_run_with_max_vector_distance_zero_runtime():
387386
query_embedding=[0.1, 0.2],
388387
filters={},
389388
top_k=10,
390-
alpha=DEFAULT_ALPHA,
389+
alpha=0.7,
391390
max_vector_distance=0.0,
392391
)
393392

@@ -408,7 +407,7 @@ def test_run_with_max_vector_distance_zero_init_and_none_runtime():
408407
query_embedding=[0.1, 0.2],
409408
filters={},
410409
top_k=10,
411-
alpha=DEFAULT_ALPHA,
410+
alpha=0.7,
412411
max_vector_distance=0.0,
413412
)
414413

0 commit comments

Comments
 (0)