- **Add SPDX license headers to python source files** - **Check for SPDX headers using pre-commit** commit 9d7ef44c3cfb72ca4c32e1c677d99259d10d4745 Author: Russell Bryant <rbryant@redhat.com> Date: Fri Jan 31 14:18:24 2025 -0500 Add SPDX license headers to python source files This commit adds SPDX license headers to python source files as recommended to the project by the Linux Foundation. These headers provide a concise way that is both human and machine readable for communicating license information for each source file. It helps avoid any ambiguity about the license of the code and can also be easily used by tools to help manage license compliance. The Linux Foundation runs license scans against the codebase to help ensure we are in compliance with the licenses of the code we use, including dependencies. Having these headers in place helps that tool do its job. More information can be found on the SPDX site: - https://spdx.dev/learn/handling-license-info/ Signed-off-by: Russell Bryant <rbryant@redhat.com> commit 5a1cf1cb3b80759131c73f6a9dddebccac039dea Author: Russell Bryant <rbryant@redhat.com> Date: Fri Jan 31 14:36:32 2025 -0500 Check for SPDX headers using pre-commit Signed-off-by: Russell Bryant <rbryant@redhat.com> --------- Signed-off-by: Russell Bryant <rbryant@redhat.com>
147 lines
5.3 KiB
Python
147 lines
5.3 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
from typing import Final, List, Optional, Union
|
|
|
|
from fastapi import Request
|
|
|
|
from vllm.config import ModelConfig
|
|
from vllm.engine.protocol import EngineClient
|
|
from vllm.entrypoints.chat_utils import ChatTemplateContentFormatOption
|
|
from vllm.entrypoints.logger import RequestLogger
|
|
# yapf conflicts with isort for this block
|
|
# yapf: disable
|
|
from vllm.entrypoints.openai.protocol import (DetokenizeRequest,
|
|
DetokenizeResponse,
|
|
ErrorResponse,
|
|
TokenizeChatRequest,
|
|
TokenizeRequest,
|
|
TokenizeResponse)
|
|
# yapf: enable
|
|
from vllm.entrypoints.openai.serving_engine import OpenAIServing
|
|
from vllm.entrypoints.openai.serving_models import OpenAIServingModels
|
|
from vllm.logger import init_logger
|
|
|
|
logger = init_logger(__name__)
|
|
|
|
|
|
class OpenAIServingTokenization(OpenAIServing):
|
|
|
|
def __init__(
|
|
self,
|
|
engine_client: EngineClient,
|
|
model_config: ModelConfig,
|
|
models: OpenAIServingModels,
|
|
*,
|
|
request_logger: Optional[RequestLogger],
|
|
chat_template: Optional[str],
|
|
chat_template_content_format: ChatTemplateContentFormatOption,
|
|
) -> None:
|
|
super().__init__(engine_client=engine_client,
|
|
model_config=model_config,
|
|
models=models,
|
|
request_logger=request_logger)
|
|
|
|
self.chat_template = chat_template
|
|
self.chat_template_content_format: Final = chat_template_content_format
|
|
|
|
async def create_tokenize(
|
|
self,
|
|
request: TokenizeRequest,
|
|
raw_request: Request,
|
|
) -> Union[TokenizeResponse, ErrorResponse]:
|
|
error_check_ret = await self._check_model(request)
|
|
if error_check_ret is not None:
|
|
return error_check_ret
|
|
|
|
request_id = f"tokn-{self._base_request_id(raw_request)}"
|
|
|
|
try:
|
|
(
|
|
lora_request,
|
|
prompt_adapter_request,
|
|
) = self._maybe_get_adapters(request)
|
|
|
|
tokenizer = await self.engine_client.get_tokenizer(lora_request)
|
|
|
|
if isinstance(request, TokenizeChatRequest):
|
|
(
|
|
_,
|
|
request_prompts,
|
|
engine_prompts,
|
|
) = await self._preprocess_chat(
|
|
request,
|
|
tokenizer,
|
|
request.messages,
|
|
chat_template=request.chat_template or self.chat_template,
|
|
chat_template_content_format=self.
|
|
chat_template_content_format,
|
|
add_generation_prompt=request.add_generation_prompt,
|
|
continue_final_message=request.continue_final_message,
|
|
chat_template_kwargs=request.chat_template_kwargs,
|
|
add_special_tokens=request.add_special_tokens,
|
|
)
|
|
else:
|
|
(request_prompts,
|
|
engine_prompts) = await self._preprocess_completion(
|
|
request,
|
|
tokenizer,
|
|
request.prompt,
|
|
add_special_tokens=request.add_special_tokens,
|
|
)
|
|
except ValueError as e:
|
|
logger.exception("Error in preprocessing prompt inputs")
|
|
return self.create_error_response(str(e))
|
|
|
|
input_ids: List[int] = []
|
|
for i, engine_prompt in enumerate(engine_prompts):
|
|
self._log_inputs(request_id,
|
|
request_prompts[i],
|
|
params=None,
|
|
lora_request=lora_request,
|
|
prompt_adapter_request=prompt_adapter_request)
|
|
|
|
# Silently ignore prompt adapter since it does not affect
|
|
# tokenization (Unlike in Embeddings API where an error is raised)
|
|
|
|
input_ids.extend(engine_prompt["prompt_token_ids"])
|
|
|
|
return TokenizeResponse(tokens=input_ids,
|
|
count=len(input_ids),
|
|
max_model_len=self.max_model_len)
|
|
|
|
async def create_detokenize(
|
|
self,
|
|
request: DetokenizeRequest,
|
|
raw_request: Request,
|
|
) -> Union[DetokenizeResponse, ErrorResponse]:
|
|
error_check_ret = await self._check_model(request)
|
|
if error_check_ret is not None:
|
|
return error_check_ret
|
|
|
|
request_id = f"tokn-{self._base_request_id(raw_request)}"
|
|
|
|
(
|
|
lora_request,
|
|
prompt_adapter_request,
|
|
) = self._maybe_get_adapters(request)
|
|
|
|
tokenizer = await self.engine_client.get_tokenizer(lora_request)
|
|
|
|
self._log_inputs(request_id,
|
|
request.tokens,
|
|
params=None,
|
|
lora_request=lora_request,
|
|
prompt_adapter_request=prompt_adapter_request)
|
|
|
|
# Silently ignore prompt adapter since it does not affect tokenization
|
|
# (Unlike in Embeddings API where an error is raised)
|
|
|
|
prompt_input = await self._tokenize_prompt_input_async(
|
|
request,
|
|
tokenizer,
|
|
request.tokens,
|
|
)
|
|
input_text = prompt_input["prompt"]
|
|
|
|
return DetokenizeResponse(prompt=input_text)
|