From 88768a93eb0d9890cf06b77fefd09e8d0198f753 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Tue, 25 Feb 2025 14:47:51 -0800 Subject: [PATCH] small enhancement, immaterial mostly --- llama_stack/providers/tests/inference/conftest.py | 3 ++- llama_stack/providers/utils/inference/openai_compat.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/llama_stack/providers/tests/inference/conftest.py b/llama_stack/providers/tests/inference/conftest.py index 2e9b5bcff..0075ff80d 100644 --- a/llama_stack/providers/tests/inference/conftest.py +++ b/llama_stack/providers/tests/inference/conftest.py @@ -46,9 +46,10 @@ def pytest_generate_tests(metafunc): if ("Vision" in cls_name and "Vision" in model) or ("Vision" not in cls_name and "Vision" not in model): params.append(pytest.param(model, id=model)) + print(f"params: {params}") if not params: model = metafunc.config.getoption("--inference-model") - params = [pytest.param(model, id="")] + params = [pytest.param(model, id=model)] metafunc.parametrize( "inference_model", diff --git a/llama_stack/providers/utils/inference/openai_compat.py b/llama_stack/providers/utils/inference/openai_compat.py index 51b8b248c..1e684f4a3 100644 --- a/llama_stack/providers/utils/inference/openai_compat.py +++ b/llama_stack/providers/utils/inference/openai_compat.py @@ -21,6 +21,9 @@ from openai.types.chat import ( from openai.types.chat import ( ChatCompletionContentPartParam as OpenAIChatCompletionContentPartParam, ) +from openai.types.chat import ( + ChatCompletionContentPartTextParam as OpenAIChatCompletionContentPartTextParam, +) from openai.types.chat import ( ChatCompletionMessageParam as OpenAIChatCompletionMessage, ) @@ -519,8 +522,12 @@ async def convert_message_to_openai_dict_new(message: Message | Dict) -> OpenAIC content: InterleavedContent, ) -> Union[str, Iterable[OpenAIChatCompletionContentPartParam]]: # Llama Stack and OpenAI spec match for str and text input - if isinstance(content, str) or isinstance(content, TextContentItem): + if isinstance(content, str): return content + elif isinstance(content, TextContentItem): + return OpenAIChatCompletionContentPartTextParam( + text=content.text, + ) elif isinstance(content, ImageContentItem): return OpenAIChatCompletionContentPartImageParam( image_url=OpenAIImageURL(url=await convert_image_content_to_url(content)),