API Perf: Replace pydantic per-element validation with C loop validation (#26355)
This commit is contained in:
@@ -25,9 +25,10 @@ from array import array
|
||||
from collections import Counter
|
||||
from dataclasses import dataclass, field
|
||||
from enum import Enum
|
||||
from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Union
|
||||
from typing import TYPE_CHECKING, Annotated, Any, Dict, List, Literal, Optional, Union
|
||||
|
||||
import torch
|
||||
from pydantic import PlainValidator
|
||||
|
||||
from sglang.srt.lora.lora_registry import LoRARef
|
||||
from sglang.srt.managers.embed_types import PositionalEmbeds
|
||||
@@ -40,6 +41,7 @@ from sglang.srt.observability.req_time_stats import (
|
||||
)
|
||||
from sglang.srt.sampling.sampling_params import SamplingParams
|
||||
from sglang.srt.utils import ImageData, VideoData
|
||||
from sglang.srt.utils.field_validators import validate_optional_list_i64_1d_2d
|
||||
|
||||
# Handle serialization of Image for pydantic
|
||||
if TYPE_CHECKING:
|
||||
@@ -136,8 +138,13 @@ MultimodalDataInputFormat = Union[
|
||||
class GenerateReqInput(BaseReq):
|
||||
# The input prompt. It can be a single prompt or a batch of prompts.
|
||||
text: Optional[Union[List[str], str]] = None
|
||||
# The token ids for text; one can specify either text or input_ids
|
||||
input_ids: Optional[Union[List[List[int]], List[int]]] = None
|
||||
# The token ids for text.
|
||||
#
|
||||
# Use C-loop validator to replace Pydantic per-element type check for efficiency.
|
||||
input_ids: Annotated[
|
||||
Optional[Union[List[List[int]], List[int]]],
|
||||
PlainValidator(validate_optional_list_i64_1d_2d),
|
||||
] = None
|
||||
# The embeddings for input_ids; one can specify either text or input_ids or input_embeds.
|
||||
input_embeds: Optional[Union[List[List[List[float]]], List[List[float]]]] = None
|
||||
# The image input. It can be an image instance, file name, URL, or base64 encoded string.
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
# Copyright 2023-2024 SGLang Team
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# ==============================================================================
|
||||
"""Lightweight, reusable validators for hot-path API fields.
|
||||
|
||||
These are intended to be paired with ``pydantic.PlainValidator`` on
|
||||
dataclass fields whose JSON shape is large or homogeneously typed, where
|
||||
pydantic's default per-element walk has been measured to dominate
|
||||
request latency.
|
||||
|
||||
Usage::
|
||||
|
||||
from typing import Annotated, List, Optional, Union
|
||||
from pydantic import PlainValidator
|
||||
from sglang.srt.utils.field_validators import validate_optional_list_i64_1d_2d
|
||||
|
||||
@dataclass
|
||||
class MyReq:
|
||||
input_ids: Annotated[
|
||||
Optional[Union[List[List[int]], List[int]]],
|
||||
PlainValidator(validate_optional_list_i64_1d_2d),
|
||||
] = None
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from array import array
|
||||
from typing import Any
|
||||
|
||||
|
||||
def validate_list_i64_1d(v: Any) -> list[int]:
|
||||
"""Validates type: list[int]"""
|
||||
if v is None:
|
||||
raise ValueError("must not be None")
|
||||
if not isinstance(v, list):
|
||||
raise ValueError(f"must be list; got {type(v).__name__}")
|
||||
if not v:
|
||||
return v
|
||||
if not isinstance(v[0], int):
|
||||
raise ValueError(f"elements must be int; got {type(v[0]).__name__}")
|
||||
try:
|
||||
array("q", v)
|
||||
except (TypeError, OverflowError) as e:
|
||||
raise ValueError(f"contains non-int64 element: {e}") from None
|
||||
return v
|
||||
|
||||
|
||||
def validate_optional_list_i64_1d_2d(
|
||||
v: Any,
|
||||
) -> list[int] | list[list[int]] | None:
|
||||
"""Validates type: list[int] | list[list[int]] | None"""
|
||||
if v is None:
|
||||
# Accept None
|
||||
return v
|
||||
if not isinstance(v, list):
|
||||
raise ValueError(f"must be list or null; got {type(v).__name__}")
|
||||
if not v:
|
||||
# Accept empty list
|
||||
return v
|
||||
if isinstance(v[0], int):
|
||||
# Accept list[int]
|
||||
return validate_list_i64_1d(v)
|
||||
if isinstance(v[0], list):
|
||||
# Accept list[list[int]]
|
||||
for i, row in enumerate(v):
|
||||
try:
|
||||
validate_list_i64_1d(row)
|
||||
except ValueError as e:
|
||||
raise ValueError(f"row {i}: {e}") from None
|
||||
return v
|
||||
raise ValueError(f"elements must be int or list; got {type(v[0]).__name__}")
|
||||
Reference in New Issue
Block a user