Align tests

Author: Anri-Lombard

outlines/models/lmstudio.py

@@ -109,12 +109,13 @@ def format_chat_model_input(self, model_input: Chat) -> "LMStudioChat":
                 else:
                     raise ValueError(
                         f"Invalid content type: {type(content)}. "
-                        "Content must be a string or a list."
+                        "The content must be a string or a list containing a string "
+                        "and a list of images."
                     )
             elif role == "assistant":
                 chat.add_assistant_response(content)
             else:
-                raise ValueError(f"Unsupported message role: {role}")
+                raise ValueError(f"Unsupported role: {role}")
 
         return chat
 

tests/models/test_lmstudio.py

@@ -98,12 +98,6 @@ def test_lmstudio_direct(model_no_model_name):
     assert isinstance(result, str)
 
 
-@pytest.mark.api_call
-def test_lmstudio_call(model):
-    result = model("Respond with one word. Not more.")
-    assert isinstance(result, str)
-
-
 @pytest.mark.api_call
 def test_lmstudio_simple_vision(image, model):
     # This is not using a vision model, so it's not able to describe
@@ -116,7 +110,7 @@ def test_lmstudio_simple_vision(image, model):
 
 
 @pytest.mark.api_call
-def test_lmstudio_chat_with_image(image, model):
+def test_lmstudio_chat(image, model):
     result = model.generate(
         Chat(
             [
@@ -132,16 +126,6 @@ def test_lmstudio_chat_with_image(image, model):
     assert isinstance(result, str)
 
 
-@pytest.mark.api_call
-def test_lmstudio_chat(model):
-    chat = Chat(messages=[
-        {"role": "system", "content": "You are a helpful assistant."},
-        {"role": "user", "content": "Say hello."},
-    ])
-    result = model.generate(chat, None)
-    assert isinstance(result, str)
-
-
 @pytest.mark.api_call
 def test_lmstudio_json(model):
     class Foo(BaseModel):
@@ -238,13 +222,6 @@ async def test_lmstudio_async_direct(async_model_no_model_name):
     assert isinstance(result, str)
 
 
-@pytest.mark.api_call
-@pytest.mark.asyncio
-async def test_lmstudio_async_call(async_model):
-    result = await async_model("Respond with one word. Not more.")
-    assert isinstance(result, str)
-
-
 @pytest.mark.api_call
 @pytest.mark.asyncio
 async def test_lmstudio_async_simple_vision(image, async_model):
@@ -259,7 +236,7 @@ async def test_lmstudio_async_simple_vision(image, async_model):
 
 @pytest.mark.api_call
 @pytest.mark.asyncio
-async def test_lmstudio_async_chat_with_image(image, async_model):
+async def test_lmstudio_async_chat(image, async_model):
     result = await async_model.generate(
         Chat(
             [
@@ -275,17 +252,6 @@ async def test_lmstudio_async_chat_with_image(image, async_model):
     assert isinstance(result, str)
 
 
-@pytest.mark.api_call
-@pytest.mark.asyncio
-async def test_lmstudio_async_chat(async_model):
-    chat = Chat(messages=[
-        {"role": "system", "content": "You are a helpful assistant."},
-        {"role": "user", "content": "Say hello."},
-    ])
-    result = await async_model.generate(chat, None)
-    assert isinstance(result, str)
-
-
 @pytest.mark.api_call
 @pytest.mark.asyncio
 async def test_lmstudio_async_json(async_model):

tests/models/test_lmstudio_type_adapter.py

@@ -126,7 +126,7 @@ def test_lmstudio_type_adapter_input_chat_invalid_role(adapter):
     chat_input = Chat(messages=[
         {"role": "unknown", "content": "hello"},
     ])
-    with pytest.raises(ValueError, match="Unsupported message role"):
+    with pytest.raises(ValueError, match="Unsupported role"):
         _ = adapter.format_input(chat_input)