Skip to content
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

[Frontend] Adjust try/except blocks in API impl #10056

Merged
merged 1 commit into from
Nov 7, 2024
Merged

[Frontend] Adjust try/except blocks in API impl #10056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions vllm/entrypoints/openai/serving_completion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,7 @@ async def create_completion(
try:
async for i, res in result_generator:
final_res_batch[i] = res
except asyncio.CancelledError:
return self.create_error_response("Client disconnected")
except ValueError as e:
# TODO: Use a vllm-specific Validation Error
return self.create_error_response(str(e))

try:
for i, final_res in enumerate(final_res_batch):
assert final_res is not None

Expand All @@ -217,6 +211,8 @@ async def create_completion(
tokenizer,
request_metadata,
)
except asyncio.CancelledError:
return self.create_error_response("Client disconnected")
except ValueError as e:
# TODO: Use a vllm-specific Validation Error
return self.create_error_response(str(e))
Expand Down
8 changes: 3 additions & 5 deletions vllm/entrypoints/openai/serving_embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,17 @@ async def create_embedding(
try:
async for i, res in result_generator:
final_res_batch[i] = res
except asyncio.CancelledError:
return self.create_error_response("Client disconnected")

try:
for final_res in final_res_batch:
assert final_res is not None
assert all(final_res is not None for final_res in final_res_batch)

final_res_batch_checked = cast(List[EmbeddingRequestOutput],
final_res_batch)

response = request_output_to_embedding_response(
final_res_batch_checked, request_id, created_time, model_name,
encoding_format)
except asyncio.CancelledError:
return self.create_error_response("Client disconnected")
except ValueError as e:
# TODO: Use a vllm-specific Validation Error
return self.create_error_response(str(e))
Expand Down