Skip to content

Commit 7acf5c0

Browse files
authored
Merge pull request #1838 from weaviate/fix_tests
Remove unneeded version checks
2 parents 7cc1861 + 960559d commit 7acf5c0

File tree

2 files changed

+13
-29
lines changed

2 files changed

+13
-29
lines changed

integration/test_collection.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
WeaviateInsertManyAllFailedError,
4343
WeaviateInvalidInputError,
4444
WeaviateQueryError,
45-
WeaviateUnsupportedFeatureError,
4645
)
4746
from weaviate.types import UUID, UUIDS
4847

@@ -569,17 +568,11 @@ def test_bm25_group_by(collection_factory: CollectionFactory) -> None:
569568
]
570569
)
571570
assert res.has_errors is False
572-
if collection._connection.supports_groupby_in_bm25_and_hybrid():
573-
objs = collection.query.bm25(
574-
query="test", group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2)
575-
).objects
576-
assert len(objs) == 1
577-
assert objs[0].belongs_to_group == "test"
578-
else:
579-
with pytest.raises(WeaviateUnsupportedFeatureError):
580-
collection.query.bm25(
581-
query="test", group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2)
582-
)
571+
objs = collection.query.bm25(
572+
query="test", group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2)
573+
).objects
574+
assert len(objs) == 1
575+
assert objs[0].belongs_to_group == "test"
583576

584577

585578
@pytest.mark.parametrize("limit", [1, 2])

integration/test_collection_hybrid.py

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,14 @@ def test_search_hybrid_group_by(collection_factory: CollectionFactory) -> None:
5656
)
5757
collection.data.insert({"Name": "some name"}, uuid=uuid.uuid4())
5858
collection.data.insert({"Name": "other word"}, uuid=uuid.uuid4())
59-
if collection._connection.supports_groupby_in_bm25_and_hybrid():
60-
objs = collection.query.hybrid(
61-
alpha=0,
62-
query="name",
63-
include_vector=True,
64-
group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2),
65-
).objects
66-
assert len(objs) == 1
67-
assert objs[0].belongs_to_group == "some name"
68-
else:
69-
with pytest.raises(WeaviateUnsupportedFeatureError):
70-
collection.query.hybrid(
71-
alpha=0,
72-
query="name",
73-
include_vector=True,
74-
group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2),
75-
)
59+
objs = collection.query.hybrid(
60+
alpha=0,
61+
query="name",
62+
include_vector=True,
63+
group_by=GroupBy(prop="name", objects_per_group=1, number_of_groups=2),
64+
).objects
65+
assert len(objs) == 1
66+
assert objs[0].belongs_to_group == "some name"
7667

7768

7869
@pytest.mark.parametrize("query", [None, ""])

0 commit comments

Comments
 (0)