From 43f3678106ec4e57a51d60498d396cc19378dc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= Date: Tue, 17 Sep 2024 10:55:22 +0200 Subject: [PATCH] http_server: compatibility fixes for vllm>0.6.1.post1 --- src/vllm_tgis_adapter/http.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/vllm_tgis_adapter/http.py b/src/vllm_tgis_adapter/http.py index f111517..e7e217a 100644 --- a/src/vllm_tgis_adapter/http.py +++ b/src/vllm_tgis_adapter/http.py @@ -3,11 +3,15 @@ from typing import TYPE_CHECKING from vllm.entrypoints.launcher import serve_http -from vllm.entrypoints.openai.api_server import ( - init_app, -) +from vllm.entrypoints.openai.api_server import build_app from vllm.logger import init_logger +try: + from vllm.entrypoints.openai.api_server import init_app +except ImportError: # vllm > 0.6.1.post2 + from vllm.entrypoints.openai.api_server import init_app_state + + if TYPE_CHECKING: import argparse @@ -27,7 +31,12 @@ async def run_http_server( # modified copy of vllm.entrypoints.openai.api_server.run_server that # allows passing of the engine - app = await init_app(engine, args) # type: ignore[arg-type] + try: + app = await init_app(engine, args) # type: ignore[arg-type] + except NameError: # vllm > 0.6.1.post2 + app = build_app(args) + model_config = await engine.get_model_config() + app = await init_app_state(engine, model_config, app.staste, args) serve_kwargs = { "host": args.host,