[Frontend] Split OpenAIServingModels into OpenAIModelRegistry + OpenAIServingModels (#36536)
Signed-off-by: Sage Ahrac <sagiahrak@gmail.com>
This commit is contained in:
@@ -16,10 +16,8 @@ from vllm.entrypoints.openai.chat_completion.protocol import ChatCompletionReque
|
||||
from vllm.entrypoints.openai.completion.protocol import CompletionRequest
|
||||
from vllm.entrypoints.openai.engine.protocol import (
|
||||
ErrorResponse,
|
||||
ModelCard,
|
||||
ModelList,
|
||||
ModelPermission,
|
||||
)
|
||||
from vllm.entrypoints.openai.models.serving import OpenAIModelRegistry
|
||||
from vllm.entrypoints.openai.parser.harmony_utils import (
|
||||
get_developer_message,
|
||||
get_system_message,
|
||||
@@ -46,7 +44,7 @@ class OpenAIServingRender:
|
||||
model_config: ModelConfig,
|
||||
renderer: BaseRenderer,
|
||||
io_processor: Any,
|
||||
served_model_names: list[str],
|
||||
model_registry: OpenAIModelRegistry,
|
||||
*,
|
||||
request_logger: RequestLogger | None,
|
||||
chat_template: str | None,
|
||||
@@ -61,7 +59,7 @@ class OpenAIServingRender:
|
||||
self.model_config = model_config
|
||||
self.renderer = renderer
|
||||
self.io_processor = io_processor
|
||||
self.served_model_names = served_model_names
|
||||
self.model_registry = model_registry
|
||||
self.request_logger = request_logger
|
||||
self.chat_template = chat_template
|
||||
self.chat_template_content_format: ChatTemplateContentFormatOption = (
|
||||
@@ -252,21 +250,6 @@ class OpenAIServingRender:
|
||||
|
||||
return messages, [engine_prompt]
|
||||
|
||||
async def show_available_models(self) -> ModelList:
|
||||
"""Returns the models served by this render server."""
|
||||
max_model_len = self.model_config.max_model_len
|
||||
return ModelList(
|
||||
data=[
|
||||
ModelCard(
|
||||
id=name,
|
||||
max_model_len=max_model_len,
|
||||
root=self.model_config.model,
|
||||
permission=[ModelPermission()],
|
||||
)
|
||||
for name in self.served_model_names
|
||||
]
|
||||
)
|
||||
|
||||
def create_error_response(
|
||||
self,
|
||||
message: str | Exception,
|
||||
@@ -276,23 +259,11 @@ class OpenAIServingRender:
|
||||
) -> ErrorResponse:
|
||||
return create_error_response(message, err_type, status_code, param)
|
||||
|
||||
def _is_model_supported(self, model_name: str) -> bool:
|
||||
"""Simplified from OpenAIServing._is_model_supported (no LoRA support)."""
|
||||
return model_name in self.served_model_names
|
||||
|
||||
async def _check_model(
|
||||
self,
|
||||
request: Any,
|
||||
) -> ErrorResponse | None:
|
||||
"""Simplified from OpenAIServing._check_model (no LoRA support)."""
|
||||
if self._is_model_supported(request.model):
|
||||
return None
|
||||
return self.create_error_response(
|
||||
message=f"The model `{request.model}` does not exist.",
|
||||
err_type="NotFoundError",
|
||||
status_code=HTTPStatus.NOT_FOUND,
|
||||
param="model",
|
||||
)
|
||||
return await self.model_registry.check_model(request.model)
|
||||
|
||||
def _validate_chat_template(
|
||||
self,
|
||||
|
||||
Reference in New Issue
Block a user