Merge branch 'main' into pr2088

tests/integration/agents/test_agents.py

@@ -548,6 +548,7 @@ def test_rag_agent_with_attachments(llama_stack_client, agent_config):
     assert "lora" in response.output_message.content.lower()
 
 
+@pytest.mark.skip(reason="Code interpreter is currently disabled in the Stack")
 def test_rag_and_code_agent(llama_stack_client, agent_config):
     if "llama-4" in agent_config["model"].lower():
         pytest.xfail("Not working for llama4")

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

@@ -7,9 +7,20 @@
 import pytest
 
 from llama_stack.apis.common.content_types import TextContentItem
-from llama_stack.apis.inference.inference import CompletionMessage, UserMessage
+from llama_stack.apis.inference.inference import (
+    CompletionMessage,
+    OpenAIAssistantMessageParam,
+    OpenAIChatCompletionContentPartTextParam,
+    OpenAISystemMessageParam,
+    OpenAIUserMessageParam,
+    SystemMessage,
+    UserMessage,
+)
 from llama_stack.models.llama.datatypes import BuiltinTool, StopReason, ToolCall
-from llama_stack.providers.utils.inference.openai_compat import convert_message_to_openai_dict
+from llama_stack.providers.utils.inference.openai_compat import (
+    convert_message_to_openai_dict,
+    openai_messages_to_messages,
+)
 
 
 @pytest.mark.asyncio
@@ -67,3 +78,39 @@ async def test_convert_message_to_openai_dict_with_builtin_tool_call():
             {"id": "123", "type": "function", "function": {"name": "brave_search", "arguments": '{"foo": "bar"}'}}
         ],
     }
+
+
+@pytest.mark.asyncio
+async def test_openai_messages_to_messages_with_content_str():
+    openai_messages = [
+        OpenAISystemMessageParam(content="system message"),
+        OpenAIUserMessageParam(content="user message"),
+        OpenAIAssistantMessageParam(content="assistant message"),
+    ]
+
+    llama_messages = openai_messages_to_messages(openai_messages)
+    assert len(llama_messages) == 3
+    assert isinstance(llama_messages[0], SystemMessage)
+    assert isinstance(llama_messages[1], UserMessage)
+    assert isinstance(llama_messages[2], CompletionMessage)
+    assert llama_messages[0].content == "system message"
+    assert llama_messages[1].content == "user message"
+    assert llama_messages[2].content == "assistant message"
+
+
+@pytest.mark.asyncio
+async def test_openai_messages_to_messages_with_content_list():
+    openai_messages = [
+        OpenAISystemMessageParam(content=[OpenAIChatCompletionContentPartTextParam(text="system message")]),
+        OpenAIUserMessageParam(content=[OpenAIChatCompletionContentPartTextParam(text="user message")]),
+        OpenAIAssistantMessageParam(content=[OpenAIChatCompletionContentPartTextParam(text="assistant message")]),
+    ]
+
+    llama_messages = openai_messages_to_messages(openai_messages)
+    assert len(llama_messages) == 3
+    assert isinstance(llama_messages[0], SystemMessage)
+    assert isinstance(llama_messages[1], UserMessage)
+    assert isinstance(llama_messages[2], CompletionMessage)
+    assert llama_messages[0].content[0].text == "system message"
+    assert llama_messages[1].content[0].text == "user message"
+    assert llama_messages[2].content[0].text == "assistant message"