Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ requires-python = ">=3.8, <4"
dependencies = [
"pydantic",
"torch>=1.10.0",
"transformers>=4.38.0",
"triton; platform_system == 'Linux' and platform_machine == 'x86_64'",
"mlx-lm; platform_system == 'Darwin' and platform_machine == 'arm64'",
"ninja",
Expand All @@ -34,11 +33,11 @@ test = [
"huggingface-hub[cli]",
"protobuf",
"pytest",
"sentencepiece",
"tiktoken",
# transformers==4.50.0 has error on MacOS.
# https://github.com/huggingface/transformers/issues/36906
"transformers<4.50.0; platform_system == 'Darwin'",
"transformers!=4.50.0",
"sentencepiece",
"tiktoken",
]

[build-system]
Expand Down Expand Up @@ -78,6 +77,7 @@ sdist.include = [
"/cpp/**/*.h",
"/include/**/*",
"/python/xgrammar/**/*.py",
"/python/xgrammar/py.typed",

# Third party files
"/3rdparty/**/*",
Expand Down
Empty file added python/xgrammar/py.typed
Empty file.
49 changes: 36 additions & 13 deletions python/xgrammar/tokenizer_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,40 @@

import json
from enum import Enum
from typing import Any, Dict, List, Optional, Union

try:
import sentencepiece
except ImportError:
sentencepiece = None
try:
import tiktoken
except ImportError:
tiktoken = None

from transformers import PreTrainedTokenizerBase, PreTrainedTokenizerFast
from types import ModuleType

Check failure on line 5 in python/xgrammar/tokenizer_info.py

View workflow job for this annotation

GitHub Actions / Pre-check on Ubuntu-latest

Ruff (F401)

python/xgrammar/tokenizer_info.py:5:19: F401 `types.ModuleType` imported but unused
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union

if TYPE_CHECKING:
try:
import sentencepiece
except ImportError:
pass

try:
import tiktoken
except ImportError:
pass

try:
from transformers import PreTrainedTokenizerBase, PreTrainedTokenizerFast
except ImportError:
pass
else:
try:
import sentencepiece
except ImportError:
sentencepiece = None

try:
import tiktoken
except ImportError:
tiktoken = None

try:
from transformers import PreTrainedTokenizerBase, PreTrainedTokenizerFast
except ImportError:
PreTrainedTokenizerBase = Any
PreTrainedTokenizerFast = Any

from .base import XGRObject, _core
from .support import logging
Expand Down Expand Up @@ -162,7 +184,7 @@

Parameters
----------
tokenizer : PreTrainedTokenizerBase
tokenizer : transformers.PreTrainedTokenizerBase
The huggingface tokenizer.

vocab_size : Optional[int], default: None
Expand Down Expand Up @@ -258,6 +280,7 @@
"stop_token_ids is neither provided by user nor found from the tokenizer. "
"It will be automatically detected."
)

return TokenizerInfo(
encoded_vocab,
VocabType.RAW,
Expand Down
Loading