Unverified Commit 253305d5 authored by Cyrus Leung's avatar Cyrus Leung Committed by GitHub
Browse files

[Chore] Delay recent deprecations (#30398)


Signed-off-by: default avatarDarkLight1337 <tlleungac@connect.ust.hk>
parent 794a7875
...@@ -954,7 +954,7 @@ MultiModalKwargsOptionalItems: TypeAlias = ( ...@@ -954,7 +954,7 @@ MultiModalKwargsOptionalItems: TypeAlias = (
) )
@deprecated("`MultiModalKwargs` is deprecated and will be removed in v0.13.") @deprecated("`MultiModalKwargs` is deprecated and will be removed in v0.14.")
class MultiModalKwargs(UserDict[str, NestedTensors]): class MultiModalKwargs(UserDict[str, NestedTensors]):
""" """
A dictionary that represents the keyword arguments to A dictionary that represents the keyword arguments to
...@@ -964,7 +964,7 @@ class MultiModalKwargs(UserDict[str, NestedTensors]): ...@@ -964,7 +964,7 @@ class MultiModalKwargs(UserDict[str, NestedTensors]):
@staticmethod @staticmethod
@deprecated( @deprecated(
"`MultiModalKwargs.from_hf_inputs` is deprecated and " "`MultiModalKwargs.from_hf_inputs` is deprecated and "
"will be removed in v0.13. " "will be removed in v0.14. "
"Please use `MultiModalKwargsItems.from_hf_inputs` and " "Please use `MultiModalKwargsItems.from_hf_inputs` and "
"access the tensor data using `.get_data()`." "access the tensor data using `.get_data()`."
) )
...@@ -977,7 +977,7 @@ class MultiModalKwargs(UserDict[str, NestedTensors]): ...@@ -977,7 +977,7 @@ class MultiModalKwargs(UserDict[str, NestedTensors]):
@staticmethod @staticmethod
@deprecated( @deprecated(
"`MultiModalKwargs.from_items` is deprecated and " "`MultiModalKwargs.from_items` is deprecated and "
"will be removed in v0.13. " "will be removed in v0.14. "
"Please use `MultiModalKwargsItems.from_seq` and " "Please use `MultiModalKwargsItems.from_seq` and "
"access the tensor data using `.get_data()`." "access the tensor data using `.get_data()`."
) )
......
...@@ -429,12 +429,12 @@ def group_mm_kwargs_by_modality( ...@@ -429,12 +429,12 @@ def group_mm_kwargs_by_modality(
if merge_by_field_config is not None: if merge_by_field_config is not None:
logger.warning_once( logger.warning_once(
"The `merge_by_field_config` argument of `group_mm_kwargs_by_modality` " "The `merge_by_field_config` argument of `group_mm_kwargs_by_modality` "
"is deprecated and will be removed in v0.13." "is deprecated and will be removed in v0.14."
) )
if multimodal_cpu_fields is not None: if multimodal_cpu_fields is not None:
logger.warning_once( logger.warning_once(
"The `multimodal_cpu_fields` argument of `group_mm_kwargs_by_modality` " "The `multimodal_cpu_fields` argument of `group_mm_kwargs_by_modality` "
"is deprecated and will be removed in v0.13." "is deprecated and will be removed in v0.14."
) )
from vllm.multimodal.inputs import MultiModalKwargsItems from vllm.multimodal.inputs import MultiModalKwargsItems
......
...@@ -17,7 +17,7 @@ def __getattr__(name: str): ...@@ -17,7 +17,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer.AnyTokenizer` has been moved to " "`vllm.transformers_utils.tokenizer.AnyTokenizer` has been moved to "
"`vllm.tokenizers.TokenizerLike`. " "`vllm.tokenizers.TokenizerLike`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -29,7 +29,7 @@ def __getattr__(name: str): ...@@ -29,7 +29,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer.get_tokenizer` " "`vllm.transformers_utils.tokenizer.get_tokenizer` "
"has been moved to `vllm.tokenizers.get_tokenizer`. " "has been moved to `vllm.tokenizers.get_tokenizer`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -41,7 +41,7 @@ def __getattr__(name: str): ...@@ -41,7 +41,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer.cached_get_tokenizer` " "`vllm.transformers_utils.tokenizer.cached_get_tokenizer` "
"has been moved to `vllm.tokenizers.cached_get_tokenizer`. " "has been moved to `vllm.tokenizers.cached_get_tokenizer`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -53,7 +53,7 @@ def __getattr__(name: str): ...@@ -53,7 +53,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer.cached_tokenizer_from_config` " "`vllm.transformers_utils.tokenizer.cached_tokenizer_from_config` "
"has been moved to `vllm.tokenizers.cached_tokenizer_from_config`. " "has been moved to `vllm.tokenizers.cached_tokenizer_from_config`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -65,7 +65,7 @@ def __getattr__(name: str): ...@@ -65,7 +65,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer.init_tokenizer_from_configs` " "`vllm.transformers_utils.tokenizer.init_tokenizer_from_configs` "
"has been moved to `vllm.tokenizers.init_tokenizer_from_config`. " "has been moved to `vllm.tokenizers.init_tokenizer_from_config`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -75,7 +75,7 @@ def __getattr__(name: str): ...@@ -75,7 +75,7 @@ def __getattr__(name: str):
raise AttributeError(f"module {__name__!r} has no attribute {name!r}") raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
@deprecated("Will be removed in v0.13. Please use `tokenizer.decode()` instead.") @deprecated("Will be removed in v0.14. Please use `tokenizer.decode()` instead.")
def decode_tokens( def decode_tokens(
tokenizer: TokenizerLike, tokenizer: TokenizerLike,
token_ids: list[int], token_ids: list[int],
...@@ -97,7 +97,7 @@ def decode_tokens( ...@@ -97,7 +97,7 @@ def decode_tokens(
return tokenizer.decode(token_ids, **kw_args) return tokenizer.decode(token_ids, **kw_args)
@deprecated("Will be removed in v0.13. Please use `tokenizer.encode()` instead.") @deprecated("Will be removed in v0.14. Please use `tokenizer.encode()` instead.")
def encode_tokens( def encode_tokens(
tokenizer: TokenizerLike, tokenizer: TokenizerLike,
text: str, text: str,
......
...@@ -11,7 +11,7 @@ def __getattr__(name: str): ...@@ -11,7 +11,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer_base.TokenizerBase` has been " "`vllm.transformers_utils.tokenizer_base.TokenizerBase` has been "
"moved to `vllm.tokenizers.TokenizerLike`. " "moved to `vllm.tokenizers.TokenizerLike`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
...@@ -23,7 +23,7 @@ def __getattr__(name: str): ...@@ -23,7 +23,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.transformers_utils.tokenizer_base.TokenizerRegistry` has been " "`vllm.transformers_utils.tokenizer_base.TokenizerRegistry` has been "
"moved to `vllm.tokenizers.TokenizerRegistry`. " "moved to `vllm.tokenizers.TokenizerRegistry`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
......
...@@ -192,7 +192,7 @@ class AsyncLLM(EngineClient): ...@@ -192,7 +192,7 @@ class AsyncLLM(EngineClient):
@property @property
@deprecated( @deprecated(
"`AsyncLLM.processor` has been renamed to `AsyncLLM.input_processor`. " "`AsyncLLM.processor` has been renamed to `AsyncLLM.input_processor`. "
"The old name will be removed in v0.13." "The old name will be removed in v0.14."
) )
def processor(self): def processor(self):
return self.input_processor return self.input_processor
......
...@@ -139,7 +139,7 @@ class LLMEngine: ...@@ -139,7 +139,7 @@ class LLMEngine:
@property @property
@deprecated( @deprecated(
"`LLMEngine.processor` has been renamed to `LLMEngine.input_processor`. " "`LLMEngine.processor` has been renamed to `LLMEngine.input_processor`. "
"The old name will be removed in v0.13." "The old name will be removed in v0.14."
) )
def processor(self): def processor(self):
return self.input_processor return self.input_processor
......
...@@ -10,7 +10,7 @@ def __getattr__(name: str): ...@@ -10,7 +10,7 @@ def __getattr__(name: str):
warnings.warn( warnings.warn(
"`vllm.v1.engine.processor.Processor` has been moved to " "`vllm.v1.engine.processor.Processor` has been moved to "
"`vllm.v1.engine.input_processor.InputProcessor`. " "`vllm.v1.engine.input_processor.InputProcessor`. "
"The old name will be removed in v0.13.", "The old name will be removed in v0.14.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
......
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