Merge pull request #1377 from weaviate/feature/dynamic-rag-support

Feature/dynamic rag support

Author: tsmith023

.github/workflows/main.yaml

@@ -19,11 +19,12 @@ concurrency:
 
 env:
   WEAVIATE_124: 1.24.26
-  WEAVIATE_125: 1.25.30
-  WEAVIATE_126: 1.26.14
-  WEAVIATE_127: 1.27.12
-  WEAVIATE_128: 1.28.6
+  WEAVIATE_125: 1.25.34
+  WEAVIATE_126: 1.26.17
+  WEAVIATE_127: 1.27.14
+  WEAVIATE_128: 1.28.8
   WEAVIATE_129: 1.29.0
+  WEAVIATE_130: 1.30.0-dev-20d09bb
 
 jobs:
   lint-and-format:
@@ -279,7 +280,8 @@ jobs:
           $WEAVIATE_126,
           $WEAVIATE_127,
           $WEAVIATE_128,
-          $WEAVIATE_129
+          $WEAVIATE_129,
+          $WEAVIATE_130
         ]
     steps:
       - name: Checkout

integration/test_collection_openai.py

@@ -1,5 +1,5 @@
 import os
-from typing import List
+from typing import List, Union
 
 import pytest
 from _pytest.fixtures import SubRequest
@@ -12,8 +12,15 @@
     Property,
 )
 from weaviate.collections.classes.data import DataObject
+from weaviate.collections.classes.generative import (
+    GenerativeConfig,
+    GenerativeParameters,
+    _GroupedTask,
+    _SinglePrompt,
+)
 from weaviate.collections.classes.grpc import GroupBy, Rerank
 from weaviate.exceptions import WeaviateQueryError, WeaviateUnsupportedFeatureError
+from weaviate.proto.v1.generative_pb2 import GenerativeOpenAIMetadata
 from weaviate.util import _ServerVersion
 
 
@@ -340,8 +347,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 +360,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 +385,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 +647,98 @@ def test_queries_with_rerank_and_generative(collection_factory: CollectionFactor
         ][
             0
         ].metadata.rerank_score
+
+
+@pytest.mark.parametrize(
+    "grouped",
+    [
+        "Write out the fruit in alphabetical order. Only write the names separated by a space",
+        GenerativeParameters.grouped_task(
+            prompt="Write out the fruit in alphabetical order. Only write the names separated by a space",
+            metadata=True,
+        ),
+    ],
+    ids=["string", "object"],
+)
+@pytest.mark.parametrize(
+    "single",
+    [
+        "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",
+        GenerativeParameters.single_prompt(
+            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",
+            metadata=True,
+            debug=True,
+        ),
+    ],
+    ids=["string", "object"],
+)
+def test_near_text_generate_with_dynamic_rag(
+    openai_collection: OpenAICollection,
+    grouped: Union[str, _GroupedTask],
+    single: Union[str, _SinglePrompt],
+) -> 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",
+                }
+            ),
+        ]
+    )
+
+    query = lambda: collection.generate.near_text(
+        query="small fruit",
+        single_prompt=single,
+        grouped_task=grouped,
+        generative_provider=GenerativeConfig.openai(
+            temperature=0.1,
+        ),
+    )
+
+    if collection._connection._weaviate_version.is_lower_than(1, 30, 0):
+        with pytest.raises(WeaviateUnsupportedFeatureError):
+            res = query()
+    else:
+        res = query()
+        # deprecated usage
+        assert res.generated == "bananas melons"
+        assert res.objects[0].generated is not None
+        assert res.objects[1].generated is not None
+
+        assert res.generative is not None
+        assert res.generative.text == "bananas melons"
+
+        if isinstance(grouped, _GroupedTask):
+            assert isinstance(res.generative.metadata, GenerativeOpenAIMetadata)
+        else:
+            assert res.generative.metadata is None
+
+        g0 = res.objects[0].generative
+        g1 = res.objects[1].generative
+
+        assert g0 is not None
+        assert g0.text is not None
+        assert g1 is not None
+        assert g1.text is not None
+
+        if isinstance(single, _SinglePrompt):
+            assert g0.debug is not None
+            assert isinstance(g0.metadata, GenerativeOpenAIMetadata)
+            assert g1.debug is not None
+            assert isinstance(g1.metadata, GenerativeOpenAIMetadata)
+        else:
+            assert g0.debug is None
+            assert g0.metadata is None
+            assert g1.metadata is None