Skip to content

Commit cec8c7d

Browse files
authored
Refactor error handling for multiple exceptions in preprocessing (#15650)
Signed-off-by: JasonZhu1313 <[email protected]>
1 parent 4d0ec37 commit cec8c7d

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

vllm/entrypoints/openai/serving_chat.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,8 @@ async def create_chat_completion(
197197
truncate_prompt_tokens=request.truncate_prompt_tokens,
198198
add_special_tokens=request.add_special_tokens,
199199
)
200-
except ValueError as e:
201-
logger.exception("Error in preprocessing prompt inputs")
202-
return self.create_error_response(str(e))
203-
except TypeError as e:
204-
logger.exception("Error in preprocessing prompt inputs")
205-
return self.create_error_response(str(e))
206-
except RuntimeError as e:
207-
logger.exception("Error in preprocessing prompt inputs")
208-
return self.create_error_response(str(e))
209-
except jinja2.TemplateError as e:
200+
except (ValueError, TypeError, RuntimeError,
201+
jinja2.TemplateError) as e:
210202
logger.exception("Error in preprocessing prompt inputs")
211203
return self.create_error_response(str(e))
212204

vllm/entrypoints/openai/serving_embedding.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,7 @@ async def create_embedding(
139139
truncate_prompt_tokens=truncate_prompt_tokens,
140140
add_special_tokens=request.add_special_tokens,
141141
)
142-
except ValueError as e:
143-
logger.exception("Error in preprocessing prompt inputs")
144-
return self.create_error_response(str(e))
145-
except TypeError as e:
142+
except (ValueError, TypeError) as e:
146143
logger.exception("Error in preprocessing prompt inputs")
147144
return self.create_error_response(str(e))
148145

vllm/entrypoints/openai/serving_pooling.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,7 @@ async def create_pooling(
136136
truncate_prompt_tokens=truncate_prompt_tokens,
137137
add_special_tokens=request.add_special_tokens,
138138
)
139-
except ValueError as e:
140-
logger.exception("Error in preprocessing prompt inputs")
141-
return self.create_error_response(str(e))
142-
except TypeError as e:
143-
logger.exception("Error in preprocessing prompt inputs")
144-
return self.create_error_response(str(e))
145-
except jinja2.TemplateError as e:
139+
except (ValueError, TypeError, jinja2.TemplateError) as e:
146140
logger.exception("Error in preprocessing prompt inputs")
147141
return self.create_error_response(str(e))
148142

vllm/entrypoints/openai/serving_tokenization.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,7 @@ async def create_tokenize(
8989
request.prompt,
9090
add_special_tokens=request.add_special_tokens,
9191
)
92-
except ValueError as e:
93-
logger.exception("Error in preprocessing prompt inputs")
94-
return self.create_error_response(str(e))
95-
except TypeError as e:
96-
logger.exception("Error in preprocessing prompt inputs")
97-
return self.create_error_response(str(e))
98-
except jinja2.TemplateError as e:
92+
except (ValueError, TypeError, jinja2.TemplateError) as e:
9993
logger.exception("Error in preprocessing prompt inputs")
10094
return self.create_error_response(str(e))
10195

0 commit comments

Comments
 (0)