Skip to content

[Bugfix] Missing Content Type returns 500 Internal Server Error #13193

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 5 commits into from
Feb 13, 2025
Merged

[Bugfix] Missing Content Type returns 500 Internal Server Error #13193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4a7c76
Missing Content Type returns 500 Internal Server Error
vaibhavjainwiz Feb 13, 2025
251f82f
Add test to verify wrong content type in request
vaibhavjainwiz Feb 13, 2025
75d2026
Applying content_type validation at the endpoint level
vaibhavjainwiz Feb 13, 2025
6c97904
Applying content_type validation on /invocation endpoint
vaibhavjainwiz Feb 13, 2025
dce6ef8
Implement equality check on content_type
vaibhavjainwiz Feb 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
16 changes: 16 additions & 0 deletions tests/entrypoints/openai/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,19 @@ async def test_request_cancellation(server: RemoteOpenAIServer):
max_tokens=10)

assert len(response.choices) == 1


@pytest.mark.asyncio
async def test_request_wrong_content_type(server: RemoteOpenAIServer):

chat_input = [{"role": "user", "content": "Write a long story"}]
client = server.get_async_client()

with pytest.raises(openai.APIStatusError):
await client.chat.completions.create(
messages=chat_input,
model=MODEL_NAME,
max_tokens=10000,
extra_headers={
"Content-Type": "application/x-www-form-urlencoded"
})
42 changes: 27 additions & 15 deletions vllm/entrypoints/openai/api_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from typing import AsyncIterator, Dict, Optional, Set, Tuple, Union

import uvloop
from fastapi import APIRouter, FastAPI, HTTPException, Request
from fastapi import APIRouter, Depends, FastAPI, HTTPException, Request
from fastapi.exceptions import RequestValidationError
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse, Response, StreamingResponse
Expand Down Expand Up @@ -253,6 +253,15 @@ def _cleanup_ipc_path():
multiprocess.mark_process_dead(engine_process.pid)


async def validate_json_request(raw_request: Request):
content_type = raw_request.headers.get("content-type", "").lower()
if content_type != "application/json":
raise HTTPException(
status_code=HTTPStatus.UNSUPPORTED_MEDIA_TYPE,
detail="Unsupported Media Type: Only 'application/json' is allowed"
)


router = APIRouter()


Expand Down Expand Up @@ -336,7 +345,7 @@ async def ping(raw_request: Request) -> Response:
return await health(raw_request)


@router.post("/tokenize")
@router.post("/tokenize", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def tokenize(request: TokenizeRequest, raw_request: Request):
handler = tokenization(raw_request)
Expand All @@ -351,7 +360,7 @@ async def tokenize(request: TokenizeRequest, raw_request: Request):
assert_never(generator)


@router.post("/detokenize")
@router.post("/detokenize", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def detokenize(request: DetokenizeRequest, raw_request: Request):
handler = tokenization(raw_request)
Expand Down Expand Up @@ -380,7 +389,8 @@ async def show_version():
return JSONResponse(content=ver)


@router.post("/v1/chat/completions")
@router.post("/v1/chat/completions",
dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_chat_completion(request: ChatCompletionRequest,
raw_request: Request):
Expand All @@ -401,7 +411,7 @@ async def create_chat_completion(request: ChatCompletionRequest,
return StreamingResponse(content=generator, media_type="text/event-stream")


@router.post("/v1/completions")
@router.post("/v1/completions", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_completion(request: CompletionRequest, raw_request: Request):
handler = completion(raw_request)
Expand All @@ -419,7 +429,7 @@ async def create_completion(request: CompletionRequest, raw_request: Request):
return StreamingResponse(content=generator, media_type="text/event-stream")


@router.post("/v1/embeddings")
@router.post("/v1/embeddings", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_embedding(request: EmbeddingRequest, raw_request: Request):
handler = embedding(raw_request)
Expand Down Expand Up @@ -465,7 +475,7 @@ async def create_embedding(request: EmbeddingRequest, raw_request: Request):
assert_never(generator)


@router.post("/pooling")
@router.post("/pooling", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_pooling(request: PoolingRequest, raw_request: Request):
handler = pooling(raw_request)
Expand All @@ -483,7 +493,7 @@ async def create_pooling(request: PoolingRequest, raw_request: Request):
assert_never(generator)


@router.post("/score")
@router.post("/score", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_score(request: ScoreRequest, raw_request: Request):
handler = score(raw_request)
Expand All @@ -501,7 +511,7 @@ async def create_score(request: ScoreRequest, raw_request: Request):
assert_never(generator)


@router.post("/v1/score")
@router.post("/v1/score", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def create_score_v1(request: ScoreRequest, raw_request: Request):
logger.warning(
Expand All @@ -511,7 +521,7 @@ async def create_score_v1(request: ScoreRequest, raw_request: Request):
return await create_score(request, raw_request)


@router.post("/rerank")
@router.post("/rerank", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def do_rerank(request: RerankRequest, raw_request: Request):
handler = rerank(raw_request)
Expand All @@ -528,7 +538,7 @@ async def do_rerank(request: RerankRequest, raw_request: Request):
assert_never(generator)


@router.post("/v1/rerank")
@router.post("/v1/rerank", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def do_rerank_v1(request: RerankRequest, raw_request: Request):
logger.warning_once(
Expand All @@ -539,7 +549,7 @@ async def do_rerank_v1(request: RerankRequest, raw_request: Request):
return await do_rerank(request, raw_request)


@router.post("/v2/rerank")
@router.post("/v2/rerank", dependencies=[Depends(validate_json_request)])
@with_cancellation
async def do_rerank_v2(request: RerankRequest, raw_request: Request):
return await do_rerank(request, raw_request)
Expand Down Expand Up @@ -583,7 +593,7 @@ async def reset_prefix_cache(raw_request: Request):
return Response(status_code=200)


@router.post("/invocations")
@router.post("/invocations", dependencies=[Depends(validate_json_request)])
async def invocations(raw_request: Request):
"""
For SageMaker, routes requests to other handlers based on model `task`.
Expand Down Expand Up @@ -633,7 +643,8 @@ async def stop_profile(raw_request: Request):
"Lora dynamic loading & unloading is enabled in the API server. "
"This should ONLY be used for local development!")

@router.post("/v1/load_lora_adapter")
@router.post("/v1/load_lora_adapter",
dependencies=[Depends(validate_json_request)])
async def load_lora_adapter(request: LoadLoraAdapterRequest,
raw_request: Request):
handler = models(raw_request)
Expand All @@ -644,7 +655,8 @@ async def load_lora_adapter(request: LoadLoraAdapterRequest,

return Response(status_code=200, content=response)

@router.post("/v1/unload_lora_adapter")
@router.post("/v1/unload_lora_adapter",
dependencies=[Depends(validate_json_request)])
async def unload_lora_adapter(request: UnloadLoraAdapterRequest,
raw_request: Request):
handler = models(raw_request)
Expand Down