Unverified Commit a75a5b54 authored by kourosh hakhamaneshi's avatar kourosh hakhamaneshi Committed by GitHub
Browse files

[bug-fix] supported_tasks is breaking backward compatibility at init_app_state (#34027)


Signed-off-by: default avatarKourosh Hakhamaneshi <kourosh@anyscale.com>
Signed-off-by: default avatarkourosh hakhamaneshi <31483498+kouroshHakha@users.noreply.github.com>
Co-authored-by: default avatarCyrus Leung <cyrus.tl.leung@gmail.com>
parent f97ca671
...@@ -8,6 +8,7 @@ import os ...@@ -8,6 +8,7 @@ import os
import signal import signal
import socket import socket
import tempfile import tempfile
import warnings
from argparse import Namespace from argparse import Namespace
from collections.abc import AsyncIterator from collections.abc import AsyncIterator
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
...@@ -62,6 +63,8 @@ prometheus_multiproc_dir: tempfile.TemporaryDirectory ...@@ -62,6 +63,8 @@ prometheus_multiproc_dir: tempfile.TemporaryDirectory
# Cannot use __name__ (https://github.com/vllm-project/vllm/pull/4765) # Cannot use __name__ (https://github.com/vllm-project/vllm/pull/4765)
logger = init_logger("vllm.entrypoints.openai.api_server") logger = init_logger("vllm.entrypoints.openai.api_server")
_FALLBACK_SUPPORTED_TASKS: tuple[SupportedTask, ...] = ("generate",)
@asynccontextmanager @asynccontextmanager
async def build_async_engine_client( async def build_async_engine_client(
...@@ -152,7 +155,19 @@ async def build_async_engine_client_from_engine_args( ...@@ -152,7 +155,19 @@ async def build_async_engine_client_from_engine_args(
async_llm.shutdown() async_llm.shutdown()
def build_app(args: Namespace, supported_tasks: tuple["SupportedTask", ...]) -> FastAPI: def build_app(
args: Namespace, supported_tasks: tuple["SupportedTask", ...] | None = None
) -> FastAPI:
if supported_tasks is None:
warnings.warn(
"The 'supported_tasks' parameter was not provided to "
"build_app and will be required in a future version. "
"Defaulting to ('generate',).",
DeprecationWarning,
stacklevel=2,
)
supported_tasks = _FALLBACK_SUPPORTED_TASKS
if args.disable_fastapi_docs: if args.disable_fastapi_docs:
app = FastAPI( app = FastAPI(
openapi_url=None, docs_url=None, redoc_url=None, lifespan=lifespan openapi_url=None, docs_url=None, redoc_url=None, lifespan=lifespan
...@@ -263,9 +278,18 @@ async def init_app_state( ...@@ -263,9 +278,18 @@ async def init_app_state(
engine_client: EngineClient, engine_client: EngineClient,
state: State, state: State,
args: Namespace, args: Namespace,
supported_tasks: tuple["SupportedTask", ...], supported_tasks: tuple["SupportedTask", ...] | None = None,
) -> None: ) -> None:
vllm_config = engine_client.vllm_config vllm_config = engine_client.vllm_config
if supported_tasks is None:
warnings.warn(
"The 'supported_tasks' parameter was not provided to "
"init_app_state and will be required in a future version. "
"Please pass 'supported_tasks' explicitly.",
DeprecationWarning,
stacklevel=2,
)
supported_tasks = _FALLBACK_SUPPORTED_TASKS
if args.served_model_name is not None: if args.served_model_name is not None:
served_model_names = args.served_model_name served_model_names = args.served_model_name
......
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