Commit 66b809cc authored by zhuwenwen's avatar zhuwenwen
Browse files

Merge tag 'v0.7.2' into v0.7.2-dev

parents 37b63c24 0408efc6
# SPDX-License-Identifier: Apache-2.0
from typing import List from typing import List
from vllm.config import SchedulerConfig from vllm.config import SchedulerConfig
......
# SPDX-License-Identifier: Apache-2.0
from typing import Callable, List, Optional, Tuple from typing import Callable, List, Optional, Tuple
from vllm.lora.request import LoRARequest from vllm.lora.request import LoRARequest
......
# SPDX-License-Identifier: Apache-2.0
from typing import List from typing import List
from typing import Sequence as GenericSequence from typing import Sequence as GenericSequence
from typing import cast from typing import cast
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import AsyncGenerator, List, Mapping, Optional from typing import AsyncGenerator, List, Mapping, Optional
......
# SPDX-License-Identifier: Apache-2.0
""" """
NOTE: This API server is used only for demonstrating usage of AsyncEngine NOTE: This API server is used only for demonstrating usage of AsyncEngine
and simple performance benchmarks. It is not intended for production use. and simple performance benchmarks. It is not intended for production use.
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import codecs import codecs
import json import json
...@@ -408,7 +410,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]): ...@@ -408,7 +410,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]):
return "<image>" return "<image>"
if model_type == "mllama": if model_type == "mllama":
return "<|image|>" return "<|image|>"
if model_type == "qwen2_vl": if model_type in ("qwen2_vl", "qwen2_5_vl"):
return "<|vision_start|><|image_pad|><|vision_end|>" return "<|vision_start|><|image_pad|><|vision_end|>"
if model_type == "molmo": if model_type == "molmo":
return "" return ""
...@@ -428,7 +430,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]): ...@@ -428,7 +430,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]):
return "(<audio>./</audio>)" return "(<audio>./</audio>)"
raise TypeError(f"Unknown model type: {model_type}") raise TypeError(f"Unknown model type: {model_type}")
elif modality == "video": elif modality == "video":
if model_type == "qwen2_vl": if model_type in ("qwen2_vl", "qwen2_5_vl"):
return "<|vision_start|><|video_pad|><|vision_end|>" return "<|vision_start|><|video_pad|><|vision_end|>"
if model_type in ("minicpmo", "minicpmv"): if model_type in ("minicpmo", "minicpmv"):
return "(<video>./</video>)" return "(<video>./</video>)"
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import signal import signal
from http import HTTPStatus from http import HTTPStatus
......
# SPDX-License-Identifier: Apache-2.0
import itertools import itertools
import warnings import warnings
from contextlib import contextmanager from contextlib import contextmanager
......
# SPDX-License-Identifier: Apache-2.0
from typing import List, Optional, Union from typing import List, Optional, Union
from vllm.logger import init_logger from vllm.logger import init_logger
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import atexit import atexit
import gc import gc
......
# SPDX-License-Identifier: Apache-2.0
""" """
This file contains the command line arguments for the vLLM's This file contains the command line arguments for the vLLM's
OpenAI-compatible server. It is kept in a separate file for documentation OpenAI-compatible server. It is kept in a separate file for documentation
......
# SPDX-License-Identifier: Apache-2.0
from functools import lru_cache, partial from functools import lru_cache, partial
from typing import Dict, FrozenSet, Iterable, List, Optional, Union from typing import Dict, FrozenSet, Iterable, List, Optional, Union
......
# SPDX-License-Identifier: Apache-2.0
# Adapted from # Adapted from
# https://github.com/lm-sys/FastChat/blob/168ccc29d3f7edc50823016105c024fe2282732a/fastchat/protocol/openai_api_protocol.py # https://github.com/lm-sys/FastChat/blob/168ccc29d3f7edc50823016105c024fe2282732a/fastchat/protocol/openai_api_protocol.py
import re import re
......
# SPDX-License-Identifier: Apache-2.0
from .abs_reasoning_parsers import ReasoningParser, ReasoningParserManager from .abs_reasoning_parsers import ReasoningParser, ReasoningParserManager
from .deepseek_r1_reasoning_parser import DeepSeekR1ReasoningParser from .deepseek_r1_reasoning_parser import DeepSeekR1ReasoningParser
......
# SPDX-License-Identifier: Apache-2.0
import os import os
from functools import cached_property from functools import cached_property
from typing import Callable, Dict, List, Optional, Sequence, Tuple, Type, Union from typing import Callable, Dict, List, Optional, Sequence, Tuple, Type, Union
......
# SPDX-License-Identifier: Apache-2.0
import re import re
from typing import Optional, Sequence, Tuple, Union from typing import Optional, Sequence, Tuple, Union
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
from http import HTTPStatus from http import HTTPStatus
from io import StringIO from io import StringIO
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import json import json
import time import time
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import time import time
from typing import AsyncGenerator, AsyncIterator, Dict, List, Optional from typing import AsyncGenerator, AsyncIterator, Dict, List, Optional
......
# SPDX-License-Identifier: Apache-2.0
import asyncio import asyncio
import base64 import base64
import time import time
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment