Unverified Commit 7ad6b766 authored by Ying Wang's avatar Ying Wang Committed by GitHub
Browse files

fix: Fix failed functional tests https://github.com/meta-llama/llama-stack-evals (#8266)

parent c0fb25e9
...@@ -55,6 +55,20 @@ class OpenAIServingChat(OpenAIServingBase): ...@@ -55,6 +55,20 @@ class OpenAIServingChat(OpenAIServingBase):
def _request_id_prefix(self) -> str: def _request_id_prefix(self) -> str:
return "chatcmpl-" return "chatcmpl-"
def _validate_request(self, request: ChatCompletionRequest) -> Optional[str]:
"""Validate that the input is valid."""
if not request.messages:
return "Messages cannot be empty."
if (
isinstance(request.tool_choice, str)
and request.tool_choice.lower() == "required"
and not request.tools
):
return "Tools cannot be empty if tool choice is set to required."
return None
def _convert_to_internal_request( def _convert_to_internal_request(
self, self,
request: ChatCompletionRequest, request: ChatCompletionRequest,
......
...@@ -744,9 +744,13 @@ def load_image( ...@@ -744,9 +744,13 @@ def load_image(
image = Image.open(BytesIO(image_file)) image = Image.open(BytesIO(image_file))
elif image_file.startswith("http://") or image_file.startswith("https://"): elif image_file.startswith("http://") or image_file.startswith("https://"):
timeout = int(os.getenv("REQUEST_TIMEOUT", "3")) timeout = int(os.getenv("REQUEST_TIMEOUT", "3"))
response = requests.get(image_file, stream=True, timeout=timeout).raw response = requests.get(image_file, stream=True, timeout=timeout)
image = Image.open(response) try:
response.close() response.raise_for_status()
image = Image.open(response.raw)
image.load() # Force loading to avoid issues after closing the stream
finally:
response.close()
elif image_file.lower().endswith(("png", "jpg", "jpeg", "webp", "gif")): elif image_file.lower().endswith(("png", "jpg", "jpeg", "webp", "gif")):
image = Image.open(image_file) image = Image.open(image_file)
elif image_file.startswith("data:"): elif image_file.startswith("data:"):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment