diff --git a/vllm/renderers/__init__.py b/vllm/renderers/__init__.py index 58d9ed70a..db186e1f0 100644 --- a/vllm/renderers/__init__.py +++ b/vllm/renderers/__init__.py @@ -1,8 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project +from .base import BaseRenderer from .params import ChatParams, TokenizeParams, merge_kwargs -from .protocol import BaseRenderer from .registry import RendererRegistry, renderer_from_config __all__ = [ diff --git a/vllm/renderers/protocol.py b/vllm/renderers/base.py similarity index 100% rename from vllm/renderers/protocol.py rename to vllm/renderers/base.py diff --git a/vllm/renderers/deepseek_v32.py b/vllm/renderers/deepseek_v32.py index d10a596b2..e4cc3f0fb 100644 --- a/vllm/renderers/deepseek_v32.py +++ b/vllm/renderers/deepseek_v32.py @@ -14,10 +14,10 @@ from vllm.tokenizers import cached_get_tokenizer from vllm.tokenizers.deepseek_v32 import DeepseekV32Tokenizer from ..tokenizers.hf import HfTokenizer +from .base import BaseRenderer from .inputs import DictPrompt from .inputs.preprocess import parse_dec_only_prompt from .params import ChatParams -from .protocol import BaseRenderer logger = init_logger(__name__) diff --git a/vllm/renderers/grok2.py b/vllm/renderers/grok2.py index c5c3afe86..141c72aa7 100644 --- a/vllm/renderers/grok2.py +++ b/vllm/renderers/grok2.py @@ -13,10 +13,10 @@ from vllm.logger import init_logger from vllm.tokenizers import cached_get_tokenizer from vllm.tokenizers.grok2 import Grok2Tokenizer +from .base import BaseRenderer from .inputs import DictPrompt from .inputs.preprocess import parse_dec_only_prompt from .params import ChatParams -from .protocol import BaseRenderer logger = init_logger(__name__) diff --git a/vllm/renderers/hf.py b/vllm/renderers/hf.py index 5425bd888..83b17e961 100644 --- a/vllm/renderers/hf.py +++ b/vllm/renderers/hf.py @@ -32,10 +32,10 @@ from vllm.transformers_utils.chat_templates import get_chat_template_fallback_pa from vllm.transformers_utils.processor import cached_get_processor from vllm.utils.func_utils import supports_kw +from .base import BaseRenderer from .inputs import DictPrompt from .inputs.preprocess import parse_dec_only_prompt from .params import ChatParams -from .protocol import BaseRenderer if TYPE_CHECKING: from vllm.multimodal.inputs import MultiModalDataDict, MultiModalUUIDDict diff --git a/vllm/renderers/mistral.py b/vllm/renderers/mistral.py index 0d15b37e0..3d3141bdc 100644 --- a/vllm/renderers/mistral.py +++ b/vllm/renderers/mistral.py @@ -15,10 +15,10 @@ from vllm.tokenizers import cached_get_tokenizer from vllm.tokenizers.mistral import MistralTokenizer from vllm.utils.async_utils import make_async +from .base import BaseRenderer from .inputs import DictPrompt from .inputs.preprocess import parse_dec_only_prompt from .params import ChatParams -from .protocol import BaseRenderer logger = init_logger(__name__) diff --git a/vllm/renderers/registry.py b/vllm/renderers/registry.py index dde17a6f9..3abc7c9fe 100644 --- a/vllm/renderers/registry.py +++ b/vllm/renderers/registry.py @@ -7,7 +7,7 @@ from vllm.logger import init_logger from vllm.tokenizers.registry import tokenizer_args_from_config from vllm.utils.import_utils import resolve_obj_by_qualname -from .protocol import BaseRenderer +from .base import BaseRenderer if TYPE_CHECKING: from vllm.config import ModelConfig diff --git a/vllm/renderers/terratorch.py b/vllm/renderers/terratorch.py index 58c1459d2..2d00ebccb 100644 --- a/vllm/renderers/terratorch.py +++ b/vllm/renderers/terratorch.py @@ -12,10 +12,10 @@ from vllm.entrypoints.chat_utils import ( from vllm.logger import init_logger from vllm.tokenizers import TokenizerLike +from .base import BaseRenderer from .inputs import DictPrompt from .inputs.preprocess import parse_dec_only_prompt from .params import ChatParams -from .protocol import BaseRenderer logger = init_logger(__name__)