Skip to content

Commit fa6d8ce

Browse files
prashantgupta24njhill
authored andcommitted
♻️ use generic check for encode_plus
Signed-off-by: Prashant Gupta <[email protected]>
1 parent a033645 commit fa6d8ce

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/vllm_tgis_adapter/grpc/grpc_server.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
log_tracing_disabled_warning,
2424
)
2525
from vllm.transformers_utils.tokenizer import AnyTokenizer # noqa: TCH002
26-
from vllm.transformers_utils.tokenizers.mistral import MistralTokenizer
2726
from vllm.utils import iterate_with_cancellation
2827

2928
from vllm_tgis_adapter.logging import init_logger
@@ -856,12 +855,16 @@ async def Tokenize(
856855
tokenizer = await self._get_tokenizer(adapter_kwargs)
857856

858857
responses: list[TokenizeResponse] = []
859-
is_mistral_tokenizer = isinstance(tokenizer, MistralTokenizer)
860858

861859
# TODO: maybe parallelize, also move convert_ids_to_tokens into the
862860
# other threads
863861
for req in request.requests:
864-
if is_mistral_tokenizer:
862+
if not hasattr(tokenizer, "encode_plus"):
863+
if request.return_offsets:
864+
raise ValueError(
865+
f"{type(tokenizer)} doesn't support "
866+
"return_offsets at the moment. "
867+
)
865868
token_ids = tokenizer.encode(
866869
prompt=req.text,
867870
)
@@ -885,11 +888,6 @@ async def Tokenize(
885888
offsets = None
886889

887890
if request.return_offsets:
888-
if is_mistral_tokenizer:
889-
raise ValueError(
890-
"Mistral tokenizer doesn't support "
891-
"return_offsets at the moment. "
892-
)
893891
offsets = [
894892
{"start": start, "end": end}
895893
for start, end in batch_encoding.offset_mapping

0 commit comments

Comments
 (0)