Ensure unittest are passing

Author: luis5tb

llama_stack/providers/utils/inference/openai_compat.py

@@ -1019,7 +1019,7 @@ def openai_messages_to_messages(
     converted_messages = []
     for message in messages:
         # Check if this individual message is already a Llama Stack Message
-        if isinstance(message, Message):
+        if isinstance(message, (UserMessage | SystemMessage | ToolResponseMessage | CompletionMessage)):
             # Already a Llama Stack Message, use as-is
             converted_messages.append(message)
             continue

tests/unit/providers/inference/test_remote_vllm.py

@@ -179,13 +179,17 @@ async def test_tool_call_response(vllm_inference_adapter):
             tool_config=ToolConfig(tool_choice=ToolChoice.auto),
         )
 
-        assert mock_nonstream_completion.call_args.kwargs["messages"][2]["tool_calls"] == [
-            {
-                "id": "foo",
-                "type": "function",
-                "function": {"name": "knowledge_search", "arguments": '{"query": "How many?"}'},
-            }
-        ]
+        # The message structure contains both dict and Pydantic objects
+        message_with_tools = mock_nonstream_completion.call_args.kwargs["messages"][2]
+        assert "tool_calls" in message_with_tools
+        tool_calls = message_with_tools["tool_calls"]
+        assert len(tool_calls) == 1
+        tool_call = tool_calls[0]
+        # tool_call is still a Pydantic object (ChatCompletionMessageFunctionToolCall)
+        assert tool_call.id == "foo"
+        assert tool_call.type == "function"
+        assert tool_call.function.name == "knowledge_search"
+        assert tool_call.function.arguments == '{"query": "How many?"}'
 
 
 async def test_tool_call_delta_empty_tool_call_buf():

tests/unit/providers/utils/inference/test_openai_compat.py

@@ -155,13 +155,12 @@ def test_message_accepts_text_list(message_class, kwargs):
     "message_class,kwargs",
     [
         (OpenAISystemMessageParam, {}),
-        (OpenAIAssistantMessageParam, {}),
         (OpenAIDeveloperMessageParam, {}),
-        (OpenAIToolMessageParam, {"tool_call_id": "call_123"}),
+        (OpenAIAssistantMessageParam, {}),
     ],
 )
 def test_message_rejects_images(message_class, kwargs):
-    """Test that system, assistant, developer, and tool messages reject image content."""
+    """Test that system, assistant, and developer messages reject image content."""
     with pytest.raises(ValidationError):
         message_class(
             content=[
@@ -171,6 +170,20 @@ def test_message_rejects_images(message_class, kwargs):
         )
 
 
+def test_tool_message_accepts_images():
+    """Test that tool messages accept image content (consistent with tool_executor behavior)."""
+    msg = OpenAIToolMessageParam(
+        tool_call_id="call_123",
+        content=[
+            OpenAIChatCompletionContentPartTextParam(text="Result with image"),
+            OpenAIChatCompletionContentPartImageParam(image_url=OpenAIImageURL(url="http://example.com/image.jpg")),
+        ],
+    )
+    assert len(msg.content) == 2
+    assert msg.content[0].text == "Result with image"
+    assert msg.content[1].image_url.url == "http://example.com/image.jpg"
+
+
 def test_user_message_accepts_images():
     """Test that user messages accept image content (unlike other message types)."""
     # List with images should work