[Frontend] Delegate preprocessing to OpenAIServingRender (#36483)
Signed-off-by: Sage Ahrac <sagiahrak@gmail.com>
This commit is contained in:
@@ -87,15 +87,26 @@ class OpenAIServingRender:
|
||||
self,
|
||||
request: ChatCompletionRequest,
|
||||
) -> tuple[list[ConversationMessage], list[ProcessorInputs]] | ErrorResponse:
|
||||
"""Copied from OpenAIServingChat.render_chat_request.
|
||||
"""Validate the model and preprocess a chat completion request.
|
||||
|
||||
Differences: engine_client.errored check removed (no engine client).
|
||||
This is the authoritative implementation used directly by the
|
||||
GPU-less render server and delegated to by OpenAIServingChat.
|
||||
"""
|
||||
error_check_ret = await self._check_model(request)
|
||||
if error_check_ret is not None:
|
||||
logger.error("Error with model %s", error_check_ret)
|
||||
return error_check_ret
|
||||
return await self.render_chat(request)
|
||||
|
||||
async def render_chat(
|
||||
self,
|
||||
request: ChatCompletionRequest,
|
||||
) -> tuple[list[ConversationMessage], list[ProcessorInputs]] | ErrorResponse:
|
||||
"""Core preprocessing logic for chat requests (no model/engine check).
|
||||
|
||||
Called directly by render_chat_request and delegated to by
|
||||
OpenAIServingChat.render_chat_request after its engine-aware checks.
|
||||
"""
|
||||
tokenizer = self.renderer.tokenizer
|
||||
|
||||
tool_parser = self.tool_parser
|
||||
@@ -173,14 +184,25 @@ class OpenAIServingRender:
|
||||
self,
|
||||
request: CompletionRequest,
|
||||
) -> list[ProcessorInputs] | ErrorResponse:
|
||||
"""Copied from OpenAIServingCompletion.render_completion_request.
|
||||
"""Validate the model and preprocess a completion request.
|
||||
|
||||
Differences: engine_client.errored check removed (no engine client).
|
||||
This is the authoritative implementation used directly by the
|
||||
GPU-less render server and delegated to by OpenAIServingCompletion.
|
||||
"""
|
||||
error_check_ret = await self._check_model(request)
|
||||
if error_check_ret is not None:
|
||||
return error_check_ret
|
||||
return await self.render_completion(request)
|
||||
|
||||
async def render_completion(
|
||||
self,
|
||||
request: CompletionRequest,
|
||||
) -> list[ProcessorInputs] | ErrorResponse:
|
||||
"""Core preprocessing logic for completion requests (no model/engine check).
|
||||
|
||||
Called directly by render_completion_request and delegated to by
|
||||
OpenAIServingCompletion.render_completion_request after its engine-aware checks.
|
||||
"""
|
||||
# Return error for unsupported features.
|
||||
if request.suffix is not None:
|
||||
return self.create_error_response("suffix is not currently supported")
|
||||
@@ -206,7 +228,7 @@ class OpenAIServingRender:
|
||||
request: ChatCompletionRequest,
|
||||
should_include_tools: bool = True,
|
||||
):
|
||||
"""Copied from OpenAIServingChat._make_request_with_harmony."""
|
||||
"""Build Harmony (GPT-OSS) messages and engine prompt from a chat request."""
|
||||
messages: list[OpenAIMessage] = []
|
||||
|
||||
# because of issues with pydantic we need to potentially
|
||||
@@ -219,11 +241,10 @@ class OpenAIServingRender:
|
||||
# if the model supports it. TODO: Support browsing.
|
||||
assert not self.supports_browsing
|
||||
assert not self.supports_code_interpreter
|
||||
assert request.reasoning_effort != "none", (
|
||||
"Harmony does not support reasoning_effort='none'"
|
||||
)
|
||||
if (reasoning_effort := request.reasoning_effort) == "none":
|
||||
raise ValueError(f"Harmony does not support {reasoning_effort=}")
|
||||
sys_msg = get_system_message(
|
||||
reasoning_effort=request.reasoning_effort,
|
||||
reasoning_effort=reasoning_effort,
|
||||
browser_description=None,
|
||||
python_description=None,
|
||||
with_custom_tools=should_include_tools,
|
||||
|
||||
Reference in New Issue
Block a user