Skip to content

[BugFix]: properly catch templating error when preprocess input #13976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2025
+37 −0
Merged

[BugFix]: properly catch templating error when preprocess input #13976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7266939
feat: catch templating exception in preprocess input
gcalmettes Feb 27, 2025
01c3e40
feat: catch runtimeError in apply chat template for multimodal errors
gcalmettes Mar 3, 2025
d13231b
Merge branch 'vllm-project:main' into feat/catch-preprocessing-except…
gcalmettes Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions vllm/entrypoints/openai/serving_chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from collections.abc import Sequence as GenericSequence
from typing import Callable, Final, Optional, Union

import jinja2
from fastapi import Request

from vllm.config import ModelConfig
Expand Down Expand Up @@ -199,6 +200,15 @@ async def create_chat_completion(
except ValueError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except TypeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except RuntimeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except jinja2.TemplateError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))

request_id = "chatcmpl-" \
f"{self._base_request_id(raw_request, request.request_id)}"
Expand Down
10 changes: 10 additions & 0 deletions vllm/entrypoints/openai/serving_completion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from collections.abc import Sequence as GenericSequence
from typing import Optional, Union, cast

import jinja2
from fastapi import Request

from vllm.config import ModelConfig
Expand Down Expand Up @@ -114,6 +115,15 @@ async def create_completion(
except ValueError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except TypeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except RuntimeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except jinja2.TemplateError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))

# Schedule the request and get the result generator.
generators: list[AsyncGenerator[RequestOutput, None]] = []
Expand Down
3 changes: 3 additions & 0 deletions vllm/entrypoints/openai/serving_embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ async def create_embedding(
except ValueError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except TypeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))

# Schedule the request and get the result generator.
generators: list[AsyncGenerator[PoolingRequestOutput, None]] = []
Expand Down
7 changes: 7 additions & 0 deletions vllm/entrypoints/openai/serving_pooling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from collections.abc import AsyncGenerator
from typing import Final, Literal, Optional, Union, cast

import jinja2
import numpy as np
from fastapi import Request
from typing_extensions import assert_never
Expand Down Expand Up @@ -138,6 +139,12 @@ async def create_pooling(
except ValueError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except TypeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except jinja2.TemplateError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))

# Schedule the request and get the result generator.
generators: list[AsyncGenerator[PoolingRequestOutput, None]] = []
Expand Down
7 changes: 7 additions & 0 deletions vllm/entrypoints/openai/serving_tokenization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from typing import Final, Optional, Union

import jinja2
from fastapi import Request

from vllm.config import ModelConfig
Expand Down Expand Up @@ -91,6 +92,12 @@ async def create_tokenize(
except ValueError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except TypeError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))
except jinja2.TemplateError as e:
logger.exception("Error in preprocessing prompt inputs")
return self.create_error_response(str(e))

input_ids: list[int] = []
for i, engine_prompt in enumerate(engine_prompts):
Expand Down