fix vllm base64

This commit is contained in:
Xi Yan 2025-01-17 16:17:15 -08:00
parent 9d005154d7
commit 6d21da6e48
2 changed files with 43 additions and 4 deletions

View file

@ -176,10 +176,8 @@ class VLLMInferenceAdapter(Inference, ModelsProtocolPrivate):
media_present = request_has_media(request)
if isinstance(request, ChatCompletionRequest):
if media_present:
# vllm does not seem to work well with image urls, so we download the images
input_dict["messages"] = [
await convert_message_to_openai_dict(m, download=True)
for m in request.messages
await convert_message_to_openai_dict(m) for m in request.messages
]
else:
input_dict["prompt"] = await chat_completion_request_to_prompt(

View file

@ -4,7 +4,10 @@
# This source code is licensed under the terms described in the LICENSE file in
# the root directory of this source tree.
import base64
import pytest
import requests
from pydantic import BaseModel
PROVIDER_TOOL_PROMPT_FORMAT = {
@ -69,6 +72,16 @@ def get_weather_tool_definition():
}
@pytest.fixture
def base64_image_url():
downloadable_url = "https://www.healthypawspetinsurance.com/Images/V3/DogAndPuppyInsurance/Dog_CTA_Desktop_HeroImage.jpg"
response = requests.get(downloadable_url)
response.raise_for_status()
base64_string = base64.b64encode(response.content).decode("utf-8")
base64_url = f"data:image;base64,{base64_string}"
return base64_url
def test_completion_non_streaming(llama_stack_client, text_model_id):
response = llama_stack_client.inference.completion(
content="Complete the sentence using one word: Roses are red, violets are ",
@ -326,7 +339,7 @@ def test_image_chat_completion_non_streaming(llama_stack_client, vision_model_id
)
message_content = response.completion_message.content.lower().strip()
assert len(message_content) > 0
assert any(expected in message_content for expected in {"dog", "puppy", "pup"})
assert any([expected in message_content for expected in {"dog", "puppy", "pup"}])
def test_image_chat_completion_streaming(llama_stack_client, vision_model_id):
@ -356,3 +369,31 @@ def test_image_chat_completion_streaming(llama_stack_client, vision_model_id):
streamed_content += chunk.event.delta.text.lower()
assert len(streamed_content) > 0
assert any(expected in streamed_content for expected in {"dog", "puppy", "pup"})
def test_image_chat_completion_base64_url(
llama_stack_client, vision_model_id, base64_image_url
):
message = {
"role": "user",
"content": [
{
"type": "image",
"url": {
"uri": base64_image_url,
},
},
{
"type": "text",
"text": "Describe what is in this image.",
},
],
}
response = llama_stack_client.inference.chat_completion(
model_id=vision_model_id,
messages=[message],
stream=False,
)
message_content = response.completion_message.content.lower().strip()
assert len(message_content) > 0