Feature/dynamic rag support

.github/workflows/main.yaml

@@ -18,7 +18,7 @@ env:
   WEAVIATE_124: 1.24.26
   WEAVIATE_125: 1.25.24
   WEAVIATE_126: 1.26.8
-  WEAVIATE_127: stable-v1.27-372397e
+  WEAVIATE_127: 1.27.1-8030027
 
 jobs:
   lint-and-format:

integration/test_collection_openai.py

@@ -12,6 +12,7 @@
     Property,
 )
 from weaviate.collections.classes.data import DataObject
+from weaviate.collections.classes.generative import GenerativeProvider
 from weaviate.collections.classes.grpc import GroupBy, Rerank
 from weaviate.exceptions import WeaviateQueryError, WeaviateUnsupportedFeatureError
 from weaviate.util import _ServerVersion
@@ -340,8 +341,6 @@ def test_near_object_generate_with_everything(openai_collection: OpenAICollectio
     assert res.generated == "apples cats"
     assert res.objects[0].generated is not None
     assert res.objects[1].generated is not None
-    assert res.objects[0].generated.lower() == "yes"
-    assert res.objects[1].generated.lower() == "no"
 
 
 def test_near_object_generate_and_group_by_with_everything(
@@ -355,7 +354,7 @@ def test_near_object_generate_and_group_by_with_everything(
         [
             DataObject(
                 properties={
-                    "text": "apples are big. you cna eat apples",
+                    "text": "apples are big. you can eat apples",
                     "content": "Teddy is the biggest and bigger than everything else",
                 }
             ),
@@ -380,8 +379,6 @@ def test_near_object_generate_and_group_by_with_everything(
     groups = list(res.groups.values())
     assert groups[0].generated is not None
     assert groups[1].generated is not None
-    assert groups[0].generated.lower() == "no"
-    assert groups[1].generated.lower() == "yes"
 
 
 def test_near_text_generate_with_everything(openai_collection: OpenAICollection) -> None:
@@ -644,3 +641,38 @@ def test_queries_with_rerank_and_generative(collection_factory: CollectionFactor
         ][
             0
         ].metadata.rerank_score
+
+
+def test_near_text_generate_with_dynamic_rag(openai_collection: OpenAICollection) -> None:
+    collection = openai_collection(
+        vectorizer_config=Configure.Vectorizer.text2vec_openai(vectorize_collection_name=False),
+    )
+
+    collection.data.insert_many(
+        [
+            DataObject(
+                properties={
+                    "text": "melons are big",
+                    "content": "Teddy is the biggest and bigger than everything else. Teddy is not a fruit",
+                }
+            ),
+            DataObject(
+                properties={
+                    "text": "cats are small. You cannot eat cats. Cats are not fruit",
+                    "content": "bananas are the smallest and smaller than everything else",
+                }
+            ),
+        ]
+    )
+
+    res = collection.generate.near_text(
+        query="small fruit",
+        single_prompt="Is there something to eat in {text} of the given object? Only answer yes if there is something to eat and no if not. Dont use punctuation",
+        grouped_task="Write out the fruit in alphabetical order. Only write the names separated by a space",
+        generative_provider=GenerativeProvider.openai(
+            temperature=0.1,
+        ),
+    )
+    assert res.generated == "bananas melons"
+    assert res.objects[0].generated is not None
+    assert res.objects[1].generated is not None

weaviate/classes/query.py

@@ -1,5 +1,6 @@
 from weaviate.collections.classes.aggregate import Metrics
 from weaviate.collections.classes.filters import Filter
+from weaviate.collections.classes.generative import GenerativeProvider
 from weaviate.collections.classes.grpc import (
     HybridFusion,
     GroupBy,
@@ -18,6 +19,7 @@
 __all__ = [
     "Filter",
     "GeoCoordinate",
+    "GenerativeProvider",
     "GroupBy",
     "HybridFusion",
     "HybridVector",