Rename to DiversitySelection

Author: g-despot

integration/test_collection_diversity.py

@@ -1,7 +1,7 @@
 import pytest
 
 from integration.conftest import CollectionFactory
-from weaviate.classes.query import Diversity
+from weaviate.classes.query import DiversitySelection
 from weaviate.collections.classes.config import Configure, DataType, Property
 from weaviate.collections.classes.data import DataObject
 
@@ -36,7 +36,7 @@ def test_near_vector_diversity_pure_relevance(
     baseline = collection.query.near_vector(near_vector=[1.0, 0.0, 0.0], limit=3).objects
     diverse = collection.query.near_vector(
         near_vector=[1.0, 0.0, 0.0],
-        diversity_selection=Diversity.mmr(limit=3, balance=1.0),
+        diversity_selection=DiversitySelection.mmr(limit=3, balance=1.0),
     ).objects
 
     assert [o.properties["text"] for o in baseline] == [o.properties["text"] for o in diverse]
@@ -50,7 +50,7 @@ def test_near_vector_diversity_pure_diversity(
 
     result = collection.query.near_vector(
         near_vector=[1.0, 0.0, 0.0],
-        diversity_selection=Diversity.mmr(limit=3, balance=0.0),
+        diversity_selection=DiversitySelection.mmr(limit=3, balance=0.0),
     )
     texts = {o.properties["text"] for o in result.objects}
     assert len(texts) == 3
@@ -62,11 +62,11 @@ def test_near_vector_diversity_pure_diversity(
 def test_near_vector_diversity_with_mmr_class(
     collection_factory: CollectionFactory,
 ) -> None:
-    """Direct MMR class construction (Diversity.MMR) also works, not just the factory."""
+    """Direct MMR class construction (DiversitySelection.MMR) also works, not just the factory."""
     collection = _create_clustered_collection(collection_factory)
     result = collection.query.near_vector(
         near_vector=[1.0, 0.0, 0.0],
-        diversity_selection=Diversity.MMR(limit=3, balance=0.0),
+        diversity_selection=DiversitySelection.MMR(limit=3, balance=0.0),
     )
     clusters = {o.properties["text"][0] for o in result.objects}
     assert clusters == {"a", "b", "c"}
@@ -79,25 +79,25 @@ def test_near_object_diversity(collection_factory: CollectionFactory) -> None:
 
     result = collection.query.near_object(
         near_object=anchor,
-        diversity_selection=Diversity.mmr(limit=3, balance=0.0),
+        diversity_selection=DiversitySelection.mmr(limit=3, balance=0.0),
     )
     assert len(result.objects) == 3
     clusters = {o.properties["text"][0] for o in result.objects}
     assert len(clusters) == 3
 
 
 def test_diversity_cannot_be_instantiated() -> None:
-    """Diversity is a factory — direct instantiation should fail."""
+    """DiversitySelection is a factory — direct instantiation should fail."""
     with pytest.raises(TypeError):
-        Diversity()
+        DiversitySelection()
 
 
 def test_diversity_mmr_only_limit(collection_factory: CollectionFactory) -> None:
     """MMR accepts just a limit (balance defaults to server-side value)."""
     collection = _create_clustered_collection(collection_factory)
     result = collection.query.near_vector(
         near_vector=[1.0, 0.0, 0.0],
-        diversity_selection=Diversity.mmr(limit=2),
+        diversity_selection=DiversitySelection.mmr(limit=2),
     )
     assert len(result.objects) == 2
 
@@ -117,7 +117,7 @@ def test_near_text_diversity(collection_factory: CollectionFactory) -> None:
 
     result = collection.query.near_text(
         query="fruit",
-        diversity_selection=Diversity.mmr(limit=3, balance=0.0),
+        diversity_selection=DiversitySelection.mmr(limit=3, balance=0.0),
     )
     assert len(result.objects) == 3
 
@@ -139,6 +139,6 @@ def test_near_text_generate_diversity(collection_factory: CollectionFactory) ->
     result = collection.generate.near_text(
         query="fruit",
         single_prompt="Describe {name}",
-        diversity_selection=Diversity.mmr(limit=3, balance=0.0),
+        diversity_selection=DiversitySelection.mmr(limit=3, balance=0.0),
     )
     assert len(result.objects) == 3

weaviate/classes/query.py

@@ -6,7 +6,7 @@
 )
 from weaviate.collections.classes.grpc import (
     MMR,
-    Diversity,
+    DiversitySelection,
     GroupBy,
     HybridFusion,
     HybridVector,
@@ -23,7 +23,7 @@
 from weaviate.collections.classes.types import GeoCoordinate
 
 __all__ = [
-    "Diversity",
+    "DiversitySelection",
     "Filter",
     "FilterReturn",
     "GeoCoordinate",

weaviate/collections/classes/grpc.py

@@ -281,11 +281,13 @@ class MMR:
     balance: Optional[float] = None
 
 
-class Diversity:
+class DiversitySelection:
     """Use this factory class to apply diversity selection to search results via MMR."""
 
     def __init__(self) -> None:
-        raise TypeError("Diversity cannot be instantiated directly. Use Diversity.mmr(...).")
+        raise TypeError(
+            "DiversitySelection cannot be instantiated directly. Use DiversitySelection.mmr(...)."
+        )
 
     MMR = MMR