Update tests to expect Output as the generation return value

Author: RobinPicard

tests/backends/test_llguidance.py

@@ -158,35 +158,35 @@ def test_llguidance_backend(model, tensor_library_name, json_schema, regex, cfg_
     assert isinstance(processor, LLGuidanceLogitsProcessor)
     generator = outlines.Generator(model, backend="llguidance", processor=processor)
     response = generator("Hello, how are you?")
-    assert response[0] == "{"
+    assert response.content[0] == "{"
 
     # regex
     processor = backend.get_regex_logits_processor(regex)
     assert isinstance(processor, LLGuidanceLogitsProcessor)
     generator = outlines.Generator(model, backend="llguidance", processor=processor)
     response = generator("Hello, how are you?")
-    assert len(response) == 3
-    assert int(response)
+    assert len(response.content) == 3
+    assert int(response.content)
 
     # cfg lark
     processor = backend.get_cfg_logits_processor(cfg_lark)
     assert isinstance(processor, LLGuidanceLogitsProcessor)
     generator = outlines.Generator(model, backend="llguidance", processor=processor)
     response = generator("Hello, how are you?")
     assert (
-        "+" in response
-        or "-" in response
-        or "*" in response
-        or "/" in response
-        or float(response.strip())
+        "+" in response.content
+        or "-" in response.content
+        or "*" in response.content
+        or "/" in response.content
+        or float(response.content.strip())
     )
 
     # cfg ebnf
     processor = backend.get_cfg_logits_processor(cfg_ebnf)
     assert isinstance(processor, LLGuidanceLogitsProcessor)
     generator = outlines.Generator(model, backend="llguidance", processor=processor)
     response = generator("Hello, how are you?")
-    assert response == "yes" or response == "no"
+    assert response.content == "yes" or response.content == "no"
 
     # batch + multiple generations
     processor = backend.get_json_schema_logits_processor(json_schema)
@@ -196,7 +196,7 @@ def test_llguidance_backend(model, tensor_library_name, json_schema, regex, cfg_
             response = generator.batch(["Create a character", "Hello, how are you?"], max_new_tokens=200)
             assert len(response) == 2
             for r in response:
-                assert r[0] == "{"
+                assert r.content[0] == "{"
         else:
             response = generator("Create a character", max_tokens=20)
-            assert response[0] == "{"
+            assert response.content[0] == "{"

tests/backends/test_outlines_core.py

@@ -149,15 +149,15 @@ def test_outlines_core_backend(model, tensor_library_name, json_schema, regex, c
     assert isinstance(processor, OutlinesCoreLogitsProcessor)
     generator = outlines.Generator(model, backend="outlines_core", processor=processor)
     response = generator("Hello, how are you?")
-    assert "name" in response
+    assert "name" in response.content
 
     # regex
     processor = backend.get_regex_logits_processor(regex)
     assert isinstance(processor, OutlinesCoreLogitsProcessor)
     generator = outlines.Generator(model, backend="outlines_core", processor=processor)
     response = generator("Hello, how are you?")
-    assert len(response) == 3
-    assert int(response)
+    assert len(response.content) == 3
+    assert int(response.content)
 
     # cfg
     with pytest.raises(
@@ -174,9 +174,9 @@ def test_outlines_core_backend(model, tensor_library_name, json_schema, regex, c
             response = generator.batch(["Create a character", "Hello, how are you?"], max_new_tokens=200)
             assert len(response) == 2
             for r in response:
-                assert r[0] == "{"
-                assert "name" in r
+                assert r.content[0] == "{"
+                assert "name" in r.content
         else:
             response = generator("Create a character", max_tokens=20)
-            assert response[0] == "{"
-            assert "name" in response
+            assert response.content[0] == "{"
+            assert "name" in response.content

tests/backends/test_xgrammar.py

@@ -125,23 +125,23 @@ def test_xgrammar_backend(model, tensor_library_name, json_schema, regex, cfg):
     assert isinstance(processor, XGrammarLogitsProcessor)
     generator = outlines.Generator(model, backend="xgrammar", processor=processor)
     response = generator("Hello, how are you?")
-    assert response[0] == "{"
-    assert "name" in response
+    assert response.content[0] == "{"
+    assert "name" in response.content
 
     # regex
     processor = backend.get_regex_logits_processor(regex)
     assert isinstance(processor, XGrammarLogitsProcessor)
     generator = outlines.Generator(model, backend="xgrammar", processor=processor)
     response = generator("Hello, how are you?")
-    assert len(response) == 3
-    assert int(response)
+    assert len(response.content) == 3
+    assert int(response.content)
 
     # cfg
     processor = backend.get_cfg_logits_processor(cfg)
     assert isinstance(processor, XGrammarLogitsProcessor)
     generator = outlines.Generator(model, backend="xgrammar", processor=processor)
     response = generator("Hello, how are you?")
-    assert response == "yes" or response == "no"
+    assert response.content == "yes" or response.content == "no"
 
     # batch + multiple generations
     processor = backend.get_json_schema_logits_processor(json_schema)
@@ -151,12 +151,12 @@ def test_xgrammar_backend(model, tensor_library_name, json_schema, regex, cfg):
             response = generator.batch(["Create a character", "Hello, how are you?"], max_new_tokens=200)
             assert len(response) == 2
             for r in response:
-                assert r[0] == "{"
-                assert "name" in r
+                assert r.content[0] == "{"
+                assert "name" in r.content
         else:
             response = generator("Create a character", max_tokens=20)
-            assert response[0] == "{"
-            assert "name" in response
+            assert response.content[0] == "{"
+            assert "name" in response.content
 
 
 def test_xgrammar_backend_invalid_model():

tests/test_applications.py

@@ -6,6 +6,7 @@
 
 from outlines import from_transformers
 from outlines.applications import Application
+from outlines.outputs import Output
 from outlines.templates import Template
 
 
@@ -51,7 +52,7 @@ def test_application_template_call(model):
     application = Application(template, output_type)
     result = application(model, {"value": "example"}, max_new_tokens=10)
 
-    assert isinstance(result, str)
+    assert isinstance(result, Output)
 
 
 def test_application_callable_call(model):
@@ -62,7 +63,7 @@ def template(value):
     application = Application(template, output_type)
     result = application(model, {"value": "example"}, max_new_tokens=10)
 
-    assert isinstance(result, str)
+    assert isinstance(result, Output)
 
 
 def test_application_template_error(model):